#5 Fix: null pointer on JSRootConfiguration.getInstance

klesun · Oct 9, 2018 · 37a68ba · 37a68ba
1 parent d27728f
commit 37a68ba
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/resources/META-INF/plugin.xml b/resources/META-INF/plugin.xml
@@ -1,7 +1,7 @@
 <idea-plugin>
   <id>lv.midiana.misc.idea-plugins.deep-js-completion</id>
   <name>deep-js-completion</name>
-  <version>2018.09.14.001</version>
+  <version>2018.10.09.001</version>
   <vendor email="safronevev@gmail.com"  url="http://midiana.lv/entry/deep-js-completion">Klesun</vendor>
 
   <description><![CDATA[
@@ -26,7 +26,7 @@ This plugin will be highly inspired by my other plugin, <a href="https://plugins
     ]]></description>
 
   <change-notes><![CDATA[
-  <li>Fix: null pointer on parameters.getOriginalPosition</li>
+  <li>Fix: null pointer on JSRootConfiguration.getInstance</li>
     ]]>
   </change-notes>
 

diff --git a/src/org/klesun/deep_js_completion/completion_providers/DeepKeysPvdr.scala b/src/org/klesun/deep_js_completion/completion_providers/DeepKeysPvdr.scala
@@ -106,7 +106,11 @@ class DeepKeysPvdr extends CompletionProvider[CompletionParameters] {
 
     val nameToLookup = ListMap(suggestions.map(t => t.getLookupString -> t) : _*)
     val builtInSuggestions = new util.ArrayList[LookupElement]
-    val onlyTyped = JSRootConfiguration.getInstance(psi.getProject).isOnlyTypeBasedCompletion
+    val jsConfig = JSRootConfiguration.getInstance(psi.getProject)
+    var onlyTyped = false
+    if (jsConfig != null) {
+      onlyTyped = jsConfig.isOnlyTypeBasedCompletion
+    }
 
     result.runRemainingContributors(parameters, otherSourceResult => {
       val lookup = otherSourceResult.getLookupElement