diff --git a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/LookupCancelService.kt b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/LookupCancelService.kt index 148bcb300e9..cbdb9058098 100644 --- a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/LookupCancelService.kt +++ b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/LookupCancelService.kt @@ -35,7 +35,7 @@ class LookupCancelService { // forget about auto-popup cancellation when the caret is moved to the start or before it private var editorListener: CaretListener? = object : CaretListener { override fun caretPositionChanged(e: CaretEvent) { - if (!marker!!.isValid || editor.logicalPositionToOffset(e.newPosition) <= offset) { + if (marker != null && (!marker!!.isValid || editor.logicalPositionToOffset(e.newPosition) <= offset)) { dispose() } } diff --git a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/LookupCancelWatcher.kt.192 b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/LookupCancelWatcher.kt.192 index 6a3f3a44076..46318e0e9c5 100644 --- a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/LookupCancelWatcher.kt.192 +++ b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/LookupCancelWatcher.kt.192 @@ -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 private var editorListener: CaretListener? = object : CaretListener { override fun caretPositionChanged(e: CaretEvent) { - if (!marker!!.isValid || editor.logicalPositionToOffset(e.newPosition) <= offset) { + if (marker != null && (!marker!!.isValid || editor.logicalPositionToOffset(e.newPosition) <= offset)) { dispose() } }