From 54836113a7de711c184c12f55c35ada2cfc09730 Mon Sep 17 00:00:00 2001
From: Valentin Kipyatkov <valentin@jetbrains.com>
Date: Mon, 18 May 2015 11:11:27 +0300
Subject: [PATCH] Better test data format

---
 .../basic/codeFragments/runtimeType/castWithGenerics.kt       | 2 +-
 .../basic/codeFragments/runtimeType/complexHierarchy.kt       | 2 +-
 .../basic/codeFragments/runtimeType/extensionMethod.kt        | 2 +-
 .../testData/basic/codeFragments/runtimeType/runtimeCast.kt   | 2 +-
 .../testData/basic/common/InMiddleOfPackage.kt                | 2 +-
 .../basic/common/InfixCallNoSpecialLambdaArgumentItem.kt      | 2 +-
 .../testData/basic/common/NoClassNameDuplication.kt           | 2 +-
 .../basic/common/extensions/NoDuplicatedMethodForSmartCast.kt | 2 +-
 .../basic/common/namedParameters/InParameterExpression.kt     | 2 +-
 .../basic/common/namedParameters/OnlyNamedParameters.kt       | 2 +-
 .../basic/common/namedParameters/WithParameterExpression.kt   | 2 +-
 .../testData/basic/java/ExtensionFromStandardLibrary.kt       | 2 +-
 .../testData/basic/java/NoDuplicationForImportedJavaClass.kt  | 2 +-
 .../testData/basic/java/NoDuplicationForRuntimeClass.kt       | 2 +-
 .../DoNotCompleteWithConstraints.kt                           | 2 +-
 .../multifile/ExtensionOnNullable/ExtensionOnNullable.kt      | 2 +-
 .../NoAutoInsertionOfNotImported.kt                           | 2 +-
 .../NoExtensionMethodDuplication.kt                           | 2 +-
 .../NoGenericFunDuplication/NoGenericFunDuplication.kt        | 2 +-
 .../NotImportedExtensionForImplicitReceiver.kt                | 2 +-
 .../NotImportedExtensionFunction2.kt                          | 2 +-
 .../NotImportedExtensionFunction3.kt                          | 2 +-
 .../NotImportedExtensionFunctionAndAlias.kt                   | 2 +-
 .../NotImportedExtensionProperty.kt                           | 2 +-
 idea/idea-completion/testData/keywords/AfterClassProperty.kt  | 2 +-
 idea/idea-completion/testData/keywords/AfterClasses.kt        | 2 +-
 idea/idea-completion/testData/keywords/AfterFuns.kt           | 2 +-
 .../idea-completion/testData/keywords/BeforeDelegationCall.kt | 2 +-
 idea/idea-completion/testData/keywords/BreakWithLabel.kt      | 2 +-
 idea/idea-completion/testData/keywords/CommaExpected.kt       | 2 +-
 idea/idea-completion/testData/keywords/ContinueWithLabel.kt   | 2 +-
 idea/idea-completion/testData/keywords/FileKeyword.kt         | 2 +-
 .../testData/keywords/GlobalPropertyAccessors.kt              | 2 +-
 idea/idea-completion/testData/keywords/InArgumentList.kt      | 2 +-
 idea/idea-completion/testData/keywords/InClassBeforeFun.kt    | 2 +-
 idea/idea-completion/testData/keywords/InClassScope.kt        | 2 +-
 .../testData/keywords/InClassTypeParameters.kt                | 2 +-
 idea/idea-completion/testData/keywords/InCodeBlock.kt         | 2 +-
 .../testData/keywords/InConstructorParameterList.kt.todo      | 2 +-
 .../testData/keywords/InFunctionExpressionBody.kt             | 2 +-
 .../testData/keywords/InFunctionTypePosition.kt               | 2 +-
 .../testData/keywords/InGetterExpressionBody.kt               | 2 +-
 .../testData/keywords/InMemberFunParametersList.kt            | 2 +-
 .../testData/keywords/InModifierListInsideClass.kt            | 2 +-
 .../testData/keywords/InNotFinishedGenericWithFunAfter.kt     | 2 +-
 .../testData/keywords/InParameterDefaultValue.kt              | 2 +-
 .../testData/keywords/InPropertyInitializer.kt                | 2 +-
 .../testData/keywords/InTopFunParametersList.kt               | 2 +-
 .../testData/keywords/InTopScopeAfterPackage.kt               | 2 +-
 idea/idea-completion/testData/keywords/PrefixMatcher.kt       | 2 +-
 idea/idea-completion/testData/keywords/PropertyAccessors.kt   | 2 +-
 idea/idea-completion/testData/keywords/PropertyAccessors2.kt  | 2 +-
 idea/idea-completion/testData/keywords/PropertySetter.kt      | 2 +-
 idea/idea-completion/testData/keywords/QualifiedThis.kt       | 2 +-
 .../testData/keywords/QualifiedThisInAccessor.kt              | 2 +-
 idea/idea-completion/testData/keywords/Return1.kt             | 2 +-
 idea/idea-completion/testData/keywords/Return6.kt             | 2 +-
 idea/idea-completion/testData/keywords/ReturnBoolean.kt       | 2 +-
 idea/idea-completion/testData/keywords/ReturnKeywordName.kt   | 2 +-
 idea/idea-completion/testData/keywords/ReturnNull.kt          | 2 +-
 .../testData/keywords/ReturnNullableBoolean.kt                | 2 +-
 idea/idea-completion/testData/keywords/This.kt                | 2 +-
 idea/idea-completion/testData/keywords/TopScope.kt            | 2 +-
 idea/idea-completion/testData/smart/AfterEmptyArgument.kt     | 2 +-
 idea/idea-completion/testData/smart/AfterNamedArgument.kt     | 2 +-
 idea/idea-completion/testData/smart/GroupBySubstitutor.kt     | 2 +-
 idea/idea-completion/testData/smart/Object.kt                 | 2 +-
 idea/idea-completion/testData/smart/ObjectsFromType.kt        | 2 +-
 idea/idea-completion/testData/smart/afterAs/1.kt              | 2 +-
 idea/idea-completion/testData/smart/afterAs/2.kt              | 2 +-
 idea/idea-completion/testData/smart/afterAs/3.kt              | 2 +-
 idea/idea-completion/testData/smart/constructor/InnerClass.kt | 2 +-
 .../testData/smart/constructor/NoInnerClassInstantiation.kt   | 2 +-
 idea/idea-completion/testData/smart/this/QualifiedThis.kt     | 2 +-
 .../InheritorsAndMultipleExpectedTypes.kt                     | 2 +-
 .../smartMultiFile/NoObjectDuplication/NoObjectDuplication.kt | 2 +-
 .../kotlin/idea/completion/test/ExpectedCompletionUtils.java  | 4 ++--
 77 files changed, 78 insertions(+), 78 deletions(-)

diff --git a/idea/idea-completion/testData/basic/codeFragments/runtimeType/castWithGenerics.kt b/idea/idea-completion/testData/basic/codeFragments/runtimeType/castWithGenerics.kt
index 0fcb4f0a392..6c42f5fcfdd 100644
--- a/idea/idea-completion/testData/basic/codeFragments/runtimeType/castWithGenerics.kt
+++ b/idea/idea-completion/testData/basic/codeFragments/runtimeType/castWithGenerics.kt
@@ -16,6 +16,6 @@ class Derived: Base<String>() {
 
 // INVOCATION_COUNT: 1
 // EXIST: funInBase, funWithOverride, funWithoutOverride
-// NOTHING_ELSE: true
+// NOTHING_ELSE
 
 // RUNTIME_TYPE: Derived
diff --git a/idea/idea-completion/testData/basic/codeFragments/runtimeType/complexHierarchy.kt b/idea/idea-completion/testData/basic/codeFragments/runtimeType/complexHierarchy.kt
index 5631b424d06..5c82d96b8b5 100644
--- a/idea/idea-completion/testData/basic/codeFragments/runtimeType/complexHierarchy.kt
+++ b/idea/idea-completion/testData/basic/codeFragments/runtimeType/complexHierarchy.kt
@@ -20,6 +20,6 @@ class C: B() {
 
 // INVOCATION_COUNT: 2
 // EXIST: funA, funAp, funB, funBp, funC, funCp
-// NOTHING_ELSE: true
+// NOTHING_ELSE
 
 // RUNTIME_TYPE: C
diff --git a/idea/idea-completion/testData/basic/codeFragments/runtimeType/extensionMethod.kt b/idea/idea-completion/testData/basic/codeFragments/runtimeType/extensionMethod.kt
index 5b3a1caa078..71d0051dde6 100644
--- a/idea/idea-completion/testData/basic/codeFragments/runtimeType/extensionMethod.kt
+++ b/idea/idea-completion/testData/basic/codeFragments/runtimeType/extensionMethod.kt
@@ -14,7 +14,7 @@ fun Base.funExtBase() { }
 
 // INVOCATION_COUNT: 1
 // EXIST: funExtBase, funExtDerived
-// NOTHING_ELSE: true
+// NOTHING_ELSE
 
 
 // RUNTIME_TYPE: Derived
\ No newline at end of file
diff --git a/idea/idea-completion/testData/basic/codeFragments/runtimeType/runtimeCast.kt b/idea/idea-completion/testData/basic/codeFragments/runtimeType/runtimeCast.kt
index ba9fb4cfe98..34a95239b43 100644
--- a/idea/idea-completion/testData/basic/codeFragments/runtimeType/runtimeCast.kt
+++ b/idea/idea-completion/testData/basic/codeFragments/runtimeType/runtimeCast.kt
@@ -18,7 +18,7 @@ class Derived: Base() {
 
 // INVOCATION_COUNT: 1
 // EXIST: funInBase, funWithOverride, funWithoutOverride, funInDerived
-// NOTHING_ELSE: true
+// NOTHING_ELSE
 
 
 // RUNTIME_TYPE: Derived
\ No newline at end of file
diff --git a/idea/idea-completion/testData/basic/common/InMiddleOfPackage.kt b/idea/idea-completion/testData/basic/common/InMiddleOfPackage.kt
index 747b6f9f73b..b286aaf5482 100644
--- a/idea/idea-completion/testData/basic/common/InMiddleOfPackage.kt
+++ b/idea/idea-completion/testData/basic/common/InMiddleOfPackage.kt
@@ -7,4 +7,4 @@ class Test {
 }
 
 // EXIST: util
-// NOTHING_ELSE: true
+// NOTHING_ELSE
diff --git a/idea/idea-completion/testData/basic/common/InfixCallNoSpecialLambdaArgumentItem.kt b/idea/idea-completion/testData/basic/common/InfixCallNoSpecialLambdaArgumentItem.kt
index 178ce5d8003..9f10b1a0e0a 100644
--- a/idea/idea-completion/testData/basic/common/InfixCallNoSpecialLambdaArgumentItem.kt
+++ b/idea/idea-completion/testData/basic/common/InfixCallNoSpecialLambdaArgumentItem.kt
@@ -8,4 +8,4 @@ fun foo() {
 
 // EXIST: ext1
 // EXIST: ext2
-// NOTHING_ELSE: true
+// NOTHING_ELSE
diff --git a/idea/idea-completion/testData/basic/common/NoClassNameDuplication.kt b/idea/idea-completion/testData/basic/common/NoClassNameDuplication.kt
index 67489492dec..212af9a99e2 100644
--- a/idea/idea-completion/testData/basic/common/NoClassNameDuplication.kt
+++ b/idea/idea-completion/testData/basic/common/NoClassNameDuplication.kt
@@ -9,4 +9,4 @@ fun firstFun() {
 
 // INVOCATION_COUNT: 1
 // EXIST: Testing
-// NOTHING_ELSE: true
+// NOTHING_ELSE
diff --git a/idea/idea-completion/testData/basic/common/extensions/NoDuplicatedMethodForSmartCast.kt b/idea/idea-completion/testData/basic/common/extensions/NoDuplicatedMethodForSmartCast.kt
index 0b8b89ec875..ff3cf7cdd5a 100644
--- a/idea/idea-completion/testData/basic/common/extensions/NoDuplicatedMethodForSmartCast.kt
+++ b/idea/idea-completion/testData/basic/common/extensions/NoDuplicatedMethodForSmartCast.kt
@@ -15,4 +15,4 @@ fun g(a: A) {
 
 // EXIST: foo
 // EXIST: foo1
-// NOTHING_ELSE: true
+// NOTHING_ELSE
diff --git a/idea/idea-completion/testData/basic/common/namedParameters/InParameterExpression.kt b/idea/idea-completion/testData/basic/common/namedParameters/InParameterExpression.kt
index e9053fa909d..74d4dbc04d7 100644
--- a/idea/idea-completion/testData/basic/common/namedParameters/InParameterExpression.kt
+++ b/idea/idea-completion/testData/basic/common/namedParameters/InParameterExpression.kt
@@ -8,4 +8,4 @@ fun test() = small(paramFirst = param<caret>)
 // EXIST: paramTest
 // ABSENT: {"lookupString":"paramFirst","tailText":" Int","itemText":"paramFirst ="}
 // ABSENT: paramSecond
-// NOTHING_ELSE: true
+// NOTHING_ELSE
diff --git a/idea/idea-completion/testData/basic/common/namedParameters/OnlyNamedParameters.kt b/idea/idea-completion/testData/basic/common/namedParameters/OnlyNamedParameters.kt
index 66bcd52b1c0..3b9457c582b 100644
--- a/idea/idea-completion/testData/basic/common/namedParameters/OnlyNamedParameters.kt
+++ b/idea/idea-completion/testData/basic/common/namedParameters/OnlyNamedParameters.kt
@@ -7,4 +7,4 @@ fun test(p: Int) = foo(12, third = "", <caret>)
 // ABSENT: first
 // ABSENT: third
 // EXIST: second
-// NOTHING_ELSE: true
+// NOTHING_ELSE
diff --git a/idea/idea-completion/testData/basic/common/namedParameters/WithParameterExpression.kt b/idea/idea-completion/testData/basic/common/namedParameters/WithParameterExpression.kt
index 76cbd6b43c3..598a98981d6 100644
--- a/idea/idea-completion/testData/basic/common/namedParameters/WithParameterExpression.kt
+++ b/idea/idea-completion/testData/basic/common/namedParameters/WithParameterExpression.kt
@@ -9,4 +9,4 @@ fun test() = small(param<caret>First = 12)
 // EXIST: paramSecond
 // EXIST: paramTest
 
-// NOTHING_ELSE: true
+// NOTHING_ELSE
diff --git a/idea/idea-completion/testData/basic/java/ExtensionFromStandardLibrary.kt b/idea/idea-completion/testData/basic/java/ExtensionFromStandardLibrary.kt
index b1ac3f3575a..a946abc4284 100644
--- a/idea/idea-completion/testData/basic/java/ExtensionFromStandardLibrary.kt
+++ b/idea/idea-completion/testData/basic/java/ExtensionFromStandardLibrary.kt
@@ -9,4 +9,4 @@ fun firstFun() {
 
 // INVOCATION_COUNT: 1
 // EXIST: { lookupString:"toLinkedList", itemText:"toLinkedList", tailText:"() for Iterable<T> in kotlin" }
-// NOTHING_ELSE: true
+// NOTHING_ELSE
diff --git a/idea/idea-completion/testData/basic/java/NoDuplicationForImportedJavaClass.kt b/idea/idea-completion/testData/basic/java/NoDuplicationForImportedJavaClass.kt
index d6d045902d3..6b81ff2f09a 100644
--- a/idea/idea-completion/testData/basic/java/NoDuplicationForImportedJavaClass.kt
+++ b/idea/idea-completion/testData/basic/java/NoDuplicationForImportedJavaClass.kt
@@ -4,4 +4,4 @@ val x = InputStreamReader<caret>
 
 // INVOCATION_COUNT: 2
 // EXIST: { lookupString:"InputStreamReader", tailText:" (java.io)" }
-// NOTHING_ELSE: true
+// NOTHING_ELSE
diff --git a/idea/idea-completion/testData/basic/java/NoDuplicationForRuntimeClass.kt b/idea/idea-completion/testData/basic/java/NoDuplicationForRuntimeClass.kt
index 9882f91b133..d2b6a11cc23 100644
--- a/idea/idea-completion/testData/basic/java/NoDuplicationForRuntimeClass.kt
+++ b/idea/idea-completion/testData/basic/java/NoDuplicationForRuntimeClass.kt
@@ -2,4 +2,4 @@ val x = LinesSequence<caret>
 
 // INVOCATION_COUNT: 2
 // EXIST: { lookupString:"LinesSequence", tailText:" (kotlin.io)" }
-// NOTHING_ELSE: true
+// NOTHING_ELSE
diff --git a/idea/idea-completion/testData/basic/multifile/DoNotCompleteWithConstraints/DoNotCompleteWithConstraints.kt b/idea/idea-completion/testData/basic/multifile/DoNotCompleteWithConstraints/DoNotCompleteWithConstraints.kt
index 863aec8875f..96e8832e38b 100644
--- a/idea/idea-completion/testData/basic/multifile/DoNotCompleteWithConstraints/DoNotCompleteWithConstraints.kt
+++ b/idea/idea-completion/testData/basic/multifile/DoNotCompleteWithConstraints/DoNotCompleteWithConstraints.kt
@@ -12,4 +12,4 @@ fun firstFun() {
 // EXIST: testingExpectedFunction
 // ABSENT: testingUnexpectedFunction
 
-// NOTHING_ELSE: true
+// NOTHING_ELSE
diff --git a/idea/idea-completion/testData/basic/multifile/ExtensionOnNullable/ExtensionOnNullable.kt b/idea/idea-completion/testData/basic/multifile/ExtensionOnNullable/ExtensionOnNullable.kt
index 6de9b9cc2b9..b408b1bdbc1 100644
--- a/idea/idea-completion/testData/basic/multifile/ExtensionOnNullable/ExtensionOnNullable.kt
+++ b/idea/idea-completion/testData/basic/multifile/ExtensionOnNullable/ExtensionOnNullable.kt
@@ -9,4 +9,4 @@ fun firstFun() {
 // EXIST: helloFunPreventAutoInsert
 // EXIST: helloWithParams
 // ABSENT: helloFake
-// NOTHING_ELSE: true
+// NOTHING_ELSE
diff --git a/idea/idea-completion/testData/basic/multifile/NoAutoInsertionOfNotImported/NoAutoInsertionOfNotImported.kt b/idea/idea-completion/testData/basic/multifile/NoAutoInsertionOfNotImported/NoAutoInsertionOfNotImported.kt
index be401f8b2b9..c045efa69c3 100644
--- a/idea/idea-completion/testData/basic/multifile/NoAutoInsertionOfNotImported/NoAutoInsertionOfNotImported.kt
+++ b/idea/idea-completion/testData/basic/multifile/NoAutoInsertionOfNotImported/NoAutoInsertionOfNotImported.kt
@@ -4,4 +4,4 @@ class A : NotImported<caret>
 
 // AUTOCOMPLETE_SETTING: true
 // EXIST: NotImportedClass
-// NOTHING_ELSE: true
+// NOTHING_ELSE
diff --git a/idea/idea-completion/testData/basic/multifile/NoExtensionMethodDuplication/NoExtensionMethodDuplication.kt b/idea/idea-completion/testData/basic/multifile/NoExtensionMethodDuplication/NoExtensionMethodDuplication.kt
index 1f737a91564..a6e7605a3fa 100644
--- a/idea/idea-completion/testData/basic/multifile/NoExtensionMethodDuplication/NoExtensionMethodDuplication.kt
+++ b/idea/idea-completion/testData/basic/multifile/NoExtensionMethodDuplication/NoExtensionMethodDuplication.kt
@@ -6,4 +6,4 @@ fun f() {
 
 // EXIST: extFun1
 // EXIST: extFun2
-// NOTHING_ELSE: true
+// NOTHING_ELSE
diff --git a/idea/idea-completion/testData/basic/multifile/NoGenericFunDuplication/NoGenericFunDuplication.kt b/idea/idea-completion/testData/basic/multifile/NoGenericFunDuplication/NoGenericFunDuplication.kt
index a5734be767f..41ed500311a 100644
--- a/idea/idea-completion/testData/basic/multifile/NoGenericFunDuplication/NoGenericFunDuplication.kt
+++ b/idea/idea-completion/testData/basic/multifile/NoGenericFunDuplication/NoGenericFunDuplication.kt
@@ -6,4 +6,4 @@ fun foo() {
 }
 
 // EXIST: pair
-// NOTHING_ELSE: true
+// NOTHING_ELSE
diff --git a/idea/idea-completion/testData/basic/multifile/NotImportedExtensionForImplicitReceiver/NotImportedExtensionForImplicitReceiver.kt b/idea/idea-completion/testData/basic/multifile/NotImportedExtensionForImplicitReceiver/NotImportedExtensionForImplicitReceiver.kt
index bbfafbb3bd0..838305ed884 100644
--- a/idea/idea-completion/testData/basic/multifile/NotImportedExtensionForImplicitReceiver/NotImportedExtensionForImplicitReceiver.kt
+++ b/idea/idea-completion/testData/basic/multifile/NotImportedExtensionForImplicitReceiver/NotImportedExtensionForImplicitReceiver.kt
@@ -11,4 +11,4 @@ class C {
 // EXIST: helloProp
 // EXIST: helloForC
 // ABSENT: helloFake
-// NOTHING_ELSE: true
+// NOTHING_ELSE
diff --git a/idea/idea-completion/testData/basic/multifile/NotImportedExtensionFunction2/NotImportedExtensionFunction2.kt b/idea/idea-completion/testData/basic/multifile/NotImportedExtensionFunction2/NotImportedExtensionFunction2.kt
index 54d5ecef3ad..0a0e5529e27 100644
--- a/idea/idea-completion/testData/basic/multifile/NotImportedExtensionFunction2/NotImportedExtensionFunction2.kt
+++ b/idea/idea-completion/testData/basic/multifile/NotImportedExtensionFunction2/NotImportedExtensionFunction2.kt
@@ -9,4 +9,4 @@ fun firstFun(p: () -> Unit) {
 // EXIST: helloAny
 // ABSENT: helloFun3
 // ABSENT: helloFun4
-// NOTHING_ELSE: true
+// NOTHING_ELSE
diff --git a/idea/idea-completion/testData/basic/multifile/NotImportedExtensionFunction3/NotImportedExtensionFunction3.kt b/idea/idea-completion/testData/basic/multifile/NotImportedExtensionFunction3/NotImportedExtensionFunction3.kt
index 5672d605215..dd2478a12c6 100644
--- a/idea/idea-completion/testData/basic/multifile/NotImportedExtensionFunction3/NotImportedExtensionFunction3.kt
+++ b/idea/idea-completion/testData/basic/multifile/NotImportedExtensionFunction3/NotImportedExtensionFunction3.kt
@@ -10,4 +10,4 @@ fun firstFun(p: String.() -> Unit) {
 // ABSENT: helloFun4
 // EXIST: helloFun5
 // EXIST: helloAny
-// NOTHING_ELSE: true
+// NOTHING_ELSE
diff --git a/idea/idea-completion/testData/basic/multifile/NotImportedExtensionFunctionAndAlias/NotImportedExtensionFunctionAndAlias.kt b/idea/idea-completion/testData/basic/multifile/NotImportedExtensionFunctionAndAlias/NotImportedExtensionFunctionAndAlias.kt
index de2d252e301..6c40c2e074b 100644
--- a/idea/idea-completion/testData/basic/multifile/NotImportedExtensionFunctionAndAlias/NotImportedExtensionFunctionAndAlias.kt
+++ b/idea/idea-completion/testData/basic/multifile/NotImportedExtensionFunctionAndAlias/NotImportedExtensionFunctionAndAlias.kt
@@ -6,4 +6,4 @@ fun firstFun(x: third.Dependency) {
 
 // EXIST: helloFun
 // EXIST: helloFunGeneric
-// NOTHING_ELSE: true
+// NOTHING_ELSE
diff --git a/idea/idea-completion/testData/basic/multifile/NotImportedExtensionProperty/NotImportedExtensionProperty.kt b/idea/idea-completion/testData/basic/multifile/NotImportedExtensionProperty/NotImportedExtensionProperty.kt
index 44bade771ee..e0e7f2f7ef2 100644
--- a/idea/idea-completion/testData/basic/multifile/NotImportedExtensionProperty/NotImportedExtensionProperty.kt
+++ b/idea/idea-completion/testData/basic/multifile/NotImportedExtensionProperty/NotImportedExtensionProperty.kt
@@ -9,4 +9,4 @@ fun firstFun() {
 // EXIST: { lookupString: "helloProp2", attributes: "bold" }
 // ABSENT: helloProp3
 // ABSENT: helloProp4
-// NOTHING_ELSE: true
+// NOTHING_ELSE
diff --git a/idea/idea-completion/testData/keywords/AfterClassProperty.kt b/idea/idea-completion/testData/keywords/AfterClassProperty.kt
index a261c62433a..2649721eb78 100644
--- a/idea/idea-completion/testData/keywords/AfterClassProperty.kt
+++ b/idea/idea-completion/testData/keywords/AfterClassProperty.kt
@@ -35,4 +35,4 @@ class MouseMovedEventArgs
 // EXIST:  init
 /*why?*/
 // EXIST:  companion object
-// NOTHING_ELSE: true
+// NOTHING_ELSE
diff --git a/idea/idea-completion/testData/keywords/AfterClasses.kt b/idea/idea-completion/testData/keywords/AfterClasses.kt
index fc09b2f05b7..436af4fd543 100644
--- a/idea/idea-completion/testData/keywords/AfterClasses.kt
+++ b/idea/idea-completion/testData/keywords/AfterClasses.kt
@@ -39,4 +39,4 @@ class B {
 /*why?*/
 // EXIST:  companion object
 /*TODO*/
-// NOTHING_ELSE: true
+// NOTHING_ELSE
diff --git a/idea/idea-completion/testData/keywords/AfterFuns.kt b/idea/idea-completion/testData/keywords/AfterFuns.kt
index a134ae264d2..013df371df9 100644
--- a/idea/idea-completion/testData/keywords/AfterFuns.kt
+++ b/idea/idea-completion/testData/keywords/AfterFuns.kt
@@ -38,4 +38,4 @@ class A {
 // EXIST:  init
 /*why?*/
 // EXIST:  companion object
-// NOTHING_ELSE: true
+// NOTHING_ELSE
diff --git a/idea/idea-completion/testData/keywords/BeforeDelegationCall.kt b/idea/idea-completion/testData/keywords/BeforeDelegationCall.kt
index caaea42bcc2..6b51f5f4119 100644
--- a/idea/idea-completion/testData/keywords/BeforeDelegationCall.kt
+++ b/idea/idea-completion/testData/keywords/BeforeDelegationCall.kt
@@ -3,4 +3,4 @@ class A(x: Int) {
 }
 
 // EXIST: this, super
-// NOTHING_ELSE: true
+// NOTHING_ELSE
diff --git a/idea/idea-completion/testData/keywords/BreakWithLabel.kt b/idea/idea-completion/testData/keywords/BreakWithLabel.kt
index 811427586f6..32324742e87 100644
--- a/idea/idea-completion/testData/keywords/BreakWithLabel.kt
+++ b/idea/idea-completion/testData/keywords/BreakWithLabel.kt
@@ -14,4 +14,4 @@ fun foo() {
 // EXIST: { lookupString: "break@myDo", itemText: "break", tailText: "@myDo", attributes: "bold" }
 // EXIST: { lookupString: "break@myWhile", itemText: "break", tailText: "@myWhile", attributes: "bold" }
 // EXIST: { lookupString: "break@myFor", itemText: "break", tailText: "@myFor", attributes: "bold" }
-// NOTHING_ELSE: true
+// NOTHING_ELSE
diff --git a/idea/idea-completion/testData/keywords/CommaExpected.kt b/idea/idea-completion/testData/keywords/CommaExpected.kt
index 6cd7ae11eb9..5f20c3fbd7f 100644
--- a/idea/idea-completion/testData/keywords/CommaExpected.kt
+++ b/idea/idea-completion/testData/keywords/CommaExpected.kt
@@ -7,4 +7,4 @@ fun foo() {
 // EXIST: as
 // EXIST: in
 // EXIST: is
-// NOTHING_ELSE: true
+// NOTHING_ELSE
diff --git a/idea/idea-completion/testData/keywords/ContinueWithLabel.kt b/idea/idea-completion/testData/keywords/ContinueWithLabel.kt
index c508fb9433b..f30b6275fa0 100644
--- a/idea/idea-completion/testData/keywords/ContinueWithLabel.kt
+++ b/idea/idea-completion/testData/keywords/ContinueWithLabel.kt
@@ -14,4 +14,4 @@ fun foo() {
 // EXIST: { lookupString: "continue@myDo", itemText: "continue", tailText: "@myDo", attributes: "bold" }
 // EXIST: { lookupString: "continue@myWhile", itemText: "continue", tailText: "@myWhile", attributes: "bold" }
 // EXIST: { lookupString: "continue@myFor", itemText: "continue", tailText: "@myFor", attributes: "bold" }
-// NOTHING_ELSE: true
+// NOTHING_ELSE
diff --git a/idea/idea-completion/testData/keywords/FileKeyword.kt b/idea/idea-completion/testData/keywords/FileKeyword.kt
index 72056fe4728..e3d9da6d15b 100644
--- a/idea/idea-completion/testData/keywords/FileKeyword.kt
+++ b/idea/idea-completion/testData/keywords/FileKeyword.kt
@@ -1,4 +1,4 @@
 [<caret>]
 
 // EXIST: file
-// NOTHING_ELSE: true
+// NOTHING_ELSE
diff --git a/idea/idea-completion/testData/keywords/GlobalPropertyAccessors.kt b/idea/idea-completion/testData/keywords/GlobalPropertyAccessors.kt
index 00b92953636..aaf2001f13d 100644
--- a/idea/idea-completion/testData/keywords/GlobalPropertyAccessors.kt
+++ b/idea/idea-completion/testData/keywords/GlobalPropertyAccessors.kt
@@ -39,4 +39,4 @@ var a : Int
 /*why?*/
 // EXIST:  companion object
 /*TODO*/
-// NOTHING_ELSE: true
+// NOTHING_ELSE
diff --git a/idea/idea-completion/testData/keywords/InArgumentList.kt b/idea/idea-completion/testData/keywords/InArgumentList.kt
index 61a244f037c..c6204dc9d00 100644
--- a/idea/idea-completion/testData/keywords/InArgumentList.kt
+++ b/idea/idea-completion/testData/keywords/InArgumentList.kt
@@ -20,4 +20,4 @@ fun foo(p: Int) {
 // EXIST: try
 // EXIST: when
 // EXIST: while
-// NOTHING_ELSE: true
+// NOTHING_ELSE
diff --git a/idea/idea-completion/testData/keywords/InClassBeforeFun.kt b/idea/idea-completion/testData/keywords/InClassBeforeFun.kt
index a91ee655885..89e978abc6a 100644
--- a/idea/idea-completion/testData/keywords/InClassBeforeFun.kt
+++ b/idea/idea-completion/testData/keywords/InClassBeforeFun.kt
@@ -36,4 +36,4 @@ public class Test {
 // EXIST:  init
 /*why?*/
 // EXIST:  companion object
-// NOTHING_ELSE: true
+// NOTHING_ELSE
diff --git a/idea/idea-completion/testData/keywords/InClassScope.kt b/idea/idea-completion/testData/keywords/InClassScope.kt
index 5f0c00f5954..fd9d78ab9bb 100644
--- a/idea/idea-completion/testData/keywords/InClassScope.kt
+++ b/idea/idea-completion/testData/keywords/InClassScope.kt
@@ -30,4 +30,4 @@ class TestClass {
 // EXIST:  constructor
 // EXIST:  init
 // EXIST:  companion object
-// NOTHING_ELSE: true
+// NOTHING_ELSE
diff --git a/idea/idea-completion/testData/keywords/InClassTypeParameters.kt b/idea/idea-completion/testData/keywords/InClassTypeParameters.kt
index 294458dedfe..11eb3ff8ead 100644
--- a/idea/idea-completion/testData/keywords/InClassTypeParameters.kt
+++ b/idea/idea-completion/testData/keywords/InClassTypeParameters.kt
@@ -2,4 +2,4 @@ class T<<caret>>
 
 // EXIST: in
 // EXIST: out
-// NOTHING_ELSE: true
+// NOTHING_ELSE
diff --git a/idea/idea-completion/testData/keywords/InCodeBlock.kt b/idea/idea-completion/testData/keywords/InCodeBlock.kt
index c046a46765d..a5b85da1dfc 100644
--- a/idea/idea-completion/testData/keywords/InCodeBlock.kt
+++ b/idea/idea-completion/testData/keywords/InCodeBlock.kt
@@ -21,4 +21,4 @@ fun foo() {
 // EXIST: var
 // EXIST: when
 // EXIST: while
-// NOTHING_ELSE: true
+// NOTHING_ELSE
diff --git a/idea/idea-completion/testData/keywords/InConstructorParameterList.kt.todo b/idea/idea-completion/testData/keywords/InConstructorParameterList.kt.todo
index f343ab33417..b7509b7ec39 100644
--- a/idea/idea-completion/testData/keywords/InConstructorParameterList.kt.todo
+++ b/idea/idea-completion/testData/keywords/InConstructorParameterList.kt.todo
@@ -9,4 +9,4 @@ class C(<caret>)
 // EXIST: protected
 // EXIST: internal
 // EXIST: override
-// NOTHING_ELSE: true
+// NOTHING_ELSE
diff --git a/idea/idea-completion/testData/keywords/InFunctionExpressionBody.kt b/idea/idea-completion/testData/keywords/InFunctionExpressionBody.kt
index 4f166f3aaeb..40c481d31db 100644
--- a/idea/idea-completion/testData/keywords/InFunctionExpressionBody.kt
+++ b/idea/idea-completion/testData/keywords/InFunctionExpressionBody.kt
@@ -14,4 +14,4 @@ fun foo() = <caret>
 // EXIST: try
 // EXIST: when
 // EXIST: while
-// NOTHING_ELSE: true
+// NOTHING_ELSE
diff --git a/idea/idea-completion/testData/keywords/InFunctionTypePosition.kt b/idea/idea-completion/testData/keywords/InFunctionTypePosition.kt
index c13740e7b92..1d1e2c7fd92 100644
--- a/idea/idea-completion/testData/keywords/InFunctionTypePosition.kt
+++ b/idea/idea-completion/testData/keywords/InFunctionTypePosition.kt
@@ -5,4 +5,4 @@ fun foo() {
 /*TODO: Is 'package' type qualifier syntax correct?*/
 // EXIST: package
 // EXIST: dynamic
-// NOTHING_ELSE: true
+// NOTHING_ELSE
diff --git a/idea/idea-completion/testData/keywords/InGetterExpressionBody.kt b/idea/idea-completion/testData/keywords/InGetterExpressionBody.kt
index 5531f12fd01..d4c3e73754b 100644
--- a/idea/idea-completion/testData/keywords/InGetterExpressionBody.kt
+++ b/idea/idea-completion/testData/keywords/InGetterExpressionBody.kt
@@ -15,4 +15,4 @@ val prop: Int
 // EXIST: try
 // EXIST: when
 // EXIST: while
-// NOTHING_ELSE: true
+// NOTHING_ELSE
diff --git a/idea/idea-completion/testData/keywords/InMemberFunParametersList.kt b/idea/idea-completion/testData/keywords/InMemberFunParametersList.kt
index 0df6255778c..d84081b0125 100644
--- a/idea/idea-completion/testData/keywords/InMemberFunParametersList.kt
+++ b/idea/idea-completion/testData/keywords/InMemberFunParametersList.kt
@@ -10,4 +10,4 @@ class TestSample() {
 // EXIST: var
 // EXIST: in
 // EXIST: out
-// NOTHING_ELSE: true
+// NOTHING_ELSE
diff --git a/idea/idea-completion/testData/keywords/InModifierListInsideClass.kt b/idea/idea-completion/testData/keywords/InModifierListInsideClass.kt
index 9017bf8bcf4..e4437516cb4 100644
--- a/idea/idea-completion/testData/keywords/InModifierListInsideClass.kt
+++ b/idea/idea-completion/testData/keywords/InModifierListInsideClass.kt
@@ -4,4 +4,4 @@ open class Foo {
 }
 
 // EXIST: private, public, protected
-// NOTHING_ELSE: true
+// NOTHING_ELSE
diff --git a/idea/idea-completion/testData/keywords/InNotFinishedGenericWithFunAfter.kt b/idea/idea-completion/testData/keywords/InNotFinishedGenericWithFunAfter.kt
index 286ff311bf9..98936ed887f 100644
--- a/idea/idea-completion/testData/keywords/InNotFinishedGenericWithFunAfter.kt
+++ b/idea/idea-completion/testData/keywords/InNotFinishedGenericWithFunAfter.kt
@@ -4,4 +4,4 @@ fun testing() {}
 
 // EXIST: in
 // EXIST: out
-// NOTHING_ELSE: true
+// NOTHING_ELSE
diff --git a/idea/idea-completion/testData/keywords/InParameterDefaultValue.kt b/idea/idea-completion/testData/keywords/InParameterDefaultValue.kt
index e9e64210ba9..c25dd8e7cb2 100644
--- a/idea/idea-completion/testData/keywords/InParameterDefaultValue.kt
+++ b/idea/idea-completion/testData/keywords/InParameterDefaultValue.kt
@@ -15,4 +15,4 @@ fun foo(p: Int = <caret>)
 // EXIST: try
 // EXIST: when
 // EXIST: while
-// NOTHING_ELSE: true
+// NOTHING_ELSE
diff --git a/idea/idea-completion/testData/keywords/InPropertyInitializer.kt b/idea/idea-completion/testData/keywords/InPropertyInitializer.kt
index 34bb5acf940..4c681f178da 100644
--- a/idea/idea-completion/testData/keywords/InPropertyInitializer.kt
+++ b/idea/idea-completion/testData/keywords/InPropertyInitializer.kt
@@ -14,4 +14,4 @@ var a : Int = <caret>
 // EXIST: try
 // EXIST: when
 // EXIST: while
-// NOTHING_ELSE: true
+// NOTHING_ELSE
diff --git a/idea/idea-completion/testData/keywords/InTopFunParametersList.kt b/idea/idea-completion/testData/keywords/InTopFunParametersList.kt
index 4e76845a5e8..e6193f06576 100644
--- a/idea/idea-completion/testData/keywords/InTopFunParametersList.kt
+++ b/idea/idea-completion/testData/keywords/InTopFunParametersList.kt
@@ -7,4 +7,4 @@ fun test(<caret>) {
 // EXIST: var
 // EXIST: in
 // EXIST: out
-// NOTHING_ELSE: true
+// NOTHING_ELSE
diff --git a/idea/idea-completion/testData/keywords/InTopScopeAfterPackage.kt b/idea/idea-completion/testData/keywords/InTopScopeAfterPackage.kt
index 2b819dee2ba..9aace37ee78 100644
--- a/idea/idea-completion/testData/keywords/InTopScopeAfterPackage.kt
+++ b/idea/idea-completion/testData/keywords/InTopScopeAfterPackage.kt
@@ -30,4 +30,4 @@ package Test
 /*why?*/
 // EXIST:  companion object
 /*TODO*/
-// NOTHING_ELSE: true
+// NOTHING_ELSE
diff --git a/idea/idea-completion/testData/keywords/PrefixMatcher.kt b/idea/idea-completion/testData/keywords/PrefixMatcher.kt
index 9e3470642af..9e9e13354e8 100644
--- a/idea/idea-completion/testData/keywords/PrefixMatcher.kt
+++ b/idea/idea-completion/testData/keywords/PrefixMatcher.kt
@@ -6,4 +6,4 @@ p<caret>
 // EXIST:  private
 // EXIST:  protected
 // EXIST:  public
-// NOTHING_ELSE: true
+// NOTHING_ELSE
diff --git a/idea/idea-completion/testData/keywords/PropertyAccessors.kt b/idea/idea-completion/testData/keywords/PropertyAccessors.kt
index 129ea6fb19d..289dc9fdc89 100644
--- a/idea/idea-completion/testData/keywords/PropertyAccessors.kt
+++ b/idea/idea-completion/testData/keywords/PropertyAccessors.kt
@@ -34,4 +34,4 @@ class Some {
 // EXIST:  constructor
 // EXIST:  init
 // EXIST:  companion object
-// NOTHING_ELSE: true
+// NOTHING_ELSE
diff --git a/idea/idea-completion/testData/keywords/PropertyAccessors2.kt b/idea/idea-completion/testData/keywords/PropertyAccessors2.kt
index 3a580dac69d..7e1b324789b 100644
--- a/idea/idea-completion/testData/keywords/PropertyAccessors2.kt
+++ b/idea/idea-completion/testData/keywords/PropertyAccessors2.kt
@@ -34,4 +34,4 @@ class Some {
 // EXIST:  constructor
 // EXIST:  init
 // EXIST:  companion object
-// NOTHING_ELSE: true
+// NOTHING_ELSE
diff --git a/idea/idea-completion/testData/keywords/PropertySetter.kt b/idea/idea-completion/testData/keywords/PropertySetter.kt
index 684ec729285..78ada27bc57 100644
--- a/idea/idea-completion/testData/keywords/PropertySetter.kt
+++ b/idea/idea-completion/testData/keywords/PropertySetter.kt
@@ -36,4 +36,4 @@ class Some {
 // EXIST:  constructor
 // EXIST:  init
 // EXIST:  companion object
-// NOTHING_ELSE: true
+// NOTHING_ELSE
diff --git a/idea/idea-completion/testData/keywords/QualifiedThis.kt b/idea/idea-completion/testData/keywords/QualifiedThis.kt
index bf94c3d607f..aa94a527c89 100644
--- a/idea/idea-completion/testData/keywords/QualifiedThis.kt
+++ b/idea/idea-completion/testData/keywords/QualifiedThis.kt
@@ -10,4 +10,4 @@ class Outer {
 // EXIST: { lookupString: "this@foo", itemText: "this", tailText: "@foo", typeText: "String", attributes: "bold" }
 // EXIST: { lookupString: "this@Inner", itemText: "this", tailText: "@Inner", typeText: "Outer.Inner", attributes: "bold" }
 // EXIST: { lookupString: "this@Outer", itemText: "this", tailText: "@Outer", typeText: "Outer", attributes: "bold" }
-// NOTHING_ELSE: true
+// NOTHING_ELSE
diff --git a/idea/idea-completion/testData/keywords/QualifiedThisInAccessor.kt b/idea/idea-completion/testData/keywords/QualifiedThisInAccessor.kt
index 2d17f12f9d7..d18d7c22ab7 100644
--- a/idea/idea-completion/testData/keywords/QualifiedThisInAccessor.kt
+++ b/idea/idea-completion/testData/keywords/QualifiedThisInAccessor.kt
@@ -2,4 +2,4 @@ val String.foo: Int
     get() = this@<caret>.length()
 
 // EXIST: "this@foo"
-// NOTHING_ELSE: true
+// NOTHING_ELSE
diff --git a/idea/idea-completion/testData/keywords/Return1.kt b/idea/idea-completion/testData/keywords/Return1.kt
index ab10bf80a21..7924af1d61f 100644
--- a/idea/idea-completion/testData/keywords/Return1.kt
+++ b/idea/idea-completion/testData/keywords/Return1.kt
@@ -11,4 +11,4 @@ inline fun takeHandler2(handler: () -> Unit){}
 // EXIST: { lookupString: "return", itemText: "return", tailText: null, attributes: "bold" }
 // EXIST: { lookupString: "return@takeHandler1", itemText: "return", tailText: "@takeHandler1", attributes: "bold" }
 // EXIST: { lookupString: "return@takeHandler2", itemText: "return", tailText: "@takeHandler2", attributes: "bold" }
-// NOTHING_ELSE: true
+// NOTHING_ELSE
diff --git a/idea/idea-completion/testData/keywords/Return6.kt b/idea/idea-completion/testData/keywords/Return6.kt
index 94171c2674a..9bd9d979c85 100644
--- a/idea/idea-completion/testData/keywords/Return6.kt
+++ b/idea/idea-completion/testData/keywords/Return6.kt
@@ -10,4 +10,4 @@ inline fun takeHandler2(handler: () -> Unit){}
 // INVOCATION_COUNT: 1
 // EXIST: { lookupString: "return@takeHandler1", itemText: "return", tailText: "@takeHandler1", attributes: "bold" }
 // EXIST: { lookupString: "return@takeHandler2", itemText: "return", tailText: "@takeHandler2", attributes: "bold" }
-// NOTHING_ELSE: true
+// NOTHING_ELSE
diff --git a/idea/idea-completion/testData/keywords/ReturnBoolean.kt b/idea/idea-completion/testData/keywords/ReturnBoolean.kt
index 0310379cb2b..6a990731c0f 100644
--- a/idea/idea-completion/testData/keywords/ReturnBoolean.kt
+++ b/idea/idea-completion/testData/keywords/ReturnBoolean.kt
@@ -6,4 +6,4 @@ fun foo(): Boolean {
 // EXIST: { lookupString: "return", itemText: "return", tailText: null, attributes: "bold" }
 // EXIST: { lookupString: "return true", itemText: "return true", tailText: null, attributes: "bold" }
 // EXIST: { lookupString: "return false", itemText: "return false", tailText: null, attributes: "bold" }
-// NOTHING_ELSE: true
+// NOTHING_ELSE
diff --git a/idea/idea-completion/testData/keywords/ReturnKeywordName.kt b/idea/idea-completion/testData/keywords/ReturnKeywordName.kt
index db2c8071218..d6b85f831a0 100644
--- a/idea/idea-completion/testData/keywords/ReturnKeywordName.kt
+++ b/idea/idea-completion/testData/keywords/ReturnKeywordName.kt
@@ -11,4 +11,4 @@ inline fun `val`(handler: () -> Unit){}
 // EXIST: { lookupString: "return", itemText: "return", tailText: null, attributes: "bold" }
 // EXIST: { lookupString: "return@`fun`", itemText: "return", tailText: "@`fun`", attributes: "bold" }
 // EXIST: { lookupString: "return@`val`", itemText: "return", tailText: "@`val`", attributes: "bold" }
-// NOTHING_ELSE: true
+// NOTHING_ELSE
diff --git a/idea/idea-completion/testData/keywords/ReturnNull.kt b/idea/idea-completion/testData/keywords/ReturnNull.kt
index 288b355fe75..c5b0b3562f4 100644
--- a/idea/idea-completion/testData/keywords/ReturnNull.kt
+++ b/idea/idea-completion/testData/keywords/ReturnNull.kt
@@ -5,4 +5,4 @@ fun foo(): String? {
 // INVOCATION_COUNT: 1
 // EXIST: { lookupString: "return", itemText: "return", tailText: null, attributes: "bold" }
 // EXIST: { lookupString: "return null", itemText: "return null", tailText: null, attributes: "bold" }
-// NOTHING_ELSE: true
+// NOTHING_ELSE
diff --git a/idea/idea-completion/testData/keywords/ReturnNullableBoolean.kt b/idea/idea-completion/testData/keywords/ReturnNullableBoolean.kt
index 7467309a69a..80f689bf999 100644
--- a/idea/idea-completion/testData/keywords/ReturnNullableBoolean.kt
+++ b/idea/idea-completion/testData/keywords/ReturnNullableBoolean.kt
@@ -7,4 +7,4 @@ fun foo(): Boolean? {
 // EXIST: { lookupString: "return null", itemText: "return null", tailText: null, attributes: "bold" }
 // EXIST: { lookupString: "return true", itemText: "return true", tailText: null, attributes: "bold" }
 // EXIST: { lookupString: "return false", itemText: "return false", tailText: null, attributes: "bold" }
-// NOTHING_ELSE: true
+// NOTHING_ELSE
diff --git a/idea/idea-completion/testData/keywords/This.kt b/idea/idea-completion/testData/keywords/This.kt
index a9a9a228a17..5de20038dac 100644
--- a/idea/idea-completion/testData/keywords/This.kt
+++ b/idea/idea-completion/testData/keywords/This.kt
@@ -25,4 +25,4 @@ fun takeHandler3(handler: Char.() -> Unit){}
 // EXIST: { lookupString: "this@Inner", itemText: "this", tailText: "@Inner", typeText: "Outer.Nested.Inner", attributes: "bold" }
 // EXIST: { lookupString: "this@Nested", itemText: "this", tailText: "@Nested", typeText: "Outer.Nested", attributes: "bold" }
 // ABSENT: "this@Outer"
-// NOTHING_ELSE: true
+// NOTHING_ELSE
diff --git a/idea/idea-completion/testData/keywords/TopScope.kt b/idea/idea-completion/testData/keywords/TopScope.kt
index 56b9fa7c7b5..a77cad63424 100644
--- a/idea/idea-completion/testData/keywords/TopScope.kt
+++ b/idea/idea-completion/testData/keywords/TopScope.kt
@@ -29,4 +29,4 @@
 /*why?*/
 // EXIST:  companion object
 /*TODO*/
-// NOTHING_ELSE: true
+// NOTHING_ELSE
diff --git a/idea/idea-completion/testData/smart/AfterEmptyArgument.kt b/idea/idea-completion/testData/smart/AfterEmptyArgument.kt
index 6c57f9387ab..b450a5c14ee 100644
--- a/idea/idea-completion/testData/smart/AfterEmptyArgument.kt
+++ b/idea/idea-completion/testData/smart/AfterEmptyArgument.kt
@@ -7,4 +7,4 @@ fun bar(pInt: Int, pString: String) {
 // EXIST: { lookupString: "param1", itemText: "param1 =" }
 // EXIST: { lookupString: "param3", itemText: "param3 =" }
 // ABSENT: param2
-// NOTHING_ELSE: true
+// NOTHING_ELSE
diff --git a/idea/idea-completion/testData/smart/AfterNamedArgument.kt b/idea/idea-completion/testData/smart/AfterNamedArgument.kt
index 02468b7881f..6fff0fbf8ab 100644
--- a/idea/idea-completion/testData/smart/AfterNamedArgument.kt
+++ b/idea/idea-completion/testData/smart/AfterNamedArgument.kt
@@ -7,4 +7,4 @@ fun bar(pInt: Int, pString: String) {
 // EXIST: { lookupString: "param1", itemText: "param1 =" }
 // EXIST: { lookupString: "param3", itemText: "param3 =" }
 // ABSENT: param2
-// NOTHING_ELSE: true
+// NOTHING_ELSE
diff --git a/idea/idea-completion/testData/smart/GroupBySubstitutor.kt b/idea/idea-completion/testData/smart/GroupBySubstitutor.kt
index 6bf8318fd1b..0f73f0f510c 100644
--- a/idea/idea-completion/testData/smart/GroupBySubstitutor.kt
+++ b/idea/idea-completion/testData/smart/GroupBySubstitutor.kt
@@ -9,4 +9,4 @@ fun f(){
 
 // EXIST: { lookupString: "emptyList", typeText: "List<String>" }
 // EXIST: { lookupString: "emptyList", typeText: "List<Int>" }
-// NOTHING_ELSE: true
+// NOTHING_ELSE
diff --git a/idea/idea-completion/testData/smart/Object.kt b/idea/idea-completion/testData/smart/Object.kt
index 2242a9a16ab..1ec2f1cd1a5 100644
--- a/idea/idea-completion/testData/smart/Object.kt
+++ b/idea/idea-completion/testData/smart/Object.kt
@@ -7,4 +7,4 @@ fun foo(): I = <caret>
 // EXIST: { lookupString: "O", itemText: "O", tailText: " (<root>)" }
 // EXIST: foo
 // EXIST: object
-// NOTHING_ELSE: true
+// NOTHING_ELSE
diff --git a/idea/idea-completion/testData/smart/ObjectsFromType.kt b/idea/idea-completion/testData/smart/ObjectsFromType.kt
index e02b87b1101..b9099305068 100644
--- a/idea/idea-completion/testData/smart/ObjectsFromType.kt
+++ b/idea/idea-completion/testData/smart/ObjectsFromType.kt
@@ -14,4 +14,4 @@ fun foo(): T {
 // EXIST: foo
 // EXIST: object
 // ABSENT: Other
-// NOTHING_ELSE: true
+// NOTHING_ELSE
diff --git a/idea/idea-completion/testData/smart/afterAs/1.kt b/idea/idea-completion/testData/smart/afterAs/1.kt
index 734fffe50d0..d4025e5a9c7 100644
--- a/idea/idea-completion/testData/smart/afterAs/1.kt
+++ b/idea/idea-completion/testData/smart/afterAs/1.kt
@@ -8,4 +8,4 @@ fun bar(o: Any) {
 
 // EXIST: String
 // EXIST: Int
-// NOTHING_ELSE: true
+// NOTHING_ELSE
diff --git a/idea/idea-completion/testData/smart/afterAs/2.kt b/idea/idea-completion/testData/smart/afterAs/2.kt
index 67208d39553..d1e447f1b47 100644
--- a/idea/idea-completion/testData/smart/afterAs/2.kt
+++ b/idea/idea-completion/testData/smart/afterAs/2.kt
@@ -8,4 +8,4 @@ fun bar(o: Any) {
 
 // EXIST: { lookupString:"List", itemText:"List<String>" }
 // EXIST: { lookupString:"Map", itemText:"Map<String, Int>" }
-// NOTHING_ELSE: true
+// NOTHING_ELSE
diff --git a/idea/idea-completion/testData/smart/afterAs/3.kt b/idea/idea-completion/testData/smart/afterAs/3.kt
index c1515c789ec..0b9b90cc7b8 100644
--- a/idea/idea-completion/testData/smart/afterAs/3.kt
+++ b/idea/idea-completion/testData/smart/afterAs/3.kt
@@ -9,4 +9,4 @@ fun bar(o: Any) {
 
 // EXIST: { lookupString:"List", itemText:"List<String>" }
 // EXIST: { lookupString:"String", itemText:"String" }
-// NOTHING_ELSE: true
+// NOTHING_ELSE
diff --git a/idea/idea-completion/testData/smart/constructor/InnerClass.kt b/idea/idea-completion/testData/smart/constructor/InnerClass.kt
index 014a1b740f3..45bdabd5046 100644
--- a/idea/idea-completion/testData/smart/constructor/InnerClass.kt
+++ b/idea/idea-completion/testData/smart/constructor/InnerClass.kt
@@ -15,4 +15,4 @@ fun foo(c: C): T {
 // EXIST: { lookupString: "Inner2", itemText: "Inner2", tailText: "()", typeText: "C.Inner2" }
 // ABSENT: Inner3
 // ABSENT: Nested
-// NOTHING_ELSE: true
+// NOTHING_ELSE
diff --git a/idea/idea-completion/testData/smart/constructor/NoInnerClassInstantiation.kt b/idea/idea-completion/testData/smart/constructor/NoInnerClassInstantiation.kt
index 09c7611032d..266b5e04965 100644
--- a/idea/idea-completion/testData/smart/constructor/NoInnerClassInstantiation.kt
+++ b/idea/idea-completion/testData/smart/constructor/NoInnerClassInstantiation.kt
@@ -8,4 +8,4 @@ fun foo() : C.Inner {
 
 // ABSENT: Inner
 // EXIST: foo
-// NOTHING_ELSE: true
+// NOTHING_ELSE
diff --git a/idea/idea-completion/testData/smart/this/QualifiedThis.kt b/idea/idea-completion/testData/smart/this/QualifiedThis.kt
index 904d7f9d491..4917e870cec 100644
--- a/idea/idea-completion/testData/smart/this/QualifiedThis.kt
+++ b/idea/idea-completion/testData/smart/this/QualifiedThis.kt
@@ -10,4 +10,4 @@ class Outer {
 // EXIST: { lookupString: "this@foo", itemText: "this", tailText: "@foo", typeText: "String", attributes: "bold" }
 // EXIST: { lookupString: "this@Inner", itemText: "this", tailText: "@Inner", typeText: "Outer.Inner", attributes: "bold" }
 // EXIST: { lookupString: "this@Outer", itemText: "this", tailText: "@Outer", typeText: "Outer", attributes: "bold" }
-// NOTHING_ELSE: true
+// NOTHING_ELSE
diff --git a/idea/idea-completion/testData/smartMultiFile/InheritorsAndMultipleExpectedTypes/InheritorsAndMultipleExpectedTypes.kt b/idea/idea-completion/testData/smartMultiFile/InheritorsAndMultipleExpectedTypes/InheritorsAndMultipleExpectedTypes.kt
index fec8440647b..131fdb81cdb 100644
--- a/idea/idea-completion/testData/smartMultiFile/InheritorsAndMultipleExpectedTypes/InheritorsAndMultipleExpectedTypes.kt
+++ b/idea/idea-completion/testData/smartMultiFile/InheritorsAndMultipleExpectedTypes/InheritorsAndMultipleExpectedTypes.kt
@@ -9,4 +9,4 @@ fun bar() {
 // EXIST: { lookupString: "C2", itemText: "C2<X>" }
 // EXIST: { lookupString: "C2", itemText: "C2<Y>" }
 // EXIST: { lookupString: "C3", itemText: "C3" }
-// NOTHING_ELSE: true
+// NOTHING_ELSE
diff --git a/idea/idea-completion/testData/smartMultiFile/NoObjectDuplication/NoObjectDuplication.kt b/idea/idea-completion/testData/smartMultiFile/NoObjectDuplication/NoObjectDuplication.kt
index 6aedde155c3..aaab7eaad35 100644
--- a/idea/idea-completion/testData/smartMultiFile/NoObjectDuplication/NoObjectDuplication.kt
+++ b/idea/idea-completion/testData/smartMultiFile/NoObjectDuplication/NoObjectDuplication.kt
@@ -3,4 +3,4 @@ fun foo(): T = <caret>
 // EXIST: foo
 // EXIST: { lookupString: "object", itemText: "object: T{...}" }
 // EXIST: { lookupString: "OO", itemText: "OO", tailText: " (<root>)" }
-// NOTHING_ELSE: true
+// NOTHING_ELSE
diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/ExpectedCompletionUtils.java b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/ExpectedCompletionUtils.java
index fef22c3346b..9cebff72291 100644
--- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/ExpectedCompletionUtils.java
+++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/ExpectedCompletionUtils.java
@@ -123,7 +123,7 @@ public class ExpectedCompletionUtils {
     private static final String NUMBER_JS_LINE_PREFIX = "NUMBER_JS:";
     private static final String NUMBER_JAVA_LINE_PREFIX = "NUMBER_JAVA:";
 
-    private static final String NOTHING_ELSE_PREFIX = "NOTHING_ELSE:";
+    private static final String NOTHING_ELSE_PREFIX = "NOTHING_ELSE";
 
     private static final String INVOCATION_COUNT_PREFIX = "INVOCATION_COUNT:";
     private static final String WITH_ORDER_PREFIX = "WITH_ORDER:";
@@ -218,7 +218,7 @@ public class ExpectedCompletionUtils {
     }
 
     public static boolean isNothingElseExpected(String fileText) {
-        return Boolean.TRUE.equals(InTextDirectivesUtils.getPrefixedBoolean(fileText, NOTHING_ELSE_PREFIX));
+        return !InTextDirectivesUtils.findLinesWithPrefixesRemoved(fileText, NOTHING_ELSE_PREFIX).isEmpty();
     }
 
     @Nullable