Skip to content

Commit bbe91d2

Browse files
committed
Fix same null-pointer exception yet again
1 parent 37a68ba commit bbe91d2

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

resources/META-INF/plugin.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<idea-plugin>
22
<id>lv.midiana.misc.idea-plugins.deep-js-completion</id>
33
<name>deep-js-completion</name>
4-
<version>2018.10.09.001</version>
4+
<version>2018.10.18.001</version>
55
<vendor email="safronevev@gmail.com" url="http://midiana.lv/entry/deep-js-completion">Klesun</vendor>
66

77
<description><![CDATA[

src/org/klesun/deep_js_completion/completion_providers/DeepKeysPvdr.scala

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -104,13 +104,16 @@ class DeepKeysPvdr extends CompletionProvider[CompletionParameters] {
104104
val elapsed = System.nanoTime - startTime
105105
result.addLookupAdvertisement("Resolved in " + (elapsed / 1000000000.0) + " seconds")
106106

107+
// test
108+
// test
109+
// test
110+
// test
111+
107112
val nameToLookup = ListMap(suggestions.map(t => t.getLookupString -> t) : _*)
108113
val builtInSuggestions = new util.ArrayList[LookupElement]
109-
val jsConfig = JSRootConfiguration.getInstance(psi.getProject)
110-
var onlyTyped = false
111-
if (jsConfig != null) {
112-
onlyTyped = jsConfig.isOnlyTypeBasedCompletion
113-
}
114+
val project = if (psi != null) psi.getProject else null
115+
val jsConfig = if (project != null) JSRootConfiguration.getInstance(project) else null
116+
val onlyTyped = if (jsConfig != null) jsConfig.isOnlyTypeBasedCompletion else false
114117

115118
result.runRemainingContributors(parameters, otherSourceResult => {
116119
val lookup = otherSourceResult.getLookupElement

0 commit comments

Comments
 (0)