Merge pull request #46 from koxudaxi/support_default_values

Support default values
koxudaxi · Aug 19, 2019 · 57e96c2 · 57e96c2
2 parents 61b9876 + d2a1c7a
commit 57e96c2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/resources/META-INF/plugin.xml b/resources/META-INF/plugin.xml
@@ -7,7 +7,8 @@
     <h2>version 0.0.14</h2>
     <p>Features</p>
     <ul>
-        <li>Ignore warning for `self` argument with @validator
+        <li>Support default values [#46] <li>
+        <li>Ignore warning for self argument with @validator [#45] </li>
         <li>Support pydantic.dataclasses.dataclass [#43] </li>
         <li>Search related-fields by class attributes and keyword arguments of __init__. with Ctrl+B and Cmd+B [#42] </li>
     </ul>
@@ -41,7 +42,7 @@
          </li>
         <li>pydantic.dataclasses.dataclass
             <ul>
-                <li>Support same features as `pydantic.BaseModel`</li>
+                <li>Support same features as pydantic.BaseModel</li>
             </ul>
         </li>
     </ul>

diff --git a/src/com/koxudaxi/pydantic/PydanticTypeProvider.kt b/src/com/koxudaxi/pydantic/PydanticTypeProvider.kt
@@ -169,7 +169,8 @@ class PydanticTypeProvider : PyTypeProviderBase() {
         if (assignedValue.text == "...") {
             return null
         }
-        val callee = (assignedValue as? PyCallExpressionImpl)?.callee ?: return ellipsis
+
+        val callee = (assignedValue as? PyCallExpressionImpl)?.callee ?: return assignedValue
         val referenceExpression = callee.reference?.element as? PyReferenceExpression ?: return ellipsis
 
         val resolveResults = getResolveElements(referenceExpression, context)
@@ -180,14 +181,13 @@ class PydanticTypeProvider : PyTypeProviderBase() {
                     if (pyClass != null && isPydanticField(pyClass, context)) {
                         val defaultValue = assignedValue.getKeywordArgument("default")
                                 ?: assignedValue.getArgument(0, PyExpression::class.java)
-                        when {
-                            defaultValue == null -> return null
-                            defaultValue.text == "..." -> return null
-                            defaultValue.text == null -> return ellipsis
-                            defaultValue.text.isNotBlank() -> return ellipsis
+                        return when {
+                            defaultValue == null -> null
+                            defaultValue.text == "..." -> null
+                            else -> defaultValue
                         }
                     }
                 }
-        return ellipsis
+        return assignedValue
     }
 }