azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix NPE in LookupCancelService$Reminiscence

Browse Source 
#EA-228125 Fixed
This commit is contained in:
Vladimir Dolzhenko
2020-04-19 23:08:35 +02:00
committed by Vladimir Dolzhenko
parent 061bc9af07
commit 3d4c5b0091
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/LookupCancelService.kt
+1 -1
View File
@@ -35,7 +35,7 @@ class LookupCancelService {
// forget about auto-popup cancellation when the caret is moved to the start or before it // forget about auto-popup cancellation when the caret is moved to the start or before it
private var editorListener: CaretListener? = object : CaretListener { private var editorListener: CaretListener? = object : CaretListener {
override fun caretPositionChanged(e: CaretEvent) { override fun caretPositionChanged(e: CaretEvent) {
if (!marker!!.isValid || editor.logicalPositionToOffset(e.newPosition) <= offset) { if (marker != null && (!marker!!.isValid || editor.logicalPositionToOffset(e.newPosition) <= offset)) {
dispose() dispose()
} }
} }
idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/LookupCancelWatcher.kt.192
+1 -1
View File
@@ -45,7 +45,7 @@ class LookupCancelWatcher(val project: Project) : ProjectComponent {
// forget about auto-popup cancellation when the caret is moved to the start or before it // forget about auto-popup cancellation when the caret is moved to the start or before it
private var editorListener: CaretListener? = object : CaretListener { private var editorListener: CaretListener? = object : CaretListener {
override fun caretPositionChanged(e: CaretEvent) { override fun caretPositionChanged(e: CaretEvent) {
if (!marker!!.isValid || editor.logicalPositionToOffset(e.newPosition) <= offset) { if (marker != null && (!marker!!.isValid || editor.logicalPositionToOffset(e.newPosition) <= offset)) {
dispose() dispose()
} }
} }