From bea77900ff3e5690e6114c51379465ca1ff5911f Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <nikolay.krasko@jetbrains.com>
Date: Wed, 9 May 2018 03:10:25 +0300
Subject: [PATCH] Fix NPE in KotlinCompletionCharFilter (EA-120148)

---
 .../kotlin/idea/completion/KotlinCompletionCharFilter.kt        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/KotlinCompletionCharFilter.kt b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/KotlinCompletionCharFilter.kt
index 29a10aa21de..4830e0a9e44 100644
--- a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/KotlinCompletionCharFilter.kt
+++ b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/KotlinCompletionCharFilter.kt
@@ -35,7 +35,7 @@ class KotlinCompletionCharFilter() : CharFilter() {
     override fun acceptChar(c : Char, prefixLength : Int, lookup : Lookup) : Result? {
         if (lookup.psiFile !is KtFile) return null
         if (!lookup.isCompletion) return null
-        val isAutopopup = CompletionService.getCompletionService().currentCompletion!!.isAutopopupCompletion
+        val isAutopopup = CompletionService.getCompletionService().currentCompletion?.isAutopopupCompletion ?: return null
 
         if (Character.isJavaIdentifierPart(c) || c == '@') {
             return CharFilter.Result.ADD_TO_PREFIX