Fix invalid warning when field type is any (#101)

* fix invalid warning when field type is any * update history
koxudaxi · Apr 18, 2020 · 431c230 · 431c230
1 parent bc0b86a
commit 431c230
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 15 deletions.
diff --git a/resources/META-INF/plugin.xml b/resources/META-INF/plugin.xml
@@ -8,6 +8,7 @@
     <p>BugFixes</p>
     <ul>
         <li>Fix plugin build settings [#100] </li>
+        <li>Fix an invalid warning when a field type is any [#101] </li>
     </ul>
     <h2>version 0.1.1</h2>
     <p>Features</p>

diff --git a/src/com/koxudaxi/pydantic/PydanticTypeProvider.kt b/src/com/koxudaxi/pydantic/PydanticTypeProvider.kt
@@ -4,9 +4,7 @@ import com.intellij.openapi.util.Ref
 import com.intellij.psi.PsiElement
 import com.intellij.psi.util.PsiTreeUtil
 import com.jetbrains.python.psi.*
-import com.jetbrains.python.psi.impl.PyCallExpressionImpl
-import com.jetbrains.python.psi.impl.PyCallExpressionNavigator
-import com.jetbrains.python.psi.impl.PySubscriptionExpressionImpl
+import com.jetbrains.python.psi.impl.*
 import com.jetbrains.python.psi.types.*
 import com.koxudaxi.pydantic.PydanticConfigService.Companion.getInstance
 import one.util.streamex.StreamEx
@@ -177,19 +175,29 @@ class PydanticTypeProvider : PyTypeProviderBase() {
 
         when (val value = field.findAssignedValue()) {
             null -> {
-                val annotation = (field.annotation?.value as? PySubscriptionExpressionImpl) ?: return null
-
-                when {
-                    annotation.qualifier == null -> return value
-                    annotation.qualifier!!.text == "Optional" -> return ellipsis
-                    annotation.qualifier!!.text == "Union" -> annotation.children
-                            .filterIsInstance<PyTupleExpression>()
-                            .forEach {
-                                it.children
-                                        .forEach { type -> if (type is PyNoneLiteralExpression) return ellipsis }
-                            }
+                when (val annotation = field.annotation?.value) {
+                    is PySubscriptionExpressionImpl -> {
+                        when {
+                            annotation.qualifier == null -> return value
+                            annotation.qualifier!!.text == "Optional" -> return ellipsis
+                            annotation.qualifier!!.text == "Union" -> annotation.children
+                                    .filterIsInstance<PyTupleExpression>()
+                                    .forEach {
+                                        it.children
+                                                .forEach { type -> if (type is PyNoneLiteralExpression) return ellipsis }
+                                    }
+                        }
+                        return value
+                    }
+                    is PyReferenceExpressionImpl -> {
+                        return if (annotation.text == "Any") {
+                            ellipsis
+                        } else null
+                    }
+                    else -> {
+                        return null
+                    }
                 }
-                return value
             }
             else -> return getDefaultValueByAssignedValue(field, ellipsis, context, pydanticVersion)
         }

diff --git a/testData/mock/stub/typing/__init__.py b/testData/mock/stub/typing/__init__.py
@@ -9,6 +9,9 @@ class Optional:
     def __getitem__(cls, item):
         pass
 
+class Any:
+    pass
+
 
 class Type:
     @classmethod

diff --git a/testData/typecheckerinspection/field.py b/testData/typecheckerinspection/field.py
@@ -0,0 +1,17 @@
+from builtins import *
+
+from typing import *
+
+from pydantic import BaseModel
+
+
+class A(BaseModel):
+    a: int
+    b: Any
+    c: Optional[int]
+    d: Union[str, int, None]
+
+
+A(a=int(123))
+A(a=int(123), b=456, c=789, d=345)
+A(<warning descr="Expected type 'int', got 'str' instead">a=str(123)</warning>, b=456, <warning descr="Expected type 'Optional[int]', got 'str' instead">c=str(789)</warning>, <warning descr="Expected type 'Union[str, int, None]', got 'bytes' instead">d=bytes(234)</warning>)
diff --git a/testSrc/com/koxudaxi/pydantic/PydanticTypeCheckerInspectionTest.kt b/testSrc/com/koxudaxi/pydantic/PydanticTypeCheckerInspectionTest.kt
@@ -19,4 +19,8 @@ open class PydanticTypeCheckerInspectionTest : PydanticInspectionBase() {
         pydanticConfigService.parsableTypeMap["builtins.str"] = arrayListOf("int")
         doTest()
     }
+
+    fun testField() {
+        doTest()
+    }
 }