intellij: fix narrowed types

KotlinIsland · KotlinIsland · commit 98f770df5b7b · 2024-02-13T17:22:00.000+10:00
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+intellij/src/test/java/** linguist-vendored
diff --git a/.idea/basedtyping.iml b/.idea/basedtyping.iml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/intellij/CHANGELOG.md b/intellij/CHANGELOG.md
@@ -4,8 +4,12 @@
 
 ## [Unreleased]
 
+## [0.1.3]
+
 ### Added
 - Callable literal types `() -> int`
+### Fixed
+- Narrowed types were broken
  
 ## [0.1.2] - 2023-01-12
 
diff --git a/intellij/build.gradle.kts b/intellij/build.gradle.kts
@@ -26,9 +26,9 @@ dependencies {
 
 // Set the JVM language level used to build the project. Use Java 11 for 2020.3+, and Java 17 for 2022.2+.
 kotlin {
-    @Suppress("UnstableApiUsage")
     jvmToolchain {
         languageVersion = JavaLanguageVersion.of(17)
+        @Suppress("UnstableApiUsage")
         vendor = JvmVendorSpec.JETBRAINS
     }
 }
diff --git a/intellij/gradle.properties b/intellij/gradle.properties
@@ -4,22 +4,22 @@ pluginGroup = org.basedsoft.plugins.basedtyping
 pluginName = basedtyping
 pluginRepositoryUrl = https://github.com/KotlinIsland/basedtyping
 # SemVer format -> https://semver.org
-pluginVersion = 0.1.2
+pluginVersion = 0.1.3
 
 # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 pluginSinceBuild = 233
-pluginUntilBuild = 233.*
+pluginUntilBuild = 241.*
 
 # IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension
-platformType = IC
-platformVersion = 2023.3.2
+platformType = PC
+platformVersion = 2023.3.3
 
 # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
 # Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22
-platformPlugins = PythonCore:233.11799.300
+platformPlugins = PythonCore
 
 # Gradle Releases -> https://github.com/gradle/gradle/releases
-gradleVersion = 8.5
+gradleVersion = 8.6
 
 # Opt-out flag for bundling Kotlin standard library -> https://jb.gg/intellij-platform-kotlin-stdlib
 kotlin.stdlib.default.dependency = false
diff --git a/intellij/gradle/libs.versions.toml b/intellij/gradle/libs.versions.toml
@@ -3,11 +3,12 @@
 annotations = "24.1.0"
 
 # plugins
-kotlin = "1.9.21"
+kotlin = "1.9.22"
 changelog = "2.2.0"
-gradleIntelliJPlugin = "1.16.1"
+gradleIntelliJPlugin = "1.17.1"
 kover = "0.7.5"
 
+
 [libraries]
 annotations = { group = "org.jetbrains", name = "annotations", version.ref = "annotations" }
 
diff --git a/intellij/gradle/wrapper/gradle-wrapper.properties b/intellij/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/intellij/gradlew.bat b/intellij/gradlew.bat
@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
diff --git a/intellij/src/main/kotlin/org/basedsoft/plugins/basedtyping/BasedTypingTypeProvider.kt b/intellij/src/main/kotlin/org/basedsoft/plugins/basedtyping/BasedTypingTypeProvider.kt
@@ -45,7 +45,7 @@ private class BasedTypingTypeProvider : PyTypeProviderBase() {
         val param = referenceExpression.followAssignmentsChain(PyResolveContext.defaultContext(context)).element
         if (param !is PyNamedParameter) return null
         val annotation = param.annotation?.value ?: return null
-        return getType(annotation, context)
+        return getType(annotation, context, simple=true)
     }
     /**
      * Needed to work around a limitation in PyTypingTypeProvider
@@ -137,6 +137,7 @@ fun getOverload(param: PyNamedParameter, func: PyFunction, context: TypeEvalCont
             .filterNotNull()
             .toSet()
             .takeIf { it.isNotEmpty() }
+            // TODO: keep the correct order
             ?.let { PyUnionType.union(it) }
 
 fun getOverloadReturn(func: PyFunction, context: TypeEvalContext) =
diff --git a/intellij/src/test/java/com/jetbrains/python/PythonMockSdk.java b/intellij/src/test/java/com/jetbrains/python/PythonMockSdk.java
@@ -0,0 +1,128 @@
+// Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+package com.jetbrains.python;
+
+import com.intellij.openapi.application.Application;
+import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.projectRoots.*;
+import com.intellij.openapi.roots.OrderRootType;
+import com.intellij.openapi.util.KeyWithDefaultValue;
+import com.intellij.openapi.vfs.LocalFileSystem;
+import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.util.containers.ContainerUtil;
+import com.jetbrains.python.codeInsight.typing.PyTypeShed;
+import com.jetbrains.python.codeInsight.userSkeletons.PyUserSkeletonsUtil;
+import com.jetbrains.python.psi.LanguageLevel;
+import com.jetbrains.python.sdk.PythonSdkUtil;
+import org.jdom.Element;
+import org.jetbrains.annotations.NonNls;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+public final class PythonMockSdk {
+
+    private PythonMockSdk() {
+    }
+
+    public static @NotNull Sdk create() {
+        return create(LanguageLevel.getLatest());
+    }
+
+    public static @NotNull Sdk create(@NotNull String sdkPath) {
+        return create(sdkPath, LanguageLevel.getLatest());
+    }
+
+    public static @NotNull Sdk create(@NotNull LanguageLevel level, VirtualFile @NotNull ... additionalRoots) {
+        return create(PythonHelpersLocator.getPythonCommunityPath() + "/testData" + "/MockSdk", level, additionalRoots);
+    }
+
+    private static @NotNull Sdk create(@NotNull String sdkPath, @NotNull LanguageLevel level, VirtualFile @NotNull ... additionalRoots) {
+        String sdkName = "Mock " + PyNames.PYTHON_SDK_ID_NAME + " " + level.toPythonVersion();
+        return create(sdkName, sdkPath, new PyMockSdkType(level), level, additionalRoots);
+    }
+
+    public static @NotNull Sdk create(@NotNull String sdkName,
+                                      @NotNull String sdkPath,
+                                      @NotNull SdkTypeId sdkType,
+                                      @NotNull LanguageLevel level,
+                                      VirtualFile @NotNull ... additionalRoots) {
+        Sdk sdk = ProjectJdkTable.getInstance().createSdk(sdkName, sdkType);
+        SdkModificator sdkModificator = sdk.getSdkModificator();
+        sdkModificator.setHomePath(sdkPath + "/bin/python");
+        sdkModificator.setVersionString(toVersionString(level));
+
+        createRoots(sdkPath, level).forEach(vFile -> {
+            sdkModificator.addRoot(vFile, OrderRootType.CLASSES);
+        });
+
+        Arrays.asList(additionalRoots).forEach(vFile -> {
+            sdkModificator.addRoot(vFile, OrderRootType.CLASSES);
+        });
+
+        Application application = ApplicationManager.getApplication();
+        Runnable runnable = () -> sdkModificator.commitChanges();
+        if (application.isDispatchThread()) {
+            application.runWriteAction(runnable);
+        } else {
+            application.invokeAndWait(() -> application.runWriteAction(runnable));
+        }
+        sdk.putUserData(KeyWithDefaultValue.create("MOCK_PY_MARKER_KEY", true), true);
+        return sdk;
+
+        // com.jetbrains.python.psi.resolve.PythonSdkPathCache.getInstance() corrupts SDK, so have to clone
+        //return sdk.clone();
+    }
+
+    private static @NotNull List<VirtualFile> createRoots(@NotNull @NonNls String mockSdkPath, @NotNull LanguageLevel level) {
+        final var result = new ArrayList<VirtualFile>();
+
+        final var localFS = LocalFileSystem.getInstance();
+        ContainerUtil.addIfNotNull(result, localFS.refreshAndFindFileByIoFile(new File(mockSdkPath, "Lib")));
+        ContainerUtil.addIfNotNull(result, localFS.refreshAndFindFileByIoFile(new File(mockSdkPath, PythonSdkUtil.SKELETON_DIR_NAME)));
+
+        ContainerUtil.addIfNotNull(result, PyUserSkeletonsUtil.getUserSkeletonsDirectory());
+
+        result.addAll(PyTypeShed.INSTANCE.findRootsForLanguageLevel(level));
+
+        return result;
+    }
+
+    private static @NotNull String toVersionString(@NotNull LanguageLevel level) {
+        return "Python " + level.toPythonVersion();
+    }
+
+    private static final class PyMockSdkType implements SdkTypeId {
+
+        @NotNull
+        private final LanguageLevel myLevel;
+
+        private PyMockSdkType(@NotNull LanguageLevel level) {
+            myLevel = level;
+        }
+
+        @NotNull
+        @Override
+        public String getName() {
+            return PyNames.PYTHON_SDK_ID_NAME;
+        }
+
+        @Override
+        public @NotNull String getVersionString(@NotNull Sdk sdk) {
+            return toVersionString(myLevel);
+        }
+
+        @Override
+        public void saveAdditionalData(@NotNull SdkAdditionalData additionalData, @NotNull Element additional) {
+        }
+
+        @Nullable
+        @Override
+        public SdkAdditionalData loadAdditionalData(@NotNull Sdk currentSdk, @NotNull Element additional) {
+            return null;
+        }
+    }
+}
diff --git a/intellij/src/test/java/com/jetbrains/python/README.md b/intellij/src/test/java/com/jetbrains/python/README.md
@@ -0,0 +1 @@
+This stuff is copied from JetBrains/intellij-community because they don't ship it
diff --git a/intellij/src/test/java/com/jetbrains/python/fixtures/PyLightProjectDescriptor.java b/intellij/src/test/java/com/jetbrains/python/fixtures/PyLightProjectDescriptor.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2000-2015 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.jetbrains.python.fixtures;
+
+import com.intellij.openapi.application.PathManager;
+import com.intellij.openapi.projectRoots.Sdk;
+import com.intellij.openapi.roots.ModifiableRootModel;
+import com.intellij.openapi.roots.OrderRootType;
+import com.intellij.openapi.roots.libraries.Library;
+import com.intellij.openapi.vfs.LocalFileSystem;
+import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.testFramework.LightProjectDescriptor;
+import com.jetbrains.python.PythonHelpersLocator;
+import com.jetbrains.python.PythonMockSdk;
+import com.jetbrains.python.psi.LanguageLevel;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Project descriptor (extracted from {@link com.jetbrains.python.fixtures.PyTestCase}) and should be used with it.
+ * @author Ilya.Kazakevich
+ */
+public class PyLightProjectDescriptor extends LightProjectDescriptor {
+
+    @Nullable
+    private final String myName;
+
+    @NotNull
+    private final LanguageLevel myLevel;
+
+    public PyLightProjectDescriptor(@NotNull LanguageLevel level) {
+        this(null, level);
+    }
+
+    public PyLightProjectDescriptor(@NotNull String name) {
+        this(name, LanguageLevel.getLatest());
+    }
+
+    private PyLightProjectDescriptor(@Nullable String name, @NotNull LanguageLevel level) {
+        myName = name;
+        myLevel = level;
+    }
+
+    @Override
+    public Sdk getSdk() {
+        return myName == null
+                ? PythonMockSdk.create(myLevel, getAdditionalRoots())
+                : PythonMockSdk.create(PythonHelpersLocator.getPythonCommunityPath() + "/testData" + "/" + myName);
+    }
+
+    /**
+     * @return additional roots to add to mock python
+     * @apiNote ignored when name is provided.
+     */
+    protected VirtualFile @NotNull [] getAdditionalRoots() {
+        return VirtualFile.EMPTY_ARRAY;
+    }
+
+    protected void createLibrary(ModifiableRootModel model, final String name, final String path) {
+        final Library.ModifiableModel modifiableModel = model.getModuleLibraryTable().createLibrary(name).getModifiableModel();
+        final VirtualFile home =
+                LocalFileSystem.getInstance().refreshAndFindFileByPath(PathManager.getHomePath() + path);
+
+        modifiableModel.addRoot(home, OrderRootType.CLASSES);
+        modifiableModel.commit();
+    }
+}
diff --git a/intellij/src/test/java/com/jetbrains/python/fixtures/PyTestCase.java b/intellij/src/test/java/com/jetbrains/python/fixtures/PyTestCase.java
diff --git a/intellij/src/test/kotlin/org/basedsoft/plugins/basedtyping/TestBasedTypeProvider.kt b/intellij/src/test/kotlin/org/basedsoft/plugins/basedtyping/TestBasedTypeProvider.kt

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+intellij/src/test/java/** linguist-vendored`
Original file line number	Diff line number	Diff line change
`@@ -26,9 +26,9 @@ dependencies {`
`26`	`26`
`27`	`27`	`// Set the JVM language level used to build the project. Use Java 11 for 2020.3+, and Java 17 for 2022.2+.`
`28`	`28`	`kotlin {`
`29`		`- @Suppress("UnstableApiUsage")`
`30`	`29`	`jvmToolchain {`
`31`	`30`	`languageVersion = JavaLanguageVersion.of(17)`
	`31`	`+ @Suppress("UnstableApiUsage")`
`32`	`32`	`vendor = JvmVendorSpec.JETBRAINS`
`33`	`33`	`}`
`34`	`34`	`}`