Merge pull request #400 from koxudaxi/support_pycharm_2021.3

Support PyCharm 2021.3

Author: koxudaxi

.github/workflows/CI.yml

@@ -32,7 +32,7 @@ jobs:
       uses: ChrisCarini/intellij-platform-plugin-verifier-action@v0.0.2
       with: 
         ide-versions: |
-            pycharmPC:2021.1
+            pycharmPC:2021.3
             pycharmPC:LATEST-EAP-SNAPSHOT
     - name: setup python
       uses: actions/setup-python@v1

build.gradle

@@ -15,7 +15,7 @@ plugins {
 
 intellij {
     pluginName = project.name
-    version = "2021.2.2"
+    version = "2021.3"
     type = "PC"
     updateSinceUntilBuild = false
     downloadSources = true
@@ -24,8 +24,8 @@ intellij {
 
 
 patchPluginXml {
-    sinceBuild = "212.5284.19"
-    untilBuild = "212.*"
+    sinceBuild = "213.5744.248"
+    untilBuild = "213.*"
 }
 
 

resources/META-INF/plugin.xml

@@ -1,9 +1,14 @@
 <idea-plugin url="https://github.com/koxudaxi/pydantic-pycharm-plugin" require-restart="true">
     <id>com.koxudaxi.pydantic</id>
     <name>Pydantic</name>
-    <version>0.3.8</version>
+    <version>0.3.9</version>
     <vendor email="koaxudai@gmail.com">Koudai Aono @koxudaxi</vendor>
     <change-notes><![CDATA[
+    <h2>version 0.3.9</h2>
+    <p>Features</p>
+    <ul>
+        <li>Support PyCharm 2021.3 [#400]</li>
+    </ul>
     <h2>version 0.3.8</h2>
     <p>Features</p>
     <ul>

src/com/koxudaxi/pydantic/PydanticCacheService.kt

@@ -66,7 +66,7 @@ class PydanticCacheService {
         }
 
         private fun getInstance(project: Project): PydanticCacheService {
-            return ServiceManager.getService(project, PydanticCacheService::class.java)
+            return project.getService(PydanticCacheService::class.java)
         }
     }
 

src/com/koxudaxi/pydantic/PydanticConfigService.kt

@@ -2,7 +2,6 @@ package com.koxudaxi.pydantic
 
 import com.intellij.codeInspection.ProblemHighlightType
 import com.intellij.openapi.components.PersistentStateComponent
-import com.intellij.openapi.components.ServiceManager
 import com.intellij.openapi.components.State
 import com.intellij.openapi.components.Storage
 import com.intellij.openapi.project.Project

src/com/koxudaxi/pydantic/PydanticInitializer.kt

@@ -82,7 +82,7 @@ class PydanticInitializer : StartupActivity {
                                     }
                             }
 
-                        } catch (e: AlreadyDisposedException) {
+                        } catch (_: AlreadyDisposedException) {
                         }
                     }
                 }
@@ -179,7 +179,7 @@ class PydanticInitializer : StartupActivity {
         DumbService.getInstance(project).smartInvokeLater {
             try {
                 initializeFileLoader(project)
-            } catch (e: AlreadyDisposedException) {
+            } catch (_: AlreadyDisposedException) {
             }
         }
     }

src/com/koxudaxi/pydantic/PydanticInsertArgumentsQuickFix.kt

@@ -40,7 +40,7 @@ class PydanticInsertArgumentsQuickFix(private val onlyRequired: Boolean) : Local
 
     override fun startInWriteAction(): Boolean = true
 
-    fun runFix(
+    private fun runFix(
         project: Project,
         file: PsiFile,
         originalElement: PsiElement,

src/com/koxudaxi/pydantic/PydanticInspection.kt

@@ -13,6 +13,7 @@ import com.jetbrains.python.psi.impl.PyTargetExpressionImpl
 import com.jetbrains.python.psi.resolve.PyResolveContext
 import com.jetbrains.python.psi.types.PyClassType
 import com.jetbrains.python.psi.types.PyClassTypeImpl
+import com.jetbrains.python.psi.types.TypeEvalContext
 
 
 class PydanticInspection : PyInspection() {
@@ -21,10 +22,10 @@ class PydanticInspection : PyInspection() {
         holder: ProblemsHolder,
         isOnTheFly: Boolean,
         session: LocalInspectionToolSession,
-    ): PsiElementVisitor = Visitor(holder, session)
+    ): PsiElementVisitor = Visitor(holder, PyInspectionVisitor.getContext(session))
 
-    inner class Visitor(holder: ProblemsHolder, session: LocalInspectionToolSession) :
-        PyInspectionVisitor(holder, session) {
+    inner class Visitor(holder: ProblemsHolder, context: TypeEvalContext) :
+        PyInspectionVisitor(holder, context) {
 
         val pydanticConfigService = PydanticConfigService.getInstance(holder.project)
 

src/com/koxudaxi/pydantic/PydanticPackageManagerListener.kt

@@ -30,7 +30,7 @@ class PydanticPackageManagerListener : PyPackageManager.Listener {
                 runWriteAction {
                     try {
                         pydanticStub.delete(this)
-                    } catch (e: java.io.IOException) {
+                    } catch (_: java.io.IOException) {
                     } finally {
                         pydanticStub.refresh(true, true) {
                             clearVersion(sdk)

src/com/koxudaxi/pydantic/PydanticTypeCheckerInspection.kt

@@ -8,6 +8,7 @@ import com.intellij.openapi.util.Key
 import com.intellij.psi.PsiElementVisitor
 import com.jetbrains.python.codeInsight.typing.matchingProtocolDefinitions
 import com.jetbrains.python.documentation.PythonDocumentationProvider
+import com.jetbrains.python.inspections.PyInspectionVisitor
 import com.jetbrains.python.inspections.PyTypeCheckerInspection
 import com.jetbrains.python.psi.PyCallExpression
 import com.jetbrains.python.psi.PyCallExpression.PyArgumentsMapping
@@ -27,11 +28,11 @@ class PydanticTypeCheckerInspection : PyTypeCheckerInspection() {
         if (LOG.isDebugEnabled) {
             session.putUserData(TIME_KEY, System.nanoTime())
         }
-        return Visitor(holder, session)
+        return Visitor(holder, PyInspectionVisitor.getContext(session))
     }
 
-    class Visitor(holder: ProblemsHolder?, session: LocalInspectionToolSession) :
-        PyTypeCheckerInspection.Visitor(holder, session) {
+    class Visitor(holder: ProblemsHolder?, context: TypeEvalContext) :
+        PyTypeCheckerInspection.Visitor(holder, context) {
 
         val pydanticConfigService = PydanticConfigService.getInstance(holder!!.project)
 
@@ -103,7 +104,7 @@ class PydanticTypeCheckerInspection : PyTypeCheckerInspection() {
         private fun analyzeCallee(callSite: PyCallSiteExpression, mapping: PyArgumentsMapping) {
             val callableType = mapping.callableType ?: return
             val receiver = callSite.getReceiver(callableType.callable)
-            val substitutions = PyTypeChecker.unifyReceiver(receiver, myTypeEvalContext)
+            val substitutions = PyTypeChecker.unifyReceiverWithParamSpecs(receiver, myTypeEvalContext)
             val mappedParameters = mapping.mappedParameters
             val cachedParsableTypeMap = mutableMapOf<PyType, PyType?>()
             val cachedAcceptableTypeMap = mutableMapOf<PyType, PyType?>()
@@ -162,7 +163,7 @@ class PydanticTypeCheckerInspection : PyTypeCheckerInspection() {
         private fun matchParameterAndArgument(
             parameterType: PyType?,
             argumentType: PyType?,
-            substitutions: Map<PyGenericType, PyType>,
+            substitutions: PyTypeChecker.GenericSubstitutions,
         ): Boolean {
             return PyTypeChecker.match(parameterType,
                 argumentType,