Prepare for release 0.16.0

leinardi · Aug 31, 2023 · 26d9a9b · 26d9a9b
1 parent b2aed58
commit 26d9a9b
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+**[0.16.0] 2023-08-31**
+- Fixed #63: Remote Interpreter
+- Fixed #110: Support for mypy using WSL interpreter
+- Respect mypy path field and don't force usage of project interpreter
+
 **[0.15.0] 2023-04-24**
 - Fixed #107: Icons not visible in new Jetbrains UI
 - New: Min IDEA version raised from PC-2021.2 to PC-2022.1.4

diff --git a/gradle.properties b/gradle.properties
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-version=0.15.0
+version=0.16.0
 ideVersion=PC-2022.1.4
 pythonPlugin=python-ce
 sinceBuild=221.6008

diff --git a/src/main/java/com/leinardi/pycharm/mypy/mpapi/MypyRunner.java b/src/main/java/com/leinardi/pycharm/mypy/mpapi/MypyRunner.java
@@ -58,6 +58,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
+import java.nio.file.Path;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 
@@ -137,6 +138,7 @@ public static String getMypyPath(Project project, boolean checkConfigService) {
                 return mypyPath;
             }
         }
+
         VirtualFile interpreterFile = getInterpreterFile(project);
         if (isVenv(interpreterFile)) {
             VirtualFile mypyFile = LocalFileSystem.getInstance()
@@ -155,6 +157,12 @@ public static boolean checkMypyAvailable(Project project) {
     }
 
     public static boolean checkMypyAvailable(Project project, boolean showNotifications) {
+        String mypyPath = getMypyPath(project);
+        boolean isMypyPathValid = !mypyPath.isEmpty() && isMypyPathValid(mypyPath, project);
+        if (isMypyPathValid) {
+            return true;
+        }
+
         Sdk projectSdk = ProjectRootManager.getInstance(project).getProjectSdk();
         if (projectSdk == null
                 || projectSdk.getHomeDirectory() == null
@@ -173,16 +181,8 @@ public static boolean checkMypyAvailable(Project project, boolean showNotificati
                 }
             }
         }
-        MypyConfigService mypyConfigService = MypyConfigService.getInstance(project);
-        if (mypyConfigService == null) {
-            throw new IllegalStateException("MypyConfigService is null");
-        }
-        String mypyPath = getMypyPath(project);
-        boolean isMypyPathValid = !mypyPath.isEmpty() && isMypyPathValid(mypyPath, project);
-        if (showNotifications && !isMypyPathValid) {
-            Notifications.showUnableToRunMypy(project);
-        }
-        return isMypyPathValid;
+
+        return false;
     }
 
     private static String getMypyConfigFile(Project project, String mypyConfigFilePath) throws MypyPluginException {
@@ -382,11 +382,28 @@ private static GeneralCommandLine getMypyCommandLine(Project project, String myp
 
     @Nullable
     private static VirtualFile getInterpreterFile(Project project) {
-        Sdk projectSdk = ProjectRootManager.getInstance(project).getProjectSdk();
-        if (projectSdk != null) {
-            return projectSdk.getHomeDirectory();
+        MypyConfigService mypyConfigService = MypyConfigService.getInstance(project);
+        if (mypyConfigService == null) {
+            throw new IllegalStateException("MypyConfigService is null");
+        }
+        String customMypyPath = mypyConfigService.getCustomMypyPath();
+        if (!customMypyPath.isEmpty()) {
+            Path mypyFolder = Path.of(customMypyPath).getParent();
+            File file = mypyFolder.resolve("python").toFile();
+            if (!file.exists()) {
+                return null;
+            }
+
+            LocalFileSystem fileSystem = LocalFileSystem.getInstance();
+            return fileSystem.findFileByIoFile(file);
+
+        } else {
+            Sdk projectSdk = ProjectRootManager.getInstance(project).getProjectSdk();
+            if (projectSdk != null) {
+                return projectSdk.getHomeDirectory();
+            }
+            return null;
         }
-        return null;
     }
 
     private static void injectEnvironmentVariables(Project project, GeneralCommandLine cmd) {