From 62900a4e5cf466f0832372caa05983f1a17e1b17 Mon Sep 17 00:00:00 2001
From: Koudai Aono <koxudaxi@gmail.com>
Date: Tue, 24 Sep 2019 13:57:40 +0900
Subject: [PATCH] fix auto completion for Fields (#75)

---
 resources/META-INF/plugin.xml                             | 6 ++++++
 .../koxudaxi/pydantic/PydanticCompletionContributor.kt    | 8 ++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/resources/META-INF/plugin.xml b/resources/META-INF/plugin.xml
index a294d6a5..aaa11b23 100644
--- a/resources/META-INF/plugin.xml
+++ b/resources/META-INF/plugin.xml
@@ -4,6 +4,12 @@
     <version>0.0.21</version>
     <vendor email="koaxudai@gmail.com">Koudai Aono @koxudaxi</vendor>
     <change-notes><![CDATA[
+    <h2>version 0.0.22</h2>
+    <p>Features, BugFixes</p>
+    <ul>
+        <li>Fix auto-completion for Fields [#75] </li>
+        <li>Improve to insert validate methods [#74] </li>
+    </ul>
     <h2>version 0.0.21</h2>
     <p>Features, BugFixes</p>
     <ul>
diff --git a/src/com/koxudaxi/pydantic/PydanticCompletionContributor.kt b/src/com/koxudaxi/pydantic/PydanticCompletionContributor.kt
index bc05daf6..7753a5ff 100644
--- a/src/com/koxudaxi/pydantic/PydanticCompletionContributor.kt
+++ b/src/com/koxudaxi/pydantic/PydanticCompletionContributor.kt
@@ -118,7 +118,7 @@ class PydanticCompletionContributor : CompletionContributor() {
             { completionResult ->
                 if (completionResult.lookupElement.psiElement?.getIcon(0) == AllIcons.Nodes.Field) {
                     completionResult.lookupElement.lookupString
-                            .takeIf { name -> !fieldElements.contains(name) && (excludes == null || !excludes.contains(name)) }
+                            .takeIf { name -> !fieldElements.contains(name) && (!excludes.contains(name)) }
                             ?.let { result.passResult(completionResult) }
                 } else {
                     result.passResult(completionResult)
@@ -135,9 +135,9 @@ class PydanticCompletionContributor : CompletionContributor() {
         override val icon: Icon = AllIcons.Nodes.Parameter
 
         override fun addCompletions(parameters: CompletionParameters, context: ProcessingContext, result: CompletionResultSet) {
-            val pyArgumentList = parameters.position.parent!!.parent!! as PyArgumentList
+            val pyArgumentList = parameters.position.parent?.parent as? PyArgumentList ?: return
             val typeEvalContext = parameters.getTypeEvalContext()
-            val pyClassType = (typeEvalContext.getType(pyArgumentList.parent as PyCallExpression) as? PyClassType)
+            val pyClassType = (pyArgumentList.parent as? PyCallExpression)?.let{typeEvalContext.getType(it)} as? PyClassType
                     ?: return
 
             if (!isPydanticModel(pyClassType.pyClass, typeEvalContext)) return
@@ -160,7 +160,7 @@ class PydanticCompletionContributor : CompletionContributor() {
 
         override fun addCompletions(parameters: CompletionParameters, context: ProcessingContext, result: CompletionResultSet) {
             val typeEvalContext = parameters.getTypeEvalContext()
-            val pyType = typeEvalContext.getType(parameters.position.parent.firstChild as PyTypedElement) ?: return
+            val pyType = (parameters.position.parent?.firstChild as? PyTypedElement)?.let { typeEvalContext.getType(it)} ?: return
 
             val pyClassType = getPyClassTypeByPyTypes(pyType).firstOrNull { isPydanticModel(it.pyClass) } ?: return
             if (pyClassType.isDefinition) { // class