Merge pull request #362 from koxudaxi/fix_null_pointer_exception_in_p…

…ydantic_type_checker_inspection Fix NullPointerException in PydanticTypeCheckerInspection.kt
koxudaxi · Sep 4, 2021 · c55822b · c55822b
2 parents e82c193 + 51a3dad
commit c55822b
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/resources/META-INF/plugin.xml b/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.5</version>
+    <version>0.3.6</version>
     <vendor email="koaxudai@gmail.com">Koudai Aono @koxudaxi</vendor>
     <change-notes><![CDATA[
+    <h2>version 0.3.6</h2>
+    <p>BugFixes</p>
+    <ul>
+        <li>Fix NullPointerException in PydanticTypeCheckerInspection.kt [#362]</li>
+    </ul>
     <h2>version 0.3.5</h2>
     <p>Features</p>
     <ul>

diff --git a/src/com/koxudaxi/pydantic/PydanticTypeCheckerInspection.kt b/src/com/koxudaxi/pydantic/PydanticTypeCheckerInspection.kt
@@ -110,7 +110,7 @@ class PydanticTypeCheckerInspection : PyTypeCheckerInspection() {
             for ((argument, parameter) in PyCallExpressionHelper.getRegularMappedParameters(mappedParameters)) {
                 val expected = parameter.getArgumentType(myTypeEvalContext)
                 val promotedToLiteral = promoteToLiteral(argument, expected, myTypeEvalContext)
-                val actual = promotedToLiteral ?: myTypeEvalContext.getType(argument)!!
+                val actual = promotedToLiteral ?: myTypeEvalContext.getType(argument)
                 val strictMatched = matchParameterAndArgument(expected, actual, substitutions)
                 val strictResult = AnalyzeArgumentResult(expected, actual, strictMatched)
                 if (!strictResult.isMatched) {

diff --git a/testData/typecheckerinspection/acceptableType.py b/testData/typecheckerinspection/acceptableType.py
@@ -10,3 +10,14 @@ class A(BaseModel):
 
 A(a=str('123'))
 A(<weak_warning descr="Field is of type 'str', 'int' is set as an acceptable type in pyproject.toml">a=int(123)</weak_warning>)
+
+def get_unknown_type_value():
+    raise Exception()
+
+A(a=get_unknown_type_value())
+A(<warning descr="Expected type 'str', got 'None' instead">a=None</warning>)
+
+class B:
+    pass
+
+A(<warning descr="Expected type 'str', got 'B' instead">a=B()</warning>)