From bd1c92d8674e8c386dfa3cad3ecaa08e56fe84f5 Mon Sep 17 00:00:00 2001
From: Frederik Haselmeier <frederik.haselmeier@jetbrains.com>
Date: Mon, 19 Jan 2026 13:11:30 +0100
Subject: [PATCH] [kotlin] KTIJ-26166 ignore failing smart completion tests for
 K2

Space-RevId: 8a85c32eed1f1311eb592aa931485a1b1a6ae6d5

GitOrigin-RevId: c9b51bbfc6e793e3fb3dc312ff1e5a7851cdeda7
---
 plugins/kotlin/completion/testData/handlers/smart/AfterAs.kt   | 3 ++-
 .../kotlin/completion/testData/handlers/smart/AfterAs.kt.after | 3 ++-
 plugins/kotlin/completion/testData/handlers/smart/AfterAs2.kt  | 3 ++-
 .../completion/testData/handlers/smart/AfterAs2.kt.after       | 3 ++-
 plugins/kotlin/completion/testData/handlers/smart/AfterAs3.kt  | 3 ++-
 .../completion/testData/handlers/smart/AfterAs3.kt.after       | 3 ++-
 .../kotlin/completion/testData/handlers/smart/AfterSafeAs.kt   | 3 ++-
 .../completion/testData/handlers/smart/AfterSafeAs.kt.after    | 3 ++-
 .../kotlin/completion/testData/handlers/smart/AfterVararg.kt   | 2 ++
 .../completion/testData/handlers/smart/AfterVararg.kt.after    | 2 ++
 .../completion/testData/handlers/smart/AnonymousObject1.kt     | 2 ++
 .../testData/handlers/smart/AnonymousObject1.kt.after          | 2 ++
 .../completion/testData/handlers/smart/AnonymousObject2.kt     | 2 ++
 .../testData/handlers/smart/AnonymousObject2.kt.after          | 2 ++
 .../completion/testData/handlers/smart/AnonymousObject3.kt     | 3 ++-
 .../testData/handlers/smart/AnonymousObject3.kt.after          | 3 ++-
 .../testData/handlers/smart/AnonymousObjectInsertsImport.kt    | 2 ++
 .../handlers/smart/AnonymousObjectInsertsImport.kt.after       | 2 ++
 .../handlers/smart/AnonymousObjectUninferredTypeArgs.kt        | 3 ++-
 .../handlers/smart/AnonymousObjectUninferredTypeArgs.kt.after  | 3 ++-
 .../completion/testData/handlers/smart/ArrayClassLiteral.kt    | 3 ++-
 .../testData/handlers/smart/ArrayClassLiteral.kt.after         | 3 ++-
 .../completion/testData/handlers/smart/AutoCompleteAfterAs1.kt | 3 ++-
 .../testData/handlers/smart/AutoCompleteAfterAs1.kt.after      | 3 ++-
 .../completion/testData/handlers/smart/AutoCompleteAfterAs2.kt | 3 ++-
 .../testData/handlers/smart/AutoCompleteAfterAs2.kt.after      | 3 ++-
 .../completion/testData/handlers/smart/AutoCompleteAfterAs3.kt | 3 ++-
 .../testData/handlers/smart/AutoCompleteAfterAs3.kt.after      | 3 ++-
 .../completion/testData/handlers/smart/CallableReference1.kt   | 3 ++-
 .../testData/handlers/smart/CallableReference1.kt.after        | 3 ++-
 .../completion/testData/handlers/smart/CallableReference2.kt   | 3 ++-
 .../testData/handlers/smart/CallableReference2.kt.after        | 3 ++-
 .../completion/testData/handlers/smart/CallableReference3.kt   | 3 ++-
 .../testData/handlers/smart/CallableReference3.kt.after        | 3 ++-
 .../completion/testData/handlers/smart/CallableReference4.kt   | 2 ++
 .../testData/handlers/smart/CallableReference4.kt.after        | 2 ++
 .../completion/testData/handlers/smart/ClassInClassObject.kt   | 2 ++
 .../testData/handlers/smart/ClassInClassObject.kt.after        | 2 ++
 .../kotlin/completion/testData/handlers/smart/ClassInObject.kt | 2 ++
 .../completion/testData/handlers/smart/ClassInObject.kt.after  | 2 ++
 .../testData/handlers/smart/ClassObjectFieldKeywordName.kt     | 2 ++
 .../handlers/smart/ClassObjectFieldKeywordName.kt.after        | 2 ++
 .../completion/testData/handlers/smart/ClassObjectMethod1.kt   | 2 ++
 .../testData/handlers/smart/ClassObjectMethod1.kt.after        | 2 ++
 .../completion/testData/handlers/smart/ClassObjectMethod2.kt   | 2 ++
 .../testData/handlers/smart/ClassObjectMethod2.kt.after        | 2 ++
 .../completion/testData/handlers/smart/ClassObjectMethod3.kt   | 2 ++
 .../testData/handlers/smart/ClassObjectMethod3.kt.after        | 2 ++
 .../completion/testData/handlers/smart/ClassObjectMethod4.kt   | 2 ++
 .../testData/handlers/smart/ClassObjectMethod4.kt.after        | 2 ++
 .../completion/testData/handlers/smart/ClosingParenthesis1.kt  | 2 ++
 .../testData/handlers/smart/ClosingParenthesis1.kt.after       | 2 ++
 .../completion/testData/handlers/smart/ClosingParenthesis2.kt  | 2 ++
 .../testData/handlers/smart/ClosingParenthesis2.kt.after       | 2 ++
 plugins/kotlin/completion/testData/handlers/smart/Comma1.kt    | 2 ++
 .../kotlin/completion/testData/handlers/smart/Comma1.kt.after  | 2 ++
 plugins/kotlin/completion/testData/handlers/smart/Comma2.kt    | 2 ++
 .../kotlin/completion/testData/handlers/smart/Comma2.kt.after  | 2 ++
 plugins/kotlin/completion/testData/handlers/smart/Comma5.kt    | 2 ++
 .../kotlin/completion/testData/handlers/smart/Comma5.kt.after  | 2 ++
 plugins/kotlin/completion/testData/handlers/smart/Comma6.kt    | 2 ++
 .../kotlin/completion/testData/handlers/smart/Comma6.kt.after  | 2 ++
 plugins/kotlin/completion/testData/handlers/smart/Comma7.kt    | 2 ++
 .../kotlin/completion/testData/handlers/smart/Comma7.kt.after  | 2 ++
 plugins/kotlin/completion/testData/handlers/smart/Comma8.kt    | 2 ++
 .../kotlin/completion/testData/handlers/smart/Comma8.kt.after  | 2 ++
 plugins/kotlin/completion/testData/handlers/smart/Comma9.kt    | 2 ++
 .../kotlin/completion/testData/handlers/smart/Comma9.kt.after  | 2 ++
 .../testData/handlers/smart/CommaInSuperConstructorCall.kt     | 2 ++
 .../handlers/smart/CommaInSuperConstructorCall.kt.after        | 2 ++
 .../completion/testData/handlers/smart/ConcreteJavaClass.kt    | 2 ++
 .../testData/handlers/smart/ConcreteJavaClass.kt.after         | 2 ++
 .../completion/testData/handlers/smart/ConcreteJavaClass2.kt   | 2 ++
 .../testData/handlers/smart/ConcreteJavaClass2.kt.after        | 2 ++
 .../completion/testData/handlers/smart/ConcreteKClass.kt       | 2 ++
 .../completion/testData/handlers/smart/ConcreteKClass.kt.after | 2 ++
 .../kotlin/completion/testData/handlers/smart/Constructor.kt   | 3 ++-
 .../completion/testData/handlers/smart/Constructor.kt.after    | 3 ++-
 .../testData/handlers/smart/ConstructorForGenericType.kt       | 2 ++
 .../testData/handlers/smart/ConstructorForGenericType.kt.after | 2 ++
 .../testData/handlers/smart/ConstructorForGenericType2.kt      | 3 ++-
 .../handlers/smart/ConstructorForGenericType2.kt.after         | 3 ++-
 .../testData/handlers/smart/ConstructorForNullable.kt          | 2 ++
 .../testData/handlers/smart/ConstructorForNullable.kt.after    | 2 ++
 .../testData/handlers/smart/ConstructorInsertsImport.kt        | 2 ++
 .../testData/handlers/smart/ConstructorInsertsImport.kt.after  | 2 ++
 .../testData/handlers/smart/ConstructorInsertsImport2.kt       | 2 ++
 .../testData/handlers/smart/ConstructorInsertsImport2.kt.after | 2 ++
 .../testData/handlers/smart/ConstructorWithKeywordName.kt      | 3 ++-
 .../handlers/smart/ConstructorWithKeywordName.kt.after         | 3 ++-
 .../testData/handlers/smart/ConstructorWithLambdaParameter1.kt | 3 ++-
 .../handlers/smart/ConstructorWithLambdaParameter1.kt.after    | 3 ++-
 .../testData/handlers/smart/ConstructorWithLambdaParameter2.kt | 3 ++-
 .../handlers/smart/ConstructorWithLambdaParameter2.kt.after    | 3 ++-
 .../testData/handlers/smart/ConstructorWithParameters.kt       | 3 ++-
 .../testData/handlers/smart/ConstructorWithParameters.kt.after | 3 ++-
 .../testData/handlers/smart/DoNotInsertTypeArguments.kt        | 2 ++
 .../testData/handlers/smart/DoNotInsertTypeArguments.kt.after  | 2 ++
 plugins/kotlin/completion/testData/handlers/smart/ExclChar.kt  | 2 ++
 .../completion/testData/handlers/smart/ExclChar.kt.after       | 2 ++
 .../testData/handlers/smart/ExtensionFunctionTypeVariable1.kt  | 3 ++-
 .../handlers/smart/ExtensionFunctionTypeVariable1.kt.after     | 3 ++-
 .../testData/handlers/smart/ExtensionFunctionTypeVariable2.kt  | 3 ++-
 .../handlers/smart/ExtensionFunctionTypeVariable2.kt.after     | 3 ++-
 .../kotlin/completion/testData/handlers/smart/ForLoopRange.kt  | 2 ++
 .../completion/testData/handlers/smart/ForLoopRange.kt.after   | 2 ++
 .../kotlin/completion/testData/handlers/smart/ForLoopRange2.kt | 2 ++
 .../completion/testData/handlers/smart/ForLoopRange2.kt.after  | 2 ++
 .../completion/testData/handlers/smart/GetWithBrackets.kt      | 2 ++
 .../testData/handlers/smart/GetWithBrackets.kt.after           | 2 ++
 .../kotlin/completion/testData/handlers/smart/IfCondition.kt   | 2 ++
 .../completion/testData/handlers/smart/IfCondition.kt.after    | 2 ++
 plugins/kotlin/completion/testData/handlers/smart/IfValue1.kt  | 2 ++
 .../completion/testData/handlers/smart/IfValue1.kt.after       | 2 ++
 plugins/kotlin/completion/testData/handlers/smart/IfValue2.kt  | 2 ++
 .../completion/testData/handlers/smart/IfValue2.kt.after       | 2 ++
 plugins/kotlin/completion/testData/handlers/smart/IfValue3.kt  | 2 ++
 .../completion/testData/handlers/smart/IfValue3.kt.after       | 2 ++
 .../completion/testData/handlers/smart/InElvisOperator.kt      | 2 ++
 .../testData/handlers/smart/InElvisOperator.kt.after           | 2 ++
 .../testData/handlers/smart/InnerClassInstantiation1.kt        | 2 ++
 .../testData/handlers/smart/InnerClassInstantiation1.kt.after  | 2 ++
 .../testData/handlers/smart/InnerClassInstantiation2.kt        | 2 ++
 .../testData/handlers/smart/InnerClassInstantiation2.kt.after  | 2 ++
 .../completion/testData/handlers/smart/JavaStaticField.kt      | 2 ++
 .../testData/handlers/smart/JavaStaticField.kt.after           | 2 ++
 .../testData/handlers/smart/JavaStaticFieldInsertImport.kt     | 2 ++
 .../handlers/smart/JavaStaticFieldInsertImport.kt.after        | 2 ++
 .../completion/testData/handlers/smart/JavaStaticMethod.kt     | 2 ++
 .../testData/handlers/smart/JavaStaticMethod.kt.after          | 2 ++
 .../completion/testData/handlers/smart/JavaStaticMethod2.kt    | 2 ++
 .../testData/handlers/smart/JavaStaticMethod2.kt.after         | 2 ++
 .../testData/handlers/smart/JavaStaticMethodInsertsImport.kt   | 2 ++
 .../handlers/smart/JavaStaticMethodInsertsImport.kt.after      | 2 ++
 .../kotlin/completion/testData/handlers/smart/LambdaValue1.kt  | 3 ++-
 .../completion/testData/handlers/smart/LambdaValue1.kt.after   | 3 ++-
 .../kotlin/completion/testData/handlers/smart/LambdaValue2.kt  | 3 ++-
 .../completion/testData/handlers/smart/LambdaValue2.kt.after   | 3 ++-
 .../testData/handlers/smart/LastNonOptionalParamIsFunction.kt  | 2 ++
 .../handlers/smart/LastNonOptionalParamIsFunction.kt.after     | 2 ++
 .../kotlin/completion/testData/handlers/smart/MergeTail1.kt    | 3 ++-
 .../completion/testData/handlers/smart/MergeTail1.kt.after     | 3 ++-
 .../kotlin/completion/testData/handlers/smart/MergeTail2.kt    | 2 ++
 .../completion/testData/handlers/smart/MergeTail2.kt.after     | 2 ++
 .../kotlin/completion/testData/handlers/smart/MergeTail3.kt    | 2 ++
 .../completion/testData/handlers/smart/MergeTail3.kt.after     | 2 ++
 .../kotlin/completion/testData/handlers/smart/MergeTail4.kt    | 2 ++
 .../completion/testData/handlers/smart/MergeTail4.kt.after     | 2 ++
 .../testData/handlers/smart/MultipleArgsIntoBrackets.kt        | 2 ++
 .../testData/handlers/smart/MultipleArgsIntoBrackets.kt.after  | 2 ++
 .../completion/testData/handlers/smart/MultipleArgsItem.kt     | 2 ++
 .../testData/handlers/smart/MultipleArgsItem.kt.after          | 2 ++
 .../testData/handlers/smart/MultipleArgsItemByTab.kt           | 2 ++
 .../testData/handlers/smart/MultipleArgsItemByTab.kt.after     | 2 ++
 .../completion/testData/handlers/smart/NamedArgument1.kt       | 2 ++
 .../completion/testData/handlers/smart/NamedArgument1.kt.after | 2 ++
 .../completion/testData/handlers/smart/NamedArgument3.kt       | 2 ++
 .../completion/testData/handlers/smart/NamedArgument3.kt.after | 2 ++
 .../completion/testData/handlers/smart/NamedArgumentVararg1.kt | 2 ++
 .../testData/handlers/smart/NamedArgumentVararg1.kt.after      | 2 ++
 .../completion/testData/handlers/smart/NamedArgumentVararg2.kt | 2 ++
 .../testData/handlers/smart/NamedArgumentVararg2.kt.after      | 2 ++
 .../completion/testData/handlers/smart/NamedArgumentVararg3.kt | 2 ++
 .../testData/handlers/smart/NamedArgumentVararg3.kt.after      | 2 ++
 .../completion/testData/handlers/smart/NamedBooleanArgument.kt | 2 ++
 .../testData/handlers/smart/NamedBooleanArgument.kt.after      | 2 ++
 .../completion/testData/handlers/smart/NestedDataClass.kt      | 2 ++
 .../testData/handlers/smart/NestedDataClass.kt.after           | 2 ++
 .../completion/testData/handlers/smart/NestedDataClassComma.kt | 2 ++
 .../testData/handlers/smart/NestedDataClassComma.kt.after      | 2 ++
 .../completion/testData/handlers/smart/NullableValue1.kt       | 2 ++
 .../completion/testData/handlers/smart/NullableValue1.kt.after | 2 ++
 .../completion/testData/handlers/smart/NullableValue2.kt       | 2 ++
 .../completion/testData/handlers/smart/NullableValue2.kt.after | 2 ++
 .../completion/testData/handlers/smart/NullableValue3.kt       | 2 ++
 .../completion/testData/handlers/smart/NullableValue3.kt.after | 2 ++
 .../testData/handlers/smart/NullableValueKeepOldArguments.kt   | 2 ++
 .../handlers/smart/NullableValueKeepOldArguments.kt.after      | 2 ++
 .../completion/testData/handlers/smart/ObjectFromType.kt       | 2 ++
 .../completion/testData/handlers/smart/ObjectFromType.kt.after | 2 ++
 .../testData/handlers/smart/QualifiedCallReplacementBug.kt     | 3 ++-
 .../handlers/smart/QualifiedCallReplacementBug.kt.after        | 3 ++-
 .../testData/handlers/smart/QualifiedThisKeywordName1.kt       | 2 ++
 .../testData/handlers/smart/QualifiedThisKeywordName1.kt.after | 2 ++
 .../testData/handlers/smart/QualifiedThisKeywordName2.kt       | 2 ++
 .../testData/handlers/smart/QualifiedThisKeywordName2.kt.after | 2 ++
 .../completion/testData/handlers/smart/ReplaceArgument.kt      | 2 ++
 .../testData/handlers/smart/ReplaceArgument.kt.after           | 2 ++
 .../kotlin/completion/testData/handlers/smart/SAMExpected1.kt  | 2 ++
 .../completion/testData/handlers/smart/SAMExpected1.kt.after   | 2 ++
 .../kotlin/completion/testData/handlers/smart/SAMExpected2.kt  | 2 ++
 .../completion/testData/handlers/smart/SAMExpected2.kt.after   | 2 ++
 .../kotlin/completion/testData/handlers/smart/SecondVararg.kt  | 2 ++
 .../completion/testData/handlers/smart/SecondVararg.kt.after   | 2 ++
 .../completion/testData/handlers/smart/SetWithBrackets.kt      | 2 ++
 .../testData/handlers/smart/SetWithBrackets.kt.after           | 2 ++
 .../completion/testData/handlers/smart/TabReplaceComma1.kt     | 2 ++
 .../testData/handlers/smart/TabReplaceComma1.kt.after          | 2 ++
 .../completion/testData/handlers/smart/TabReplaceComma2.kt     | 2 ++
 .../testData/handlers/smart/TabReplaceComma2.kt.after          | 2 ++
 .../completion/testData/handlers/smart/TabReplaceExpression.kt | 2 ++
 .../testData/handlers/smart/TabReplaceExpression.kt.after      | 2 ++
 .../testData/handlers/smart/TabReplaceExpression2.kt           | 2 ++
 .../testData/handlers/smart/TabReplaceExpression2.kt.after     | 2 ++
 .../testData/handlers/smart/TabReplaceExpression3.kt           | 2 ++
 .../testData/handlers/smart/TabReplaceExpression3.kt.after     | 2 ++
 .../testData/handlers/smart/TabReplaceExpression4.kt           | 2 ++
 .../testData/handlers/smart/TabReplaceExpression4.kt.after     | 2 ++
 .../testData/handlers/smart/TabReplaceFunctionName2.kt         | 2 ++
 .../testData/handlers/smart/TabReplaceFunctionName2.kt.after   | 2 ++
 .../testData/handlers/smart/TabReplaceFunctionName3.kt         | 2 ++
 .../testData/handlers/smart/TabReplaceFunctionName3.kt.after   | 2 ++
 .../completion/testData/handlers/smart/TabReplaceIdentifier.kt | 2 ++
 .../testData/handlers/smart/TabReplaceIdentifier.kt.after      | 2 ++
 .../completion/testData/handlers/smart/TabReplaceOperand.kt    | 2 ++
 .../testData/handlers/smart/TabReplaceOperand.kt.after         | 2 ++
 plugins/kotlin/completion/testData/handlers/smart/True2.kt     | 2 ++
 .../kotlin/completion/testData/handlers/smart/True2.kt.after   | 2 ++
 .../completion/testData/handlers/smart/TypeParameterAfterAs.kt | 3 ++-
 .../testData/handlers/smart/TypeParameterAfterAs.kt.after      | 3 ++-
 plugins/kotlin/completion/testData/handlers/smart/Vararg4.kt   | 2 ++
 .../kotlin/completion/testData/handlers/smart/Vararg4.kt.after | 2 ++
 plugins/kotlin/completion/testData/handlers/smart/Vararg5.kt   | 2 ++
 .../kotlin/completion/testData/handlers/smart/Vararg5.kt.after | 2 ++
 plugins/kotlin/completion/testData/handlers/smart/Vararg6.kt   | 2 ++
 .../kotlin/completion/testData/handlers/smart/Vararg6.kt.after | 2 ++
 .../completion/testData/handlers/smart/VarargAfterStar.kt      | 2 ++
 .../testData/handlers/smart/VarargAfterStar.kt.after           | 2 ++
 .../testData/handlers/smart/VarargWithParameterAfter.kt        | 2 ++
 .../testData/handlers/smart/VarargWithParameterAfter.kt.after  | 2 ++
 plugins/kotlin/completion/testData/handlers/smart/WhenElse.kt  | 2 ++
 .../completion/testData/handlers/smart/WhenElse.kt.after       | 2 ++
 plugins/kotlin/completion/testData/handlers/smart/kt10602.kt   | 3 ++-
 .../kotlin/completion/testData/handlers/smart/kt10602.kt.after | 3 ++-
 plugins/kotlin/completion/testData/handlers/smart/lambda/1.kt  | 2 ++
 .../completion/testData/handlers/smart/lambda/1.kt.after       | 2 ++
 plugins/kotlin/completion/testData/handlers/smart/lambda/2.kt  | 2 ++
 .../completion/testData/handlers/smart/lambda/2.kt.after       | 2 ++
 plugins/kotlin/completion/testData/handlers/smart/lambda/3.kt  | 2 ++
 .../completion/testData/handlers/smart/lambda/3.kt.after       | 2 ++
 plugins/kotlin/completion/testData/handlers/smart/lambda/4.kt  | 2 ++
 .../completion/testData/handlers/smart/lambda/4.kt.after       | 2 ++
 plugins/kotlin/completion/testData/handlers/smart/lambda/5.kt  | 2 ++
 .../completion/testData/handlers/smart/lambda/5.kt.after       | 2 ++
 .../completion/testData/handlers/smart/lambda/InsertImport.kt  | 2 ++
 .../testData/handlers/smart/lambda/InsertImport.kt.after       | 2 ++
 .../testData/handlers/smart/lambda/ParameterNamesSpecified.kt  | 2 ++
 .../handlers/smart/lambda/ParameterNamesSpecified.kt.after     | 2 ++
 .../smart/lambda/ParameterNamesSpecified_NullableType.kt       | 2 ++
 .../smart/lambda/ParameterNamesSpecified_NullableType.kt.after | 2 ++
 .../handlers/smart/lambdaSignature/NoAdditionalSpace.kt        | 2 ++
 .../handlers/smart/lambdaSignature/NoAdditionalSpace.kt.after  | 2 ++
 .../testData/handlers/smart/lambdaSignature/Simple.kt          | 2 ++
 .../testData/handlers/smart/lambdaSignature/Simple.kt.after    | 2 ++
 .../handlers/smart/suspendLambdaSignature/NoAdditionalSpace.kt | 2 ++
 .../smart/suspendLambdaSignature/NoAdditionalSpace.kt.after    | 2 ++
 .../testData/handlers/smart/suspendLambdaSignature/Simple.kt   | 2 ++
 .../handlers/smart/suspendLambdaSignature/Simple.kt.after      | 2 ++
 plugins/kotlin/completion/testData/smart/AbstractMembers.kt    | 2 ++
 plugins/kotlin/completion/testData/smart/AfterEmptyArgument.kt | 2 ++
 plugins/kotlin/completion/testData/smart/AfterExclSign.kt      | 2 ++
 plugins/kotlin/completion/testData/smart/AfterNamedArgument.kt | 2 ++
 plugins/kotlin/completion/testData/smart/AnyExpected.kt        | 2 ++
 .../completion/testData/smart/BooleanArgumentExpected.kt       | 2 ++
 plugins/kotlin/completion/testData/smart/BooleanExpected.kt    | 2 ++
 .../testData/smart/BooleanOrNullableArgumentExpected.kt        | 2 ++
 plugins/kotlin/completion/testData/smart/ClassObjectMembers.kt | 2 ++
 .../completion/testData/smart/ClassObjectMembersForNullable.kt | 2 ++
 .../completion/testData/smart/ClassObjectMembersWithPrefix.kt  | 2 ++
 plugins/kotlin/completion/testData/smart/EmptyPrefix.kt        | 2 ++
 plugins/kotlin/completion/testData/smart/EqOperator.kt         | 2 ++
 .../testData/smart/ExtensionFunctionTypeVariables.kt           | 2 ++
 plugins/kotlin/completion/testData/smart/FilterTo.kt           | 2 ++
 plugins/kotlin/completion/testData/smart/GetOperator.kt        | 2 ++
 plugins/kotlin/completion/testData/smart/GroupBySubstitutor.kt | 2 ++
 plugins/kotlin/completion/testData/smart/HighOrderFunction.kt  | 2 ++
 plugins/kotlin/completion/testData/smart/ImplicitInvoke.kt     | 3 ++-
 .../kotlin/completion/testData/smart/ImplicitlyTypedFunBody.kt | 3 ++-
 .../testData/smart/ImplicitlyTypedOverrideFunBody.kt           | 3 ++-
 .../testData/smart/ImplicitlyTypedOverrideValInitializer.kt    | 3 ++-
 .../testData/smart/ImplicitlyTypedValInitializer1.kt           | 3 ++-
 .../testData/smart/ImplicitlyTypedValInitializer2.kt           | 3 ++-
 .../testData/smart/ImplicitlyTypedValInitializerUnknownType.kt | 2 ++
 .../completion/testData/smart/InaccessibleConstructor.kt       | 2 ++
 plugins/kotlin/completion/testData/smart/InfixCall.kt          | 2 ++
 .../completion/testData/smart/JavaEnumMembersAfterQualifier.kt | 2 ++
 plugins/kotlin/completion/testData/smart/JavaStaticFields.kt   | 2 ++
 .../completion/testData/smart/JavaStaticFieldsForNullable.kt   | 2 ++
 plugins/kotlin/completion/testData/smart/JavaStaticMethods.kt  | 2 ++
 plugins/kotlin/completion/testData/smart/LambdaValue3.kt       | 2 ++
 plugins/kotlin/completion/testData/smart/MapTo.kt              | 2 ++
 plugins/kotlin/completion/testData/smart/MapTo2.kt             | 2 ++
 .../testData/smart/NoExtensionMethodFromClassObject.kt         | 2 ++
 plugins/kotlin/completion/testData/smart/NoPrivateOverload.kt  | 2 ++
 plugins/kotlin/completion/testData/smart/NoSillyAssignment.kt  | 2 ++
 plugins/kotlin/completion/testData/smart/NotEqOperator.kt      | 2 ++
 plugins/kotlin/completion/testData/smart/NotSillyAssignment.kt | 2 ++
 plugins/kotlin/completion/testData/smart/Object.kt             | 2 ++
 plugins/kotlin/completion/testData/smart/ObjectsFromType.kt    | 2 ++
 .../completion/testData/smart/OverloadedConstructorArgument.kt | 2 ++
 .../completion/testData/smart/OverloadedMethodCallArgument1.kt | 2 ++
 .../completion/testData/smart/OverloadedMethodCallArgument2.kt | 2 ++
 .../completion/testData/smart/PreviousArgMismatchedType.kt     | 2 ++
 .../testData/smart/QualifiedOverloadedMethodCallArgument1.kt   | 2 ++
 .../testData/smart/QualifiedOverloadedMethodCallArgument2.kt   | 2 ++
 .../completion/testData/smart/SAMConstructorForTypeAlias.kt    | 3 ++-
 plugins/kotlin/completion/testData/smart/SAMExpected1.kt       | 2 ++
 plugins/kotlin/completion/testData/smart/SAMExpected2.kt       | 2 ++
 .../kotlin/completion/testData/smart/SkipDeclarationsOfType.kt | 2 ++
 plugins/kotlin/completion/testData/smart/SuperMembers.kt       | 3 ++-
 .../kotlin/completion/testData/smart/VariableAsFunction1.kt    | 2 ++
 .../kotlin/completion/testData/smart/VariableAsFunction3.kt    | 2 ++
 plugins/kotlin/completion/testData/smart/afterAs/1.kt          | 2 ++
 plugins/kotlin/completion/testData/smart/afterAs/2.kt          | 2 ++
 plugins/kotlin/completion/testData/smart/afterAs/3.kt          | 2 ++
 plugins/kotlin/completion/testData/smart/anonymousObject/1.kt  | 2 ++
 plugins/kotlin/completion/testData/smart/anonymousObject/2.kt  | 2 ++
 .../testData/smart/anonymousObject/ForJavaInterface.kt         | 3 ++-
 .../testData/smart/anonymousObject/UninferredTypeArgs.kt       | 2 ++
 .../completion/testData/smart/anonymousObject/WithPrefix.kt    | 2 ++
 .../testData/smart/callableReference/ClassLiteral.kt           | 2 ++
 .../testData/smart/callableReference/ClassLiteralDotJava.kt    | 2 ++
 .../smart/callableReference/ConcreteJavaClassExpected.kt       | 2 ++
 .../testData/smart/callableReference/ConcreteKClassExpected.kt | 2 ++
 .../callableReference/ConcreteKClassExpectedNoDuplicates.kt    | 2 ++
 .../testData/smart/callableReference/EmptyQualifier1.kt        | 2 ++
 .../testData/smart/callableReference/EmptyQualifier2.kt        | 2 ++
 .../testData/smart/callableReference/EmptyQualifier3.kt        | 2 ++
 .../testData/smart/callableReference/ExpressionQualifier.kt    | 2 ++
 .../testData/smart/callableReference/NoQualifier1.kt           | 2 ++
 .../testData/smart/callableReference/NoQualifier10.kt          | 2 ++
 .../testData/smart/callableReference/NoQualifier12.kt          | 2 ++
 .../testData/smart/callableReference/NoQualifier2.kt           | 2 ++
 .../testData/smart/callableReference/NoQualifier3.kt           | 2 ++
 .../testData/smart/callableReference/NoQualifier4.kt           | 2 ++
 .../testData/smart/callableReference/NoQualifier7.kt           | 2 ++
 .../smart/callableReference/NoQualifierMultipleConstructors.kt | 2 ++
 .../smart/callableReference/NoQualifierPropertyExpected.kt     | 2 ++
 .../testData/smart/callableReference/NonEmptyQualifier1.kt     | 2 ++
 .../testData/smart/callableReference/NonEmptyQualifier2.kt     | 2 ++
 .../testData/smart/constructor/ConstructorViaTypeAlias.kt      | 3 ++-
 ...onstructorWithTypeParamsPartialSubstitution1ViaTypeAlias.kt | 3 ++-
 ...onstructorWithTypeParamsPartialSubstitution2ViaTypeAlias.kt | 3 ++-
 .../ConstructorWithTypeParamsSubstitutionViaTypeAlias.kt       | 3 ++-
 .../smart/constructor/ConstructorWithTypeParamsViaTypeAlias.kt | 3 ++-
 .../completion/testData/smart/constructor/GenericJavaClass.kt  | 2 ++
 .../completion/testData/smart/constructor/GenericType.kt       | 2 ++
 .../smart/constructor/PrivateConstructorForAbstract.kt         | 2 ++
 .../smart/constructor/ProtectedConstructorForAbstract.kt       | 2 ++
 .../completion/testData/smart/constructor/StarProjection1.kt   | 2 ++
 .../completion/testData/smart/constructor/StarProjection2.kt   | 2 ++
 .../kotlin/completion/testData/smart/forLoopRange/AfterDot.kt  | 2 ++
 .../testData/smart/forLoopRange/ExtensionIteratorMethod.kt     | 2 ++
 .../completion/testData/smart/forLoopRange/NoGenericT.kt       | 2 ++
 .../kotlin/completion/testData/smart/forLoopRange/Nullable.kt  | 2 ++
 .../kotlin/completion/testData/smart/forLoopRange/Simple.kt    | 2 ++
 .../completion/testData/smart/forLoopRange/SmartCasts.kt       | 2 ++
 .../completion/testData/smart/forLoopRange/TypedLoopVar.kt     | 2 ++
 plugins/kotlin/completion/testData/smart/functionLiterals/1.kt | 2 ++
 plugins/kotlin/completion/testData/smart/functionLiterals/2.kt | 2 ++
 plugins/kotlin/completion/testData/smart/functionLiterals/3.kt | 2 ++
 plugins/kotlin/completion/testData/smart/functionLiterals/4.kt | 2 ++
 plugins/kotlin/completion/testData/smart/functionLiterals/5.kt | 2 ++
 .../smart/functionLiterals/ExplicitParameterTypesRequired.kt   | 2 ++
 .../testData/smart/functionLiterals/OutsideCallParenthesis1.kt | 3 ++-
 .../testData/smart/functionLiterals/OutsideCallParenthesis2.kt | 2 ++
 .../testData/smart/functionLiterals/OutsideCallParenthesis3.kt | 3 ++-
 .../testData/smart/functionLiterals/OutsideCallParenthesis4.kt | 3 ++-
 .../testData/smart/functionLiterals/OutsideCallParenthesis5.kt | 3 ++-
 .../testData/smart/functionLiterals/OutsideCallParenthesis6.kt | 3 ++-
 .../testData/smart/functionLiterals/OutsideCallParenthesis7.kt | 3 ++-
 .../testData/smart/functionLiterals/OutsideCallParenthesis8.kt | 3 ++-
 .../smart/functionLiterals/OutsideCallParenthesisAndVararg1.kt | 3 ++-
 .../smart/functionLiterals/OutsideCallParenthesisAndVararg2.kt | 3 ++-
 .../functionLiterals/SuspendExplicitParameterTypesRequired.kt  | 2 ++
 .../completion/testData/smart/generics/GenericFunction1.kt     | 2 ++
 .../completion/testData/smart/generics/GenericFunction2.kt     | 2 ++
 .../completion/testData/smart/generics/GenericFunction3.kt     | 2 ++
 .../completion/testData/smart/generics/GenericFunction4.kt     | 2 ++
 .../completion/testData/smart/generics/GenericFunction5.kt     | 2 ++
 .../testData/smart/heuristicSignatures/InOperator.kt           | 2 ++
 plugins/kotlin/completion/testData/smart/ifValue/1.kt          | 2 ++
 plugins/kotlin/completion/testData/smart/ifValue/3.kt          | 2 ++
 plugins/kotlin/completion/testData/smart/ifValue/4.kt          | 2 ++
 plugins/kotlin/completion/testData/smart/ifValue/InBlock1.kt   | 2 ++
 plugins/kotlin/completion/testData/smart/inElvisOperator/2.kt  | 2 ++
 plugins/kotlin/completion/testData/smart/inElvisOperator/3.kt  | 2 ++
 plugins/kotlin/completion/testData/smart/inElvisOperator/5.kt  | 2 ++
 plugins/kotlin/completion/testData/smart/inElvisOperator/6.kt  | 2 ++
 .../completion/testData/smart/inOperator/ExtensionContains.kt  | 2 ++
 .../testData/smart/inOperator/FilterByArgumentType.kt          | 2 ++
 .../completion/testData/smart/inOperator/GenericMethod.kt      | 2 ++
 .../completion/testData/smart/inOperator/GenericMethod2.kt     | 2 ++
 .../completion/testData/smart/inOperator/GenericMethod3.kt     | 2 ++
 plugins/kotlin/completion/testData/smart/inOperator/NotIn.kt   | 2 ++
 .../kotlin/completion/testData/smart/inOperator/Nullable.kt    | 2 ++
 plugins/kotlin/completion/testData/smart/inOperator/Simple.kt  | 2 ++
 .../kotlin/completion/testData/smart/inOperator/SmartCasts.kt  | 2 ++
 plugins/kotlin/completion/testData/smart/inheritors/1.kt       | 2 ++
 plugins/kotlin/completion/testData/smart/inheritors/2.kt       | 2 ++
 .../completion/testData/smart/inheritors/GenericClass1.kt      | 2 ++
 .../completion/testData/smart/inheritors/GenericClass2.kt      | 2 ++
 .../completion/testData/smart/inheritors/GenericClass3.kt      | 2 ++
 .../completion/testData/smart/inheritors/GenericClass4.kt      | 2 ++
 .../completion/testData/smart/inheritors/GenericClass5.kt      | 2 ++
 .../completion/testData/smart/inheritors/GenericClass6.kt      | 2 ++
 .../smart/lambdaSignature/ExplicitParameterTypesRequired.kt    | 2 ++
 .../kotlin/completion/testData/smart/lambdaSignature/Map.kt    | 2 ++
 .../testData/smart/lambdaSignature/MultipleParameters.kt       | 2 ++
 .../testData/smart/lambdaSignature/SingleParameter.kt          | 2 ++
 .../lambdaSignature/SuspendExplicitParameterTypesRequired.kt   | 2 ++
 plugins/kotlin/completion/testData/smart/multipleArgsItem/1.kt | 2 ++
 .../kotlin/completion/testData/smart/multipleArgsItem/10.kt    | 2 ++
 .../kotlin/completion/testData/smart/multipleArgsItem/11.kt    | 2 ++
 plugins/kotlin/completion/testData/smart/multipleArgsItem/2.kt | 2 ++
 plugins/kotlin/completion/testData/smart/multipleArgsItem/3.kt | 2 ++
 plugins/kotlin/completion/testData/smart/multipleArgsItem/4.kt | 2 ++
 plugins/kotlin/completion/testData/smart/multipleArgsItem/6.kt | 2 ++
 plugins/kotlin/completion/testData/smart/multipleArgsItem/7.kt | 2 ++
 plugins/kotlin/completion/testData/smart/multipleArgsItem/8.kt | 2 ++
 plugins/kotlin/completion/testData/smart/multipleArgsItem/9.kt | 2 ++
 .../testData/smart/multipleArgsItem/CallWithBrackets.kt        | 2 ++
 .../testData/smart/multipleArgsItem/notFirstArgument.kt        | 3 ++-
 .../completion/testData/smart/propertyDelegate/DelegatesDot.kt | 2 ++
 .../smart/propertyDelegate/DelegatesDotExplicitPropertyType.kt | 2 ++
 .../testData/smart/propertyDelegate/ExplicitValType.kt         | 2 ++
 .../testData/smart/propertyDelegate/ExplicitVarType.kt         | 2 ++
 .../testData/smart/propertyDelegate/ExtensionSubstitution1.kt  | 2 ++
 .../testData/smart/propertyDelegate/ExtensionSubstitution2.kt  | 2 ++
 .../testData/smart/propertyDelegate/ExtensionSubstitution3.kt  | 2 ++
 .../testData/smart/propertyDelegate/ExtensionSubstitution4.kt  | 2 ++
 .../completion/testData/smart/propertyDelegate/ExtensionVal.kt | 2 ++
 .../completion/testData/smart/propertyDelegate/ExtensionVar.kt | 2 ++
 .../testData/smart/propertyDelegate/GenericOperator.kt         | 2 ++
 .../completion/testData/smart/propertyDelegate/GenericVal.kt   | 3 ++-
 .../completion/testData/smart/propertyDelegate/GenericVar.kt   | 3 ++-
 .../smart/propertyDelegate/NonConflictingSubstitutors.kt       | 2 ++
 .../kotlin/completion/testData/smart/propertyDelegate/Order.kt | 2 ++
 .../completion/testData/smart/propertyDelegate/OverrideVal.kt  | 2 ++
 .../completion/testData/smart/propertyDelegate/TopLevelVal.kt  | 2 ++
 .../completion/testData/smart/propertyDelegate/ValInClass.kt   | 2 ++
 .../testData/smart/propertyDelegate/ValInGenericClass1.kt      | 2 ++
 .../testData/smart/propertyDelegate/ValInGenericClass2.kt      | 2 ++
 .../testData/smart/propertyDelegate/ValInGenericClass3.kt      | 2 ++
 .../completion/testData/smart/propertyDelegate/VarInClass.kt   | 2 ++
 .../testData/smart/propertyDelegate/VarInGenericClass.kt       | 2 ++
 .../completion/testData/smart/smartCasts/AutoNotNullType.kt    | 2 ++
 .../smart/smartCasts/AutoNotNullTypeForConstructorParameter.kt | 2 ++
 .../testData/smart/smartCasts/AutoNotNullTypeWithQualifier.kt  | 2 ++
 .../completion/testData/smart/smartCasts/CheckCorrectThis.kt   | 3 ++-
 .../completion/testData/smart/smartCasts/SmartCastThisType2.kt | 2 ++
 .../completion/testData/smart/smartCasts/SmartCastType.kt      | 2 ++
 .../testData/smart/smartCasts/SmartCastTypeWithQualifier.kt    | 2 ++
 plugins/kotlin/completion/testData/smart/this/NullableThis.kt  | 2 ++
 plugins/kotlin/completion/testData/smart/this/QualifiedThis.kt | 2 ++
 plugins/kotlin/completion/testData/smart/this/This.kt          | 2 ++
 plugins/kotlin/completion/testData/smart/vararg/1.kt           | 1 +
 plugins/kotlin/completion/testData/smart/vararg/2.kt           | 1 +
 plugins/kotlin/completion/testData/smart/vararg/4.kt           | 1 +
 .../kotlin/completion/testData/smart/vararg/SecondVararg.kt    | 1 +
 plugins/kotlin/completion/testData/smart/whenEntry/2.kt        | 2 ++
 plugins/kotlin/completion/testData/smart/whenEntry/3.kt        | 2 ++
 plugins/kotlin/completion/testData/smart/whenEntry/5.kt        | 2 ++
 plugins/kotlin/completion/testData/smart/whenEntry/6.kt        | 2 ++
 plugins/kotlin/completion/testData/smart/whenEntry/8.kt        | 2 ++
 plugins/kotlin/completion/testData/smart/whenEntry/9.kt        | 2 ++
 .../completion/testData/smart/whenEntry/WhenWithNoSubject1.kt  | 2 ++
 .../completion/testData/smart/whenEntry/WhenWithNoSubject2.kt  | 2 ++
 .../testData/smart/whenEntry/WhenWithSubjectTrueFalse.kt       | 2 ++
 .../AnonymousObjectGenericJava/AnonymousObjectGenericJava.kt   | 2 ++
 .../CallableReferenceNotImported.kt                            | 2 ++
 .../smartMultiFile/GenericInheritors1/GenericInheritors1.kt    | 2 ++
 .../smartMultiFile/GenericInheritors2/GenericInheritors2.kt    | 2 ++
 .../smartMultiFile/GenericInheritors3/GenericInheritors3.kt    | 2 ++
 .../smartMultiFile/GenericInheritors4/GenericInheritors4.kt    | 2 ++
 .../testData/smartMultiFile/Inheritors/Inheritors.kt           | 2 ++
 .../InheritorsAndMultipleExpectedTypes.kt                      | 2 ++
 .../completion/testData/smartMultiFile/KT_8751/KT_8751.kt      | 2 ++
 .../completion/testData/smartMultiFile/KT_8751_2/KT_8751_2.kt  | 2 ++
 .../smartMultiFile/NestedClassAfterAs/NestedClassAfterAs.kt    | 2 ++
 .../smartMultiFile/NoObjectDuplication/NoObjectDuplication.kt  | 2 ++
 .../smartMultiFile/NotImportedContains/NotImportedContains.kt  | 2 ++
 .../smartMultiFile/NotImportedGetValue/NotImportedGetValue.kt  | 2 ++
 .../testData/smartMultiFile/StaticMembers1/StaticMembers1.kt   | 2 ++
 .../testData/smartMultiFile/StaticMembers2/StaticMembers2.kt   | 2 ++
 485 files changed, 966 insertions(+), 81 deletions(-)

diff --git a/plugins/kotlin/completion/testData/handlers/smart/AfterAs.kt b/plugins/kotlin/completion/testData/handlers/smart/AfterAs.kt
index 32fb545f0553..3fb485386236 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/AfterAs.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/AfterAs.kt
@@ -3,4 +3,5 @@ fun foo(p1: String, p2: Int){ }
 fun bar(o: Any){
     foo(o as <caret>)
 }
-// AUTOCOMPLETE_SETTING: true
\ No newline at end of file
+// AUTOCOMPLETE_SETTING: true
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/AfterAs.kt.after b/plugins/kotlin/completion/testData/handlers/smart/AfterAs.kt.after
index 390fc60f2519..8e25760522de 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/AfterAs.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/AfterAs.kt.after
@@ -3,4 +3,5 @@ fun foo(p1: String, p2: Int){ }
 fun bar(o: Any){
     foo(o as String, <caret>)
 }
-// AUTOCOMPLETE_SETTING: true
\ No newline at end of file
+// AUTOCOMPLETE_SETTING: true
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/AfterAs2.kt b/plugins/kotlin/completion/testData/handlers/smart/AfterAs2.kt
index 4c8735edd1f0..dad724da0c7d 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/AfterAs2.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/AfterAs2.kt
@@ -3,4 +3,5 @@ fun foo(p: java.util.HashMap<String, java.io.File>){ }
 fun bar(o: Any){
     foo(o as <caret>)
 }
-// AUTOCOMPLETE_SETTING: true
\ No newline at end of file
+// AUTOCOMPLETE_SETTING: true
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/AfterAs2.kt.after b/plugins/kotlin/completion/testData/handlers/smart/AfterAs2.kt.after
index 60b418a02395..fab589fe1234 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/AfterAs2.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/AfterAs2.kt.after
@@ -6,4 +6,5 @@ fun foo(p: java.util.HashMap<String, java.io.File>){ }
 fun bar(o: Any){
     foo(o as HashMap<String, File>)<caret>
 }
-// AUTOCOMPLETE_SETTING: true
\ No newline at end of file
+// AUTOCOMPLETE_SETTING: true
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/AfterAs3.kt b/plugins/kotlin/completion/testData/handlers/smart/AfterAs3.kt
index db498bf90c0c..f599f63526ce 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/AfterAs3.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/AfterAs3.kt
@@ -5,4 +5,5 @@ fun bar(o: Any) {
     foo(o as <caret>)
 }
 
-// AUTOCOMPLETE_SETTING: true
\ No newline at end of file
+// AUTOCOMPLETE_SETTING: true
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/AfterAs3.kt.after b/plugins/kotlin/completion/testData/handlers/smart/AfterAs3.kt.after
index 258511bad502..21e80c524374 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/AfterAs3.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/AfterAs3.kt.after
@@ -5,4 +5,5 @@ fun bar(o: Any) {
     foo(o as List<String><caret>)
 }
 
-// AUTOCOMPLETE_SETTING: true
\ No newline at end of file
+// AUTOCOMPLETE_SETTING: true
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/AfterSafeAs.kt b/plugins/kotlin/completion/testData/handlers/smart/AfterSafeAs.kt
index b20105a43f8d..c69a6a7937e0 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/AfterSafeAs.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/AfterSafeAs.kt
@@ -3,4 +3,5 @@ fun foo(p: java.io.File?){ }
 fun bar(o: Any){
     foo(o as? <caret>)
 }
-// AUTOCOMPLETE_SETTING: true
\ No newline at end of file
+// AUTOCOMPLETE_SETTING: true
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/AfterSafeAs.kt.after b/plugins/kotlin/completion/testData/handlers/smart/AfterSafeAs.kt.after
index eea3b794dcbc..551abf6c67e2 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/AfterSafeAs.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/AfterSafeAs.kt.after
@@ -5,4 +5,5 @@ fun foo(p: java.io.File?){ }
 fun bar(o: Any){
     foo(o as? File)<caret>
 }
-// AUTOCOMPLETE_SETTING: true
\ No newline at end of file
+// AUTOCOMPLETE_SETTING: true
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/AfterVararg.kt b/plugins/kotlin/completion/testData/handlers/smart/AfterVararg.kt
index 0e75448a16aa..aa2d0199f562 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/AfterVararg.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/AfterVararg.kt
@@ -5,3 +5,5 @@ fun bar(i: Int) {
 }
 
 // ELEMENT: i
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/AfterVararg.kt.after b/plugins/kotlin/completion/testData/handlers/smart/AfterVararg.kt.after
index 004cc223114d..053505abab26 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/AfterVararg.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/AfterVararg.kt.after
@@ -5,3 +5,5 @@ fun bar(i: Int) {
 }
 
 // ELEMENT: i
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/AnonymousObject1.kt b/plugins/kotlin/completion/testData/handlers/smart/AnonymousObject1.kt
index 24f26d7c41a3..cca64c835344 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/AnonymousObject1.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/AnonymousObject1.kt
@@ -3,3 +3,5 @@ interface Foo
 var a : Foo = <caret>
 
 //ELEMENT: object
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/AnonymousObject1.kt.after b/plugins/kotlin/completion/testData/handlers/smart/AnonymousObject1.kt.after
index f6d7ee06891f..f05236d94eca 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/AnonymousObject1.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/AnonymousObject1.kt.after
@@ -3,3 +3,5 @@ interface Foo
 var a : Foo = object : Foo {<caret>}
 
 //ELEMENT: object
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/AnonymousObject2.kt b/plugins/kotlin/completion/testData/handlers/smart/AnonymousObject2.kt
index 6a88befe666c..44831dbf377f 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/AnonymousObject2.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/AnonymousObject2.kt
@@ -3,3 +3,5 @@ abstract class Foo
 var a : Foo = <caret>
 
 //ELEMENT: object
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/AnonymousObject2.kt.after b/plugins/kotlin/completion/testData/handlers/smart/AnonymousObject2.kt.after
index 0ae66a40336b..65430b6d2f12 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/AnonymousObject2.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/AnonymousObject2.kt.after
@@ -3,3 +3,5 @@ abstract class Foo
 var a : Foo = object : Foo() {<caret>}
 
 //ELEMENT: object
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/AnonymousObject3.kt b/plugins/kotlin/completion/testData/handlers/smart/AnonymousObject3.kt
index 8858f9ce9ab2..37818860b1d8 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/AnonymousObject3.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/AnonymousObject3.kt
@@ -1,4 +1,5 @@
 var r : Runnable = <caret>
 
 //ELEMENT: object
-//TAIL_TEXT: " (java.lang)"
\ No newline at end of file
+//TAIL_TEXT: " (java.lang)"
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/AnonymousObject3.kt.after b/plugins/kotlin/completion/testData/handlers/smart/AnonymousObject3.kt.after
index c43f4e6c4e9a..f992a39ca310 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/AnonymousObject3.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/AnonymousObject3.kt.after
@@ -5,4 +5,5 @@ var r : Runnable = object : Runnable {
 }
 
 //ELEMENT: object
-//TAIL_TEXT: " (java.lang)"
\ No newline at end of file
+//TAIL_TEXT: " (java.lang)"
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/AnonymousObjectInsertsImport.kt b/plugins/kotlin/completion/testData/handlers/smart/AnonymousObjectInsertsImport.kt
index 6bf296b801c9..09b75c676c0d 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/AnonymousObjectInsertsImport.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/AnonymousObjectInsertsImport.kt
@@ -1,3 +1,5 @@
 val c: java.io.Closeable = <caret>
 
 //ELEMENT_TEXT: "object : Closeable{...}"
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/AnonymousObjectInsertsImport.kt.after b/plugins/kotlin/completion/testData/handlers/smart/AnonymousObjectInsertsImport.kt.after
index 6903dc2a8a84..65885620bee3 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/AnonymousObjectInsertsImport.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/AnonymousObjectInsertsImport.kt.after
@@ -7,3 +7,5 @@ val c: java.io.Closeable = object : Closeable {
 }
 
 //ELEMENT_TEXT: "object : Closeable{...}"
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/AnonymousObjectUninferredTypeArgs.kt b/plugins/kotlin/completion/testData/handlers/smart/AnonymousObjectUninferredTypeArgs.kt
index d199d5a40da9..d05fe655ee8e 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/AnonymousObjectUninferredTypeArgs.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/AnonymousObjectUninferredTypeArgs.kt
@@ -6,4 +6,5 @@ fun g() {
     foo(<caret>)
 }
 
-// ELEMENT: object
\ No newline at end of file
+// ELEMENT: object
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/AnonymousObjectUninferredTypeArgs.kt.after b/plugins/kotlin/completion/testData/handlers/smart/AnonymousObjectUninferredTypeArgs.kt.after
index 0c6fff5617e5..e9f1b12e46e6 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/AnonymousObjectUninferredTypeArgs.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/AnonymousObjectUninferredTypeArgs.kt.after
@@ -6,4 +6,5 @@ fun g() {
     foo(object : A<<caret>> {})
 }
 
-// ELEMENT: object
\ No newline at end of file
+// ELEMENT: object
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/ArrayClassLiteral.kt b/plugins/kotlin/completion/testData/handlers/smart/ArrayClassLiteral.kt
index 57f2cb5c8397..20e09c336a1d 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/ArrayClassLiteral.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/ArrayClassLiteral.kt
@@ -4,4 +4,5 @@ fun<T> f(klass: Class<Array<T>>) {
 fun g() {
     f<String>(<caret>)
 }
-// ELEMENT: Array
\ No newline at end of file
+// ELEMENT: Array
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/ArrayClassLiteral.kt.after b/plugins/kotlin/completion/testData/handlers/smart/ArrayClassLiteral.kt.after
index 591ebd70312d..3c1b8fb1efbd 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/ArrayClassLiteral.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/ArrayClassLiteral.kt.after
@@ -4,4 +4,5 @@ fun<T> f(klass: Class<Array<T>>) {
 fun g() {
     f<String>(Array<String>::class.java)<caret>
 }
-// ELEMENT: Array
\ No newline at end of file
+// ELEMENT: Array
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/AutoCompleteAfterAs1.kt b/plugins/kotlin/completion/testData/handlers/smart/AutoCompleteAfterAs1.kt
index e15828a477db..4329d9c792cd 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/AutoCompleteAfterAs1.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/AutoCompleteAfterAs1.kt
@@ -5,4 +5,5 @@ fun bar(o: Any) {
     foo(o as <caret>)
 }
 
-// AUTOCOMPLETE_SETTING: true
\ No newline at end of file
+// AUTOCOMPLETE_SETTING: true
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/AutoCompleteAfterAs1.kt.after b/plugins/kotlin/completion/testData/handlers/smart/AutoCompleteAfterAs1.kt.after
index de0a54f1a47b..50bd284ce2c0 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/AutoCompleteAfterAs1.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/AutoCompleteAfterAs1.kt.after
@@ -5,4 +5,5 @@ fun bar(o: Any) {
     foo(o as Int<caret>)
 }
 
-// AUTOCOMPLETE_SETTING: true
\ No newline at end of file
+// AUTOCOMPLETE_SETTING: true
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/AutoCompleteAfterAs2.kt b/plugins/kotlin/completion/testData/handlers/smart/AutoCompleteAfterAs2.kt
index f5d6b13f60f0..bba8dcddc6bf 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/AutoCompleteAfterAs2.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/AutoCompleteAfterAs2.kt
@@ -2,4 +2,5 @@ fun bar(o: Any): String {
     return o as <caret>
 }
 
-// AUTOCOMPLETE_SETTING: true
\ No newline at end of file
+// AUTOCOMPLETE_SETTING: true
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/AutoCompleteAfterAs2.kt.after b/plugins/kotlin/completion/testData/handlers/smart/AutoCompleteAfterAs2.kt.after
index c2adcae1995c..bc253a18e8b2 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/AutoCompleteAfterAs2.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/AutoCompleteAfterAs2.kt.after
@@ -2,4 +2,5 @@ fun bar(o: Any): String {
     return o as String<caret>
 }
 
-// AUTOCOMPLETE_SETTING: true
\ No newline at end of file
+// AUTOCOMPLETE_SETTING: true
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/AutoCompleteAfterAs3.kt b/plugins/kotlin/completion/testData/handlers/smart/AutoCompleteAfterAs3.kt
index 655d2c821f48..59b8bd63bbde 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/AutoCompleteAfterAs3.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/AutoCompleteAfterAs3.kt
@@ -3,4 +3,5 @@ fun bar(o: Any): String {
     return ""
 }
 
-// AUTOCOMPLETE_SETTING: true
\ No newline at end of file
+// AUTOCOMPLETE_SETTING: true
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/AutoCompleteAfterAs3.kt.after b/plugins/kotlin/completion/testData/handlers/smart/AutoCompleteAfterAs3.kt.after
index b3e2a6317548..51dc7e0f2289 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/AutoCompleteAfterAs3.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/AutoCompleteAfterAs3.kt.after
@@ -3,4 +3,5 @@ fun bar(o: Any): String {
     return ""
 }
 
-// AUTOCOMPLETE_SETTING: true
\ No newline at end of file
+// AUTOCOMPLETE_SETTING: true
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/CallableReference1.kt b/plugins/kotlin/completion/testData/handlers/smart/CallableReference1.kt
index 93ca249b729a..19f14411db19 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/CallableReference1.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/CallableReference1.kt
@@ -6,4 +6,5 @@ fun bar() {
 
 fun f(){}
 
-// ELEMENT: ::f
\ No newline at end of file
+// ELEMENT: ::f
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/CallableReference1.kt.after b/plugins/kotlin/completion/testData/handlers/smart/CallableReference1.kt.after
index 9093966215a3..228adb23e2a3 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/CallableReference1.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/CallableReference1.kt.after
@@ -6,4 +6,5 @@ fun bar() {
 
 fun f(){}
 
-// ELEMENT: ::f
\ No newline at end of file
+// ELEMENT: ::f
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/CallableReference2.kt b/plugins/kotlin/completion/testData/handlers/smart/CallableReference2.kt
index 3461032fd349..37a3deecbdec 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/CallableReference2.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/CallableReference2.kt
@@ -6,4 +6,5 @@ fun bar() {
 
 fun f(){}
 
-// ELEMENT: ::f
\ No newline at end of file
+// ELEMENT: ::f
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/CallableReference2.kt.after b/plugins/kotlin/completion/testData/handlers/smart/CallableReference2.kt.after
index 57ff4a2d62f4..f93c726561c2 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/CallableReference2.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/CallableReference2.kt.after
@@ -6,4 +6,5 @@ fun bar() {
 
 fun f(){}
 
-// ELEMENT: ::f
\ No newline at end of file
+// ELEMENT: ::f
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/CallableReference3.kt b/plugins/kotlin/completion/testData/handlers/smart/CallableReference3.kt
index 3494134837ed..a5e1749ffda0 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/CallableReference3.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/CallableReference3.kt
@@ -6,4 +6,5 @@ fun bar() {
 
 fun f(){}
 
-// ELEMENT: f
\ No newline at end of file
+// ELEMENT: f
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/CallableReference3.kt.after b/plugins/kotlin/completion/testData/handlers/smart/CallableReference3.kt.after
index d198ac24a4e2..4378c3b18cd0 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/CallableReference3.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/CallableReference3.kt.after
@@ -6,4 +6,5 @@ fun bar() {
 
 fun f(){}
 
-// ELEMENT: f
\ No newline at end of file
+// ELEMENT: f
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/CallableReference4.kt b/plugins/kotlin/completion/testData/handlers/smart/CallableReference4.kt
index 199fb0bdb464..166e271ac52b 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/CallableReference4.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/CallableReference4.kt
@@ -10,3 +10,5 @@ fun bar() {
 }
 
 // ELEMENT: extFun
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/CallableReference4.kt.after b/plugins/kotlin/completion/testData/handlers/smart/CallableReference4.kt.after
index f92e7df03ec5..2d2d38154ad1 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/CallableReference4.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/CallableReference4.kt.after
@@ -10,3 +10,5 @@ fun bar() {
 }
 
 // ELEMENT: extFun
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/ClassInClassObject.kt b/plugins/kotlin/completion/testData/handlers/smart/ClassInClassObject.kt
index 0c923bf9509c..616f775f7f9e 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/ClassInClassObject.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/ClassInClassObject.kt
@@ -7,3 +7,5 @@ class A {
 val v: A.Companion.Inner = <caret>
 
 // ELEMENT: Inner
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/ClassInClassObject.kt.after b/plugins/kotlin/completion/testData/handlers/smart/ClassInClassObject.kt.after
index 8936819dd4c0..c552948626fc 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/ClassInClassObject.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/ClassInClassObject.kt.after
@@ -7,3 +7,5 @@ class A {
 val v: A.Companion.Inner = A.Companion.Inner()
 
 // ELEMENT: Inner
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/ClassInObject.kt b/plugins/kotlin/completion/testData/handlers/smart/ClassInObject.kt
index 497c6c0ae5a2..c55d055c7825 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/ClassInObject.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/ClassInObject.kt
@@ -7,3 +7,5 @@ class A {
 }
 
 // ELEMENT: Inner
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/ClassInObject.kt.after b/plugins/kotlin/completion/testData/handlers/smart/ClassInObject.kt.after
index 33a3f93275b8..737a41c5b517 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/ClassInObject.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/ClassInObject.kt.after
@@ -7,3 +7,5 @@ class A {
 }
 
 // ELEMENT: Inner
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/ClassObjectFieldKeywordName.kt b/plugins/kotlin/completion/testData/handlers/smart/ClassObjectFieldKeywordName.kt
index f7e2a9cb973f..736ca721006e 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/ClassObjectFieldKeywordName.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/ClassObjectFieldKeywordName.kt
@@ -11,3 +11,5 @@ fun foo(){
 }
 
 // ELEMENT: val
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/ClassObjectFieldKeywordName.kt.after b/plugins/kotlin/completion/testData/handlers/smart/ClassObjectFieldKeywordName.kt.after
index 2f1a2993c508..b9e7764b974a 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/ClassObjectFieldKeywordName.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/ClassObjectFieldKeywordName.kt.after
@@ -11,3 +11,5 @@ fun foo(){
 }
 
 // ELEMENT: val
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/ClassObjectMethod1.kt b/plugins/kotlin/completion/testData/handlers/smart/ClassObjectMethod1.kt
index 68952422d422..4c2476773d85 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/ClassObjectMethod1.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/ClassObjectMethod1.kt
@@ -11,3 +11,5 @@ fun foo(){
 }
 
 // ELEMENT: bar
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/ClassObjectMethod1.kt.after b/plugins/kotlin/completion/testData/handlers/smart/ClassObjectMethod1.kt.after
index be51d7a81d55..125f1f1f9b9f 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/ClassObjectMethod1.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/ClassObjectMethod1.kt.after
@@ -11,3 +11,5 @@ fun foo(){
 }
 
 // ELEMENT: bar
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/ClassObjectMethod2.kt b/plugins/kotlin/completion/testData/handlers/smart/ClassObjectMethod2.kt
index 3291239eb5ec..9a7d928f38d0 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/ClassObjectMethod2.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/ClassObjectMethod2.kt
@@ -11,3 +11,5 @@ fun foo(){
 }
 
 // ELEMENT: bar
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/ClassObjectMethod2.kt.after b/plugins/kotlin/completion/testData/handlers/smart/ClassObjectMethod2.kt.after
index 0f9ad8c45adb..6396dc3ffc72 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/ClassObjectMethod2.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/ClassObjectMethod2.kt.after
@@ -11,3 +11,5 @@ fun foo(){
 }
 
 // ELEMENT: bar
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/ClassObjectMethod3.kt b/plugins/kotlin/completion/testData/handlers/smart/ClassObjectMethod3.kt
index 2e0ebb3a41a3..e70fcce8608b 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/ClassObjectMethod3.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/ClassObjectMethod3.kt
@@ -11,3 +11,5 @@ fun foo(){
 }
 
 // ELEMENT: bar
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/ClassObjectMethod3.kt.after b/plugins/kotlin/completion/testData/handlers/smart/ClassObjectMethod3.kt.after
index 1d8b950d37b4..60f0f18ab49f 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/ClassObjectMethod3.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/ClassObjectMethod3.kt.after
@@ -11,3 +11,5 @@ fun foo(){
 }
 
 // ELEMENT: bar
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/ClassObjectMethod4.kt b/plugins/kotlin/completion/testData/handlers/smart/ClassObjectMethod4.kt
index 132332416ec0..18a91210843e 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/ClassObjectMethod4.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/ClassObjectMethod4.kt
@@ -12,3 +12,5 @@ fun foo(){
 
 // ELEMENT: bar
 // TAIL_TEXT: "(p: (Int, String) -> Unit) (sample)"
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/ClassObjectMethod4.kt.after b/plugins/kotlin/completion/testData/handlers/smart/ClassObjectMethod4.kt.after
index 24595c6d387f..197af15de24f 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/ClassObjectMethod4.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/ClassObjectMethod4.kt.after
@@ -12,3 +12,5 @@ fun foo(){
 
 // ELEMENT: bar
 // TAIL_TEXT: "(p: (Int, String) -> Unit) (sample)"
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/ClosingParenthesis1.kt b/plugins/kotlin/completion/testData/handlers/smart/ClosingParenthesis1.kt
index 4a8c96865b00..0f913c91584e 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/ClosingParenthesis1.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/ClosingParenthesis1.kt
@@ -5,3 +5,5 @@ fun bar(sss: String) {
 }
 
 //ELEMENT: sss
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/ClosingParenthesis1.kt.after b/plugins/kotlin/completion/testData/handlers/smart/ClosingParenthesis1.kt.after
index 5aeab2842240..fb2ae9bfb54e 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/ClosingParenthesis1.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/ClosingParenthesis1.kt.after
@@ -5,3 +5,5 @@ fun bar(sss: String) {
 }
 
 //ELEMENT: sss
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/ClosingParenthesis2.kt b/plugins/kotlin/completion/testData/handlers/smart/ClosingParenthesis2.kt
index eed859fab46d..92b17b665fe1 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/ClosingParenthesis2.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/ClosingParenthesis2.kt
@@ -5,3 +5,5 @@ fun bar(sss: String) {
 }
 
 //ELEMENT: sss
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/ClosingParenthesis2.kt.after b/plugins/kotlin/completion/testData/handlers/smart/ClosingParenthesis2.kt.after
index 5aeab2842240..fb2ae9bfb54e 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/ClosingParenthesis2.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/ClosingParenthesis2.kt.after
@@ -5,3 +5,5 @@ fun bar(sss: String) {
 }
 
 //ELEMENT: sss
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/Comma1.kt b/plugins/kotlin/completion/testData/handlers/smart/Comma1.kt
index eed859fab46d..92b17b665fe1 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/Comma1.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/Comma1.kt
@@ -5,3 +5,5 @@ fun bar(sss: String) {
 }
 
 //ELEMENT: sss
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/Comma1.kt.after b/plugins/kotlin/completion/testData/handlers/smart/Comma1.kt.after
index 5aeab2842240..fb2ae9bfb54e 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/Comma1.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/Comma1.kt.after
@@ -5,3 +5,5 @@ fun bar(sss: String) {
 }
 
 //ELEMENT: sss
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/Comma2.kt b/plugins/kotlin/completion/testData/handlers/smart/Comma2.kt
index 92af737c80c9..c2d0fadecc87 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/Comma2.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/Comma2.kt
@@ -5,3 +5,5 @@ fun bar(sss: String) {
 }
 
 //ELEMENT: sss
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/Comma2.kt.after b/plugins/kotlin/completion/testData/handlers/smart/Comma2.kt.after
index b7d3f1195f79..de8fccf56b01 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/Comma2.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/Comma2.kt.after
@@ -5,3 +5,5 @@ fun bar(sss: String) {
 }
 
 //ELEMENT: sss
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/Comma5.kt b/plugins/kotlin/completion/testData/handlers/smart/Comma5.kt
index 82d6149f2973..155c323f0b8a 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/Comma5.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/Comma5.kt
@@ -6,3 +6,5 @@ fun bar(sss: String) {
 }
 
 //ELEMENT: sss
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/Comma5.kt.after b/plugins/kotlin/completion/testData/handlers/smart/Comma5.kt.after
index 6aee486f6ded..994ed7dc32c3 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/Comma5.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/Comma5.kt.after
@@ -6,3 +6,5 @@ fun bar(sss: String) {
 }
 
 //ELEMENT: sss
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/Comma6.kt b/plugins/kotlin/completion/testData/handlers/smart/Comma6.kt
index 4acee9b73f19..980c06a2a3d4 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/Comma6.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/Comma6.kt
@@ -7,3 +7,5 @@ fun bar() {
 fun getString(p: Int): String = ""
 
 //ELEMENT: getString
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/Comma6.kt.after b/plugins/kotlin/completion/testData/handlers/smart/Comma6.kt.after
index 983ab204ae89..1c36281f3f5a 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/Comma6.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/Comma6.kt.after
@@ -7,3 +7,5 @@ fun bar() {
 fun getString(p: Int): String = ""
 
 //ELEMENT: getString
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/Comma7.kt b/plugins/kotlin/completion/testData/handlers/smart/Comma7.kt
index 76f709e1c7b0..acfba2bf61af 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/Comma7.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/Comma7.kt
@@ -7,3 +7,5 @@ class C {
 }
 
 //ELEMENT: this
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/Comma7.kt.after b/plugins/kotlin/completion/testData/handlers/smart/Comma7.kt.after
index c827e9e7cb47..b1d0aeb41cbb 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/Comma7.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/Comma7.kt.after
@@ -7,3 +7,5 @@ class C {
 }
 
 //ELEMENT: this
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/Comma8.kt b/plugins/kotlin/completion/testData/handlers/smart/Comma8.kt
index 282441cfa6c7..b8c3156fd897 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/Comma8.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/Comma8.kt
@@ -7,3 +7,5 @@ fun bar() {
 }
 
 //ELEMENT: object
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/Comma8.kt.after b/plugins/kotlin/completion/testData/handlers/smart/Comma8.kt.after
index 8cdd5b1715ed..591db05a5c5b 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/Comma8.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/Comma8.kt.after
@@ -7,3 +7,5 @@ fun bar() {
 }
 
 //ELEMENT: object
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/Comma9.kt b/plugins/kotlin/completion/testData/handlers/smart/Comma9.kt
index a84d6e2826a5..45e5f6d148b0 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/Comma9.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/Comma9.kt
@@ -10,3 +10,5 @@ fun bar(){
 }
 
 // ELEMENT: X
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/Comma9.kt.after b/plugins/kotlin/completion/testData/handlers/smart/Comma9.kt.after
index 82cfa4aa405e..62e6cf867190 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/Comma9.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/Comma9.kt.after
@@ -10,3 +10,5 @@ fun bar(){
 }
 
 // ELEMENT: X
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/CommaInSuperConstructorCall.kt b/plugins/kotlin/completion/testData/handlers/smart/CommaInSuperConstructorCall.kt
index 010d20b6d525..779eb23395d1 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/CommaInSuperConstructorCall.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/CommaInSuperConstructorCall.kt
@@ -3,3 +3,5 @@ open class Base(p1: String, p2: String)
 class Derived(s: String) : Base(<caret>)
 
 // ELEMENT: s
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/CommaInSuperConstructorCall.kt.after b/plugins/kotlin/completion/testData/handlers/smart/CommaInSuperConstructorCall.kt.after
index db7a024fb871..2d5cf9c5c6ea 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/CommaInSuperConstructorCall.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/CommaInSuperConstructorCall.kt.after
@@ -3,3 +3,5 @@ open class Base(p1: String, p2: String)
 class Derived(s: String) : Base(s, <caret>)
 
 // ELEMENT: s
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/ConcreteJavaClass.kt b/plugins/kotlin/completion/testData/handlers/smart/ConcreteJavaClass.kt
index 8eb88d09cd5e..20e9bb3fa63b 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/ConcreteJavaClass.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/ConcreteJavaClass.kt
@@ -3,3 +3,5 @@ open class A<T : Any>(val javaClass: Class<T>?)
 class B : A<java.io.File>(<caret>)
 
 // ELEMENT: File
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/ConcreteJavaClass.kt.after b/plugins/kotlin/completion/testData/handlers/smart/ConcreteJavaClass.kt.after
index bdb7dbe72e6e..96c6993bd721 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/ConcreteJavaClass.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/ConcreteJavaClass.kt.after
@@ -5,3 +5,5 @@ open class A<T : Any>(val javaClass: Class<T>?)
 class B : A<java.io.File>(File::class.java)<caret>
 
 // ELEMENT: File
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/ConcreteJavaClass2.kt b/plugins/kotlin/completion/testData/handlers/smart/ConcreteJavaClass2.kt
index dda5400f7b4a..313683cbeec7 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/ConcreteJavaClass2.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/ConcreteJavaClass2.kt
@@ -6,3 +6,5 @@ fun bar() {
 
 // ELEMENT: String
 
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/ConcreteJavaClass2.kt.after b/plugins/kotlin/completion/testData/handlers/smart/ConcreteJavaClass2.kt.after
index c0054e3c01e3..d675c6dcd987 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/ConcreteJavaClass2.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/ConcreteJavaClass2.kt.after
@@ -6,3 +6,5 @@ fun bar() {
 
 // ELEMENT: String
 
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/ConcreteKClass.kt b/plugins/kotlin/completion/testData/handlers/smart/ConcreteKClass.kt
index 8c3642e50eef..f8c90cc7cbcc 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/ConcreteKClass.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/ConcreteKClass.kt
@@ -5,3 +5,5 @@ open class A<T : Any>(val kClass: KClass<T>?)
 class B : A<java.io.File>(<caret>)
 
 // ELEMENT: File
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/ConcreteKClass.kt.after b/plugins/kotlin/completion/testData/handlers/smart/ConcreteKClass.kt.after
index 5c39b041d441..a0023a47538f 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/ConcreteKClass.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/ConcreteKClass.kt.after
@@ -6,3 +6,5 @@ open class A<T : Any>(val kClass: KClass<T>?)
 class B : A<java.io.File>(File::class)<caret>
 
 // ELEMENT: File
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/Constructor.kt b/plugins/kotlin/completion/testData/handlers/smart/Constructor.kt
index 54763e84ad4a..b565267de01b 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/Constructor.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/Constructor.kt
@@ -2,4 +2,5 @@ class Foo
 
 var a : Foo = <caret>
 
-// AUTOCOMPLETE_SETTING: true
\ No newline at end of file
+// AUTOCOMPLETE_SETTING: true
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/Constructor.kt.after b/plugins/kotlin/completion/testData/handlers/smart/Constructor.kt.after
index 546dfdcae1d5..77bfb4846106 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/Constructor.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/Constructor.kt.after
@@ -2,4 +2,5 @@ class Foo
 
 var a : Foo = Foo()<caret>
 
-// AUTOCOMPLETE_SETTING: true
\ No newline at end of file
+// AUTOCOMPLETE_SETTING: true
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/ConstructorForGenericType.kt b/plugins/kotlin/completion/testData/handlers/smart/ConstructorForGenericType.kt
index 550178802705..868c1ca494a3 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/ConstructorForGenericType.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/ConstructorForGenericType.kt
@@ -8,3 +8,5 @@ fun f(){
 
 // ELEMENT: HashMap
 // TAIL_TEXT: (...) (kotlin.collections)
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/ConstructorForGenericType.kt.after b/plugins/kotlin/completion/testData/handlers/smart/ConstructorForGenericType.kt.after
index 4c5f7a5a98a7..424bb898b362 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/ConstructorForGenericType.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/ConstructorForGenericType.kt.after
@@ -8,3 +8,5 @@ fun f(){
 
 // ELEMENT: HashMap
 // TAIL_TEXT: (...) (kotlin.collections)
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/ConstructorForGenericType2.kt b/plugins/kotlin/completion/testData/handlers/smart/ConstructorForGenericType2.kt
index 42288df8d257..54ba657cf232 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/ConstructorForGenericType2.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/ConstructorForGenericType2.kt
@@ -10,4 +10,5 @@ interface Handler<E> {
     fun handle(e: E)
 }
 
-// ELEMENT: object
\ No newline at end of file
+// ELEMENT: object
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/ConstructorForGenericType2.kt.after b/plugins/kotlin/completion/testData/handlers/smart/ConstructorForGenericType2.kt.after
index 125d8b182921..7168516444bd 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/ConstructorForGenericType2.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/ConstructorForGenericType2.kt.after
@@ -14,4 +14,5 @@ interface Handler<E> {
     fun handle(e: E)
 }
 
-// ELEMENT: object
\ No newline at end of file
+// ELEMENT: object
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/ConstructorForNullable.kt b/plugins/kotlin/completion/testData/handlers/smart/ConstructorForNullable.kt
index f24736729744..ef87b094766b 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/ConstructorForNullable.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/ConstructorForNullable.kt
@@ -5,3 +5,5 @@ fun foo(p : Any){
 }
 
 // ELEMENT: Foo
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/ConstructorForNullable.kt.after b/plugins/kotlin/completion/testData/handlers/smart/ConstructorForNullable.kt.after
index 7d096e250313..d518e2d9a366 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/ConstructorForNullable.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/ConstructorForNullable.kt.after
@@ -5,3 +5,5 @@ fun foo(p : Any){
 }
 
 // ELEMENT: Foo
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/ConstructorInsertsImport.kt b/plugins/kotlin/completion/testData/handlers/smart/ConstructorInsertsImport.kt
index 889aa8be1389..2294180d8888 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/ConstructorInsertsImport.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/ConstructorInsertsImport.kt
@@ -7,3 +7,5 @@ class X<T> {
 }
 
 // ELEMENT: TreeMap
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/ConstructorInsertsImport.kt.after b/plugins/kotlin/completion/testData/handlers/smart/ConstructorInsertsImport.kt.after
index 86640c0e837c..8df0bb64ecba 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/ConstructorInsertsImport.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/ConstructorInsertsImport.kt.after
@@ -9,3 +9,5 @@ class X<T> {
 }
 
 // ELEMENT: TreeMap
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/ConstructorInsertsImport2.kt b/plugins/kotlin/completion/testData/handlers/smart/ConstructorInsertsImport2.kt
index c22d3198df52..787aca9b1c32 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/ConstructorInsertsImport2.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/ConstructorInsertsImport2.kt
@@ -7,3 +7,5 @@ class X<T> {
 }
 
 // ELEMENT: TreeMap
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/ConstructorInsertsImport2.kt.after b/plugins/kotlin/completion/testData/handlers/smart/ConstructorInsertsImport2.kt.after
index 71f395dc7d3f..045ca9717eb7 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/ConstructorInsertsImport2.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/ConstructorInsertsImport2.kt.after
@@ -9,3 +9,5 @@ class X<T> {
 }
 
 // ELEMENT: TreeMap
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/ConstructorWithKeywordName.kt b/plugins/kotlin/completion/testData/handlers/smart/ConstructorWithKeywordName.kt
index 1a99e292b494..960e2125903e 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/ConstructorWithKeywordName.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/ConstructorWithKeywordName.kt
@@ -8,4 +8,5 @@ fun f(){
     foo(<caret>)
 }
 
-// AUTOCOMPLETE_SETTING: true
\ No newline at end of file
+// AUTOCOMPLETE_SETTING: true
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/ConstructorWithKeywordName.kt.after b/plugins/kotlin/completion/testData/handlers/smart/ConstructorWithKeywordName.kt.after
index 8ccc3063b759..f020fd5ed96e 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/ConstructorWithKeywordName.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/ConstructorWithKeywordName.kt.after
@@ -8,4 +8,5 @@ fun f(){
     foo(`class`())<caret>
 }
 
-// AUTOCOMPLETE_SETTING: true
\ No newline at end of file
+// AUTOCOMPLETE_SETTING: true
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/ConstructorWithLambdaParameter1.kt b/plugins/kotlin/completion/testData/handlers/smart/ConstructorWithLambdaParameter1.kt
index b2d9de894ab6..f9d3213d15cd 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/ConstructorWithLambdaParameter1.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/ConstructorWithLambdaParameter1.kt
@@ -2,4 +2,5 @@ class Foo(p : () -> Unit)
 
 var a : Foo = <caret>
 
-// AUTOCOMPLETE_SETTING: true
\ No newline at end of file
+// AUTOCOMPLETE_SETTING: true
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/ConstructorWithLambdaParameter1.kt.after b/plugins/kotlin/completion/testData/handlers/smart/ConstructorWithLambdaParameter1.kt.after
index ba9142f21935..f4ca61867f6d 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/ConstructorWithLambdaParameter1.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/ConstructorWithLambdaParameter1.kt.after
@@ -2,4 +2,5 @@ class Foo(p : () -> Unit)
 
 var a : Foo = Foo { <caret> }
 
-// AUTOCOMPLETE_SETTING: true
\ No newline at end of file
+// AUTOCOMPLETE_SETTING: true
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/ConstructorWithLambdaParameter2.kt b/plugins/kotlin/completion/testData/handlers/smart/ConstructorWithLambdaParameter2.kt
index a14ed1ce6f55..725019aa0f44 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/ConstructorWithLambdaParameter2.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/ConstructorWithLambdaParameter2.kt
@@ -2,4 +2,5 @@ class Foo(p : (String) -> Unit)
 
 var a : Foo = <caret>
 
-// AUTOCOMPLETE_SETTING: true
\ No newline at end of file
+// AUTOCOMPLETE_SETTING: true
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/ConstructorWithLambdaParameter2.kt.after b/plugins/kotlin/completion/testData/handlers/smart/ConstructorWithLambdaParameter2.kt.after
index 2b674670c106..ff7b2eea4eb4 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/ConstructorWithLambdaParameter2.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/ConstructorWithLambdaParameter2.kt.after
@@ -2,4 +2,5 @@ class Foo(p : (String) -> Unit)
 
 var a : Foo = Foo { <caret> }
 
-// AUTOCOMPLETE_SETTING: true
\ No newline at end of file
+// AUTOCOMPLETE_SETTING: true
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/ConstructorWithParameters.kt b/plugins/kotlin/completion/testData/handlers/smart/ConstructorWithParameters.kt
index a773fe92b9ba..0edabab39635 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/ConstructorWithParameters.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/ConstructorWithParameters.kt
@@ -2,4 +2,5 @@ class Foo(p : Int)
 
 var a : Foo = <caret>
 
-// AUTOCOMPLETE_SETTING: true
\ No newline at end of file
+// AUTOCOMPLETE_SETTING: true
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/ConstructorWithParameters.kt.after b/plugins/kotlin/completion/testData/handlers/smart/ConstructorWithParameters.kt.after
index 37c80b030a7a..d1618f0ea7b9 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/ConstructorWithParameters.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/ConstructorWithParameters.kt.after
@@ -2,4 +2,5 @@ class Foo(p : Int)
 
 var a : Foo = Foo(<caret>)
 
-// AUTOCOMPLETE_SETTING: true
\ No newline at end of file
+// AUTOCOMPLETE_SETTING: true
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/DoNotInsertTypeArguments.kt b/plugins/kotlin/completion/testData/handlers/smart/DoNotInsertTypeArguments.kt
index 97ab1419b83f..692d2ce8a604 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/DoNotInsertTypeArguments.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/DoNotInsertTypeArguments.kt
@@ -5,3 +5,5 @@ fun f(list: List<Any>): Collection<String> {
 }
 
 // ELEMENT: foo
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/DoNotInsertTypeArguments.kt.after b/plugins/kotlin/completion/testData/handlers/smart/DoNotInsertTypeArguments.kt.after
index b084e803a381..c3f26c4532e4 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/DoNotInsertTypeArguments.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/DoNotInsertTypeArguments.kt.after
@@ -5,3 +5,5 @@ fun f(list: List<Any>): Collection<String> {
 }
 
 // ELEMENT: foo
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/ExclChar.kt b/plugins/kotlin/completion/testData/handlers/smart/ExclChar.kt
index 73d0fb0cb2a7..b3a79def7550 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/ExclChar.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/ExclChar.kt
@@ -4,3 +4,5 @@ fun foo(flag: Boolean) {
 
 // ELEMENT: flag
 // CHAR: '!'
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/ExclChar.kt.after b/plugins/kotlin/completion/testData/handlers/smart/ExclChar.kt.after
index ca0b6311c4a8..0563cdd9eccf 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/ExclChar.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/ExclChar.kt.after
@@ -4,3 +4,5 @@ fun foo(flag: Boolean) {
 
 // ELEMENT: flag
 // CHAR: '!'
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/ExtensionFunctionTypeVariable1.kt b/plugins/kotlin/completion/testData/handlers/smart/ExtensionFunctionTypeVariable1.kt
index 27d5058f879a..e3426175e064 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/ExtensionFunctionTypeVariable1.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/ExtensionFunctionTypeVariable1.kt
@@ -4,4 +4,5 @@ fun test(i: Int, foo: Int.() -> Char) {
 
 fun bar(p1: Char, p2: Int){}
 
-// ELEMENT: foo
\ No newline at end of file
+// ELEMENT: foo
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/ExtensionFunctionTypeVariable1.kt.after b/plugins/kotlin/completion/testData/handlers/smart/ExtensionFunctionTypeVariable1.kt.after
index 044ac77bfb88..d99ff4c9f1c7 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/ExtensionFunctionTypeVariable1.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/ExtensionFunctionTypeVariable1.kt.after
@@ -4,4 +4,5 @@ fun test(i: Int, foo: Int.() -> Char) {
 
 fun bar(p1: Char, p2: Int){}
 
-// ELEMENT: foo
\ No newline at end of file
+// ELEMENT: foo
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/ExtensionFunctionTypeVariable2.kt b/plugins/kotlin/completion/testData/handlers/smart/ExtensionFunctionTypeVariable2.kt
index 5b9e1034afd6..a050d37bb48b 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/ExtensionFunctionTypeVariable2.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/ExtensionFunctionTypeVariable2.kt
@@ -4,4 +4,5 @@ fun test(i: Int, foo: Int.(String) -> Char) {
 
 fun bar(p1: Char, p2: Int){}
 
-// ELEMENT: foo
\ No newline at end of file
+// ELEMENT: foo
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/ExtensionFunctionTypeVariable2.kt.after b/plugins/kotlin/completion/testData/handlers/smart/ExtensionFunctionTypeVariable2.kt.after
index 4c489fd2c5c5..496a1ede6a5a 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/ExtensionFunctionTypeVariable2.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/ExtensionFunctionTypeVariable2.kt.after
@@ -4,4 +4,5 @@ fun test(i: Int, foo: Int.(String) -> Char) {
 
 fun bar(p1: Char, p2: Int){}
 
-// ELEMENT: foo
\ No newline at end of file
+// ELEMENT: foo
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/ForLoopRange.kt b/plugins/kotlin/completion/testData/handlers/smart/ForLoopRange.kt
index 5c15073bc5dc..996dafc0f5c7 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/ForLoopRange.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/ForLoopRange.kt
@@ -11,3 +11,5 @@ fun foo(x: X) {
 }
 
 // ELEMENT: x
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/ForLoopRange.kt.after b/plugins/kotlin/completion/testData/handlers/smart/ForLoopRange.kt.after
index 2b9abfd0cb6e..59b9cab395c5 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/ForLoopRange.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/ForLoopRange.kt.after
@@ -11,3 +11,5 @@ fun foo(x: X) {
 }
 
 // ELEMENT: x
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/ForLoopRange2.kt b/plugins/kotlin/completion/testData/handlers/smart/ForLoopRange2.kt
index 3199c083e034..3754fb34cd9f 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/ForLoopRange2.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/ForLoopRange2.kt
@@ -11,3 +11,5 @@ fun foo(x: X?) {
 }
 
 // ELEMENT_TEXT: "!! x"
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/ForLoopRange2.kt.after b/plugins/kotlin/completion/testData/handlers/smart/ForLoopRange2.kt.after
index e12a66a37e23..a21c92b572bb 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/ForLoopRange2.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/ForLoopRange2.kt.after
@@ -11,3 +11,5 @@ fun foo(x: X?) {
 }
 
 // ELEMENT_TEXT: "!! x"
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/GetWithBrackets.kt b/plugins/kotlin/completion/testData/handlers/smart/GetWithBrackets.kt
index 203d8c2a9400..7b203303754e 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/GetWithBrackets.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/GetWithBrackets.kt
@@ -3,3 +3,5 @@ fun foo(map: Map<String, Int>, p: String) {
 }
 
 // ELEMENT: p
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/GetWithBrackets.kt.after b/plugins/kotlin/completion/testData/handlers/smart/GetWithBrackets.kt.after
index 6dc7c60fee7b..966a35e37371 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/GetWithBrackets.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/GetWithBrackets.kt.after
@@ -3,3 +3,5 @@ fun foo(map: Map<String, Int>, p: String) {
 }
 
 // ELEMENT: p
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/IfCondition.kt b/plugins/kotlin/completion/testData/handlers/smart/IfCondition.kt
index 4dd09d7e81d0..2c4f4a83e890 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/IfCondition.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/IfCondition.kt
@@ -3,3 +3,5 @@ fun bar(b: Boolean){
 }
 
 // ELEMENT: b
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/IfCondition.kt.after b/plugins/kotlin/completion/testData/handlers/smart/IfCondition.kt.after
index d76d052354b5..a2f86411e53d 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/IfCondition.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/IfCondition.kt.after
@@ -3,3 +3,5 @@ fun bar(b: Boolean){
 }
 
 // ELEMENT: b
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/IfValue1.kt b/plugins/kotlin/completion/testData/handlers/smart/IfValue1.kt
index 000294d77001..7b136f6ea8d0 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/IfValue1.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/IfValue1.kt
@@ -6,3 +6,5 @@ fun bar(b: Boolean, s: String){
 }
 
 // ELEMENT: s
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/IfValue1.kt.after b/plugins/kotlin/completion/testData/handlers/smart/IfValue1.kt.after
index 1d4e27f5abdb..a74abc46c7da 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/IfValue1.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/IfValue1.kt.after
@@ -6,3 +6,5 @@ fun bar(b: Boolean, s: String){
 }
 
 // ELEMENT: s
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/IfValue2.kt b/plugins/kotlin/completion/testData/handlers/smart/IfValue2.kt
index 42c36d9d2458..07298631b2c3 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/IfValue2.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/IfValue2.kt
@@ -6,3 +6,5 @@ fun bar(b: Boolean, s: String){
 }
 
 // ELEMENT: s
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/IfValue2.kt.after b/plugins/kotlin/completion/testData/handlers/smart/IfValue2.kt.after
index 27464dc052e5..13718d4036e9 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/IfValue2.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/IfValue2.kt.after
@@ -6,3 +6,5 @@ fun bar(b: Boolean, s: String){
 }
 
 // ELEMENT: s
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/IfValue3.kt b/plugins/kotlin/completion/testData/handlers/smart/IfValue3.kt
index e8889e6bb5f9..564d01fb2d0f 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/IfValue3.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/IfValue3.kt
@@ -7,3 +7,5 @@ fun bar(b: Boolean, s: String){
 
 // ELEMENT: s
 // CHAR: \t
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/IfValue3.kt.after b/plugins/kotlin/completion/testData/handlers/smart/IfValue3.kt.after
index 8919bf63b981..78b2cb9febb5 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/IfValue3.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/IfValue3.kt.after
@@ -7,3 +7,5 @@ fun bar(b: Boolean, s: String){
 
 // ELEMENT: s
 // CHAR: \t
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/InElvisOperator.kt b/plugins/kotlin/completion/testData/handlers/smart/InElvisOperator.kt
index 1062564b53b9..28f6ba21fd29 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/InElvisOperator.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/InElvisOperator.kt
@@ -5,3 +5,5 @@ fun bar(p1: String?, p2: String) {
 }
 
 // ELEMENT: p2
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/InElvisOperator.kt.after b/plugins/kotlin/completion/testData/handlers/smart/InElvisOperator.kt.after
index 9785c95357d2..7c0a44ebff02 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/InElvisOperator.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/InElvisOperator.kt.after
@@ -5,3 +5,5 @@ fun bar(p1: String?, p2: String) {
 }
 
 // ELEMENT: p2
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/InnerClassInstantiation1.kt b/plugins/kotlin/completion/testData/handlers/smart/InnerClassInstantiation1.kt
index e479c0a0d0cf..d7a7acb89412 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/InnerClassInstantiation1.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/InnerClassInstantiation1.kt
@@ -7,3 +7,5 @@ class A {
 }
 
 // ELEMENT: XYZ
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/InnerClassInstantiation1.kt.after b/plugins/kotlin/completion/testData/handlers/smart/InnerClassInstantiation1.kt.after
index fbb6fc9dae86..f4f899123e42 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/InnerClassInstantiation1.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/InnerClassInstantiation1.kt.after
@@ -7,3 +7,5 @@ class A {
 }
 
 // ELEMENT: XYZ
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/InnerClassInstantiation2.kt b/plugins/kotlin/completion/testData/handlers/smart/InnerClassInstantiation2.kt
index 647da0125d24..389d3d3b44db 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/InnerClassInstantiation2.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/InnerClassInstantiation2.kt
@@ -7,3 +7,5 @@ fun A.foo(): A.XYZ {
 }
 
 // ELEMENT: XYZ
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/InnerClassInstantiation2.kt.after b/plugins/kotlin/completion/testData/handlers/smart/InnerClassInstantiation2.kt.after
index b58d90bf223a..e84cfe7242f2 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/InnerClassInstantiation2.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/InnerClassInstantiation2.kt.after
@@ -7,3 +7,5 @@ fun A.foo(): A.XYZ {
 }
 
 // ELEMENT: XYZ
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/JavaStaticField.kt b/plugins/kotlin/completion/testData/handlers/smart/JavaStaticField.kt
index be4834a2f2f9..61e66401553f 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/JavaStaticField.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/JavaStaticField.kt
@@ -5,3 +5,5 @@ fun foo(){
 }
 
 // ELEMENT: ENGLISH
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/JavaStaticField.kt.after b/plugins/kotlin/completion/testData/handlers/smart/JavaStaticField.kt.after
index 9425611e4b54..6e64e659319f 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/JavaStaticField.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/JavaStaticField.kt.after
@@ -5,3 +5,5 @@ fun foo(){
 }
 
 // ELEMENT: ENGLISH
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/JavaStaticFieldInsertImport.kt b/plugins/kotlin/completion/testData/handlers/smart/JavaStaticFieldInsertImport.kt
index ae173770d875..26e1399bbaa7 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/JavaStaticFieldInsertImport.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/JavaStaticFieldInsertImport.kt
@@ -3,3 +3,5 @@ fun foo(){
 }
 
 // ELEMENT: ENGLISH
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/JavaStaticFieldInsertImport.kt.after b/plugins/kotlin/completion/testData/handlers/smart/JavaStaticFieldInsertImport.kt.after
index 6610962a210c..e90931a41d1c 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/JavaStaticFieldInsertImport.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/JavaStaticFieldInsertImport.kt.after
@@ -5,3 +5,5 @@ fun foo(){
 }
 
 // ELEMENT: ENGLISH
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/JavaStaticMethod.kt b/plugins/kotlin/completion/testData/handlers/smart/JavaStaticMethod.kt
index de4798f6f0e6..87dd9ba23f60 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/JavaStaticMethod.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/JavaStaticMethod.kt
@@ -3,3 +3,5 @@ fun foo(){
 }
 
 // ELEMENT_TEXT: Thread.currentThread
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/JavaStaticMethod.kt.after b/plugins/kotlin/completion/testData/handlers/smart/JavaStaticMethod.kt.after
index 58f9cb9201c3..9c62438926f4 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/JavaStaticMethod.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/JavaStaticMethod.kt.after
@@ -3,3 +3,5 @@ fun foo(){
 }
 
 // ELEMENT_TEXT: Thread.currentThread
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/JavaStaticMethod2.kt b/plugins/kotlin/completion/testData/handlers/smart/JavaStaticMethod2.kt
index 1fcb0168a2bc..b66260b81922 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/JavaStaticMethod2.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/JavaStaticMethod2.kt
@@ -7,3 +7,5 @@ fun bar(){
 
 // INVOCATION_COUNT: 2
 // ELEMENT_TEXT: Thread.currentThread
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/JavaStaticMethod2.kt.after b/plugins/kotlin/completion/testData/handlers/smart/JavaStaticMethod2.kt.after
index 54f7601ef5fa..698f7a306d82 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/JavaStaticMethod2.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/JavaStaticMethod2.kt.after
@@ -7,3 +7,5 @@ fun bar(){
 
 // INVOCATION_COUNT: 2
 // ELEMENT_TEXT: Thread.currentThread
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/JavaStaticMethodInsertsImport.kt b/plugins/kotlin/completion/testData/handlers/smart/JavaStaticMethodInsertsImport.kt
index 5152cdd9b956..e4ab0c1cbd6b 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/JavaStaticMethodInsertsImport.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/JavaStaticMethodInsertsImport.kt
@@ -4,3 +4,5 @@ fun foo(){
 
 // ELEMENT_TEXT: "Calendar.getInstance"
 // TAIL_TEXT: "(TimeZone!) (java.util)"
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/JavaStaticMethodInsertsImport.kt.after b/plugins/kotlin/completion/testData/handlers/smart/JavaStaticMethodInsertsImport.kt.after
index ea5acd12ce3b..d146606fed9b 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/JavaStaticMethodInsertsImport.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/JavaStaticMethodInsertsImport.kt.after
@@ -6,3 +6,5 @@ fun foo(){
 
 // ELEMENT_TEXT: "Calendar.getInstance"
 // TAIL_TEXT: "(TimeZone!) (java.util)"
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/LambdaValue1.kt b/plugins/kotlin/completion/testData/handlers/smart/LambdaValue1.kt
index 33b93faa96a3..c266e4e30dca 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/LambdaValue1.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/LambdaValue1.kt
@@ -2,4 +2,5 @@ fun foo(list: List<String>) {
     list.filter { it.<caret> }
 }
 
-// ELEMENT: isEmpty
\ No newline at end of file
+// ELEMENT: isEmpty
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/LambdaValue1.kt.after b/plugins/kotlin/completion/testData/handlers/smart/LambdaValue1.kt.after
index 706dcb1f6a9d..19e02aafbbd5 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/LambdaValue1.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/LambdaValue1.kt.after
@@ -2,4 +2,5 @@ fun foo(list: List<String>) {
     list.filter { it.isEmpty() }<caret>
 }
 
-// ELEMENT: isEmpty
\ No newline at end of file
+// ELEMENT: isEmpty
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/LambdaValue2.kt b/plugins/kotlin/completion/testData/handlers/smart/LambdaValue2.kt
index ec29c13b160e..45b162cdca88 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/LambdaValue2.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/LambdaValue2.kt
@@ -4,4 +4,5 @@ fun foo(list: List<String>) {
     }
 }
 
-// ELEMENT: isEmpty
\ No newline at end of file
+// ELEMENT: isEmpty
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/LambdaValue2.kt.after b/plugins/kotlin/completion/testData/handlers/smart/LambdaValue2.kt.after
index 44944eaf67bc..dd2fd9f5de60 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/LambdaValue2.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/LambdaValue2.kt.after
@@ -4,4 +4,5 @@ fun foo(list: List<String>) {
     }<caret>
 }
 
-// ELEMENT: isEmpty
\ No newline at end of file
+// ELEMENT: isEmpty
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/LastNonOptionalParamIsFunction.kt b/plugins/kotlin/completion/testData/handlers/smart/LastNonOptionalParamIsFunction.kt
index b55af545f3ba..c25c12bf8990 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/LastNonOptionalParamIsFunction.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/LastNonOptionalParamIsFunction.kt
@@ -5,3 +5,5 @@ fun bar(p: Int) {
 }
 
 // ELEMENT: p
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/LastNonOptionalParamIsFunction.kt.after b/plugins/kotlin/completion/testData/handlers/smart/LastNonOptionalParamIsFunction.kt.after
index 84e561688f20..a348bf21c366 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/LastNonOptionalParamIsFunction.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/LastNonOptionalParamIsFunction.kt.after
@@ -5,3 +5,5 @@ fun bar(p: Int) {
 }
 
 // ELEMENT: p
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/MergeTail1.kt b/plugins/kotlin/completion/testData/handlers/smart/MergeTail1.kt
index dfb547da04e1..42a3ccf30078 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/MergeTail1.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/MergeTail1.kt
@@ -7,4 +7,5 @@ fun foo() {
     foo(<caret>
 }
 
-// AUTOCOMPLETE_SETTING: true
\ No newline at end of file
+// AUTOCOMPLETE_SETTING: true
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/MergeTail1.kt.after b/plugins/kotlin/completion/testData/handlers/smart/MergeTail1.kt.after
index 637e2d0a2521..a2f296288678 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/MergeTail1.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/MergeTail1.kt.after
@@ -7,4 +7,5 @@ fun foo() {
     foo(C()<caret>
 }
 
-// AUTOCOMPLETE_SETTING: true
\ No newline at end of file
+// AUTOCOMPLETE_SETTING: true
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/MergeTail2.kt b/plugins/kotlin/completion/testData/handlers/smart/MergeTail2.kt
index 64b2ab6ca6d8..cd86e196b49e 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/MergeTail2.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/MergeTail2.kt
@@ -8,3 +8,5 @@ fun foo() {
 }
 
 // ELEMENT: C
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/MergeTail2.kt.after b/plugins/kotlin/completion/testData/handlers/smart/MergeTail2.kt.after
index 89249a9853a7..3fa84e59a905 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/MergeTail2.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/MergeTail2.kt.after
@@ -8,3 +8,5 @@ fun foo() {
 }
 
 // ELEMENT: C
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/MergeTail3.kt b/plugins/kotlin/completion/testData/handlers/smart/MergeTail3.kt
index 2f13d381157e..f9fbe953fa24 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/MergeTail3.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/MergeTail3.kt
@@ -14,3 +14,5 @@ fun foo() {
 }
 
 // ELEMENT: f1
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/MergeTail3.kt.after b/plugins/kotlin/completion/testData/handlers/smart/MergeTail3.kt.after
index fd6e260f5b95..bcb892a8edf4 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/MergeTail3.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/MergeTail3.kt.after
@@ -14,3 +14,5 @@ fun foo() {
 }
 
 // ELEMENT: f1
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/MergeTail4.kt b/plugins/kotlin/completion/testData/handlers/smart/MergeTail4.kt
index 66476e4a1985..425363282a3d 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/MergeTail4.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/MergeTail4.kt
@@ -14,3 +14,5 @@ fun foo() {
 }
 
 // ELEMENT: f3
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/MergeTail4.kt.after b/plugins/kotlin/completion/testData/handlers/smart/MergeTail4.kt.after
index 489867433854..08698914c7f3 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/MergeTail4.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/MergeTail4.kt.after
@@ -14,3 +14,5 @@ fun foo() {
 }
 
 // ELEMENT: f3
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/MultipleArgsIntoBrackets.kt b/plugins/kotlin/completion/testData/handlers/smart/MultipleArgsIntoBrackets.kt
index 64f57734e303..a9072a5626cb 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/MultipleArgsIntoBrackets.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/MultipleArgsIntoBrackets.kt
@@ -5,3 +5,5 @@ fun bar(b: String, a: Int, c: String) {
 }
 
 // ELEMENT: "a, b, c"
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/MultipleArgsIntoBrackets.kt.after b/plugins/kotlin/completion/testData/handlers/smart/MultipleArgsIntoBrackets.kt.after
index 4e6516f02863..491ac93f825b 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/MultipleArgsIntoBrackets.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/MultipleArgsIntoBrackets.kt.after
@@ -5,3 +5,5 @@ fun bar(b: String, a: Int, c: String) {
 }
 
 // ELEMENT: "a, b, c"
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/MultipleArgsItem.kt b/plugins/kotlin/completion/testData/handlers/smart/MultipleArgsItem.kt
index 273aa7a4e8fe..e9fbf3271768 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/MultipleArgsItem.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/MultipleArgsItem.kt
@@ -5,3 +5,5 @@ fun bar(b: String, a: Int, c: String) {
 }
 
 // ELEMENT: "a, b, c"
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/MultipleArgsItem.kt.after b/plugins/kotlin/completion/testData/handlers/smart/MultipleArgsItem.kt.after
index 3496eb86e787..2dcbaed0c051 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/MultipleArgsItem.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/MultipleArgsItem.kt.after
@@ -5,3 +5,5 @@ fun bar(b: String, a: Int, c: String) {
 }
 
 // ELEMENT: "a, b, c"
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/MultipleArgsItemByTab.kt b/plugins/kotlin/completion/testData/handlers/smart/MultipleArgsItemByTab.kt
index 8530fa87c313..15c1ac9c075e 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/MultipleArgsItemByTab.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/MultipleArgsItemByTab.kt
@@ -6,3 +6,5 @@ fun bar(b: String, a: Int, c: String) {
 
 // ELEMENT: "a, b, c"
 // CHAR: \t
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/MultipleArgsItemByTab.kt.after b/plugins/kotlin/completion/testData/handlers/smart/MultipleArgsItemByTab.kt.after
index 066656881c9f..be9a8b05b29d 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/MultipleArgsItemByTab.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/MultipleArgsItemByTab.kt.after
@@ -6,3 +6,5 @@ fun bar(b: String, a: Int, c: String) {
 
 // ELEMENT: "a, b, c"
 // CHAR: \t
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/NamedArgument1.kt b/plugins/kotlin/completion/testData/handlers/smart/NamedArgument1.kt
index bd44a2e13d3f..a7dc9dbf4dcd 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/NamedArgument1.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/NamedArgument1.kt
@@ -5,3 +5,5 @@ fun bar(pInt: Int) {
 }
 
 // ELEMENT: pInt
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/NamedArgument1.kt.after b/plugins/kotlin/completion/testData/handlers/smart/NamedArgument1.kt.after
index e40d0cf214b1..0927ad0e8a88 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/NamedArgument1.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/NamedArgument1.kt.after
@@ -5,3 +5,5 @@ fun bar(pInt: Int) {
 }
 
 // ELEMENT: pInt
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/NamedArgument3.kt b/plugins/kotlin/completion/testData/handlers/smart/NamedArgument3.kt
index 815e6c4232cb..f172fdda0d63 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/NamedArgument3.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/NamedArgument3.kt
@@ -5,3 +5,5 @@ fun bar(pInt: Int) {
 }
 
 // ELEMENT: pInt
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/NamedArgument3.kt.after b/plugins/kotlin/completion/testData/handlers/smart/NamedArgument3.kt.after
index 8caa3202447d..b64f6d8068db 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/NamedArgument3.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/NamedArgument3.kt.after
@@ -5,3 +5,5 @@ fun bar(pInt: Int) {
 }
 
 // ELEMENT: pInt
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/NamedArgumentVararg1.kt b/plugins/kotlin/completion/testData/handlers/smart/NamedArgumentVararg1.kt
index 360504476223..3ab745a05c0b 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/NamedArgumentVararg1.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/NamedArgumentVararg1.kt
@@ -5,3 +5,5 @@ fun bar(arr: IntArray) {
 }
 
 // ELEMENT: arr
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/NamedArgumentVararg1.kt.after b/plugins/kotlin/completion/testData/handlers/smart/NamedArgumentVararg1.kt.after
index 98618f145f7a..7c55858d8aac 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/NamedArgumentVararg1.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/NamedArgumentVararg1.kt.after
@@ -5,3 +5,5 @@ fun bar(arr: IntArray) {
 }
 
 // ELEMENT: arr
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/NamedArgumentVararg2.kt b/plugins/kotlin/completion/testData/handlers/smart/NamedArgumentVararg2.kt
index de70b80e3165..424387124315 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/NamedArgumentVararg2.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/NamedArgumentVararg2.kt
@@ -5,3 +5,5 @@ fun bar(p: Int) {
 }
 
 // ELEMENT: p
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/NamedArgumentVararg2.kt.after b/plugins/kotlin/completion/testData/handlers/smart/NamedArgumentVararg2.kt.after
index 4697c3de87ef..28927f1c64a8 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/NamedArgumentVararg2.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/NamedArgumentVararg2.kt.after
@@ -5,3 +5,5 @@ fun bar(p: Int) {
 }
 
 // ELEMENT: p
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/NamedArgumentVararg3.kt b/plugins/kotlin/completion/testData/handlers/smart/NamedArgumentVararg3.kt
index 0f24642cc6d9..2b7e8a75b2dc 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/NamedArgumentVararg3.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/NamedArgumentVararg3.kt
@@ -5,3 +5,5 @@ fun bar(arr: IntArray) {
 }
 
 // ELEMENT: arr
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/NamedArgumentVararg3.kt.after b/plugins/kotlin/completion/testData/handlers/smart/NamedArgumentVararg3.kt.after
index e24dd90e6e30..cfd7720a314f 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/NamedArgumentVararg3.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/NamedArgumentVararg3.kt.after
@@ -5,3 +5,5 @@ fun bar(arr: IntArray) {
 }
 
 // ELEMENT: arr
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/NamedBooleanArgument.kt b/plugins/kotlin/completion/testData/handlers/smart/NamedBooleanArgument.kt
index 6789ce1e2917..f665230baabb 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/NamedBooleanArgument.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/NamedBooleanArgument.kt
@@ -6,3 +6,5 @@ fun bar() {
 }
 
 // ELEMENT_TEXT: "flag = true"
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/NamedBooleanArgument.kt.after b/plugins/kotlin/completion/testData/handlers/smart/NamedBooleanArgument.kt.after
index bd3c95e87472..75dadd49f8ae 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/NamedBooleanArgument.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/NamedBooleanArgument.kt.after
@@ -6,3 +6,5 @@ fun bar() {
 }
 
 // ELEMENT_TEXT: "flag = true"
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/NestedDataClass.kt b/plugins/kotlin/completion/testData/handlers/smart/NestedDataClass.kt
index 47ac19390e9d..afa29e3fbf41 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/NestedDataClass.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/NestedDataClass.kt
@@ -7,3 +7,5 @@ class Outer {
 }
 
 // ELEMENT: Nested
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/NestedDataClass.kt.after b/plugins/kotlin/completion/testData/handlers/smart/NestedDataClass.kt.after
index fc8d380c4a1b..91178d05f8b8 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/NestedDataClass.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/NestedDataClass.kt.after
@@ -7,3 +7,5 @@ class Outer {
 }
 
 // ELEMENT: Nested
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/NestedDataClassComma.kt b/plugins/kotlin/completion/testData/handlers/smart/NestedDataClassComma.kt
index b5c221933a08..172399ec2d50 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/NestedDataClassComma.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/NestedDataClassComma.kt
@@ -7,3 +7,5 @@ class Outer {
 }
 
 // ELEMENT: p
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/NestedDataClassComma.kt.after b/plugins/kotlin/completion/testData/handlers/smart/NestedDataClassComma.kt.after
index a0f10e5ef2e2..225d009669f2 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/NestedDataClassComma.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/NestedDataClassComma.kt.after
@@ -7,3 +7,5 @@ class Outer {
 }
 
 // ELEMENT: p
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/NullableValue1.kt b/plugins/kotlin/completion/testData/handlers/smart/NullableValue1.kt
index 5aa470b0e739..ae72d31adb21 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/NullableValue1.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/NullableValue1.kt
@@ -5,3 +5,5 @@ fun bar(sss: String?) {
 }
 
 // ELEMENT_TEXT: "!! sss"
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/NullableValue1.kt.after b/plugins/kotlin/completion/testData/handlers/smart/NullableValue1.kt.after
index 7c41567d43eb..5f3784af25cc 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/NullableValue1.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/NullableValue1.kt.after
@@ -5,3 +5,5 @@ fun bar(sss: String?) {
 }
 
 // ELEMENT_TEXT: "!! sss"
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/NullableValue2.kt b/plugins/kotlin/completion/testData/handlers/smart/NullableValue2.kt
index 4cb5321b8df2..d6bbe3b5fb03 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/NullableValue2.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/NullableValue2.kt
@@ -8,3 +8,5 @@ fun bar() {
 
 // ELEMENT_TEXT: "?: getString"
 // TAIL_TEXT: "(i: Int) (<root>)"
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/NullableValue2.kt.after b/plugins/kotlin/completion/testData/handlers/smart/NullableValue2.kt.after
index d1b29d8d905d..770ebff58c88 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/NullableValue2.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/NullableValue2.kt.after
@@ -8,3 +8,5 @@ fun bar() {
 
 // ELEMENT_TEXT: "?: getString"
 // TAIL_TEXT: "(i: Int) (<root>)"
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/NullableValue3.kt b/plugins/kotlin/completion/testData/handlers/smart/NullableValue3.kt
index 22007bef800b..caab3c001366 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/NullableValue3.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/NullableValue3.kt
@@ -10,3 +10,5 @@ fun foo(){
 
 // ELEMENT_TEXT: "!! K.bar"
 // TAIL_TEXT: "() (<root>)"
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/NullableValue3.kt.after b/plugins/kotlin/completion/testData/handlers/smart/NullableValue3.kt.after
index 5747c5f8b396..7a9bbb648241 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/NullableValue3.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/NullableValue3.kt.after
@@ -10,3 +10,5 @@ fun foo(){
 
 // ELEMENT_TEXT: "!! K.bar"
 // TAIL_TEXT: "() (<root>)"
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/NullableValueKeepOldArguments.kt b/plugins/kotlin/completion/testData/handlers/smart/NullableValueKeepOldArguments.kt
index 74121ac37c5e..da2a5c88f3d9 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/NullableValueKeepOldArguments.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/NullableValueKeepOldArguments.kt
@@ -8,3 +8,5 @@ fun bar() {
 
 // ELEMENT_TEXT: "!! takeString"
 // CHAR: \t
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/NullableValueKeepOldArguments.kt.after b/plugins/kotlin/completion/testData/handlers/smart/NullableValueKeepOldArguments.kt.after
index bde01ae580c1..3008b8d1eb04 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/NullableValueKeepOldArguments.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/NullableValueKeepOldArguments.kt.after
@@ -8,3 +8,5 @@ fun bar() {
 
 // ELEMENT_TEXT: "!! takeString"
 // CHAR: \t
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/ObjectFromType.kt b/plugins/kotlin/completion/testData/handlers/smart/ObjectFromType.kt
index b6fb1448e03b..a66debdd335f 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/ObjectFromType.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/ObjectFromType.kt
@@ -11,3 +11,5 @@ fun foo(): Outer.T {
 }
 
 // ELEMENT: Null
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/ObjectFromType.kt.after b/plugins/kotlin/completion/testData/handlers/smart/ObjectFromType.kt.after
index ba435d765423..643eb1bac6e3 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/ObjectFromType.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/ObjectFromType.kt.after
@@ -11,3 +11,5 @@ fun foo(): Outer.T {
 }
 
 // ELEMENT: Null
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/QualifiedCallReplacementBug.kt b/plugins/kotlin/completion/testData/handlers/smart/QualifiedCallReplacementBug.kt
index 0f5d7eb2e091..866d08e037a8 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/QualifiedCallReplacementBug.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/QualifiedCallReplacementBug.kt
@@ -5,4 +5,5 @@ fun foo(): C {
 }
 
 // ELEMENT: C
-// CHAR: \t
\ No newline at end of file
+// CHAR: \t
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/QualifiedCallReplacementBug.kt.after b/plugins/kotlin/completion/testData/handlers/smart/QualifiedCallReplacementBug.kt.after
index 2bc3b320555c..2608bb8be23f 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/QualifiedCallReplacementBug.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/QualifiedCallReplacementBug.kt.after
@@ -5,4 +5,5 @@ fun foo(): C {
 }
 
 // ELEMENT: C
-// CHAR: \t
\ No newline at end of file
+// CHAR: \t
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/QualifiedThisKeywordName1.kt b/plugins/kotlin/completion/testData/handlers/smart/QualifiedThisKeywordName1.kt
index 5f955c555782..1046755e43f7 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/QualifiedThisKeywordName1.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/QualifiedThisKeywordName1.kt
@@ -6,3 +6,5 @@ class `this` {
 
 // ELEMENT: "this@`this`"
 
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/QualifiedThisKeywordName1.kt.after b/plugins/kotlin/completion/testData/handlers/smart/QualifiedThisKeywordName1.kt.after
index ca5dd02449a9..0402b46d2520 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/QualifiedThisKeywordName1.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/QualifiedThisKeywordName1.kt.after
@@ -6,3 +6,5 @@ class `this` {
 
 // ELEMENT: "this@`this`"
 
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/QualifiedThisKeywordName2.kt b/plugins/kotlin/completion/testData/handlers/smart/QualifiedThisKeywordName2.kt
index 367723954dbf..bc5da6dd7553 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/QualifiedThisKeywordName2.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/QualifiedThisKeywordName2.kt
@@ -10,3 +10,5 @@ fun foo(){
 }
 
 // ELEMENT: this@`fun`
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/QualifiedThisKeywordName2.kt.after b/plugins/kotlin/completion/testData/handlers/smart/QualifiedThisKeywordName2.kt.after
index 7f59de76c663..8ecc2530d4f5 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/QualifiedThisKeywordName2.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/QualifiedThisKeywordName2.kt.after
@@ -10,3 +10,5 @@ fun foo(){
 }
 
 // ELEMENT: this@`fun`
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/ReplaceArgument.kt b/plugins/kotlin/completion/testData/handlers/smart/ReplaceArgument.kt
index d32c4de8f166..38fc494d57f4 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/ReplaceArgument.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/ReplaceArgument.kt
@@ -9,3 +9,5 @@ fun foo(p: Int){
 
 // CHAR: '\t'
 // ELEMENT: p
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/ReplaceArgument.kt.after b/plugins/kotlin/completion/testData/handlers/smart/ReplaceArgument.kt.after
index cdd6948e6e84..0961094eeca5 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/ReplaceArgument.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/ReplaceArgument.kt.after
@@ -9,3 +9,5 @@ fun foo(p: Int){
 
 // CHAR: '\t'
 // ELEMENT: p
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/SAMExpected1.kt b/plugins/kotlin/completion/testData/handlers/smart/SAMExpected1.kt
index b717b24dcf3b..22887a38a503 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/SAMExpected1.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/SAMExpected1.kt
@@ -2,3 +2,5 @@ var a : Runnable = <caret>
 
 // ELEMENT_TEXT: Runnable
 // TAIL_TEXT: " {...} (function: () -> Unit) (java.lang)"
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/SAMExpected1.kt.after b/plugins/kotlin/completion/testData/handlers/smart/SAMExpected1.kt.after
index dd389f324f5c..62ecd978468e 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/SAMExpected1.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/SAMExpected1.kt.after
@@ -2,3 +2,5 @@ var a : Runnable = Runnable { <caret> }
 
 // ELEMENT_TEXT: Runnable
 // TAIL_TEXT: " {...} (function: () -> Unit) (java.lang)"
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/SAMExpected2.kt b/plugins/kotlin/completion/testData/handlers/smart/SAMExpected2.kt
index e32da4197f46..b67f3d4e9006 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/SAMExpected2.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/SAMExpected2.kt
@@ -1,3 +1,5 @@
 var a : java.io.Closeable = <caret>
 
 // ELEMENT: Closeable
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/SAMExpected2.kt.after b/plugins/kotlin/completion/testData/handlers/smart/SAMExpected2.kt.after
index dd71e3fd3b01..114359ea06fc 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/SAMExpected2.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/SAMExpected2.kt.after
@@ -3,3 +3,5 @@ import java.io.Closeable
 var a : java.io.Closeable = Closeable { <caret> }
 
 // ELEMENT: Closeable
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/SecondVararg.kt b/plugins/kotlin/completion/testData/handlers/smart/SecondVararg.kt
index c303070059ca..cbbab400c8ca 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/SecondVararg.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/SecondVararg.kt
@@ -5,3 +5,5 @@ fun bar(i: Int) {
 }
 
 // ELEMENT: i
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/SecondVararg.kt.after b/plugins/kotlin/completion/testData/handlers/smart/SecondVararg.kt.after
index 3be0942fd6b2..6574edce2efe 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/SecondVararg.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/SecondVararg.kt.after
@@ -5,3 +5,5 @@ fun bar(i: Int) {
 }
 
 // ELEMENT: i
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/SetWithBrackets.kt b/plugins/kotlin/completion/testData/handlers/smart/SetWithBrackets.kt
index 40e2de3cd863..dbc837180634 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/SetWithBrackets.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/SetWithBrackets.kt
@@ -3,3 +3,5 @@ fun foo(map: Map<String, Int>, p: String) {
 }
 
 // ELEMENT: p
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/SetWithBrackets.kt.after b/plugins/kotlin/completion/testData/handlers/smart/SetWithBrackets.kt.after
index bbbf21a69236..a619782f158d 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/SetWithBrackets.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/SetWithBrackets.kt.after
@@ -3,3 +3,5 @@ fun foo(map: Map<String, Int>, p: String) {
 }
 
 // ELEMENT: p
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/TabReplaceComma1.kt b/plugins/kotlin/completion/testData/handlers/smart/TabReplaceComma1.kt
index d6587ab40081..c52339907f87 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/TabReplaceComma1.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/TabReplaceComma1.kt
@@ -6,3 +6,5 @@ fun bar(sss: String) {
 
 //ELEMENT: sss
 //CHAR: \t
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/TabReplaceComma1.kt.after b/plugins/kotlin/completion/testData/handlers/smart/TabReplaceComma1.kt.after
index 5c4cb9da1763..055ceff2b68b 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/TabReplaceComma1.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/TabReplaceComma1.kt.after
@@ -6,3 +6,5 @@ fun bar(sss: String) {
 
 //ELEMENT: sss
 //CHAR: \t
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/TabReplaceComma2.kt b/plugins/kotlin/completion/testData/handlers/smart/TabReplaceComma2.kt
index 4452b12e07b7..c1b46a11680e 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/TabReplaceComma2.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/TabReplaceComma2.kt
@@ -6,3 +6,5 @@ fun bar(sss: String) {
 
 //ELEMENT: sss
 //CHAR: \t
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/TabReplaceComma2.kt.after b/plugins/kotlin/completion/testData/handlers/smart/TabReplaceComma2.kt.after
index 5c4cb9da1763..055ceff2b68b 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/TabReplaceComma2.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/TabReplaceComma2.kt.after
@@ -6,3 +6,5 @@ fun bar(sss: String) {
 
 //ELEMENT: sss
 //CHAR: \t
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/TabReplaceExpression.kt b/plugins/kotlin/completion/testData/handlers/smart/TabReplaceExpression.kt
index bc8d93e9b483..0afbe9dd18f1 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/TabReplaceExpression.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/TabReplaceExpression.kt
@@ -6,3 +6,5 @@ fun bar(sss: String) {
 
 //ELEMENT: sss
 //CHAR: \t
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/TabReplaceExpression.kt.after b/plugins/kotlin/completion/testData/handlers/smart/TabReplaceExpression.kt.after
index 86699894ac50..4153dc62e450 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/TabReplaceExpression.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/TabReplaceExpression.kt.after
@@ -6,3 +6,5 @@ fun bar(sss: String) {
 
 //ELEMENT: sss
 //CHAR: \t
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/TabReplaceExpression2.kt b/plugins/kotlin/completion/testData/handlers/smart/TabReplaceExpression2.kt
index 27003049d4d0..73c224c0cd84 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/TabReplaceExpression2.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/TabReplaceExpression2.kt
@@ -6,3 +6,5 @@ fun bar(sss: String) {
 
 //ELEMENT: sss
 //CHAR: \t
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/TabReplaceExpression2.kt.after b/plugins/kotlin/completion/testData/handlers/smart/TabReplaceExpression2.kt.after
index 86699894ac50..4153dc62e450 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/TabReplaceExpression2.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/TabReplaceExpression2.kt.after
@@ -6,3 +6,5 @@ fun bar(sss: String) {
 
 //ELEMENT: sss
 //CHAR: \t
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/TabReplaceExpression3.kt b/plugins/kotlin/completion/testData/handlers/smart/TabReplaceExpression3.kt
index 8314f6d952a8..fad5409e01c0 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/TabReplaceExpression3.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/TabReplaceExpression3.kt
@@ -6,3 +6,5 @@ fun bar(sss: String) {
 
 //ELEMENT: sss
 //CHAR: \t
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/TabReplaceExpression3.kt.after b/plugins/kotlin/completion/testData/handlers/smart/TabReplaceExpression3.kt.after
index 86699894ac50..4153dc62e450 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/TabReplaceExpression3.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/TabReplaceExpression3.kt.after
@@ -6,3 +6,5 @@ fun bar(sss: String) {
 
 //ELEMENT: sss
 //CHAR: \t
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/TabReplaceExpression4.kt b/plugins/kotlin/completion/testData/handlers/smart/TabReplaceExpression4.kt
index 8b5be9faf20b..22eb7bbd9921 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/TabReplaceExpression4.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/TabReplaceExpression4.kt
@@ -6,3 +6,5 @@ fun bar(sss: String) {
 
 //ELEMENT: sss
 //CHAR: \t
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/TabReplaceExpression4.kt.after b/plugins/kotlin/completion/testData/handlers/smart/TabReplaceExpression4.kt.after
index 86699894ac50..4153dc62e450 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/TabReplaceExpression4.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/TabReplaceExpression4.kt.after
@@ -6,3 +6,5 @@ fun bar(sss: String) {
 
 //ELEMENT: sss
 //CHAR: \t
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/TabReplaceFunctionName2.kt b/plugins/kotlin/completion/testData/handlers/smart/TabReplaceFunctionName2.kt
index 0994f02fc988..b44bb7096bd0 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/TabReplaceFunctionName2.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/TabReplaceFunctionName2.kt
@@ -7,3 +7,5 @@ fun f(): Int {
 
 //ELEMENT: bar
 //CHAR: \t
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/TabReplaceFunctionName2.kt.after b/plugins/kotlin/completion/testData/handlers/smart/TabReplaceFunctionName2.kt.after
index 2f5ee25598eb..819e936fbadf 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/TabReplaceFunctionName2.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/TabReplaceFunctionName2.kt.after
@@ -7,3 +7,5 @@ fun f(): Int {
 
 //ELEMENT: bar
 //CHAR: \t
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/TabReplaceFunctionName3.kt b/plugins/kotlin/completion/testData/handlers/smart/TabReplaceFunctionName3.kt
index 3c68aa0e6dfa..c9e894d9513c 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/TabReplaceFunctionName3.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/TabReplaceFunctionName3.kt
@@ -8,3 +8,5 @@ fun bar() {
 
 //ELEMENT: takeString
 //CHAR: \t
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/TabReplaceFunctionName3.kt.after b/plugins/kotlin/completion/testData/handlers/smart/TabReplaceFunctionName3.kt.after
index dbc55ee61d81..01d066acd50e 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/TabReplaceFunctionName3.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/TabReplaceFunctionName3.kt.after
@@ -8,3 +8,5 @@ fun bar() {
 
 //ELEMENT: takeString
 //CHAR: \t
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/TabReplaceIdentifier.kt b/plugins/kotlin/completion/testData/handlers/smart/TabReplaceIdentifier.kt
index 898eebb979c7..3728f8518bf3 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/TabReplaceIdentifier.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/TabReplaceIdentifier.kt
@@ -6,3 +6,5 @@ fun bar(ss: String) {
 
 //ELEMENT: ss
 //CHAR: \t
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/TabReplaceIdentifier.kt.after b/plugins/kotlin/completion/testData/handlers/smart/TabReplaceIdentifier.kt.after
index 09a9ba993871..2fd8358424de 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/TabReplaceIdentifier.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/TabReplaceIdentifier.kt.after
@@ -6,3 +6,5 @@ fun bar(ss: String) {
 
 //ELEMENT: ss
 //CHAR: \t
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/TabReplaceOperand.kt b/plugins/kotlin/completion/testData/handlers/smart/TabReplaceOperand.kt
index 91bbff9d8d95..43c5b4b1d422 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/TabReplaceOperand.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/TabReplaceOperand.kt
@@ -9,3 +9,5 @@ fun bar() {
 
 //ELEMENT: b3
 //CHAR: \t
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/TabReplaceOperand.kt.after b/plugins/kotlin/completion/testData/handlers/smart/TabReplaceOperand.kt.after
index 83fc5b4c7bd3..814452b39f62 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/TabReplaceOperand.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/TabReplaceOperand.kt.after
@@ -9,3 +9,5 @@ fun bar() {
 
 //ELEMENT: b3
 //CHAR: \t
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/True2.kt b/plugins/kotlin/completion/testData/handlers/smart/True2.kt
index fe13081347bf..0b87845fa1f3 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/True2.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/True2.kt
@@ -5,3 +5,5 @@ fun bar() {
 }
 
 // ELEMENT: true
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/True2.kt.after b/plugins/kotlin/completion/testData/handlers/smart/True2.kt.after
index de4b2f06c22a..73d9989d9e56 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/True2.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/True2.kt.after
@@ -5,3 +5,5 @@ fun bar() {
 }
 
 // ELEMENT: true
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/TypeParameterAfterAs.kt b/plugins/kotlin/completion/testData/handlers/smart/TypeParameterAfterAs.kt
index fe89de2a924b..da6fd433da2f 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/TypeParameterAfterAs.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/TypeParameterAfterAs.kt
@@ -4,4 +4,5 @@ fun <T> foo(o: Any): T {
     return o as <caret>
 }
 
-// AUTOCOMPLETE_SETTING: true
\ No newline at end of file
+// AUTOCOMPLETE_SETTING: true
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/TypeParameterAfterAs.kt.after b/plugins/kotlin/completion/testData/handlers/smart/TypeParameterAfterAs.kt.after
index 4d3966ca78a3..db19ac670212 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/TypeParameterAfterAs.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/TypeParameterAfterAs.kt.after
@@ -4,4 +4,5 @@ fun <T> foo(o: Any): T {
     return o as T<caret>
 }
 
-// AUTOCOMPLETE_SETTING: true
\ No newline at end of file
+// AUTOCOMPLETE_SETTING: true
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/Vararg4.kt b/plugins/kotlin/completion/testData/handlers/smart/Vararg4.kt
index 120ccb6961a9..1a79f71c32be 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/Vararg4.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/Vararg4.kt
@@ -5,3 +5,5 @@ fun bar(arr: Array<String>){
 }
 
 // ELEMENT: arr
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/Vararg4.kt.after b/plugins/kotlin/completion/testData/handlers/smart/Vararg4.kt.after
index 233b118db464..b4bc3d0abcc0 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/Vararg4.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/Vararg4.kt.after
@@ -5,3 +5,5 @@ fun bar(arr: Array<String>){
 }
 
 // ELEMENT: arr
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/Vararg5.kt b/plugins/kotlin/completion/testData/handlers/smart/Vararg5.kt
index 5481d131d932..952c73bb6b8d 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/Vararg5.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/Vararg5.kt
@@ -5,3 +5,5 @@ fun bar(list: List<String>){
 }
 
 // ELEMENT: toTypedArray
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/Vararg5.kt.after b/plugins/kotlin/completion/testData/handlers/smart/Vararg5.kt.after
index d8a0b1138146..79311629057b 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/Vararg5.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/Vararg5.kt.after
@@ -5,3 +5,5 @@ fun bar(list: List<String>){
 }
 
 // ELEMENT: toTypedArray
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/Vararg6.kt b/plugins/kotlin/completion/testData/handlers/smart/Vararg6.kt
index 52b3c7ef0ef0..c4896754cf4b 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/Vararg6.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/Vararg6.kt
@@ -5,3 +5,5 @@ fun bar(arr: Array<String>){
 }
 
 // ELEMENT: arr
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/Vararg6.kt.after b/plugins/kotlin/completion/testData/handlers/smart/Vararg6.kt.after
index 41beb180df29..b63ebf1618c8 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/Vararg6.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/Vararg6.kt.after
@@ -5,3 +5,5 @@ fun bar(arr: Array<String>){
 }
 
 // ELEMENT: arr
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/VarargAfterStar.kt b/plugins/kotlin/completion/testData/handlers/smart/VarargAfterStar.kt
index ba7efab3f51a..899e1a8a443b 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/VarargAfterStar.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/VarargAfterStar.kt
@@ -5,3 +5,5 @@ fun bar(list: List<String>){
 }
 
 // ELEMENT: toTypedArray
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/VarargAfterStar.kt.after b/plugins/kotlin/completion/testData/handlers/smart/VarargAfterStar.kt.after
index d8a0b1138146..79311629057b 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/VarargAfterStar.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/VarargAfterStar.kt.after
@@ -5,3 +5,5 @@ fun bar(list: List<String>){
 }
 
 // ELEMENT: toTypedArray
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/VarargWithParameterAfter.kt b/plugins/kotlin/completion/testData/handlers/smart/VarargWithParameterAfter.kt
index 5c535300b55f..6fd4029c7650 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/VarargWithParameterAfter.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/VarargWithParameterAfter.kt
@@ -5,3 +5,5 @@ fun bar(s: String){
 }
 
 // ELEMENT: s
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/VarargWithParameterAfter.kt.after b/plugins/kotlin/completion/testData/handlers/smart/VarargWithParameterAfter.kt.after
index e0449cb63420..a8883b8d0314 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/VarargWithParameterAfter.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/VarargWithParameterAfter.kt.after
@@ -5,3 +5,5 @@ fun bar(s: String){
 }
 
 // ELEMENT: s
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/WhenElse.kt b/plugins/kotlin/completion/testData/handlers/smart/WhenElse.kt
index b9edb90ad4c8..272e6e174ec9 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/WhenElse.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/WhenElse.kt
@@ -6,3 +6,5 @@ fun foo(s: String) {
 }
 
 // ELEMENT: else
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/WhenElse.kt.after b/plugins/kotlin/completion/testData/handlers/smart/WhenElse.kt.after
index 393d56f8b604..376eae2f74f9 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/WhenElse.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/WhenElse.kt.after
@@ -6,3 +6,5 @@ fun foo(s: String) {
 }
 
 // ELEMENT: else
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/kt10602.kt b/plugins/kotlin/completion/testData/handlers/smart/kt10602.kt
index 1980b9d28783..5c63ad8fdea6 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/kt10602.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/kt10602.kt
@@ -4,4 +4,5 @@ fun f() {
     AtomicReferenceFieldUpdater.newUpdater<String, Int>(<caret>)
 }
 
-// ELEMENT: String
\ No newline at end of file
+// ELEMENT: String
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/kt10602.kt.after b/plugins/kotlin/completion/testData/handlers/smart/kt10602.kt.after
index bc14066b6649..84112cc970e3 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/kt10602.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/kt10602.kt.after
@@ -4,4 +4,5 @@ fun f() {
     AtomicReferenceFieldUpdater.newUpdater<String, Int>(String::class.java, <caret>)
 }
 
-// ELEMENT: String
\ No newline at end of file
+// ELEMENT: String
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/lambda/1.kt b/plugins/kotlin/completion/testData/handlers/smart/lambda/1.kt
index c7438cbb4c82..02ac2e27c696 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/lambda/1.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/lambda/1.kt
@@ -5,3 +5,5 @@ fun bar() {
 }
 
 // ELEMENT: "{...}"
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/lambda/1.kt.after b/plugins/kotlin/completion/testData/handlers/smart/lambda/1.kt.after
index 2a374c99ea93..7311a5ef5ae5 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/lambda/1.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/lambda/1.kt.after
@@ -5,3 +5,5 @@ fun bar() {
 }
 
 // ELEMENT: "{...}"
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/lambda/2.kt b/plugins/kotlin/completion/testData/handlers/smart/lambda/2.kt
index 2c4811c2c2d6..03147193bf64 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/lambda/2.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/lambda/2.kt
@@ -5,3 +5,5 @@ fun bar() {
 }
 
 // ELEMENT: "{...}"
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/lambda/2.kt.after b/plugins/kotlin/completion/testData/handlers/smart/lambda/2.kt.after
index e4e9618cd3f7..adaed33a976f 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/lambda/2.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/lambda/2.kt.after
@@ -5,3 +5,5 @@ fun bar() {
 }
 
 // ELEMENT: "{...}"
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/lambda/3.kt b/plugins/kotlin/completion/testData/handlers/smart/lambda/3.kt
index d7606bc2e1b2..2409ad788946 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/lambda/3.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/lambda/3.kt
@@ -5,3 +5,5 @@ fun bar() {
 }
 
 // ELEMENT: "{ i -> ... }"
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/lambda/3.kt.after b/plugins/kotlin/completion/testData/handlers/smart/lambda/3.kt.after
index 288119138ce2..c100fcbcacf1 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/lambda/3.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/lambda/3.kt.after
@@ -5,3 +5,5 @@ fun bar() {
 }
 
 // ELEMENT: "{ i -> ... }"
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/lambda/4.kt b/plugins/kotlin/completion/testData/handlers/smart/lambda/4.kt
index 4c8181f06f0f..8f3d7f5c9b3f 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/lambda/4.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/lambda/4.kt
@@ -6,3 +6,5 @@ fun bar() {
 }
 
 // ELEMENT: "{ s, stringBuilder -> ... }"
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/lambda/4.kt.after b/plugins/kotlin/completion/testData/handlers/smart/lambda/4.kt.after
index d62c7b0f2b87..ec5973a6b5cd 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/lambda/4.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/lambda/4.kt.after
@@ -6,3 +6,5 @@ fun bar() {
 }
 
 // ELEMENT: "{ s, stringBuilder -> ... }"
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/lambda/5.kt b/plugins/kotlin/completion/testData/handlers/smart/lambda/5.kt
index 47b345ef0ace..4d4481e4b341 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/lambda/5.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/lambda/5.kt
@@ -6,3 +6,5 @@ fun bar() {
 }
 
 // ELEMENT: "{ String, StringBuilder -> ... }"
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/lambda/5.kt.after b/plugins/kotlin/completion/testData/handlers/smart/lambda/5.kt.after
index bacc83ab256b..c54bb8f045f4 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/lambda/5.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/lambda/5.kt.after
@@ -6,3 +6,5 @@ fun bar() {
 }
 
 // ELEMENT: "{ String, StringBuilder -> ... }"
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/lambda/InsertImport.kt b/plugins/kotlin/completion/testData/handlers/smart/lambda/InsertImport.kt
index 4d254fdb1983..10ab05a5696a 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/lambda/InsertImport.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/lambda/InsertImport.kt
@@ -6,3 +6,5 @@ fun bar() {
 }
 
 // ELEMENT: "{ Date -> ... }"
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/lambda/InsertImport.kt.after b/plugins/kotlin/completion/testData/handlers/smart/lambda/InsertImport.kt.after
index 863ff0b72799..9d51ea6e86d7 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/lambda/InsertImport.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/lambda/InsertImport.kt.after
@@ -8,3 +8,5 @@ fun bar() {
 }
 
 // ELEMENT: "{ Date -> ... }"
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/lambda/ParameterNamesSpecified.kt b/plugins/kotlin/completion/testData/handlers/smart/lambda/ParameterNamesSpecified.kt
index 0e36126cb910..8842666e9bc2 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/lambda/ParameterNamesSpecified.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/lambda/ParameterNamesSpecified.kt
@@ -5,3 +5,5 @@ fun bar() {
 }
 
 // ELEMENT: "{ word, number -> ... }"
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/lambda/ParameterNamesSpecified.kt.after b/plugins/kotlin/completion/testData/handlers/smart/lambda/ParameterNamesSpecified.kt.after
index e30d6f87386c..d70a75ce77b6 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/lambda/ParameterNamesSpecified.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/lambda/ParameterNamesSpecified.kt.after
@@ -5,3 +5,5 @@ fun bar() {
 }
 
 // ELEMENT: "{ word, number -> ... }"
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/lambda/ParameterNamesSpecified_NullableType.kt b/plugins/kotlin/completion/testData/handlers/smart/lambda/ParameterNamesSpecified_NullableType.kt
index a5b312ab56a5..389d7fcb2234 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/lambda/ParameterNamesSpecified_NullableType.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/lambda/ParameterNamesSpecified_NullableType.kt
@@ -5,3 +5,5 @@ fun bar() {
 }
 
 // ELEMENT: "{ word, number -> ... }"
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/lambda/ParameterNamesSpecified_NullableType.kt.after b/plugins/kotlin/completion/testData/handlers/smart/lambda/ParameterNamesSpecified_NullableType.kt.after
index cfab81c3e936..717b98ebe325 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/lambda/ParameterNamesSpecified_NullableType.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/lambda/ParameterNamesSpecified_NullableType.kt.after
@@ -5,3 +5,5 @@ fun bar() {
 }
 
 // ELEMENT: "{ word, number -> ... }"
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/lambdaSignature/NoAdditionalSpace.kt b/plugins/kotlin/completion/testData/handlers/smart/lambdaSignature/NoAdditionalSpace.kt
index 0fa52fe92fea..e45089aabb65 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/lambdaSignature/NoAdditionalSpace.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/lambdaSignature/NoAdditionalSpace.kt
@@ -5,3 +5,5 @@ fun bar() {
 }
 
 // ELEMENT: "x, s ->"
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/lambdaSignature/NoAdditionalSpace.kt.after b/plugins/kotlin/completion/testData/handlers/smart/lambdaSignature/NoAdditionalSpace.kt.after
index ef2c17b913bc..7e6708484b88 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/lambdaSignature/NoAdditionalSpace.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/lambdaSignature/NoAdditionalSpace.kt.after
@@ -5,3 +5,5 @@ fun bar() {
 }
 
 // ELEMENT: "x, s ->"
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/lambdaSignature/Simple.kt b/plugins/kotlin/completion/testData/handlers/smart/lambdaSignature/Simple.kt
index 38732607eecb..905ba8b3324c 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/lambdaSignature/Simple.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/lambdaSignature/Simple.kt
@@ -5,3 +5,5 @@ fun bar() {
 }
 
 // ELEMENT: "x, s ->"
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/lambdaSignature/Simple.kt.after b/plugins/kotlin/completion/testData/handlers/smart/lambdaSignature/Simple.kt.after
index ef2c17b913bc..7e6708484b88 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/lambdaSignature/Simple.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/lambdaSignature/Simple.kt.after
@@ -5,3 +5,5 @@ fun bar() {
 }
 
 // ELEMENT: "x, s ->"
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/suspendLambdaSignature/NoAdditionalSpace.kt b/plugins/kotlin/completion/testData/handlers/smart/suspendLambdaSignature/NoAdditionalSpace.kt
index e17aeef00c31..22faa09ffa51 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/suspendLambdaSignature/NoAdditionalSpace.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/suspendLambdaSignature/NoAdditionalSpace.kt
@@ -5,3 +5,5 @@ fun bar() {
 }
 
 // ELEMENT: "x, s ->"
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/suspendLambdaSignature/NoAdditionalSpace.kt.after b/plugins/kotlin/completion/testData/handlers/smart/suspendLambdaSignature/NoAdditionalSpace.kt.after
index 8b8f681f845c..763b1683bf0d 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/suspendLambdaSignature/NoAdditionalSpace.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/suspendLambdaSignature/NoAdditionalSpace.kt.after
@@ -5,3 +5,5 @@ fun bar() {
 }
 
 // ELEMENT: "x, s ->"
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/suspendLambdaSignature/Simple.kt b/plugins/kotlin/completion/testData/handlers/smart/suspendLambdaSignature/Simple.kt
index 5a60d76e0add..2ccdbdcaaa29 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/suspendLambdaSignature/Simple.kt
+++ b/plugins/kotlin/completion/testData/handlers/smart/suspendLambdaSignature/Simple.kt
@@ -5,3 +5,5 @@ fun bar() {
 }
 
 // ELEMENT: "x, s ->"
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/handlers/smart/suspendLambdaSignature/Simple.kt.after b/plugins/kotlin/completion/testData/handlers/smart/suspendLambdaSignature/Simple.kt.after
index 8b8f681f845c..763b1683bf0d 100644
--- a/plugins/kotlin/completion/testData/handlers/smart/suspendLambdaSignature/Simple.kt.after
+++ b/plugins/kotlin/completion/testData/handlers/smart/suspendLambdaSignature/Simple.kt.after
@@ -5,3 +5,5 @@ fun bar() {
 }
 
 // ELEMENT: "x, s ->"
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/AbstractMembers.kt b/plugins/kotlin/completion/testData/smart/AbstractMembers.kt
index 0a8913991002..5dfd39ec306d 100644
--- a/plugins/kotlin/completion/testData/smart/AbstractMembers.kt
+++ b/plugins/kotlin/completion/testData/smart/AbstractMembers.kt
@@ -11,3 +11,5 @@ fun foo(){
 
 // EXIST: { lookupString:"X", itemText:"X", tailText:" (sample.Foo)" }
 // EXIST: { lookupString:"Y", itemText:"Y", tailText:"() (sample.Foo)" }
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/AfterEmptyArgument.kt b/plugins/kotlin/completion/testData/smart/AfterEmptyArgument.kt
index b871ecd91f97..75136c8d07f0 100644
--- a/plugins/kotlin/completion/testData/smart/AfterEmptyArgument.kt
+++ b/plugins/kotlin/completion/testData/smart/AfterEmptyArgument.kt
@@ -8,3 +8,5 @@ fun bar(pInt: Int, pString: String) {
 // EXIST: { lookupString: "param3 =", itemText: "param3 =" }
 // ABSENT: param2
 // NOTHING_ELSE
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/AfterExclSign.kt b/plugins/kotlin/completion/testData/smart/AfterExclSign.kt
index 2b4af5d15dd1..7d8cba935076 100644
--- a/plugins/kotlin/completion/testData/smart/AfterExclSign.kt
+++ b/plugins/kotlin/completion/testData/smart/AfterExclSign.kt
@@ -4,3 +4,5 @@ fun foo(p1: Boolean, p2: String) {
 
 // EXIST: p1
 // ABSENT: p2
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/AfterNamedArgument.kt b/plugins/kotlin/completion/testData/smart/AfterNamedArgument.kt
index e9260d509746..4e290e93e5e4 100644
--- a/plugins/kotlin/completion/testData/smart/AfterNamedArgument.kt
+++ b/plugins/kotlin/completion/testData/smart/AfterNamedArgument.kt
@@ -8,3 +8,5 @@ fun bar(pInt: Int, pString: String) {
 // EXIST: { lookupString: "param3 =", itemText: "param3 =" }
 // ABSENT: param2
 // NOTHING_ELSE
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/AnyExpected.kt b/plugins/kotlin/completion/testData/smart/AnyExpected.kt
index 73d4a997e724..e89664e65f78 100644
--- a/plugins/kotlin/completion/testData/smart/AnyExpected.kt
+++ b/plugins/kotlin/completion/testData/smart/AnyExpected.kt
@@ -8,3 +8,5 @@ val v: Any = <caret>
 // ABSENT: ::C
 // ABSENT: ::Runnable
 // ABSENT: C
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/BooleanArgumentExpected.kt b/plugins/kotlin/completion/testData/smart/BooleanArgumentExpected.kt
index 20375616067f..21efa2eb8e3a 100644
--- a/plugins/kotlin/completion/testData/smart/BooleanArgumentExpected.kt
+++ b/plugins/kotlin/completion/testData/smart/BooleanArgumentExpected.kt
@@ -17,3 +17,5 @@ fun bar() {
 // EXIST: { lookupString: "minOf", tailText:"(a: Boolean, b: Boolean, c: Boolean) (kotlin.comparisons)", typeText:"Boolean"}
 // EXIST: {"lookupString":"equals","tailText":"(other: Any?) (kotlin)","typeText":"Boolean"}
 // NOTHING_ELSE
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/BooleanExpected.kt b/plugins/kotlin/completion/testData/smart/BooleanExpected.kt
index 18be8fe16d35..c13f8bb8cf0c 100644
--- a/plugins/kotlin/completion/testData/smart/BooleanExpected.kt
+++ b/plugins/kotlin/completion/testData/smart/BooleanExpected.kt
@@ -3,3 +3,5 @@ fun foo(): Boolean = <caret>
 // EXIST: { itemText: "true", attributes: "bold" }
 // EXIST: { itemText: "false", attributes: "bold" }
 // ABSENT: Boolean
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/BooleanOrNullableArgumentExpected.kt b/plugins/kotlin/completion/testData/smart/BooleanOrNullableArgumentExpected.kt
index 2f04eeb01a1a..ae39c4000910 100644
--- a/plugins/kotlin/completion/testData/smart/BooleanOrNullableArgumentExpected.kt
+++ b/plugins/kotlin/completion/testData/smart/BooleanOrNullableArgumentExpected.kt
@@ -11,3 +11,5 @@ fun bar() {
 // EXIST: { lookupString: "s = null", itemText: "s = null", attributes: "" }
 // EXIST: { lookupString: "xx = true", itemText: "xx = true", attributes: "" }
 // EXIST: { lookupString: "xx = false", itemText: "xx = false", attributes: "" }
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/ClassObjectMembers.kt b/plugins/kotlin/completion/testData/smart/ClassObjectMembers.kt
index 94c8afb62a93..ecd9c761d31d 100644
--- a/plugins/kotlin/completion/testData/smart/ClassObjectMembers.kt
+++ b/plugins/kotlin/completion/testData/smart/ClassObjectMembers.kt
@@ -21,3 +21,5 @@ fun foo(){
 // EXIST: { lookupString:"kk", itemText:"!! K.kk", tailText:" (sample)", typeText:"K?", attributes:"" }
 // EXIST: { lookupString:"kk", itemText:"?: K.kk", tailText:" (sample)", typeText:"K?", attributes:"" }
 // ABSENT: { itemText: "K.privateVal" }
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/ClassObjectMembersForNullable.kt b/plugins/kotlin/completion/testData/smart/ClassObjectMembersForNullable.kt
index 9fd29a131275..0c4289135dca 100644
--- a/plugins/kotlin/completion/testData/smart/ClassObjectMembersForNullable.kt
+++ b/plugins/kotlin/completion/testData/smart/ClassObjectMembersForNullable.kt
@@ -17,3 +17,5 @@ fun foo(){
 // EXIST: { lookupString:"bar", itemText:"K.bar", tailText:"() (sample)", typeText:"K" }
 // ABSENT: { itemText: "K.x" }
 // EXIST: { lookupString:"kk", itemText:"K.kk", tailText:" (sample)", typeText:"K?" }
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/ClassObjectMembersWithPrefix.kt b/plugins/kotlin/completion/testData/smart/ClassObjectMembersWithPrefix.kt
index 0cf5b8c5abdf..7be9a2bcae6d 100644
--- a/plugins/kotlin/completion/testData/smart/ClassObjectMembersWithPrefix.kt
+++ b/plugins/kotlin/completion/testData/smart/ClassObjectMembersWithPrefix.kt
@@ -13,3 +13,5 @@ fun foo(){
 
 // EXIST: foo
 // EXIST: bar
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/EmptyPrefix.kt b/plugins/kotlin/completion/testData/smart/EmptyPrefix.kt
index 4cc54d82743d..465fbae83e9b 100644
--- a/plugins/kotlin/completion/testData/smart/EmptyPrefix.kt
+++ b/plugins/kotlin/completion/testData/smart/EmptyPrefix.kt
@@ -27,3 +27,5 @@ fun f3() : String{}
 // EXIST: f2
 // ABSENT: f3
 // EXIST: { lookupString:"Foo", itemText:"Foo", tailText: "() (<root>)" }
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/EqOperator.kt b/plugins/kotlin/completion/testData/smart/EqOperator.kt
index b503b218f818..ca7e27e9d499 100644
--- a/plugins/kotlin/completion/testData/smart/EqOperator.kt
+++ b/plugins/kotlin/completion/testData/smart/EqOperator.kt
@@ -15,3 +15,5 @@ fun f(e1: E, e2: E?, x: Any) {
 // ABSENT: { itemText:"!! e2" }
 // ABSENT: e1
 // ABSENT: x
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/ExtensionFunctionTypeVariables.kt b/plugins/kotlin/completion/testData/smart/ExtensionFunctionTypeVariables.kt
index a70a122ea9ee..9c365b8d7848 100644
--- a/plugins/kotlin/completion/testData/smart/ExtensionFunctionTypeVariables.kt
+++ b/plugins/kotlin/completion/testData/smart/ExtensionFunctionTypeVariables.kt
@@ -5,3 +5,5 @@ fun test(i: Int, foo1: Int.(String) -> Char, foo2: Int.() -> Int, foo3: String.(
 // EXIST: { lookupString: "foo1", itemText: "foo1", tailText: "(String)", typeText: "Char", attributes: "bold" }
 // ABSENT: foo2
 // ABSENT: foo3
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/FilterTo.kt b/plugins/kotlin/completion/testData/smart/FilterTo.kt
index 033a4c0fab78..d9d970da3d3b 100644
--- a/plugins/kotlin/completion/testData/smart/FilterTo.kt
+++ b/plugins/kotlin/completion/testData/smart/FilterTo.kt
@@ -6,3 +6,5 @@ fun foo(list: List<String>, intList: MutableList<Int>, stringList: MutableList<S
 // EXIST: stringList
 // ABSENT: intList
 // ABSENT: p
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/GetOperator.kt b/plugins/kotlin/completion/testData/smart/GetOperator.kt
index 1d1e9665dcd3..b4170c1b02d0 100644
--- a/plugins/kotlin/completion/testData/smart/GetOperator.kt
+++ b/plugins/kotlin/completion/testData/smart/GetOperator.kt
@@ -3,3 +3,5 @@ fun some(list: List<String>): String {
 }
 
 // EXIST: { lookupString: "[]", itemText: "[]", tailText: "(index: Int)", typeText: "String", attributes: "bold" }
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/GroupBySubstitutor.kt b/plugins/kotlin/completion/testData/smart/GroupBySubstitutor.kt
index 0f73f0f510cf..a9236b297cf8 100644
--- a/plugins/kotlin/completion/testData/smart/GroupBySubstitutor.kt
+++ b/plugins/kotlin/completion/testData/smart/GroupBySubstitutor.kt
@@ -10,3 +10,5 @@ fun f(){
 // EXIST: { lookupString: "emptyList", typeText: "List<String>" }
 // EXIST: { lookupString: "emptyList", typeText: "List<Int>" }
 // NOTHING_ELSE
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/HighOrderFunction.kt b/plugins/kotlin/completion/testData/smart/HighOrderFunction.kt
index 9245ed358be0..1326538eeb5a 100644
--- a/plugins/kotlin/completion/testData/smart/HighOrderFunction.kt
+++ b/plugins/kotlin/completion/testData/smart/HighOrderFunction.kt
@@ -16,3 +16,5 @@ fun v: C = fo<caret>
 // EXIST: { lookupString:"foo", itemText: "foo", tailText: "(handler1) (<root>)", typeText:"C" }
 // EXIST: { allLookupStrings: "C, foo", itemText: "C.foo", tailText: " {...} (p: (Int) -> Unit) (<root>)", typeText:"C" }
 // EXIST: { allLookupStrings: "C, foo", itemText: "C.foo", tailText: "(handler2) (<root>)", typeText:"C" }
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/ImplicitInvoke.kt b/plugins/kotlin/completion/testData/smart/ImplicitInvoke.kt
index efb3e5b0495a..49c25514aa71 100644
--- a/plugins/kotlin/completion/testData/smart/ImplicitInvoke.kt
+++ b/plugins/kotlin/completion/testData/smart/ImplicitInvoke.kt
@@ -3,4 +3,5 @@ fun foo(actions: List<(String) -> Unit>) {
 }
 
 // EXIST: {"lookupString":"String","tailText":"() (kotlin)","itemText":"String"}
-// EXIST: {"lookupString":"toString","tailText":"() (kotlin)","typeText":"String","itemText":"String.toString"}
\ No newline at end of file
+// EXIST: {"lookupString":"toString","tailText":"() (kotlin)","typeText":"String","itemText":"String.toString"}
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/ImplicitlyTypedFunBody.kt b/plugins/kotlin/completion/testData/smart/ImplicitlyTypedFunBody.kt
index fa62c133429e..add163b6c8e1 100644
--- a/plugins/kotlin/completion/testData/smart/ImplicitlyTypedFunBody.kt
+++ b/plugins/kotlin/completion/testData/smart/ImplicitlyTypedFunBody.kt
@@ -9,4 +9,5 @@ fun f() = c.<caret>foo()
 
 // EXIST: foo
 // EXIST: bar
-// ABSENT: zoo
\ No newline at end of file
+// ABSENT: zoo
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/ImplicitlyTypedOverrideFunBody.kt b/plugins/kotlin/completion/testData/smart/ImplicitlyTypedOverrideFunBody.kt
index efa0752e659d..c2cdbde9bda4 100644
--- a/plugins/kotlin/completion/testData/smart/ImplicitlyTypedOverrideFunBody.kt
+++ b/plugins/kotlin/completion/testData/smart/ImplicitlyTypedOverrideFunBody.kt
@@ -10,4 +10,5 @@ fun getInt(): Int = 0
 fun getString(): String = ""
 
 // EXIST: getInt
-// ABSENT: getString
\ No newline at end of file
+// ABSENT: getString
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/ImplicitlyTypedOverrideValInitializer.kt b/plugins/kotlin/completion/testData/smart/ImplicitlyTypedOverrideValInitializer.kt
index 8d91b1ec9f40..2bbce3737b7e 100644
--- a/plugins/kotlin/completion/testData/smart/ImplicitlyTypedOverrideValInitializer.kt
+++ b/plugins/kotlin/completion/testData/smart/ImplicitlyTypedOverrideValInitializer.kt
@@ -10,4 +10,5 @@ fun getInt(): Int = 0
 fun getString(): String = ""
 
 // EXIST: getInt
-// ABSENT: getString
\ No newline at end of file
+// ABSENT: getString
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/ImplicitlyTypedValInitializer1.kt b/plugins/kotlin/completion/testData/smart/ImplicitlyTypedValInitializer1.kt
index 8c400e44129c..100cbf6d08ee 100644
--- a/plugins/kotlin/completion/testData/smart/ImplicitlyTypedValInitializer1.kt
+++ b/plugins/kotlin/completion/testData/smart/ImplicitlyTypedValInitializer1.kt
@@ -3,4 +3,5 @@ fun foo(p1: String, p2: Int) {
 }
 
 // EXIST: p1
-// ABSENT: p2
\ No newline at end of file
+// ABSENT: p2
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/ImplicitlyTypedValInitializer2.kt b/plugins/kotlin/completion/testData/smart/ImplicitlyTypedValInitializer2.kt
index 116541615f4a..76a180872bd1 100644
--- a/plugins/kotlin/completion/testData/smart/ImplicitlyTypedValInitializer2.kt
+++ b/plugins/kotlin/completion/testData/smart/ImplicitlyTypedValInitializer2.kt
@@ -3,4 +3,5 @@ class A(s: String) {
 }
 
 // EXIST: hashCode
-// ABSENT: substring
\ No newline at end of file
+// ABSENT: substring
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/ImplicitlyTypedValInitializerUnknownType.kt b/plugins/kotlin/completion/testData/smart/ImplicitlyTypedValInitializerUnknownType.kt
index 621e9e2b4a1d..b5d67dae0735 100644
--- a/plugins/kotlin/completion/testData/smart/ImplicitlyTypedValInitializerUnknownType.kt
+++ b/plugins/kotlin/completion/testData/smart/ImplicitlyTypedValInitializerUnknownType.kt
@@ -7,3 +7,5 @@ fun foo(p1: String, p2: Int) {
 // EXIST: p1
 // EXIST: p2
 // ABSENT: C
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/InaccessibleConstructor.kt b/plugins/kotlin/completion/testData/smart/InaccessibleConstructor.kt
index a6f771574c46..7539915aefef 100644
--- a/plugins/kotlin/completion/testData/smart/InaccessibleConstructor.kt
+++ b/plugins/kotlin/completion/testData/smart/InaccessibleConstructor.kt
@@ -3,3 +3,5 @@ class Foo protected()
 var a : Foo = <caret>
 
 // ABSENT: Foo
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/InfixCall.kt b/plugins/kotlin/completion/testData/smart/InfixCall.kt
index eeb2d970d2f0..0501d47160b0 100644
--- a/plugins/kotlin/completion/testData/smart/InfixCall.kt
+++ b/plugins/kotlin/completion/testData/smart/InfixCall.kt
@@ -16,3 +16,5 @@ val s: String = X() <caret>
 // EXIST: ext1
 // ABSENT: ext2
 // ABSENT: extProp
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/JavaEnumMembersAfterQualifier.kt b/plugins/kotlin/completion/testData/smart/JavaEnumMembersAfterQualifier.kt
index 95e6869bc173..4fbf18d6dd60 100644
--- a/plugins/kotlin/completion/testData/smart/JavaEnumMembersAfterQualifier.kt
+++ b/plugins/kotlin/completion/testData/smart/JavaEnumMembersAfterQualifier.kt
@@ -6,3 +6,5 @@ fun foo(){
 
 // EXIST: { lookupString:"TYPE", itemText:"TYPE", tailText:" (java.lang.annotation.ElementType)" }
 // EXIST: { lookupString:"FIELD", itemText:"FIELD", tailText:" (java.lang.annotation.ElementType)" }
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/JavaStaticFields.kt b/plugins/kotlin/completion/testData/smart/JavaStaticFields.kt
index 4be63119ee21..c6497fd27ae4 100644
--- a/plugins/kotlin/completion/testData/smart/JavaStaticFields.kt
+++ b/plugins/kotlin/completion/testData/smart/JavaStaticFields.kt
@@ -4,3 +4,5 @@ fun foo(){
 
 // EXIST: { lookupString:"ENGLISH", itemText:"Locale.ENGLISH", tailText:" (java.util)", typeText:"Locale", attributes:"" }
 // EXIST: { lookupString:"FRENCH", itemText:"Locale.FRENCH", tailText:" (java.util)", typeText:"Locale", attributes:"" }
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/JavaStaticFieldsForNullable.kt b/plugins/kotlin/completion/testData/smart/JavaStaticFieldsForNullable.kt
index 53d5d034ee5b..66017b8b9697 100644
--- a/plugins/kotlin/completion/testData/smart/JavaStaticFieldsForNullable.kt
+++ b/plugins/kotlin/completion/testData/smart/JavaStaticFieldsForNullable.kt
@@ -4,3 +4,5 @@ fun foo(){
 
 // EXIST: { lookupString:"ENGLISH", itemText:"Locale.ENGLISH", tailText:" (java.util)", typeText:"Locale" }
 // EXIST: { lookupString:"FRENCH", itemText:"Locale.FRENCH", tailText:" (java.util)", typeText:"Locale" }
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/JavaStaticMethods.kt b/plugins/kotlin/completion/testData/smart/JavaStaticMethods.kt
index cfa655b4b830..35eac0c90be2 100644
--- a/plugins/kotlin/completion/testData/smart/JavaStaticMethods.kt
+++ b/plugins/kotlin/completion/testData/smart/JavaStaticMethods.kt
@@ -5,3 +5,5 @@ fun foo(){
 // EXIST: { lookupString:"getInstance", itemText:"Calendar.getInstance", tailText:"() (java.util)", typeText:"Calendar!", attributes:"" }
 // EXIST: { lookupString:"getInstance", itemText:"Calendar.getInstance", tailText:"(Locale!) (java.util)", typeText:"Calendar!", attributes:"" }
 // EXIST: { lookupString:"getInstance", itemText:"Calendar.getInstance", tailText:"(TimeZone!, Locale!) (java.util)", typeText:"Calendar!", attributes:"" }
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/LambdaValue3.kt b/plugins/kotlin/completion/testData/smart/LambdaValue3.kt
index a60f4368b6a9..f269be77116c 100644
--- a/plugins/kotlin/completion/testData/smart/LambdaValue3.kt
+++ b/plugins/kotlin/completion/testData/smart/LambdaValue3.kt
@@ -11,3 +11,5 @@ fun bar(p: Collection<String>, b: Boolean) {
 // EXIST: length
 // EXIST: substring
 // ABSENT: isEmpty
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/MapTo.kt b/plugins/kotlin/completion/testData/smart/MapTo.kt
index 96d7ca0b47ab..c666aa3174a0 100644
--- a/plugins/kotlin/completion/testData/smart/MapTo.kt
+++ b/plugins/kotlin/completion/testData/smart/MapTo.kt
@@ -8,3 +8,5 @@ fun foo(list: List<String>, intList: MutableList<Int>, stringList: MutableList<S
 // EXIST: stringList
 // EXIST: arrayList
 // ABSENT: p
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/MapTo2.kt b/plugins/kotlin/completion/testData/smart/MapTo2.kt
index 90e4cdb1de2f..56f06f432bb3 100644
--- a/plugins/kotlin/completion/testData/smart/MapTo2.kt
+++ b/plugins/kotlin/completion/testData/smart/MapTo2.kt
@@ -6,3 +6,5 @@ fun foo(list: List<String>, intList: MutableList<Int>, stringList: MutableList<S
 // EXIST: stringList
 // EXIST: arrayListOf
 // ABSENT: p
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/NoExtensionMethodFromClassObject.kt b/plugins/kotlin/completion/testData/smart/NoExtensionMethodFromClassObject.kt
index bd28a63efea7..ed8c0e398058 100644
--- a/plugins/kotlin/completion/testData/smart/NoExtensionMethodFromClassObject.kt
+++ b/plugins/kotlin/completion/testData/smart/NoExtensionMethodFromClassObject.kt
@@ -11,3 +11,5 @@ fun foo(): X {
 
 // ABSENT: f
 // EXIST: { lookupString:"g", itemText:"X.g", tailText:"() (<root>)" }
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/NoPrivateOverload.kt b/plugins/kotlin/completion/testData/smart/NoPrivateOverload.kt
index e9c93937cb23..4613813d5339 100644
--- a/plugins/kotlin/completion/testData/smart/NoPrivateOverload.kt
+++ b/plugins/kotlin/completion/testData/smart/NoPrivateOverload.kt
@@ -13,3 +13,5 @@ class C {
 // ABSENT: expr1
 // EXIST: expr2
 // ABSENT: expr3
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/NoSillyAssignment.kt b/plugins/kotlin/completion/testData/smart/NoSillyAssignment.kt
index 052e22a6ca2b..bf54c93dad61 100644
--- a/plugins/kotlin/completion/testData/smart/NoSillyAssignment.kt
+++ b/plugins/kotlin/completion/testData/smart/NoSillyAssignment.kt
@@ -5,3 +5,5 @@ fun f(p : String) {
 
 // EXIST: p
 // ABSENT: a
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/NotEqOperator.kt b/plugins/kotlin/completion/testData/smart/NotEqOperator.kt
index 3bc25461d4aa..a38e69808d06 100644
--- a/plugins/kotlin/completion/testData/smart/NotEqOperator.kt
+++ b/plugins/kotlin/completion/testData/smart/NotEqOperator.kt
@@ -13,3 +13,5 @@ fun f(e1: E?, e2: E, x: Any) {
 // EXIST: null
 // ABSENT: e1
 // ABSENT: x
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/NotSillyAssignment.kt b/plugins/kotlin/completion/testData/smart/NotSillyAssignment.kt
index 4769b8f55f03..0cdf5efb4faa 100644
--- a/plugins/kotlin/completion/testData/smart/NotSillyAssignment.kt
+++ b/plugins/kotlin/completion/testData/smart/NotSillyAssignment.kt
@@ -5,3 +5,5 @@ fun f(foo1 : Foo, foo2 : Foo) {
 }
 
 // EXIST: prop
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/Object.kt b/plugins/kotlin/completion/testData/smart/Object.kt
index 7895de62b724..ce3e9e415437 100644
--- a/plugins/kotlin/completion/testData/smart/Object.kt
+++ b/plugins/kotlin/completion/testData/smart/Object.kt
@@ -8,3 +8,5 @@ fun foo(): I = <caret>
 // EXIST: foo
 // EXIST: object
 // NOTHING_ELSE
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/ObjectsFromType.kt b/plugins/kotlin/completion/testData/smart/ObjectsFromType.kt
index f066d53c363e..5816a87abe5f 100644
--- a/plugins/kotlin/completion/testData/smart/ObjectsFromType.kt
+++ b/plugins/kotlin/completion/testData/smart/ObjectsFromType.kt
@@ -15,3 +15,5 @@ fun foo(): T {
 // EXIST: object
 // ABSENT: Other
 // NOTHING_ELSE
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/OverloadedConstructorArgument.kt b/plugins/kotlin/completion/testData/smart/OverloadedConstructorArgument.kt
index a45a4fde2a08..0d544bdc88e2 100644
--- a/plugins/kotlin/completion/testData/smart/OverloadedConstructorArgument.kt
+++ b/plugins/kotlin/completion/testData/smart/OverloadedConstructorArgument.kt
@@ -7,3 +7,5 @@ fun f(p1: Any, p2: String, p3: File) {
 // ABSENT: p1
 // EXIST: p2
 // EXIST: p3
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/OverloadedMethodCallArgument1.kt b/plugins/kotlin/completion/testData/smart/OverloadedMethodCallArgument1.kt
index f9c79040cd7e..c56516a478a2 100644
--- a/plugins/kotlin/completion/testData/smart/OverloadedMethodCallArgument1.kt
+++ b/plugins/kotlin/completion/testData/smart/OverloadedMethodCallArgument1.kt
@@ -16,3 +16,5 @@ fun foo(p1: Int) {
 // EXIST: expr3
 // EXIST: s
 // EXIST: i
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/OverloadedMethodCallArgument2.kt b/plugins/kotlin/completion/testData/smart/OverloadedMethodCallArgument2.kt
index db98fa94c444..10683041e01b 100644
--- a/plugins/kotlin/completion/testData/smart/OverloadedMethodCallArgument2.kt
+++ b/plugins/kotlin/completion/testData/smart/OverloadedMethodCallArgument2.kt
@@ -21,3 +21,5 @@ fun foo(p1: Char) {
 // EXIST: expr4
 // EXIST: s
 // EXIST: i
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/PreviousArgMismatchedType.kt b/plugins/kotlin/completion/testData/smart/PreviousArgMismatchedType.kt
index b7e2c7038319..3f331ee39eb8 100644
--- a/plugins/kotlin/completion/testData/smart/PreviousArgMismatchedType.kt
+++ b/plugins/kotlin/completion/testData/smart/PreviousArgMismatchedType.kt
@@ -14,3 +14,5 @@ fun f(pa: A, pb: B, pc: C, pd: D, pe: E) {
 
 // EXIST: pc, pe
 // ABSENT: pa, pb, pd
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/QualifiedOverloadedMethodCallArgument1.kt b/plugins/kotlin/completion/testData/smart/QualifiedOverloadedMethodCallArgument1.kt
index a0058735b24c..a000646a2891 100644
--- a/plugins/kotlin/completion/testData/smart/QualifiedOverloadedMethodCallArgument1.kt
+++ b/plugins/kotlin/completion/testData/smart/QualifiedOverloadedMethodCallArgument1.kt
@@ -22,3 +22,5 @@ class C {
 // EXIST: expr4
 // EXIST: s
 // EXIST: i
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/QualifiedOverloadedMethodCallArgument2.kt b/plugins/kotlin/completion/testData/smart/QualifiedOverloadedMethodCallArgument2.kt
index 5dce6e00031a..ad0764fd5cae 100644
--- a/plugins/kotlin/completion/testData/smart/QualifiedOverloadedMethodCallArgument2.kt
+++ b/plugins/kotlin/completion/testData/smart/QualifiedOverloadedMethodCallArgument2.kt
@@ -22,3 +22,5 @@ class C {
 // EXIST: expr4
 // EXIST: s
 // EXIST: i
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/SAMConstructorForTypeAlias.kt b/plugins/kotlin/completion/testData/smart/SAMConstructorForTypeAlias.kt
index b682279923eb..d50599903c7b 100644
--- a/plugins/kotlin/completion/testData/smart/SAMConstructorForTypeAlias.kt
+++ b/plugins/kotlin/completion/testData/smart/SAMConstructorForTypeAlias.kt
@@ -10,4 +10,5 @@ fun usage() {
     usesRunnable(<caret>)
 }
 
-// EXIST: {"lookupString":"TaRunnable","tailText":" {...} (function: () -> Unit) (<root>)","typeText":"Runnable"}
\ No newline at end of file
+// EXIST: {"lookupString":"TaRunnable","tailText":" {...} (function: () -> Unit) (<root>)","typeText":"Runnable"}
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/SAMExpected1.kt b/plugins/kotlin/completion/testData/smart/SAMExpected1.kt
index 55c9bfde739c..dfd1374c57bb 100644
--- a/plugins/kotlin/completion/testData/smart/SAMExpected1.kt
+++ b/plugins/kotlin/completion/testData/smart/SAMExpected1.kt
@@ -1,3 +1,5 @@
 var a : Runnable = <caret>
 
 // EXIST: {"lookupString":"Runnable", "itemText":"Runnable", "tailText":" {...} (function: () -> Unit) (java.lang)", "typeText":"Runnable"}
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/SAMExpected2.kt b/plugins/kotlin/completion/testData/smart/SAMExpected2.kt
index 54d5527539ae..442c7ca430b4 100644
--- a/plugins/kotlin/completion/testData/smart/SAMExpected2.kt
+++ b/plugins/kotlin/completion/testData/smart/SAMExpected2.kt
@@ -5,3 +5,5 @@ var v: Comparator<String> = <caret>
 // EXIST: { itemText: "object : Comparator<String>{...}" }
 // EXIST: { lookupString: "Comparator", itemText: "Comparator", tailText: "(function: (T!, T!) -> Int) (java.util)", typeText: "Comparator<T>" }
 // EXIST: { lookupString: "Comparator", itemText: "Comparator", tailText: " { T, T -> ... } (function: (T!, T!) -> Int) (java.util)", typeText: "Comparator<T>" }
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/SkipDeclarationsOfType.kt b/plugins/kotlin/completion/testData/smart/SkipDeclarationsOfType.kt
index abf88a3c842e..5b800f59bb9a 100644
--- a/plugins/kotlin/completion/testData/smart/SkipDeclarationsOfType.kt
+++ b/plugins/kotlin/completion/testData/smart/SkipDeclarationsOfType.kt
@@ -14,3 +14,5 @@ fun foo(): Runnable {
 // ABSENT: genericFoo1
 // ABSENT: genericFoo2
 // EXIST: { itemText: "genericFoo3", tailText: "(t: Runnable) (<root>)", typeText: "Runnable" }
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/SuperMembers.kt b/plugins/kotlin/completion/testData/smart/SuperMembers.kt
index 6ededb129da5..3ed0b56116dc 100644
--- a/plugins/kotlin/completion/testData/smart/SuperMembers.kt
+++ b/plugins/kotlin/completion/testData/smart/SuperMembers.kt
@@ -34,4 +34,5 @@ abstract class A : Base(), I {
 // ABSENT: extOnI
 // ABSENT: extOnFile
 
-// NOTHING_ELSE
\ No newline at end of file
+// NOTHING_ELSE
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/VariableAsFunction1.kt b/plugins/kotlin/completion/testData/smart/VariableAsFunction1.kt
index 4459ceb4bab7..631ae4a81b9a 100644
--- a/plugins/kotlin/completion/testData/smart/VariableAsFunction1.kt
+++ b/plugins/kotlin/completion/testData/smart/VariableAsFunction1.kt
@@ -11,3 +11,5 @@ class C {
 // EXIST: p1
 // EXIST: p2
 // ABSENT: p3
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/VariableAsFunction3.kt b/plugins/kotlin/completion/testData/smart/VariableAsFunction3.kt
index 4c7db45ffbf6..2f6ae4830e6a 100644
--- a/plugins/kotlin/completion/testData/smart/VariableAsFunction3.kt
+++ b/plugins/kotlin/completion/testData/smart/VariableAsFunction3.kt
@@ -11,3 +11,5 @@ class C {
 // EXIST: p1
 // ABSENT: p2
 // EXIST: p3
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/afterAs/1.kt b/plugins/kotlin/completion/testData/smart/afterAs/1.kt
index d4025e5a9c7c..fae8f940fa2c 100644
--- a/plugins/kotlin/completion/testData/smart/afterAs/1.kt
+++ b/plugins/kotlin/completion/testData/smart/afterAs/1.kt
@@ -9,3 +9,5 @@ fun bar(o: Any) {
 // EXIST: String
 // EXIST: Int
 // NOTHING_ELSE
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/afterAs/2.kt b/plugins/kotlin/completion/testData/smart/afterAs/2.kt
index 8a6b2c62bb7d..f69f46264f4b 100644
--- a/plugins/kotlin/completion/testData/smart/afterAs/2.kt
+++ b/plugins/kotlin/completion/testData/smart/afterAs/2.kt
@@ -9,3 +9,5 @@ fun bar(o: Any) {
 // EXIST: { lookupString:"List", itemText:"List<String>", tailText: " (kotlin.collections)" }
 // EXIST: { lookupString:"Map", itemText:"Map<String, Int>", tailText: " (kotlin.collections)" }
 // NOTHING_ELSE
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/afterAs/3.kt b/plugins/kotlin/completion/testData/smart/afterAs/3.kt
index 416793f9587c..f8dd1f8cc3f0 100644
--- a/plugins/kotlin/completion/testData/smart/afterAs/3.kt
+++ b/plugins/kotlin/completion/testData/smart/afterAs/3.kt
@@ -10,3 +10,5 @@ fun bar(o: Any) {
 // EXIST: { lookupString:"List", itemText:"List<String>", tailText: " (kotlin.collections)" }
 // EXIST: { lookupString:"String", itemText:"String", tailText: " (kotlin)" }
 // NOTHING_ELSE
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/anonymousObject/1.kt b/plugins/kotlin/completion/testData/smart/anonymousObject/1.kt
index 45e02e22e5f0..543548ed858d 100644
--- a/plugins/kotlin/completion/testData/smart/anonymousObject/1.kt
+++ b/plugins/kotlin/completion/testData/smart/anonymousObject/1.kt
@@ -4,3 +4,5 @@ var a : Foo = <caret>
 
 // ABSENT: Foo
 // EXIST: { lookupString:"object", itemText:"object : Foo{...}" }
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/anonymousObject/2.kt b/plugins/kotlin/completion/testData/smart/anonymousObject/2.kt
index 50464b083f02..6d8199d4978b 100644
--- a/plugins/kotlin/completion/testData/smart/anonymousObject/2.kt
+++ b/plugins/kotlin/completion/testData/smart/anonymousObject/2.kt
@@ -4,3 +4,5 @@ var a : Foo = <caret>
 
 // ABSENT: Foo
 // EXIST: { lookupString:"object", itemText:"object : Foo(){...}" }
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/anonymousObject/ForJavaInterface.kt b/plugins/kotlin/completion/testData/smart/anonymousObject/ForJavaInterface.kt
index 9d9fedbe6d0b..c548e4ebb4cc 100644
--- a/plugins/kotlin/completion/testData/smart/anonymousObject/ForJavaInterface.kt
+++ b/plugins/kotlin/completion/testData/smart/anonymousObject/ForJavaInterface.kt
@@ -1,4 +1,5 @@
 var a : Appendable = <caret>
 
 // ABSENT: Appendable
-// EXIST: { lookupString:"object", itemText:"object : Appendable{...}" }
\ No newline at end of file
+// EXIST: { lookupString:"object", itemText:"object : Appendable{...}" }
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/anonymousObject/UninferredTypeArgs.kt b/plugins/kotlin/completion/testData/smart/anonymousObject/UninferredTypeArgs.kt
index ee63bd01ea69..6094d0ea23be 100644
--- a/plugins/kotlin/completion/testData/smart/anonymousObject/UninferredTypeArgs.kt
+++ b/plugins/kotlin/completion/testData/smart/anonymousObject/UninferredTypeArgs.kt
@@ -7,3 +7,5 @@ fun g() {
 }
 
 // EXIST: { lookupString:"object", itemText:"object : A<...>{...}" }
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/anonymousObject/WithPrefix.kt b/plugins/kotlin/completion/testData/smart/anonymousObject/WithPrefix.kt
index b4afbb9fe0e7..f151d93f9952 100644
--- a/plugins/kotlin/completion/testData/smart/anonymousObject/WithPrefix.kt
+++ b/plugins/kotlin/completion/testData/smart/anonymousObject/WithPrefix.kt
@@ -3,3 +3,5 @@ interface Foo
 var a : Foo = o<caret>
 
 // EXIST: { lookupString:"object", itemText:"object : Foo{...}" }
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/callableReference/ClassLiteral.kt b/plugins/kotlin/completion/testData/smart/callableReference/ClassLiteral.kt
index 5cc0c7e44ea9..f9141197b29e 100644
--- a/plugins/kotlin/completion/testData/smart/callableReference/ClassLiteral.kt
+++ b/plugins/kotlin/completion/testData/smart/callableReference/ClassLiteral.kt
@@ -8,3 +8,5 @@ fun bar() {
 
 // EXIST: { lookupString: "class", itemText: "class", attributes: "bold" }
 // NOTHING_ELSE
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/callableReference/ClassLiteralDotJava.kt b/plugins/kotlin/completion/testData/smart/callableReference/ClassLiteralDotJava.kt
index 4a84b37fd35b..e87ae3626e65 100644
--- a/plugins/kotlin/completion/testData/smart/callableReference/ClassLiteralDotJava.kt
+++ b/plugins/kotlin/completion/testData/smart/callableReference/ClassLiteralDotJava.kt
@@ -6,3 +6,5 @@ fun bar() {
 
 // EXIST_JAVA_ONLY: { lookupString: "class.java", itemText: "class", tailText: ".java", attributes: "bold" }
 // NOTHING_ELSE
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/callableReference/ConcreteJavaClassExpected.kt b/plugins/kotlin/completion/testData/smart/callableReference/ConcreteJavaClassExpected.kt
index db3ec15553e5..e10439250289 100644
--- a/plugins/kotlin/completion/testData/smart/callableReference/ConcreteJavaClassExpected.kt
+++ b/plugins/kotlin/completion/testData/smart/callableReference/ConcreteJavaClassExpected.kt
@@ -3,3 +3,5 @@ open class A<T : Any>(val javaClass: Class<T>)
 class B : A<String>(<caret>)
 
 // EXIST_JAVA_ONLY: { lookupString: "String", itemText: "String::class.java", attributes: "" }
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/callableReference/ConcreteKClassExpected.kt b/plugins/kotlin/completion/testData/smart/callableReference/ConcreteKClassExpected.kt
index c3d9c709f18c..f70639140aca 100644
--- a/plugins/kotlin/completion/testData/smart/callableReference/ConcreteKClassExpected.kt
+++ b/plugins/kotlin/completion/testData/smart/callableReference/ConcreteKClassExpected.kt
@@ -5,3 +5,5 @@ open class A<T : Any>(val kClass: KClass<T>)
 class B : A<String>(<caret>)
 
 // EXIST: { lookupString: "String", itemText: "String::class", attributes: "" }
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/callableReference/ConcreteKClassExpectedNoDuplicates.kt b/plugins/kotlin/completion/testData/smart/callableReference/ConcreteKClassExpectedNoDuplicates.kt
index 69e4e40c3a2d..3ef0894f8619 100644
--- a/plugins/kotlin/completion/testData/smart/callableReference/ConcreteKClassExpectedNoDuplicates.kt
+++ b/plugins/kotlin/completion/testData/smart/callableReference/ConcreteKClassExpectedNoDuplicates.kt
@@ -13,3 +13,5 @@ fun f() {
 // EXIST: null
 // EXIST: { lookupString: "kClass = null", itemText: "kClass = null" }
 // NOTHING_ELSE
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/callableReference/EmptyQualifier1.kt b/plugins/kotlin/completion/testData/smart/callableReference/EmptyQualifier1.kt
index f7ee1c34a565..c68468a92ad4 100644
--- a/plugins/kotlin/completion/testData/smart/callableReference/EmptyQualifier1.kt
+++ b/plugins/kotlin/completion/testData/smart/callableReference/EmptyQualifier1.kt
@@ -10,3 +10,5 @@ fun xf2(i: Int){}
 
 // EXIST: { lookupString:"xf1", itemText:"xf1", tailText: "() (<root>)", typeText: "Unit" }
 // NOTHING_ELSE
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/callableReference/EmptyQualifier2.kt b/plugins/kotlin/completion/testData/smart/callableReference/EmptyQualifier2.kt
index 93aaf1834a72..46089b35422f 100644
--- a/plugins/kotlin/completion/testData/smart/callableReference/EmptyQualifier2.kt
+++ b/plugins/kotlin/completion/testData/smart/callableReference/EmptyQualifier2.kt
@@ -13,3 +13,5 @@ val xTopLevelStringVal = "1"
 // EXIST: { lookupString:"xTopLevelIntVal", itemText:"xTopLevelIntVal", tailText: " (<root>)", typeText: "Int" }
 // EXIST: { lookupString:"xTopLevelIntVar", itemText:"xTopLevelIntVar", tailText: " (<root>)", typeText: "Int" }
 // NOTHING_ELSE
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/callableReference/EmptyQualifier3.kt b/plugins/kotlin/completion/testData/smart/callableReference/EmptyQualifier3.kt
index 82df9669689c..96a5275958ef 100644
--- a/plugins/kotlin/completion/testData/smart/callableReference/EmptyQualifier3.kt
+++ b/plugins/kotlin/completion/testData/smart/callableReference/EmptyQualifier3.kt
@@ -7,3 +7,5 @@ fun bar(){
 }
 
 // EXIST: C
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/callableReference/ExpressionQualifier.kt b/plugins/kotlin/completion/testData/smart/callableReference/ExpressionQualifier.kt
index 40695744fb4a..f13bee60935e 100644
--- a/plugins/kotlin/completion/testData/smart/callableReference/ExpressionQualifier.kt
+++ b/plugins/kotlin/completion/testData/smart/callableReference/ExpressionQualifier.kt
@@ -25,3 +25,5 @@ fun bar(c: C) {
 // EXIST: { lookupString:"xfe1", itemText:"xfe1", tailText: "(s: String) for C in <root>", typeText: "Unit" }
 // EXIST: { lookupString:"anyF", itemText:"anyF", tailText: "(s: String) for Any in <root>", typeText: "Unit" }
 // NOTHING_ELSE
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/callableReference/NoQualifier1.kt b/plugins/kotlin/completion/testData/smart/callableReference/NoQualifier1.kt
index 80325150e809..87a773bc5d69 100644
--- a/plugins/kotlin/completion/testData/smart/callableReference/NoQualifier1.kt
+++ b/plugins/kotlin/completion/testData/smart/callableReference/NoQualifier1.kt
@@ -12,3 +12,5 @@ fun f2(i: Int){}
 // ABSENT: ::Unit
 // ABSENT: ::Nothing
 // ABSENT: { lookupString:"object" }
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/callableReference/NoQualifier10.kt b/plugins/kotlin/completion/testData/smart/callableReference/NoQualifier10.kt
index ea86e73c3a34..cc2b013fdfc9 100644
--- a/plugins/kotlin/completion/testData/smart/callableReference/NoQualifier10.kt
+++ b/plugins/kotlin/completion/testData/smart/callableReference/NoQualifier10.kt
@@ -17,3 +17,5 @@ fun globalFoo(s: String): Boolean = true
 // ABSENT: ::staticFoo
 // ABSENT: ::extensionFoo
 // EXIST: ::globalFoo
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/callableReference/NoQualifier12.kt b/plugins/kotlin/completion/testData/smart/callableReference/NoQualifier12.kt
index 06dc37f4448e..ad6a7678eabc 100644
--- a/plugins/kotlin/completion/testData/smart/callableReference/NoQualifier12.kt
+++ b/plugins/kotlin/completion/testData/smart/callableReference/NoQualifier12.kt
@@ -20,3 +20,5 @@ class Outer
 // ABSENT: ::Inner
 // EXIST: ::Nested
 // EXIST: ::Outer
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/callableReference/NoQualifier2.kt b/plugins/kotlin/completion/testData/smart/callableReference/NoQualifier2.kt
index 8bea23efd6c7..be6b0b426f07 100644
--- a/plugins/kotlin/completion/testData/smart/callableReference/NoQualifier2.kt
+++ b/plugins/kotlin/completion/testData/smart/callableReference/NoQualifier2.kt
@@ -12,3 +12,5 @@ fun<T> genericF(t: T){}
 
 // EXIST: ::f
 // ABSENT: ::genericF
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/callableReference/NoQualifier3.kt b/plugins/kotlin/completion/testData/smart/callableReference/NoQualifier3.kt
index bf5baa414dc5..e4c04f2f16f7 100644
--- a/plugins/kotlin/completion/testData/smart/callableReference/NoQualifier3.kt
+++ b/plugins/kotlin/completion/testData/smart/callableReference/NoQualifier3.kt
@@ -9,3 +9,5 @@ fun f(): () -> Unit {}
 
 // EXIST: ::f
 // EXIST: f
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/callableReference/NoQualifier4.kt b/plugins/kotlin/completion/testData/smart/callableReference/NoQualifier4.kt
index f24fe7bc0418..c4883a225bea 100644
--- a/plugins/kotlin/completion/testData/smart/callableReference/NoQualifier4.kt
+++ b/plugins/kotlin/completion/testData/smart/callableReference/NoQualifier4.kt
@@ -9,3 +9,5 @@ fun f2(i: Int){}
 
 // EXIST: ::f1
 // ABSENT: ::f2
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/callableReference/NoQualifier7.kt b/plugins/kotlin/completion/testData/smart/callableReference/NoQualifier7.kt
index bf74c0467aed..9b5d41ed4c31 100644
--- a/plugins/kotlin/completion/testData/smart/callableReference/NoQualifier7.kt
+++ b/plugins/kotlin/completion/testData/smart/callableReference/NoQualifier7.kt
@@ -7,3 +7,5 @@ fun bar(){
 }
 
 // EXIST: ::Date
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/callableReference/NoQualifierMultipleConstructors.kt b/plugins/kotlin/completion/testData/smart/callableReference/NoQualifierMultipleConstructors.kt
index c0aa40363146..6c065130df9d 100644
--- a/plugins/kotlin/completion/testData/smart/callableReference/NoQualifierMultipleConstructors.kt
+++ b/plugins/kotlin/completion/testData/smart/callableReference/NoQualifierMultipleConstructors.kt
@@ -11,3 +11,5 @@ class B() {
 }
 
 // EXIST: ::B
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/callableReference/NoQualifierPropertyExpected.kt b/plugins/kotlin/completion/testData/smart/callableReference/NoQualifierPropertyExpected.kt
index c385ac3af3f9..7d378246d8ba 100644
--- a/plugins/kotlin/completion/testData/smart/callableReference/NoQualifierPropertyExpected.kt
+++ b/plugins/kotlin/completion/testData/smart/callableReference/NoQualifierPropertyExpected.kt
@@ -14,3 +14,5 @@ fun fInt() = 0
 // EXIST: { lookupString: "::vInt", itemText: "::vInt", tailText: " (<root>)", typeText: "Int" }
 // ABSENT: ::vString
 // ABSENT: ::fInt
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/callableReference/NonEmptyQualifier1.kt b/plugins/kotlin/completion/testData/smart/callableReference/NonEmptyQualifier1.kt
index 2ce9ff845407..1fa8ed98dcf7 100644
--- a/plugins/kotlin/completion/testData/smart/callableReference/NonEmptyQualifier1.kt
+++ b/plugins/kotlin/completion/testData/smart/callableReference/NonEmptyQualifier1.kt
@@ -18,3 +18,5 @@ fun bar() {
 // EXIST: { lookupString:"xf1", itemText:"xf1", tailText: "(s: String)", typeText: "Unit" }
 // EXIST: { lookupString:"xfe1", itemText:"xfe1", tailText: "(s: String) for C in <root>", typeText: "Unit" }
 // NOTHING_ELSE
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/callableReference/NonEmptyQualifier2.kt b/plugins/kotlin/completion/testData/smart/callableReference/NonEmptyQualifier2.kt
index 0a4b865440c2..750cb175f005 100644
--- a/plugins/kotlin/completion/testData/smart/callableReference/NonEmptyQualifier2.kt
+++ b/plugins/kotlin/completion/testData/smart/callableReference/NonEmptyQualifier2.kt
@@ -14,3 +14,5 @@ val Int.xTopLevelValOnInt: Int get()  = 1
 // EXIST: { lookupString:"xTopLevelIntVal", itemText:"xTopLevelIntVal", tailText: " for String in <root>", typeText: "Int" }
 // EXIST: { lookupString:"xTopLevelValOnAny", itemText:"xTopLevelValOnAny", tailText: " for Any in <root>", typeText: "Int" }
 // NOTHING_ELSE
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/constructor/ConstructorViaTypeAlias.kt b/plugins/kotlin/completion/testData/smart/constructor/ConstructorViaTypeAlias.kt
index 8d239e695afd..558471e87b6b 100644
--- a/plugins/kotlin/completion/testData/smart/constructor/ConstructorViaTypeAlias.kt
+++ b/plugins/kotlin/completion/testData/smart/constructor/ConstructorViaTypeAlias.kt
@@ -10,4 +10,5 @@ fun usage() {
     usesSomeClass(<caret>)
 }
 
-// EXIST: {"lookupString":"TaSomeClass","tailText":"() (<root>)"}
\ No newline at end of file
+// EXIST: {"lookupString":"TaSomeClass","tailText":"() (<root>)"}
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/constructor/ConstructorWithTypeParamsPartialSubstitution1ViaTypeAlias.kt b/plugins/kotlin/completion/testData/smart/constructor/ConstructorWithTypeParamsPartialSubstitution1ViaTypeAlias.kt
index 502d5fc03d1d..ad7ef7dc9e62 100644
--- a/plugins/kotlin/completion/testData/smart/constructor/ConstructorWithTypeParamsPartialSubstitution1ViaTypeAlias.kt
+++ b/plugins/kotlin/completion/testData/smart/constructor/ConstructorWithTypeParamsPartialSubstitution1ViaTypeAlias.kt
@@ -10,4 +10,5 @@ fun usage() {
     usesSomeClass<Any>(<caret>)
 }
 
-// EXIST: {"lookupString":"TaSomeClass","tailText":"() (<root>)","typeText":"SomeClass<K, V>"}
\ No newline at end of file
+// EXIST: {"lookupString":"TaSomeClass","tailText":"() (<root>)","typeText":"SomeClass<K, V>"}
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/constructor/ConstructorWithTypeParamsPartialSubstitution2ViaTypeAlias.kt b/plugins/kotlin/completion/testData/smart/constructor/ConstructorWithTypeParamsPartialSubstitution2ViaTypeAlias.kt
index b47317a0c0ab..0fdb68696ab6 100644
--- a/plugins/kotlin/completion/testData/smart/constructor/ConstructorWithTypeParamsPartialSubstitution2ViaTypeAlias.kt
+++ b/plugins/kotlin/completion/testData/smart/constructor/ConstructorWithTypeParamsPartialSubstitution2ViaTypeAlias.kt
@@ -10,4 +10,5 @@ fun usage() {
     usesSomeClass(<caret>)
 }
 
-// EXIST: {"lookupString":"TaSomeClass","tailText":"() (<root>)","typeText":"SomeClass<Any, V>"}
\ No newline at end of file
+// EXIST: {"lookupString":"TaSomeClass","tailText":"() (<root>)","typeText":"SomeClass<Any, V>"}
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/constructor/ConstructorWithTypeParamsSubstitutionViaTypeAlias.kt b/plugins/kotlin/completion/testData/smart/constructor/ConstructorWithTypeParamsSubstitutionViaTypeAlias.kt
index 8d7531a95eb3..795ddc8b481d 100644
--- a/plugins/kotlin/completion/testData/smart/constructor/ConstructorWithTypeParamsSubstitutionViaTypeAlias.kt
+++ b/plugins/kotlin/completion/testData/smart/constructor/ConstructorWithTypeParamsSubstitutionViaTypeAlias.kt
@@ -10,4 +10,5 @@ fun usage() {
     usesSomeClass(<caret>)
 }
 
-// EXIST: {"lookupString":"TaSomeClass","tailText":"() (<root>)","typeText":"SomeClass<Any, Any>"}
\ No newline at end of file
+// EXIST: {"lookupString":"TaSomeClass","tailText":"() (<root>)","typeText":"SomeClass<Any, Any>"}
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/constructor/ConstructorWithTypeParamsViaTypeAlias.kt b/plugins/kotlin/completion/testData/smart/constructor/ConstructorWithTypeParamsViaTypeAlias.kt
index 722560399f9b..029f1923c3a6 100644
--- a/plugins/kotlin/completion/testData/smart/constructor/ConstructorWithTypeParamsViaTypeAlias.kt
+++ b/plugins/kotlin/completion/testData/smart/constructor/ConstructorWithTypeParamsViaTypeAlias.kt
@@ -10,4 +10,5 @@ fun usage() {
     usesSomeClass(<caret>)
 }
 
-// EXIST: {"lookupString":"TaSomeClass","tailText":"() (<root>)","typeText":"SomeClass<K, V>"}
\ No newline at end of file
+// EXIST: {"lookupString":"TaSomeClass","tailText":"() (<root>)","typeText":"SomeClass<K, V>"}
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/constructor/GenericJavaClass.kt b/plugins/kotlin/completion/testData/smart/constructor/GenericJavaClass.kt
index 593af0942399..6ff722a41234 100644
--- a/plugins/kotlin/completion/testData/smart/constructor/GenericJavaClass.kt
+++ b/plugins/kotlin/completion/testData/smart/constructor/GenericJavaClass.kt
@@ -3,3 +3,5 @@ import java.util.ArrayList
 var a : ArrayList<String> = <caret>
 
 // EXIST: { lookupString: "ArrayList", itemText: "ArrayList", tailText: "(...) (java.util)" }
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/constructor/GenericType.kt b/plugins/kotlin/completion/testData/smart/constructor/GenericType.kt
index 53dcdf591a44..76430e705395 100644
--- a/plugins/kotlin/completion/testData/smart/constructor/GenericType.kt
+++ b/plugins/kotlin/completion/testData/smart/constructor/GenericType.kt
@@ -5,3 +5,5 @@ fun foo(p : Any){
 }
 
 // EXIST: { lookupString:"Foo", itemText:"Foo", tailText:"(t: String) (<root>)" }
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/constructor/PrivateConstructorForAbstract.kt b/plugins/kotlin/completion/testData/smart/constructor/PrivateConstructorForAbstract.kt
index 27db7f5cb4e9..62ea36eb4666 100644
--- a/plugins/kotlin/completion/testData/smart/constructor/PrivateConstructorForAbstract.kt
+++ b/plugins/kotlin/completion/testData/smart/constructor/PrivateConstructorForAbstract.kt
@@ -4,3 +4,5 @@ var a : Foo = <caret>
 
 // ABSENT: Foo
 // ABSENT: object
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/constructor/ProtectedConstructorForAbstract.kt b/plugins/kotlin/completion/testData/smart/constructor/ProtectedConstructorForAbstract.kt
index 643e541e01c7..1cf9b3d798ac 100644
--- a/plugins/kotlin/completion/testData/smart/constructor/ProtectedConstructorForAbstract.kt
+++ b/plugins/kotlin/completion/testData/smart/constructor/ProtectedConstructorForAbstract.kt
@@ -4,3 +4,5 @@ var a : Foo = <caret>
 
 // ABSENT: Foo
 // EXIST: { lookupString:"object", itemText:"object : Foo(){...}" }
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/constructor/StarProjection1.kt b/plugins/kotlin/completion/testData/smart/constructor/StarProjection1.kt
index fc16737987a6..bfb2dbf35b2d 100644
--- a/plugins/kotlin/completion/testData/smart/constructor/StarProjection1.kt
+++ b/plugins/kotlin/completion/testData/smart/constructor/StarProjection1.kt
@@ -7,3 +7,5 @@ fun test() {
 fun bar(foo: X<*>) {}
 
 // EXIST: { lookupString:"X", itemText:"X", tailText:"() (<root>)" }
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/constructor/StarProjection2.kt b/plugins/kotlin/completion/testData/smart/constructor/StarProjection2.kt
index a1ed91598c64..0ea00d698af4 100644
--- a/plugins/kotlin/completion/testData/smart/constructor/StarProjection2.kt
+++ b/plugins/kotlin/completion/testData/smart/constructor/StarProjection2.kt
@@ -7,3 +7,5 @@ fun test() {
 fun bar(foo: X<*>) {}
 
 // EXIST: { lookupString:"X", itemText:"X", tailText:"(d: D) (<root>)" }
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/forLoopRange/AfterDot.kt b/plugins/kotlin/completion/testData/smart/forLoopRange/AfterDot.kt
index f84c43d3a66e..28d08d03d757 100644
--- a/plugins/kotlin/completion/testData/smart/forLoopRange/AfterDot.kt
+++ b/plugins/kotlin/completion/testData/smart/forLoopRange/AfterDot.kt
@@ -7,3 +7,5 @@ fun String.extFun(): Collection<Int>{}
 // EXIST: toString
 // EXIST: substring
 // EXIST: extFun
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/forLoopRange/ExtensionIteratorMethod.kt b/plugins/kotlin/completion/testData/smart/forLoopRange/ExtensionIteratorMethod.kt
index 6a88294a9e0e..8f9375405cb5 100644
--- a/plugins/kotlin/completion/testData/smart/forLoopRange/ExtensionIteratorMethod.kt
+++ b/plugins/kotlin/completion/testData/smart/forLoopRange/ExtensionIteratorMethod.kt
@@ -12,3 +12,5 @@ fun foo(x: X, y: Y) {
 
 // EXIST: x
 // ABSENT: y
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/forLoopRange/NoGenericT.kt b/plugins/kotlin/completion/testData/smart/forLoopRange/NoGenericT.kt
index 19fbbc324f09..8c3da4118346 100644
--- a/plugins/kotlin/completion/testData/smart/forLoopRange/NoGenericT.kt
+++ b/plugins/kotlin/completion/testData/smart/forLoopRange/NoGenericT.kt
@@ -7,3 +7,5 @@ fun foo() {
 
 // ABSENT: xxx1
 // EXIST: xxx2
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/forLoopRange/Nullable.kt b/plugins/kotlin/completion/testData/smart/forLoopRange/Nullable.kt
index 144d90c8248b..ea602253545e 100644
--- a/plugins/kotlin/completion/testData/smart/forLoopRange/Nullable.kt
+++ b/plugins/kotlin/completion/testData/smart/forLoopRange/Nullable.kt
@@ -10,3 +10,5 @@ fun f(): Collection<Int>? {}
 // ABSENT: { lookupString:"f", itemText: "f" }
 // EXIST: { lookupString:"f", itemText: "!! f", typeText:"Collection<Int>?" }
 // EXIST: { lookupString:"f", itemText: "?: f", typeText:"Collection<Int>?" }
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/forLoopRange/Simple.kt b/plugins/kotlin/completion/testData/smart/forLoopRange/Simple.kt
index d053a0658a05..cdbeee7ed37a 100644
--- a/plugins/kotlin/completion/testData/smart/forLoopRange/Simple.kt
+++ b/plugins/kotlin/completion/testData/smart/forLoopRange/Simple.kt
@@ -14,3 +14,5 @@ fun f3(): Iterable<Char>{}
 // EXIST: f3
 // EXIST: { lookupString:"listOf", itemText: "listOf", tailText: "(vararg elements: T) (kotlin.collections)", typeText:"List<T>" }
 
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/forLoopRange/SmartCasts.kt b/plugins/kotlin/completion/testData/smart/forLoopRange/SmartCasts.kt
index ad645eb83267..dd0558a1c48c 100644
--- a/plugins/kotlin/completion/testData/smart/forLoopRange/SmartCasts.kt
+++ b/plugins/kotlin/completion/testData/smart/forLoopRange/SmartCasts.kt
@@ -6,3 +6,5 @@ fun foo(p1: Any, p2: Any) {
 
 // EXIST: p1
 // ABSENT: p2
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/forLoopRange/TypedLoopVar.kt b/plugins/kotlin/completion/testData/smart/forLoopRange/TypedLoopVar.kt
index ded4412a5e28..4ba3cb4cbdeb 100644
--- a/plugins/kotlin/completion/testData/smart/forLoopRange/TypedLoopVar.kt
+++ b/plugins/kotlin/completion/testData/smart/forLoopRange/TypedLoopVar.kt
@@ -11,3 +11,5 @@ fun foo(p1: Collection<X>, p2: Collection<Y>, p3: Collection<Z>, p4: Collection<
 // ABSENT: p3
 // ABSENT: p4
 // EXIST: { lookupString:"listOf", itemText: "listOf", tailText: "(vararg elements: T) (kotlin.collections)", typeText:"List<T>" }
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/functionLiterals/1.kt b/plugins/kotlin/completion/testData/smart/functionLiterals/1.kt
index 08e7dee448b5..a2553b240eb3 100644
--- a/plugins/kotlin/completion/testData/smart/functionLiterals/1.kt
+++ b/plugins/kotlin/completion/testData/smart/functionLiterals/1.kt
@@ -6,3 +6,5 @@ fun bar() {
 
 // EXIST: "{...}"
 // ABSENT: "{ () -> ... }"
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/functionLiterals/2.kt b/plugins/kotlin/completion/testData/smart/functionLiterals/2.kt
index a68c229e796c..63a595117616 100644
--- a/plugins/kotlin/completion/testData/smart/functionLiterals/2.kt
+++ b/plugins/kotlin/completion/testData/smart/functionLiterals/2.kt
@@ -8,3 +8,5 @@ fun bar() {
 // EXIST: "{...}"
 // EXIST: "{ s -> ... }"
 // EXIST: "{ s: String -> ... }"
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/functionLiterals/3.kt b/plugins/kotlin/completion/testData/smart/functionLiterals/3.kt
index 57cfae0e7d9e..6ae8fdc8f57b 100644
--- a/plugins/kotlin/completion/testData/smart/functionLiterals/3.kt
+++ b/plugins/kotlin/completion/testData/smart/functionLiterals/3.kt
@@ -8,3 +8,5 @@ fun bar() {
 // ABSENT: "{...}"
 // EXIST: "{ s, i -> ... }"
 // EXIST: "{ s: String, i: Int -> ... }"
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/functionLiterals/4.kt b/plugins/kotlin/completion/testData/smart/functionLiterals/4.kt
index 57e9058c1891..8f052de96018 100644
--- a/plugins/kotlin/completion/testData/smart/functionLiterals/4.kt
+++ b/plugins/kotlin/completion/testData/smart/functionLiterals/4.kt
@@ -8,3 +8,5 @@ fun bar() {
 // ABSENT: "{...}"
 // EXIST: "{ String -> ... }"
 // EXIST: "{ Int -> ... }"
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/functionLiterals/5.kt b/plugins/kotlin/completion/testData/smart/functionLiterals/5.kt
index c31b7639ed81..8a4defbc0d90 100644
--- a/plugins/kotlin/completion/testData/smart/functionLiterals/5.kt
+++ b/plugins/kotlin/completion/testData/smart/functionLiterals/5.kt
@@ -8,3 +8,5 @@ fun bar() {
 // EXIST: "{...}"
 // EXIST: "{ i -> ... }"
 // EXIST: "{ i: Int -> ... }"
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/functionLiterals/ExplicitParameterTypesRequired.kt b/plugins/kotlin/completion/testData/smart/functionLiterals/ExplicitParameterTypesRequired.kt
index afdb6c94d51e..02c4860cffcb 100644
--- a/plugins/kotlin/completion/testData/smart/functionLiterals/ExplicitParameterTypesRequired.kt
+++ b/plugins/kotlin/completion/testData/smart/functionLiterals/ExplicitParameterTypesRequired.kt
@@ -9,3 +9,5 @@ fun bar() {
 // ABSENT: "{ c, xx -> ... }"
 // EXIST: "{ String, Int -> ... }"
 // EXIST: "{ Char, xx -> ... }"
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/functionLiterals/OutsideCallParenthesis1.kt b/plugins/kotlin/completion/testData/smart/functionLiterals/OutsideCallParenthesis1.kt
index feabb5269170..8871696838f9 100644
--- a/plugins/kotlin/completion/testData/smart/functionLiterals/OutsideCallParenthesis1.kt
+++ b/plugins/kotlin/completion/testData/smart/functionLiterals/OutsideCallParenthesis1.kt
@@ -7,4 +7,5 @@ fun bar(handler: (String, Char) -> Unit) {
 // WITH_ORDER
 // EXIST: "{ s, xx -> ... }"
 // EXIST: "{ s: String, xx: Char -> ... }"
-// ABSENT: handler
\ No newline at end of file
+// ABSENT: handler
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/functionLiterals/OutsideCallParenthesis2.kt b/plugins/kotlin/completion/testData/smart/functionLiterals/OutsideCallParenthesis2.kt
index dbda92ed4761..174b6d9e613f 100644
--- a/plugins/kotlin/completion/testData/smart/functionLiterals/OutsideCallParenthesis2.kt
+++ b/plugins/kotlin/completion/testData/smart/functionLiterals/OutsideCallParenthesis2.kt
@@ -8,3 +8,5 @@ fun bar(p: String.(Int) -> Unit) {
 // EXIST: "{ i -> ... }"
 // EXIST: "{ i: Int -> ... }"
 // ABSENT: p
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/functionLiterals/OutsideCallParenthesis3.kt b/plugins/kotlin/completion/testData/smart/functionLiterals/OutsideCallParenthesis3.kt
index 1e03797b49c4..1f071bc1a904 100644
--- a/plugins/kotlin/completion/testData/smart/functionLiterals/OutsideCallParenthesis3.kt
+++ b/plugins/kotlin/completion/testData/smart/functionLiterals/OutsideCallParenthesis3.kt
@@ -6,4 +6,5 @@ fun bar(handler: (String, Char) -> Unit) {
 
 // EXIST: "{ s, c -> ... }"
 // EXIST: "{ s: String, c: Char -> ... }"
-// ABSENT: handler
\ No newline at end of file
+// ABSENT: handler
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/functionLiterals/OutsideCallParenthesis4.kt b/plugins/kotlin/completion/testData/smart/functionLiterals/OutsideCallParenthesis4.kt
index 6890392df2cf..7cd1c3c4ff83 100644
--- a/plugins/kotlin/completion/testData/smart/functionLiterals/OutsideCallParenthesis4.kt
+++ b/plugins/kotlin/completion/testData/smart/functionLiterals/OutsideCallParenthesis4.kt
@@ -6,4 +6,5 @@ fun bar(handler: (String, Char) -> Unit) {
 
 // EXIST: "{ s, c -> ... }"
 // EXIST: "{ s: String, c: Char -> ... }"
-// ABSENT: handler
\ No newline at end of file
+// ABSENT: handler
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/functionLiterals/OutsideCallParenthesis5.kt b/plugins/kotlin/completion/testData/smart/functionLiterals/OutsideCallParenthesis5.kt
index 848305198052..c5ab1e5d35d8 100644
--- a/plugins/kotlin/completion/testData/smart/functionLiterals/OutsideCallParenthesis5.kt
+++ b/plugins/kotlin/completion/testData/smart/functionLiterals/OutsideCallParenthesis5.kt
@@ -6,4 +6,5 @@ fun bar(handler: (String, Char) -> Unit) {
 
 // EXIST: "{ s, c -> ... }"
 // EXIST: "{ s: String, c: Char -> ... }"
-// EXIST: handler
\ No newline at end of file
+// EXIST: handler
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/functionLiterals/OutsideCallParenthesis6.kt b/plugins/kotlin/completion/testData/smart/functionLiterals/OutsideCallParenthesis6.kt
index f141d3033b84..42854ffc5540 100644
--- a/plugins/kotlin/completion/testData/smart/functionLiterals/OutsideCallParenthesis6.kt
+++ b/plugins/kotlin/completion/testData/smart/functionLiterals/OutsideCallParenthesis6.kt
@@ -7,4 +7,5 @@ fun bar(handler: (String, Char) -> Unit) {
 // EXIST: "{ s, c -> ... }"
 // EXIST: "{ s: String, c: Char -> ... }"
 // ABSENT: null
-// ABSENT: handler
\ No newline at end of file
+// ABSENT: handler
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/functionLiterals/OutsideCallParenthesis7.kt b/plugins/kotlin/completion/testData/smart/functionLiterals/OutsideCallParenthesis7.kt
index 89b68c4699c0..68e05b49454d 100644
--- a/plugins/kotlin/completion/testData/smart/functionLiterals/OutsideCallParenthesis7.kt
+++ b/plugins/kotlin/completion/testData/smart/functionLiterals/OutsideCallParenthesis7.kt
@@ -6,4 +6,5 @@ fun bar(handler: (String, Char) -> Unit) {
 
 // EXIST: "{ s, c -> ... }"
 // EXIST: "{ s: String, c: Char -> ... }"
-// ABSENT: handler
\ No newline at end of file
+// ABSENT: handler
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/functionLiterals/OutsideCallParenthesis8.kt b/plugins/kotlin/completion/testData/smart/functionLiterals/OutsideCallParenthesis8.kt
index 43313ae73a77..7ffee20671d9 100644
--- a/plugins/kotlin/completion/testData/smart/functionLiterals/OutsideCallParenthesis8.kt
+++ b/plugins/kotlin/completion/testData/smart/functionLiterals/OutsideCallParenthesis8.kt
@@ -6,4 +6,5 @@ fun bar(handler: (String, Char) -> Unit) {
 
 // EXIST: "{ s, c -> ... }"
 // EXIST: "{ s: String, c: Char -> ... }"
-// ABSENT: handler
\ No newline at end of file
+// ABSENT: handler
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/functionLiterals/OutsideCallParenthesisAndVararg1.kt b/plugins/kotlin/completion/testData/smart/functionLiterals/OutsideCallParenthesisAndVararg1.kt
index 722bf8ad25fb..49542b5a171e 100644
--- a/plugins/kotlin/completion/testData/smart/functionLiterals/OutsideCallParenthesisAndVararg1.kt
+++ b/plugins/kotlin/completion/testData/smart/functionLiterals/OutsideCallParenthesisAndVararg1.kt
@@ -6,4 +6,5 @@ fun bar(handler: (String, Char) -> Unit) {
 
 // EXIST: "{ s, c -> ... }"
 // EXIST: "{ s: String, c: Char -> ... }"
-// ABSENT: handler
\ No newline at end of file
+// ABSENT: handler
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/functionLiterals/OutsideCallParenthesisAndVararg2.kt b/plugins/kotlin/completion/testData/smart/functionLiterals/OutsideCallParenthesisAndVararg2.kt
index bde8d1cda19c..9adcc769a613 100644
--- a/plugins/kotlin/completion/testData/smart/functionLiterals/OutsideCallParenthesisAndVararg2.kt
+++ b/plugins/kotlin/completion/testData/smart/functionLiterals/OutsideCallParenthesisAndVararg2.kt
@@ -6,4 +6,5 @@ fun bar(handler: (String, Char) -> Unit) {
 
 // EXIST: "{ s, c -> ... }"
 // EXIST: "{ s: String, c: Char -> ... }"
-// ABSENT: handler
\ No newline at end of file
+// ABSENT: handler
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/functionLiterals/SuspendExplicitParameterTypesRequired.kt b/plugins/kotlin/completion/testData/smart/functionLiterals/SuspendExplicitParameterTypesRequired.kt
index 99fe0e895e50..0e3b24d6a452 100644
--- a/plugins/kotlin/completion/testData/smart/functionLiterals/SuspendExplicitParameterTypesRequired.kt
+++ b/plugins/kotlin/completion/testData/smart/functionLiterals/SuspendExplicitParameterTypesRequired.kt
@@ -9,3 +9,5 @@ fun bar() {
 // ABSENT: "{ c, xx -> ... }"
 // EXIST: "{ String, Int -> ... }"
 // EXIST: "{ Char, xx -> ... }"
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/generics/GenericFunction1.kt b/plugins/kotlin/completion/testData/smart/generics/GenericFunction1.kt
index b04dba9769bd..2dc4375e3dd2 100644
--- a/plugins/kotlin/completion/testData/smart/generics/GenericFunction1.kt
+++ b/plugins/kotlin/completion/testData/smart/generics/GenericFunction1.kt
@@ -6,3 +6,5 @@ fun f(){
 
 // EXIST: { lookupString: "arrayOf", tailText: "(vararg elements: String) (kotlin)", typeText: "Array<String>" }
 // ABSENT: arrayOfNulls
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/generics/GenericFunction2.kt b/plugins/kotlin/completion/testData/smart/generics/GenericFunction2.kt
index d39d121e0193..818c25f5f796 100644
--- a/plugins/kotlin/completion/testData/smart/generics/GenericFunction2.kt
+++ b/plugins/kotlin/completion/testData/smart/generics/GenericFunction2.kt
@@ -6,3 +6,5 @@ fun f(){
 
 // EXIST: { lookupString: "arrayOf", tailText: "(vararg elements: String?) (kotlin)", typeText: "Array<String?>" }
 // EXIST: { lookupString: "arrayOfNulls", tailText: "(size: Int) (kotlin)", typeText: "Array<String?>" }
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/generics/GenericFunction3.kt b/plugins/kotlin/completion/testData/smart/generics/GenericFunction3.kt
index db5569184351..24b61e2c5fb2 100644
--- a/plugins/kotlin/completion/testData/smart/generics/GenericFunction3.kt
+++ b/plugins/kotlin/completion/testData/smart/generics/GenericFunction3.kt
@@ -7,3 +7,5 @@ fun f(){
 // EXIST: { lookupString: "listOf", tailText: "() (kotlin.collections)", typeText: "List<String>" }
 // EXIST: { lookupString: "listOf", tailText: "(vararg elements: String) (kotlin.collections)", typeText: "List<String>" }
 // EXIST: { lookupString: "arrayListOf", tailText: "(vararg elements: String) (kotlin.collections)", typeText: "ArrayList<String> /* = ArrayList<String> */" }
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/generics/GenericFunction4.kt b/plugins/kotlin/completion/testData/smart/generics/GenericFunction4.kt
index 006a2ce2c71a..67237b8d8ead 100644
--- a/plugins/kotlin/completion/testData/smart/generics/GenericFunction4.kt
+++ b/plugins/kotlin/completion/testData/smart/generics/GenericFunction4.kt
@@ -4,3 +4,5 @@ fun foo(list: List<String>): Collection<Int> {
 
 // EXIST: { lookupString: "map", tailText: " {...} (transform: (String) -> Int) for Iterable<T> in kotlin.collections", typeText: "List<Int>" }
 // ABSENT: filter
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/generics/GenericFunction5.kt b/plugins/kotlin/completion/testData/smart/generics/GenericFunction5.kt
index 1a1760e396ad..aaa98f611a02 100644
--- a/plugins/kotlin/completion/testData/smart/generics/GenericFunction5.kt
+++ b/plugins/kotlin/completion/testData/smart/generics/GenericFunction5.kt
@@ -11,3 +11,5 @@ fun f(){
 }
 
 // EXIST: { lookupString: "create", itemText: "C.create", tailText: "(t: String) (<root>)", typeText: "C<String>" }
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/heuristicSignatures/InOperator.kt b/plugins/kotlin/completion/testData/smart/heuristicSignatures/InOperator.kt
index aba008109989..de5487304573 100644
--- a/plugins/kotlin/completion/testData/smart/heuristicSignatures/InOperator.kt
+++ b/plugins/kotlin/completion/testData/smart/heuristicSignatures/InOperator.kt
@@ -22,3 +22,5 @@ fun foo(a: A,  cA: Collection<A>, cB: Collection<B>, cC: Collection<C>, cAny: Co
 // EXIST: aB
 // ABSENT: aC
 // EXIST: aAny
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/ifValue/1.kt b/plugins/kotlin/completion/testData/smart/ifValue/1.kt
index 261e447461dc..4861f9c22f35 100644
--- a/plugins/kotlin/completion/testData/smart/ifValue/1.kt
+++ b/plugins/kotlin/completion/testData/smart/ifValue/1.kt
@@ -8,3 +8,5 @@ fun bar(b: Boolean, s: String, c: Char){
 // EXIST: s
 // EXIST: c
 // ABSENT: b
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/ifValue/3.kt b/plugins/kotlin/completion/testData/smart/ifValue/3.kt
index 2221e953df8f..31214a54fcb4 100644
--- a/plugins/kotlin/completion/testData/smart/ifValue/3.kt
+++ b/plugins/kotlin/completion/testData/smart/ifValue/3.kt
@@ -8,3 +8,5 @@ fun bar(b: Boolean, s: String, c: Char){
 // EXIST: s
 // EXIST: c
 // ABSENT: b
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/ifValue/4.kt b/plugins/kotlin/completion/testData/smart/ifValue/4.kt
index 7b56d849bbc0..c87059982423 100644
--- a/plugins/kotlin/completion/testData/smart/ifValue/4.kt
+++ b/plugins/kotlin/completion/testData/smart/ifValue/4.kt
@@ -10,3 +10,5 @@ fun bar(b: Boolean, s: String, c: Char){
 // EXIST: s
 // EXIST: c
 // ABSENT: b
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/ifValue/InBlock1.kt b/plugins/kotlin/completion/testData/smart/ifValue/InBlock1.kt
index 825b9b90470a..6ffc36eb6116 100644
--- a/plugins/kotlin/completion/testData/smart/ifValue/InBlock1.kt
+++ b/plugins/kotlin/completion/testData/smart/ifValue/InBlock1.kt
@@ -11,3 +11,5 @@ fun bar(b: Boolean, s: String, c: Char){
 // EXIST: s
 // EXIST: c
 // ABSENT: b
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/inElvisOperator/2.kt b/plugins/kotlin/completion/testData/smart/inElvisOperator/2.kt
index b816425af7fb..0ef00ef28115 100644
--- a/plugins/kotlin/completion/testData/smart/inElvisOperator/2.kt
+++ b/plugins/kotlin/completion/testData/smart/inElvisOperator/2.kt
@@ -10,3 +10,5 @@ fun bar() {
 // ABSENT: { itemText:"foo2" }
 // EXIST: { itemText:"!! foo2" }
 // EXIST: { itemText:"?: foo2" }
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/inElvisOperator/3.kt b/plugins/kotlin/completion/testData/smart/inElvisOperator/3.kt
index 7ed80332d0eb..c816f54f89a1 100644
--- a/plugins/kotlin/completion/testData/smart/inElvisOperator/3.kt
+++ b/plugins/kotlin/completion/testData/smart/inElvisOperator/3.kt
@@ -18,3 +18,5 @@ fun A.bar(a: A, b: B, c: C, a1: A?, b1: B?, c1: C?) {
 // EXIST: { itemText:"!! a1" }
 // EXIST: { itemText:"!! b1" }
 // ABSENT: { itemText:"!! c1" }
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/inElvisOperator/5.kt b/plugins/kotlin/completion/testData/smart/inElvisOperator/5.kt
index 3454d8d5ca7f..b6b6512b5d06 100644
--- a/plugins/kotlin/completion/testData/smart/inElvisOperator/5.kt
+++ b/plugins/kotlin/completion/testData/smart/inElvisOperator/5.kt
@@ -18,3 +18,5 @@ fun B.bar(a: A, b: B, c: C, a1: A?, b1: B?, c1: C?) {
 // EXIST: { itemText:"!! a1" }
 // EXIST: { itemText:"!! b1" }
 // ABSENT: { itemText:"!! c1" }
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/inElvisOperator/6.kt b/plugins/kotlin/completion/testData/smart/inElvisOperator/6.kt
index e954773f9a9c..3eb1aa91b605 100644
--- a/plugins/kotlin/completion/testData/smart/inElvisOperator/6.kt
+++ b/plugins/kotlin/completion/testData/smart/inElvisOperator/6.kt
@@ -18,3 +18,5 @@ fun B?.bar(a: A, b: B, c: C, a1: A?, b1: B?, c1: C?) {
 // EXIST: { itemText:"!! a1" }
 // EXIST: { itemText:"!! b1" }
 // ABSENT: { itemText:"!! c1" }
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/inOperator/ExtensionContains.kt b/plugins/kotlin/completion/testData/smart/inOperator/ExtensionContains.kt
index 4254d18e84a4..a9f6029365da 100644
--- a/plugins/kotlin/completion/testData/smart/inOperator/ExtensionContains.kt
+++ b/plugins/kotlin/completion/testData/smart/inOperator/ExtensionContains.kt
@@ -12,3 +12,5 @@ fun foo(s: String, x: X, y: Y, z: Z) {
 // EXIST: x
 // EXIST: y
 // ABSENT: z
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/inOperator/FilterByArgumentType.kt b/plugins/kotlin/completion/testData/smart/inOperator/FilterByArgumentType.kt
index 33e4622de3ca..eb3a7dd8111a 100644
--- a/plugins/kotlin/completion/testData/smart/inOperator/FilterByArgumentType.kt
+++ b/plugins/kotlin/completion/testData/smart/inOperator/FilterByArgumentType.kt
@@ -17,3 +17,5 @@ fun foo(s: String, x: X, y: Y, z: Z) {
 // EXIST: x
 // ABSENT: y
 // EXIST: z
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/inOperator/GenericMethod.kt b/plugins/kotlin/completion/testData/smart/inOperator/GenericMethod.kt
index b55958fa38f2..8b16479dca36 100644
--- a/plugins/kotlin/completion/testData/smart/inOperator/GenericMethod.kt
+++ b/plugins/kotlin/completion/testData/smart/inOperator/GenericMethod.kt
@@ -3,3 +3,5 @@ fun foo(s: String) {
 }
 
 // EXIST: { lookupString:"listOf", itemText: "listOf", tailText: "(vararg elements: String) (kotlin.collections)", typeText:"List<String>" }
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/inOperator/GenericMethod2.kt b/plugins/kotlin/completion/testData/smart/inOperator/GenericMethod2.kt
index c2e8fac643cf..367b378aed73 100644
--- a/plugins/kotlin/completion/testData/smart/inOperator/GenericMethod2.kt
+++ b/plugins/kotlin/completion/testData/smart/inOperator/GenericMethod2.kt
@@ -11,3 +11,5 @@ interface A {
 }
 
 // EXIST: { lookupString:"createX", itemText: "createX", tailText: "(t: String)", typeText:"X<String>" }
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/inOperator/GenericMethod3.kt b/plugins/kotlin/completion/testData/smart/inOperator/GenericMethod3.kt
index 83c929e4a28b..f565393781b8 100644
--- a/plugins/kotlin/completion/testData/smart/inOperator/GenericMethod3.kt
+++ b/plugins/kotlin/completion/testData/smart/inOperator/GenericMethod3.kt
@@ -11,3 +11,5 @@ interface A {
 }
 
 // EXIST: { lookupString:"createX", itemText: "createX", tailText: "(t: String)", typeText:"X<String>" }
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/inOperator/NotIn.kt b/plugins/kotlin/completion/testData/smart/inOperator/NotIn.kt
index c8e95364cc00..f60c2d3873e9 100644
--- a/plugins/kotlin/completion/testData/smart/inOperator/NotIn.kt
+++ b/plugins/kotlin/completion/testData/smart/inOperator/NotIn.kt
@@ -4,3 +4,5 @@ fun foo(s: String, list: List<String>, o: Any) {
 
 // EXIST: list
 // ABSENT: o
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/inOperator/Nullable.kt b/plugins/kotlin/completion/testData/smart/inOperator/Nullable.kt
index d776fa3f7275..753f90ca08f3 100644
--- a/plugins/kotlin/completion/testData/smart/inOperator/Nullable.kt
+++ b/plugins/kotlin/completion/testData/smart/inOperator/Nullable.kt
@@ -5,3 +5,5 @@ fun foo(s: String, list: List<String>?) {
 // ABSENT: { lookupString:"list", itemText: "list" }
 // EXIST: { lookupString:"list", itemText: "!! list", typeText:"List<String>?" }
 // EXIST: { lookupString:"list", itemText: "?: list", typeText:"List<String>?" }
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/inOperator/Simple.kt b/plugins/kotlin/completion/testData/smart/inOperator/Simple.kt
index 1ed1bfde4f0a..3727eed70321 100644
--- a/plugins/kotlin/completion/testData/smart/inOperator/Simple.kt
+++ b/plugins/kotlin/completion/testData/smart/inOperator/Simple.kt
@@ -4,3 +4,5 @@ fun foo(s: String, list: List<String>, o: Any) {
 
 // EXIST: list
 // ABSENT: o
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/inOperator/SmartCasts.kt b/plugins/kotlin/completion/testData/smart/inOperator/SmartCasts.kt
index 086428cf00df..605b125ad966 100644
--- a/plugins/kotlin/completion/testData/smart/inOperator/SmartCasts.kt
+++ b/plugins/kotlin/completion/testData/smart/inOperator/SmartCasts.kt
@@ -4,3 +4,5 @@ fun foo(s: String, o1: Any, o2: Any) {
 
 // EXIST: o1
 // ABSENT: o2
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/inheritors/1.kt b/plugins/kotlin/completion/testData/smart/inheritors/1.kt
index 081a40088c20..6aa8cf75239a 100644
--- a/plugins/kotlin/completion/testData/smart/inheritors/1.kt
+++ b/plugins/kotlin/completion/testData/smart/inheritors/1.kt
@@ -6,3 +6,5 @@ fun foo(): InputStream {
 
 // EXIST: ByteArrayInputStream
 // EXIST: FileInputStream
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/inheritors/2.kt b/plugins/kotlin/completion/testData/smart/inheritors/2.kt
index d683d42d99bb..1a28e5194f70 100644
--- a/plugins/kotlin/completion/testData/smart/inheritors/2.kt
+++ b/plugins/kotlin/completion/testData/smart/inheritors/2.kt
@@ -4,3 +4,5 @@ fun foo(): List<String> {
 
 // INVOCATION_COUNT: 2
 // EXIST: { lookupString: "ArrayList", itemText: "ArrayList", tailText: "(...) (java.util)" }
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/inheritors/GenericClass1.kt b/plugins/kotlin/completion/testData/smart/inheritors/GenericClass1.kt
index dda6d343b382..2274ed0a3ba8 100644
--- a/plugins/kotlin/completion/testData/smart/inheritors/GenericClass1.kt
+++ b/plugins/kotlin/completion/testData/smart/inheritors/GenericClass1.kt
@@ -18,3 +18,5 @@ fun bar() {
 // EXIST: { itemText: "C4", tailText: "(t: Int) (<root>)" }
 // EXIST: { itemText: "C5", tailText: "(t1: T1, t2: Int) (<root>)" }
 // NOTHING_ELSE
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/inheritors/GenericClass2.kt b/plugins/kotlin/completion/testData/smart/inheritors/GenericClass2.kt
index 7adde3ac71f7..7a033ae4a7e8 100644
--- a/plugins/kotlin/completion/testData/smart/inheritors/GenericClass2.kt
+++ b/plugins/kotlin/completion/testData/smart/inheritors/GenericClass2.kt
@@ -24,3 +24,5 @@ fun bar() {
 // EXIST: { itemText: "minOf", tailText: "(a: T, vararg other: T) (kotlin.comparisons)" }
 // EXIST: { itemText: "minOf", tailText: "(a: T, b: T, c: T) (kotlin.comparisons)" }
 // NOTHING_ELSE
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/inheritors/GenericClass3.kt b/plugins/kotlin/completion/testData/smart/inheritors/GenericClass3.kt
index 960ac1e1126a..bbac57b6d491 100644
--- a/plugins/kotlin/completion/testData/smart/inheritors/GenericClass3.kt
+++ b/plugins/kotlin/completion/testData/smart/inheritors/GenericClass3.kt
@@ -25,3 +25,5 @@ fun bar() {
 // EXIST: { itemText: "minOf", tailText: "(a: T, vararg other: T) (kotlin.comparisons)" }
 // EXIST: { itemText: "minOf", tailText: "(a: T, b: T, c: T) (kotlin.comparisons)" }
 // NOTHING_ELSE
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/inheritors/GenericClass4.kt b/plugins/kotlin/completion/testData/smart/inheritors/GenericClass4.kt
index adb67edfc0ac..00b380590135 100644
--- a/plugins/kotlin/completion/testData/smart/inheritors/GenericClass4.kt
+++ b/plugins/kotlin/completion/testData/smart/inheritors/GenericClass4.kt
@@ -20,3 +20,5 @@ fun bar() {
 // EXIST: { itemText: "minOf", tailText: "(a: T, vararg other: T) (kotlin.comparisons)" }
 // EXIST: { itemText: "minOf", tailText: "(a: T, b: T, c: T) (kotlin.comparisons)" }
 // NOTHING_ELSE
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/inheritors/GenericClass5.kt b/plugins/kotlin/completion/testData/smart/inheritors/GenericClass5.kt
index dec153ccdee1..cd27e903aeae 100644
--- a/plugins/kotlin/completion/testData/smart/inheritors/GenericClass5.kt
+++ b/plugins/kotlin/completion/testData/smart/inheritors/GenericClass5.kt
@@ -11,3 +11,5 @@ fun bar() {
 // EXIST: { itemText: "object : I<String>{...}" }
 // EXIST: { itemText: "object : C<...>(){...}" }
 // NOTHING_ELSE
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/inheritors/GenericClass6.kt b/plugins/kotlin/completion/testData/smart/inheritors/GenericClass6.kt
index 8f5bcee00ff8..d8cf698e1352 100644
--- a/plugins/kotlin/completion/testData/smart/inheritors/GenericClass6.kt
+++ b/plugins/kotlin/completion/testData/smart/inheritors/GenericClass6.kt
@@ -27,3 +27,5 @@ fun bar() {
 // EXIST: { itemText: "minOf", tailText: "(a: T, vararg other: T) (kotlin.comparisons)" }
 // EXIST: { itemText: "minOf", tailText: "(a: T, b: T, c: T) (kotlin.comparisons)" }
 // NOTHING_ELSE
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/lambdaSignature/ExplicitParameterTypesRequired.kt b/plugins/kotlin/completion/testData/smart/lambdaSignature/ExplicitParameterTypesRequired.kt
index 2b068b969d53..045a746cec1e 100644
--- a/plugins/kotlin/completion/testData/smart/lambdaSignature/ExplicitParameterTypesRequired.kt
+++ b/plugins/kotlin/completion/testData/smart/lambdaSignature/ExplicitParameterTypesRequired.kt
@@ -9,3 +9,5 @@ fun bar() {
 // EXIST: "Char, xx ->"
 // ABSENT: "s, i ->"
 // ABSENT: "c, xx ->"
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/lambdaSignature/Map.kt b/plugins/kotlin/completion/testData/smart/lambdaSignature/Map.kt
index 0c43eecbf0c5..a897a9098e32 100644
--- a/plugins/kotlin/completion/testData/smart/lambdaSignature/Map.kt
+++ b/plugins/kotlin/completion/testData/smart/lambdaSignature/Map.kt
@@ -4,3 +4,5 @@ fun foo() {
 
 // EXIST: "i ->"
 // EXIST: "i: Int ->"
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/lambdaSignature/MultipleParameters.kt b/plugins/kotlin/completion/testData/smart/lambdaSignature/MultipleParameters.kt
index 7bc1a0cdcb2e..e9603043cd92 100644
--- a/plugins/kotlin/completion/testData/smart/lambdaSignature/MultipleParameters.kt
+++ b/plugins/kotlin/completion/testData/smart/lambdaSignature/MultipleParameters.kt
@@ -6,3 +6,5 @@ fun foo(p: Int) {
 // EXIST: p
 // EXIST: "acc: Int, c: Char ->"
 // EXIST: "acc, c ->"
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/lambdaSignature/SingleParameter.kt b/plugins/kotlin/completion/testData/smart/lambdaSignature/SingleParameter.kt
index f93906dab76e..5e7cc9987bc3 100644
--- a/plugins/kotlin/completion/testData/smart/lambdaSignature/SingleParameter.kt
+++ b/plugins/kotlin/completion/testData/smart/lambdaSignature/SingleParameter.kt
@@ -5,3 +5,5 @@ fun foo(p: Boolean) {
 // EXIST: p
 // EXIST: "c ->"
 // EXIST: "c: Char ->"
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/lambdaSignature/SuspendExplicitParameterTypesRequired.kt b/plugins/kotlin/completion/testData/smart/lambdaSignature/SuspendExplicitParameterTypesRequired.kt
index 3f429b9d9970..959610f27b9f 100644
--- a/plugins/kotlin/completion/testData/smart/lambdaSignature/SuspendExplicitParameterTypesRequired.kt
+++ b/plugins/kotlin/completion/testData/smart/lambdaSignature/SuspendExplicitParameterTypesRequired.kt
@@ -9,3 +9,5 @@ fun bar() {
 // EXIST: "Char, xx ->"
 // ABSENT: "s, i ->"
 // ABSENT: "c, xx ->"
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/multipleArgsItem/1.kt b/plugins/kotlin/completion/testData/smart/multipleArgsItem/1.kt
index 87aedf7c2bab..557949c7932c 100644
--- a/plugins/kotlin/completion/testData/smart/multipleArgsItem/1.kt
+++ b/plugins/kotlin/completion/testData/smart/multipleArgsItem/1.kt
@@ -5,3 +5,5 @@ fun bar(b: String, a: Int, c: String) {
 }
 
 // EXIST: "a, b, c"
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/multipleArgsItem/10.kt b/plugins/kotlin/completion/testData/smart/multipleArgsItem/10.kt
index 9cf64a69643c..1b7479ec2ec0 100644
--- a/plugins/kotlin/completion/testData/smart/multipleArgsItem/10.kt
+++ b/plugins/kotlin/completion/testData/smart/multipleArgsItem/10.kt
@@ -9,3 +9,5 @@ class C(val p1: String) {
 }
 
 // EXIST: "p1, p2, p3"
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/multipleArgsItem/11.kt b/plugins/kotlin/completion/testData/smart/multipleArgsItem/11.kt
index 7e8f5edb10be..e88968435815 100644
--- a/plugins/kotlin/completion/testData/smart/multipleArgsItem/11.kt
+++ b/plugins/kotlin/completion/testData/smart/multipleArgsItem/11.kt
@@ -7,3 +7,5 @@ fun bar(b: String, a: Int, c: String, d: Int) {
 // EXIST: "a, b"
 // EXIST: "a, b, c"
 // EXIST: "a, b, c, d"
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/multipleArgsItem/2.kt b/plugins/kotlin/completion/testData/smart/multipleArgsItem/2.kt
index 9f4a40240b98..6893dce027c0 100644
--- a/plugins/kotlin/completion/testData/smart/multipleArgsItem/2.kt
+++ b/plugins/kotlin/completion/testData/smart/multipleArgsItem/2.kt
@@ -9,3 +9,5 @@ class C : B() {
 }
 
 // EXIST: "p1, p2"
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/multipleArgsItem/3.kt b/plugins/kotlin/completion/testData/smart/multipleArgsItem/3.kt
index 64932ca95278..c25a08dc2649 100644
--- a/plugins/kotlin/completion/testData/smart/multipleArgsItem/3.kt
+++ b/plugins/kotlin/completion/testData/smart/multipleArgsItem/3.kt
@@ -3,3 +3,5 @@ class B(p1: String, p2: String)
 class C(p1: String, p2: String, p3: String) : B(<caret>)
 
 // EXIST: "p1, p2"
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/multipleArgsItem/4.kt b/plugins/kotlin/completion/testData/smart/multipleArgsItem/4.kt
index 965bf67d9b9f..d927aad40b75 100644
--- a/plugins/kotlin/completion/testData/smart/multipleArgsItem/4.kt
+++ b/plugins/kotlin/completion/testData/smart/multipleArgsItem/4.kt
@@ -5,3 +5,5 @@ fun bar(b: String, a: Int, c: String) {
 }
 
 // EXIST: "a, b, c"
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/multipleArgsItem/6.kt b/plugins/kotlin/completion/testData/smart/multipleArgsItem/6.kt
index 70e166fedeba..181be94255b1 100644
--- a/plugins/kotlin/completion/testData/smart/multipleArgsItem/6.kt
+++ b/plugins/kotlin/completion/testData/smart/multipleArgsItem/6.kt
@@ -7,3 +7,5 @@ fun bar(b: String, a: Int, c: String?) {
 }
 
 // EXIST: "a, b, c"
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/multipleArgsItem/7.kt b/plugins/kotlin/completion/testData/smart/multipleArgsItem/7.kt
index 8653e4399014..c2f03848dd0a 100644
--- a/plugins/kotlin/completion/testData/smart/multipleArgsItem/7.kt
+++ b/plugins/kotlin/completion/testData/smart/multipleArgsItem/7.kt
@@ -7,3 +7,5 @@ fun bar(b: String, a: Int, c: String) {
 
 // EXIST: "a, b, c"
 // EXIST: "a, b"
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/multipleArgsItem/8.kt b/plugins/kotlin/completion/testData/smart/multipleArgsItem/8.kt
index b13cef114908..41bda01627db 100644
--- a/plugins/kotlin/completion/testData/smart/multipleArgsItem/8.kt
+++ b/plugins/kotlin/completion/testData/smart/multipleArgsItem/8.kt
@@ -7,3 +7,5 @@ fun bar() {
 }
 
 // EXIST: "a, b"
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/multipleArgsItem/9.kt b/plugins/kotlin/completion/testData/smart/multipleArgsItem/9.kt
index a76e9dbf6ce0..48e832bd1c6f 100644
--- a/plugins/kotlin/completion/testData/smart/multipleArgsItem/9.kt
+++ b/plugins/kotlin/completion/testData/smart/multipleArgsItem/9.kt
@@ -7,3 +7,5 @@ fun bar(a: Int, b: String) {
 }
 
 // EXIST: "a, b"
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/multipleArgsItem/CallWithBrackets.kt b/plugins/kotlin/completion/testData/smart/multipleArgsItem/CallWithBrackets.kt
index 96f73729ee61..e098e8b953c7 100644
--- a/plugins/kotlin/completion/testData/smart/multipleArgsItem/CallWithBrackets.kt
+++ b/plugins/kotlin/completion/testData/smart/multipleArgsItem/CallWithBrackets.kt
@@ -5,3 +5,5 @@ fun bar(b: String, a: Int, c: String) {
 }
 
 // EXIST: "a, b, c"
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/multipleArgsItem/notFirstArgument.kt b/plugins/kotlin/completion/testData/smart/multipleArgsItem/notFirstArgument.kt
index 0749e6c3c37e..aa6e28fc7e15 100644
--- a/plugins/kotlin/completion/testData/smart/multipleArgsItem/notFirstArgument.kt
+++ b/plugins/kotlin/completion/testData/smart/multipleArgsItem/notFirstArgument.kt
@@ -7,4 +7,5 @@ fun foo() {
     f(a, <caret>)
 }
 
-// EXIST: "b, c"
\ No newline at end of file
+// EXIST: "b, c"
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/propertyDelegate/DelegatesDot.kt b/plugins/kotlin/completion/testData/smart/propertyDelegate/DelegatesDot.kt
index a8c1a118c44b..71573f1cfefe 100644
--- a/plugins/kotlin/completion/testData/smart/propertyDelegate/DelegatesDot.kt
+++ b/plugins/kotlin/completion/testData/smart/propertyDelegate/DelegatesDot.kt
@@ -8,3 +8,5 @@ class C {
 // EXIST: { itemText: "observable", typeText: "ReadWriteProperty<Any?, T>" }
 // EXIST: { itemText: "vetoable", typeText: "ReadWriteProperty<Any?, T>" }
 // NOTHING_ELSE
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/propertyDelegate/DelegatesDotExplicitPropertyType.kt b/plugins/kotlin/completion/testData/smart/propertyDelegate/DelegatesDotExplicitPropertyType.kt
index b1105def6819..670b3d29898e 100644
--- a/plugins/kotlin/completion/testData/smart/propertyDelegate/DelegatesDotExplicitPropertyType.kt
+++ b/plugins/kotlin/completion/testData/smart/propertyDelegate/DelegatesDotExplicitPropertyType.kt
@@ -8,3 +8,5 @@ class C {
 // EXIST: { itemText: "observable", typeText: "ReadWriteProperty<Any?, String>" }
 // EXIST: { itemText: "vetoable", typeText: "ReadWriteProperty<Any?, String>" }
 // NOTHING_ELSE
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/propertyDelegate/ExplicitValType.kt b/plugins/kotlin/completion/testData/smart/propertyDelegate/ExplicitValType.kt
index 2038f5c73f6c..becf5b5dc7a0 100644
--- a/plugins/kotlin/completion/testData/smart/propertyDelegate/ExplicitValType.kt
+++ b/plugins/kotlin/completion/testData/smart/propertyDelegate/ExplicitValType.kt
@@ -42,3 +42,5 @@ class C {
 // ABSENT: X3
 // EXIST: Y1
 // ABSENT: Y2
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/propertyDelegate/ExplicitVarType.kt b/plugins/kotlin/completion/testData/smart/propertyDelegate/ExplicitVarType.kt
index b83e4be750b6..8f2dd48bfc93 100644
--- a/plugins/kotlin/completion/testData/smart/propertyDelegate/ExplicitVarType.kt
+++ b/plugins/kotlin/completion/testData/smart/propertyDelegate/ExplicitVarType.kt
@@ -30,3 +30,5 @@ class C {
 // ABSENT: createX1
 // EXIST: createX2
 // ABSENT: createX3
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/propertyDelegate/ExtensionSubstitution1.kt b/plugins/kotlin/completion/testData/smart/propertyDelegate/ExtensionSubstitution1.kt
index 33b017012eb3..25b220fd5af8 100644
--- a/plugins/kotlin/completion/testData/smart/propertyDelegate/ExtensionSubstitution1.kt
+++ b/plugins/kotlin/completion/testData/smart/propertyDelegate/ExtensionSubstitution1.kt
@@ -19,3 +19,5 @@ class C {
 // EXIST: { itemText: "createProperty", typeText: "Property<C, TValue>" }
 // EXIST: { itemText: "Property", tailText: "(owner: C, value: TValue) (<root>)" }
 // EXIST: { itemText:"Property.create", tailText:"(owner: C, value: TValue) (<root>)", typeText:"Property<C, TValue>" }
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/propertyDelegate/ExtensionSubstitution2.kt b/plugins/kotlin/completion/testData/smart/propertyDelegate/ExtensionSubstitution2.kt
index 1b000a73a480..d40e4b07072a 100644
--- a/plugins/kotlin/completion/testData/smart/propertyDelegate/ExtensionSubstitution2.kt
+++ b/plugins/kotlin/completion/testData/smart/propertyDelegate/ExtensionSubstitution2.kt
@@ -14,3 +14,5 @@ class C {
 
 // EXIST: { itemText: "createProperty", typeText: "Property<C, Int>" }
 // EXIST: { itemText: "Property", tailText: "(owner: C, value: Int) (<root>)" }
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/propertyDelegate/ExtensionSubstitution3.kt b/plugins/kotlin/completion/testData/smart/propertyDelegate/ExtensionSubstitution3.kt
index 169b9d3eee3d..0616a5e130ae 100644
--- a/plugins/kotlin/completion/testData/smart/propertyDelegate/ExtensionSubstitution3.kt
+++ b/plugins/kotlin/completion/testData/smart/propertyDelegate/ExtensionSubstitution3.kt
@@ -18,3 +18,5 @@ class C {
 
 // EXIST: { itemText: "createProperty", typeText: "Property<C, TValue4>" }
 // EXIST: { itemText: "Property", tailText: "(owner: C, value: TValue1) (<root>)" }
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/propertyDelegate/ExtensionSubstitution4.kt b/plugins/kotlin/completion/testData/smart/propertyDelegate/ExtensionSubstitution4.kt
index 7e29bf96a2b4..fa769b242e6a 100644
--- a/plugins/kotlin/completion/testData/smart/propertyDelegate/ExtensionSubstitution4.kt
+++ b/plugins/kotlin/completion/testData/smart/propertyDelegate/ExtensionSubstitution4.kt
@@ -18,3 +18,5 @@ class C {
 
 // EXIST: { itemText: "createProperty", typeText: "Property<C, Int>" }
 // EXIST: { itemText: "Property", tailText: "(owner: C, value: Int) (<root>)" }
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/propertyDelegate/ExtensionVal.kt b/plugins/kotlin/completion/testData/smart/propertyDelegate/ExtensionVal.kt
index 6002bd09fc2d..3a2a8e666a14 100644
--- a/plugins/kotlin/completion/testData/smart/propertyDelegate/ExtensionVal.kt
+++ b/plugins/kotlin/completion/testData/smart/propertyDelegate/ExtensionVal.kt
@@ -44,3 +44,5 @@ val C.property by <caret>
 // EXIST: Y1
 // ABSENT: Y2
 // EXIST: Y3
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/propertyDelegate/ExtensionVar.kt b/plugins/kotlin/completion/testData/smart/propertyDelegate/ExtensionVar.kt
index 75527310979e..50d9ed7f2f2d 100644
--- a/plugins/kotlin/completion/testData/smart/propertyDelegate/ExtensionVar.kt
+++ b/plugins/kotlin/completion/testData/smart/propertyDelegate/ExtensionVar.kt
@@ -47,3 +47,5 @@ var C.property by <caret>
 // ABSENT: X3
 // EXIST: X4
 // ABSENT: X5
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/propertyDelegate/GenericOperator.kt b/plugins/kotlin/completion/testData/smart/propertyDelegate/GenericOperator.kt
index ba66b5aadc5a..828ec6221504 100644
--- a/plugins/kotlin/completion/testData/smart/propertyDelegate/GenericOperator.kt
+++ b/plugins/kotlin/completion/testData/smart/propertyDelegate/GenericOperator.kt
@@ -8,3 +8,5 @@ class C {
 
 // EXIST: lazy
 // EXIST: listOf
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/propertyDelegate/GenericVal.kt b/plugins/kotlin/completion/testData/smart/propertyDelegate/GenericVal.kt
index a95a5958ebef..41e8b1cf7a2c 100644
--- a/plugins/kotlin/completion/testData/smart/propertyDelegate/GenericVal.kt
+++ b/plugins/kotlin/completion/testData/smart/propertyDelegate/GenericVal.kt
@@ -7,4 +7,5 @@ class X {
 val <T> List<T>.property: T by <caret>
 
 // EXIST: lazy
-// EXIST: X
\ No newline at end of file
+// EXIST: X
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/propertyDelegate/GenericVar.kt b/plugins/kotlin/completion/testData/smart/propertyDelegate/GenericVar.kt
index 590f240fdc99..10a7f73e779c 100644
--- a/plugins/kotlin/completion/testData/smart/propertyDelegate/GenericVar.kt
+++ b/plugins/kotlin/completion/testData/smart/propertyDelegate/GenericVar.kt
@@ -7,4 +7,5 @@ class X {
 
 var <T> List<T>.property: T by <caret>
 
-// EXIST: X
\ No newline at end of file
+// EXIST: X
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/propertyDelegate/NonConflictingSubstitutors.kt b/plugins/kotlin/completion/testData/smart/propertyDelegate/NonConflictingSubstitutors.kt
index 1aaaaf102fab..7b0ad27eb421 100644
--- a/plugins/kotlin/completion/testData/smart/propertyDelegate/NonConflictingSubstitutors.kt
+++ b/plugins/kotlin/completion/testData/smart/propertyDelegate/NonConflictingSubstitutors.kt
@@ -9,3 +9,5 @@ class C<T> {
 }
 
 // EXIST: { itemText: "X", tailText: "(t: C<T>) (<root>)" }
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/propertyDelegate/Order.kt b/plugins/kotlin/completion/testData/smart/propertyDelegate/Order.kt
index 3b3ab10b892f..8b40c0d6227a 100644
--- a/plugins/kotlin/completion/testData/smart/propertyDelegate/Order.kt
+++ b/plugins/kotlin/completion/testData/smart/propertyDelegate/Order.kt
@@ -14,3 +14,5 @@ class C {
 // EXIST: { itemText: "Delegates.vetoable", tailText:"(initialValue: T, crossinline onChange: (KProperty<*>, T, T) -> Boolean) (kotlin.properties)", typeText: "ReadWriteProperty<Any?, T>", attributes:"" }
 // EXIST: lazy
 // EXIST: X
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/propertyDelegate/OverrideVal.kt b/plugins/kotlin/completion/testData/smart/propertyDelegate/OverrideVal.kt
index 1d208ae14c98..540a6d7c0d5c 100644
--- a/plugins/kotlin/completion/testData/smart/propertyDelegate/OverrideVal.kt
+++ b/plugins/kotlin/completion/testData/smart/propertyDelegate/OverrideVal.kt
@@ -28,3 +28,5 @@ class X3 {
 // EXIST: X1
 // ABSENT: X2
 // EXIST: X3
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/propertyDelegate/TopLevelVal.kt b/plugins/kotlin/completion/testData/smart/propertyDelegate/TopLevelVal.kt
index 3c4d11d6657a..5df253ccc0c5 100644
--- a/plugins/kotlin/completion/testData/smart/propertyDelegate/TopLevelVal.kt
+++ b/plugins/kotlin/completion/testData/smart/propertyDelegate/TopLevelVal.kt
@@ -14,3 +14,5 @@ val property by <caret>
 // EXIST: X
 // EXIST: Y
 // ABSENT: Z
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/propertyDelegate/ValInClass.kt b/plugins/kotlin/completion/testData/smart/propertyDelegate/ValInClass.kt
index f8891ad838cd..756f301f4c29 100644
--- a/plugins/kotlin/completion/testData/smart/propertyDelegate/ValInClass.kt
+++ b/plugins/kotlin/completion/testData/smart/propertyDelegate/ValInClass.kt
@@ -53,3 +53,5 @@ class C {
 // ABSENT: Y3
 
 // EXIST: { itemText:"X1.create", tailText:"() (<root>)", typeText:"X1", attributes:"" }
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/propertyDelegate/ValInGenericClass1.kt b/plugins/kotlin/completion/testData/smart/propertyDelegate/ValInGenericClass1.kt
index aaf06219ddc0..9d77472e5c7d 100644
--- a/plugins/kotlin/completion/testData/smart/propertyDelegate/ValInGenericClass1.kt
+++ b/plugins/kotlin/completion/testData/smart/propertyDelegate/ValInGenericClass1.kt
@@ -10,3 +10,5 @@ class C<T> {
 
 // EXIST: lazy
 // EXIST: { itemText: "X", tailText: "(t: T) (<root>)" }
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/propertyDelegate/ValInGenericClass2.kt b/plugins/kotlin/completion/testData/smart/propertyDelegate/ValInGenericClass2.kt
index 4dcdfe2967ae..56e7aacfc290 100644
--- a/plugins/kotlin/completion/testData/smart/propertyDelegate/ValInGenericClass2.kt
+++ b/plugins/kotlin/completion/testData/smart/propertyDelegate/ValInGenericClass2.kt
@@ -10,3 +10,5 @@ class C<T> {
 
 // EXIST: lazy
 // EXIST: { itemText: "X", tailText: "(t: T) (<root>)" }
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/propertyDelegate/ValInGenericClass3.kt b/plugins/kotlin/completion/testData/smart/propertyDelegate/ValInGenericClass3.kt
index 376570c687d5..963e5db1a78c 100644
--- a/plugins/kotlin/completion/testData/smart/propertyDelegate/ValInGenericClass3.kt
+++ b/plugins/kotlin/completion/testData/smart/propertyDelegate/ValInGenericClass3.kt
@@ -10,3 +10,5 @@ class C<T1, T2> {
 
 // EXIST: lazy
 // ABSENT: X
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/propertyDelegate/VarInClass.kt b/plugins/kotlin/completion/testData/smart/propertyDelegate/VarInClass.kt
index ee8f513e2fb1..aa0ec1609ac8 100644
--- a/plugins/kotlin/completion/testData/smart/propertyDelegate/VarInClass.kt
+++ b/plugins/kotlin/completion/testData/smart/propertyDelegate/VarInClass.kt
@@ -59,3 +59,5 @@ class C {
 // ABSENT: X5
 // EXIST: Y1
 // ABSENT: Y2
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/propertyDelegate/VarInGenericClass.kt b/plugins/kotlin/completion/testData/smart/propertyDelegate/VarInGenericClass.kt
index 0f962e1bf67e..64c525efc745 100644
--- a/plugins/kotlin/completion/testData/smart/propertyDelegate/VarInGenericClass.kt
+++ b/plugins/kotlin/completion/testData/smart/propertyDelegate/VarInGenericClass.kt
@@ -10,3 +10,5 @@ class C<T> {
 }
 
 // EXIST: { itemText: "X", tailText: "(t: T) (<root>)" }
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/smartCasts/AutoNotNullType.kt b/plugins/kotlin/completion/testData/smart/smartCasts/AutoNotNullType.kt
index 80d586a83add..4d989962b543 100644
--- a/plugins/kotlin/completion/testData/smart/smartCasts/AutoNotNullType.kt
+++ b/plugins/kotlin/completion/testData/smart/smartCasts/AutoNotNullType.kt
@@ -5,3 +5,5 @@ fun f(p: String?) {
 }
 
 // EXIST: { itemText:"p" }
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/smartCasts/AutoNotNullTypeForConstructorParameter.kt b/plugins/kotlin/completion/testData/smart/smartCasts/AutoNotNullTypeForConstructorParameter.kt
index 7aafd1b09724..9fb68ee7a6b1 100644
--- a/plugins/kotlin/completion/testData/smart/smartCasts/AutoNotNullTypeForConstructorParameter.kt
+++ b/plugins/kotlin/completion/testData/smart/smartCasts/AutoNotNullTypeForConstructorParameter.kt
@@ -9,3 +9,5 @@ class Foo(val s: String?) {
 fun foo(s: String){}
 
 // EXIST: { itemText:"s" }
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/smartCasts/AutoNotNullTypeWithQualifier.kt b/plugins/kotlin/completion/testData/smart/smartCasts/AutoNotNullTypeWithQualifier.kt
index b72df48506d7..adb02b093bd3 100644
--- a/plugins/kotlin/completion/testData/smart/smartCasts/AutoNotNullTypeWithQualifier.kt
+++ b/plugins/kotlin/completion/testData/smart/smartCasts/AutoNotNullTypeWithQualifier.kt
@@ -10,3 +10,5 @@ class Foo(val prop1 : String?, val prop2 : String?){
 // ABSENT: { itemText:"prop2" }
 // EXIST: { itemText:"!! prop2" }
 // EXIST: { itemText:"?: prop2" }
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/smartCasts/CheckCorrectThis.kt b/plugins/kotlin/completion/testData/smart/smartCasts/CheckCorrectThis.kt
index 3ad2bcdce8b1..f4c8d5b49c79 100644
--- a/plugins/kotlin/completion/testData/smart/smartCasts/CheckCorrectThis.kt
+++ b/plugins/kotlin/completion/testData/smart/smartCasts/CheckCorrectThis.kt
@@ -18,4 +18,5 @@ fun f(s: String){}
 // EXIST: v2
 // EXIST: v3
 // EXIST: v4
-// EXIST: c
\ No newline at end of file
+// EXIST: c
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/smartCasts/SmartCastThisType2.kt b/plugins/kotlin/completion/testData/smart/smartCasts/SmartCastThisType2.kt
index 0eea7837076b..d6a9019b618e 100644
--- a/plugins/kotlin/completion/testData/smart/smartCasts/SmartCastThisType2.kt
+++ b/plugins/kotlin/completion/testData/smart/smartCasts/SmartCastThisType2.kt
@@ -14,3 +14,5 @@ class Bar : Foo
 // EXIST: { lookupString: "this@g" }
 // EXIST: { lookupString: "this@f" }
 // ABSENT: { lookupString: "this@Foo" }
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/smartCasts/SmartCastType.kt b/plugins/kotlin/completion/testData/smart/smartCasts/SmartCastType.kt
index e9a00e99b5ce..70213e446288 100644
--- a/plugins/kotlin/completion/testData/smart/smartCasts/SmartCastType.kt
+++ b/plugins/kotlin/completion/testData/smart/smartCasts/SmartCastType.kt
@@ -5,3 +5,5 @@ fun f(p: Any) {
 }
 
 // EXIST: { itemText:"p" }
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/smartCasts/SmartCastTypeWithQualifier.kt b/plugins/kotlin/completion/testData/smart/smartCasts/SmartCastTypeWithQualifier.kt
index 7a55a376edb6..b7430eb038d0 100644
--- a/plugins/kotlin/completion/testData/smart/smartCasts/SmartCastTypeWithQualifier.kt
+++ b/plugins/kotlin/completion/testData/smart/smartCasts/SmartCastTypeWithQualifier.kt
@@ -8,3 +8,5 @@ class Foo(val prop1 : Any, val prop2 : Any){
 
 // EXIST: { itemText:"prop1" }
 // ABSENT: { itemText:"prop2" }
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/this/NullableThis.kt b/plugins/kotlin/completion/testData/smart/this/NullableThis.kt
index 50696961bf50..f5ca15a644fa 100644
--- a/plugins/kotlin/completion/testData/smart/this/NullableThis.kt
+++ b/plugins/kotlin/completion/testData/smart/this/NullableThis.kt
@@ -4,3 +4,5 @@ fun String?.foo(){
 
 // EXIST: { lookupString:"this", itemText: "!! this", typeText:"String?" }
 // EXIST: { lookupString:"this", itemText: "?: this", typeText:"String?" }
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/this/QualifiedThis.kt b/plugins/kotlin/completion/testData/smart/this/QualifiedThis.kt
index 4917e870cec1..eef37722a58e 100644
--- a/plugins/kotlin/completion/testData/smart/this/QualifiedThis.kt
+++ b/plugins/kotlin/completion/testData/smart/this/QualifiedThis.kt
@@ -11,3 +11,5 @@ class Outer {
 // 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
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/this/This.kt b/plugins/kotlin/completion/testData/smart/this/This.kt
index c1e6ecda7ad4..a0b44bad963a 100644
--- a/plugins/kotlin/completion/testData/smart/this/This.kt
+++ b/plugins/kotlin/completion/testData/smart/this/This.kt
@@ -29,3 +29,5 @@ fun takeHandler4(handler: Any.() -> 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"
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/vararg/1.kt b/plugins/kotlin/completion/testData/smart/vararg/1.kt
index 6d6635ed4832..963e5e93536c 100644
--- a/plugins/kotlin/completion/testData/smart/vararg/1.kt
+++ b/plugins/kotlin/completion/testData/smart/vararg/1.kt
@@ -6,3 +6,4 @@ fun bar(s: String, arr: Array<String>){
 
 // EXIST: s
 // EXIST: { lookupString: "arr", itemText: "*arr" }
+// IGNORE_K2
\ No newline at end of file
diff --git a/plugins/kotlin/completion/testData/smart/vararg/2.kt b/plugins/kotlin/completion/testData/smart/vararg/2.kt
index 20b6184f12f3..a91f472c61d4 100644
--- a/plugins/kotlin/completion/testData/smart/vararg/2.kt
+++ b/plugins/kotlin/completion/testData/smart/vararg/2.kt
@@ -7,3 +7,4 @@ fun bar(s: String, arr: Array<String>){
 // EXIST: s
 // ABSENT: { itemText: "arr" }
 // EXIST: { lookupString: "arr", itemText: "*arr" }
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/vararg/4.kt b/plugins/kotlin/completion/testData/smart/vararg/4.kt
index 7d50007e750b..a68bbdfecdf1 100644
--- a/plugins/kotlin/completion/testData/smart/vararg/4.kt
+++ b/plugins/kotlin/completion/testData/smart/vararg/4.kt
@@ -7,3 +7,4 @@ fun bar(s: String, arr: Array<String>){
 // EXIST: s
 // EXIST: { lookupString: "arr", itemText: "arr" }
 // EXIST: { lookupString: "arr", itemText: "*arr" }
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/vararg/SecondVararg.kt b/plugins/kotlin/completion/testData/smart/vararg/SecondVararg.kt
index 29128135c3e6..9b22b58591ba 100644
--- a/plugins/kotlin/completion/testData/smart/vararg/SecondVararg.kt
+++ b/plugins/kotlin/completion/testData/smart/vararg/SecondVararg.kt
@@ -8,3 +8,4 @@ fun bar(c: Char, pInt: Int) {
 // ABSENT: { lookupString: "charArrayOf", itemText: "*charArrayOf" }
 // EXIST: pInt
 // EXIST: { lookupString: "intArrayOf", itemText: "*intArrayOf" }
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/whenEntry/2.kt b/plugins/kotlin/completion/testData/smart/whenEntry/2.kt
index 90993386785e..2cf079e7b2c1 100644
--- a/plugins/kotlin/completion/testData/smart/whenEntry/2.kt
+++ b/plugins/kotlin/completion/testData/smart/whenEntry/2.kt
@@ -14,3 +14,5 @@ fun foo(e: E) {
 // EXIST: { lookupString:"B", itemText:"E.B" }
 // EXIST: { lookupString:"C", itemText:"E.C" }
 // ABSENT: else
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/whenEntry/3.kt b/plugins/kotlin/completion/testData/smart/whenEntry/3.kt
index f5b3414c8eb7..75bbaf9896de 100644
--- a/plugins/kotlin/completion/testData/smart/whenEntry/3.kt
+++ b/plugins/kotlin/completion/testData/smart/whenEntry/3.kt
@@ -15,3 +15,5 @@ fun foo(e: E) {
 // EXIST: { lookupString:"B", itemText:"E.B" }
 // EXIST: { lookupString:"C", itemText:"E.C" }
 // EXIST: {"lookupString":"else","tailText":" ->","itemText":"else"}
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/whenEntry/5.kt b/plugins/kotlin/completion/testData/smart/whenEntry/5.kt
index 842b3ada2d25..a8487457e153 100644
--- a/plugins/kotlin/completion/testData/smart/whenEntry/5.kt
+++ b/plugins/kotlin/completion/testData/smart/whenEntry/5.kt
@@ -15,3 +15,5 @@ fun foo(e: E) {
 // EXIST: B
 // EXIST: C
 // ABSENT: else
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/whenEntry/6.kt b/plugins/kotlin/completion/testData/smart/whenEntry/6.kt
index a05fe7dbeddb..826fe99b43bc 100644
--- a/plugins/kotlin/completion/testData/smart/whenEntry/6.kt
+++ b/plugins/kotlin/completion/testData/smart/whenEntry/6.kt
@@ -16,3 +16,5 @@ fun foo(e: E?) {
 // EXIST: C
 // EXIST: null
 // EXIST: {"lookupString":"else","tailText":" ->","itemText":"else"}
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/whenEntry/8.kt b/plugins/kotlin/completion/testData/smart/whenEntry/8.kt
index a0d88c6d7e96..50f46a6d407b 100644
--- a/plugins/kotlin/completion/testData/smart/whenEntry/8.kt
+++ b/plugins/kotlin/completion/testData/smart/whenEntry/8.kt
@@ -10,3 +10,5 @@ fun foo(e: ElementType) {
 // ABSENT: FIELD
 // EXIST: TYPE
 // ABSENT: e
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/whenEntry/9.kt b/plugins/kotlin/completion/testData/smart/whenEntry/9.kt
index 139bdbad33ba..05378400496d 100644
--- a/plugins/kotlin/completion/testData/smart/whenEntry/9.kt
+++ b/plugins/kotlin/completion/testData/smart/whenEntry/9.kt
@@ -6,3 +6,5 @@ fun foo(p1: String, p2: String) {
 
 // ABSENT: p1
 // EXIST: p2
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/whenEntry/WhenWithNoSubject1.kt b/plugins/kotlin/completion/testData/smart/whenEntry/WhenWithNoSubject1.kt
index f4a1ffe54490..41646877fe69 100644
--- a/plugins/kotlin/completion/testData/smart/whenEntry/WhenWithNoSubject1.kt
+++ b/plugins/kotlin/completion/testData/smart/whenEntry/WhenWithNoSubject1.kt
@@ -9,3 +9,5 @@ fun foo(b1: Boolean, b2: Boolean) {
 // ABSENT: true
 // ABSENT: false
 // ABSENT: else
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/whenEntry/WhenWithNoSubject2.kt b/plugins/kotlin/completion/testData/smart/whenEntry/WhenWithNoSubject2.kt
index 6f2c0bc4d606..d203c8f2b6df 100644
--- a/plugins/kotlin/completion/testData/smart/whenEntry/WhenWithNoSubject2.kt
+++ b/plugins/kotlin/completion/testData/smart/whenEntry/WhenWithNoSubject2.kt
@@ -6,3 +6,5 @@ fun foo(s: String) {
 
 // EXIST: equals
 // ABSENT: else
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smart/whenEntry/WhenWithSubjectTrueFalse.kt b/plugins/kotlin/completion/testData/smart/whenEntry/WhenWithSubjectTrueFalse.kt
index 8e358dbba4b0..dd9d2dc63d95 100644
--- a/plugins/kotlin/completion/testData/smart/whenEntry/WhenWithSubjectTrueFalse.kt
+++ b/plugins/kotlin/completion/testData/smart/whenEntry/WhenWithSubjectTrueFalse.kt
@@ -7,3 +7,5 @@ fun foo(b: Boolean?) {
 // EXIST: true
 // EXIST: false
 // EXIST: null
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smartMultiFile/AnonymousObjectGenericJava/AnonymousObjectGenericJava.kt b/plugins/kotlin/completion/testData/smartMultiFile/AnonymousObjectGenericJava/AnonymousObjectGenericJava.kt
index af6231936f52..8fe49ca5ea46 100644
--- a/plugins/kotlin/completion/testData/smartMultiFile/AnonymousObjectGenericJava/AnonymousObjectGenericJava.kt
+++ b/plugins/kotlin/completion/testData/smartMultiFile/AnonymousObjectGenericJava/AnonymousObjectGenericJava.kt
@@ -3,3 +3,5 @@ fun f(){
 }
 
 // EXIST: { itemText: "object : Comparator<String?>{...}" }
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smartMultiFile/CallableReferenceNotImported/CallableReferenceNotImported.kt b/plugins/kotlin/completion/testData/smartMultiFile/CallableReferenceNotImported/CallableReferenceNotImported.kt
index 6edf66502fc7..4a1232300282 100644
--- a/plugins/kotlin/completion/testData/smartMultiFile/CallableReferenceNotImported/CallableReferenceNotImported.kt
+++ b/plugins/kotlin/completion/testData/smartMultiFile/CallableReferenceNotImported/CallableReferenceNotImported.kt
@@ -8,3 +8,5 @@ fun bar(p: String.() -> Unit) { }
 
 // EXIST: topLevelFun
 // ABSENT: extFun
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smartMultiFile/GenericInheritors1/GenericInheritors1.kt b/plugins/kotlin/completion/testData/smartMultiFile/GenericInheritors1/GenericInheritors1.kt
index 5e4bdbc9ea07..2ea26d951db4 100644
--- a/plugins/kotlin/completion/testData/smartMultiFile/GenericInheritors1/GenericInheritors1.kt
+++ b/plugins/kotlin/completion/testData/smartMultiFile/GenericInheritors1/GenericInheritors1.kt
@@ -13,3 +13,5 @@ fun foo(): KotlinInterface<I1, I2> {
 // EXIST: { lookupString: "KotlinInheritor6", itemText: "KotlinInheritor6", tailText: "() (p)" }
 // EXIST: { lookupString: "JavaInheritor1", itemText: "JavaInheritor1", tailText: "() (<root>)" }
 // ABSENT: JavaInheritor2
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smartMultiFile/GenericInheritors2/GenericInheritors2.kt b/plugins/kotlin/completion/testData/smartMultiFile/GenericInheritors2/GenericInheritors2.kt
index 7e8ebe5ece4c..06d7f8c10f6c 100644
--- a/plugins/kotlin/completion/testData/smartMultiFile/GenericInheritors2/GenericInheritors2.kt
+++ b/plugins/kotlin/completion/testData/smartMultiFile/GenericInheritors2/GenericInheritors2.kt
@@ -6,3 +6,5 @@ fun foo(): KotlinInterface<I1, I1> {
 
 // EXIST: { lookupString: "object", itemText: "object : KotlinInterface<I1, I1>{...}" }
 // EXIST: { lookupString: "KotlinInheritor", itemText: "KotlinInheritor", tailText: "() (p)" }
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smartMultiFile/GenericInheritors3/GenericInheritors3.kt b/plugins/kotlin/completion/testData/smartMultiFile/GenericInheritors3/GenericInheritors3.kt
index 4bed4a058a38..f512306d59d5 100644
--- a/plugins/kotlin/completion/testData/smartMultiFile/GenericInheritors3/GenericInheritors3.kt
+++ b/plugins/kotlin/completion/testData/smartMultiFile/GenericInheritors3/GenericInheritors3.kt
@@ -6,3 +6,5 @@ fun foo(): KotlinInterface<I1, I2> {
 
 // EXIST: { lookupString: "object", itemText: "object : KotlinInterface<I1, I2>{...}" }
 // ABSENT: KotlinInheritor
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smartMultiFile/GenericInheritors4/GenericInheritors4.kt b/plugins/kotlin/completion/testData/smartMultiFile/GenericInheritors4/GenericInheritors4.kt
index efb0fa2aec8c..500f970cba09 100644
--- a/plugins/kotlin/completion/testData/smartMultiFile/GenericInheritors4/GenericInheritors4.kt
+++ b/plugins/kotlin/completion/testData/smartMultiFile/GenericInheritors4/GenericInheritors4.kt
@@ -6,3 +6,5 @@ fun foo(): KotlinInterface<I1<I2>> {
 
 // EXIST: { lookupString: "object", itemText: "object : KotlinInterface<I1<I2>>{...}" }
 // EXIST: { lookupString: "KotlinInheritor", itemText: "KotlinInheritor", tailText: "() (p)" }
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smartMultiFile/Inheritors/Inheritors.kt b/plugins/kotlin/completion/testData/smartMultiFile/Inheritors/Inheritors.kt
index acdce1383cbc..42aab3b779f0 100644
--- a/plugins/kotlin/completion/testData/smartMultiFile/Inheritors/Inheritors.kt
+++ b/plugins/kotlin/completion/testData/smartMultiFile/Inheritors/Inheritors.kt
@@ -13,3 +13,5 @@ fun foo(): p2.KotlinInterface {
 // EXIST: { lookupString: "JavaInheritor2", itemText: "JavaInheritor2", tailText: "(...) (<root>)" }
 // ABSENT: JavaInheritor3
 // EXIST: { lookupString: "ObjectInheritor", itemText: "ObjectInheritor", tailText: " (p2)" }
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smartMultiFile/InheritorsAndMultipleExpectedTypes/InheritorsAndMultipleExpectedTypes.kt b/plugins/kotlin/completion/testData/smartMultiFile/InheritorsAndMultipleExpectedTypes/InheritorsAndMultipleExpectedTypes.kt
index fe0c5bdc2c7e..1eb23c6aa0eb 100644
--- a/plugins/kotlin/completion/testData/smartMultiFile/InheritorsAndMultipleExpectedTypes/InheritorsAndMultipleExpectedTypes.kt
+++ b/plugins/kotlin/completion/testData/smartMultiFile/InheritorsAndMultipleExpectedTypes/InheritorsAndMultipleExpectedTypes.kt
@@ -9,3 +9,5 @@ fun bar() {
 // EXIST: { lookupString: "C2", itemText: "C2" }
 // EXIST: { lookupString: "C3", itemText: "C3" }
 // NOTHING_ELSE
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smartMultiFile/KT_8751/KT_8751.kt b/plugins/kotlin/completion/testData/smartMultiFile/KT_8751/KT_8751.kt
index aec448edc1f9..fdbb9dddcb73 100644
--- a/plugins/kotlin/completion/testData/smartMultiFile/KT_8751/KT_8751.kt
+++ b/plugins/kotlin/completion/testData/smartMultiFile/KT_8751/KT_8751.kt
@@ -3,3 +3,5 @@ fun foo(javaClass: JavaClass, p: String) {
 }
 
 // EXIST: p
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smartMultiFile/KT_8751_2/KT_8751_2.kt b/plugins/kotlin/completion/testData/smartMultiFile/KT_8751_2/KT_8751_2.kt
index f28035288c9f..5c5c945950fc 100644
--- a/plugins/kotlin/completion/testData/smartMultiFile/KT_8751_2/KT_8751_2.kt
+++ b/plugins/kotlin/completion/testData/smartMultiFile/KT_8751_2/KT_8751_2.kt
@@ -6,3 +6,5 @@ fun foo(c: KotlinClass, l: L<String>) {
 }
 
 // EXIST: l
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smartMultiFile/NestedClassAfterAs/NestedClassAfterAs.kt b/plugins/kotlin/completion/testData/smartMultiFile/NestedClassAfterAs/NestedClassAfterAs.kt
index c811495ef3b9..4df1ec04c811 100644
--- a/plugins/kotlin/completion/testData/smartMultiFile/NestedClassAfterAs/NestedClassAfterAs.kt
+++ b/plugins/kotlin/completion/testData/smartMultiFile/NestedClassAfterAs/NestedClassAfterAs.kt
@@ -11,3 +11,5 @@ fun f(p: KotlinClass.Nested){}
 
 // EXIST: { lookupString: "Nested", allLookupStrings: "JavaClass, Nested", itemText: "JavaClass.Nested", tailText: " (<root>)" }
 // EXIST: { lookupString: "Nested", allLookupStrings: "KotlinClass, Nested", itemText: "KotlinClass.Nested", tailText: " (<root>)" }
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smartMultiFile/NoObjectDuplication/NoObjectDuplication.kt b/plugins/kotlin/completion/testData/smartMultiFile/NoObjectDuplication/NoObjectDuplication.kt
index 38fb0ba70ac2..b1227f407450 100644
--- a/plugins/kotlin/completion/testData/smartMultiFile/NoObjectDuplication/NoObjectDuplication.kt
+++ b/plugins/kotlin/completion/testData/smartMultiFile/NoObjectDuplication/NoObjectDuplication.kt
@@ -4,3 +4,5 @@ fun foo(): T = <caret>
 // EXIST: { lookupString: "object", itemText: "object : T{...}" }
 // EXIST: { lookupString: "OO", itemText: "OO", tailText: " (<root>)" }
 // NOTHING_ELSE
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smartMultiFile/NotImportedContains/NotImportedContains.kt b/plugins/kotlin/completion/testData/smartMultiFile/NotImportedContains/NotImportedContains.kt
index 77877baeca5a..a14c6b525ff4 100644
--- a/plugins/kotlin/completion/testData/smartMultiFile/NotImportedContains/NotImportedContains.kt
+++ b/plugins/kotlin/completion/testData/smartMultiFile/NotImportedContains/NotImportedContains.kt
@@ -9,3 +9,5 @@ fun foo(s: String, x: X, y: Y, z: Z) {
 // EXIST: x
 // EXIST: y
 // ABSENT: z
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smartMultiFile/NotImportedGetValue/NotImportedGetValue.kt b/plugins/kotlin/completion/testData/smartMultiFile/NotImportedGetValue/NotImportedGetValue.kt
index 1e77bb99d29e..633f3fb2484f 100644
--- a/plugins/kotlin/completion/testData/smartMultiFile/NotImportedGetValue/NotImportedGetValue.kt
+++ b/plugins/kotlin/completion/testData/smartMultiFile/NotImportedGetValue/NotImportedGetValue.kt
@@ -24,3 +24,5 @@ class C {
 // EXIST: createY1
 // ABSENT: createY2
 // EXIST: createY3
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smartMultiFile/StaticMembers1/StaticMembers1.kt b/plugins/kotlin/completion/testData/smartMultiFile/StaticMembers1/StaticMembers1.kt
index 75f6d8777d09..32b3bc195273 100644
--- a/plugins/kotlin/completion/testData/smartMultiFile/StaticMembers1/StaticMembers1.kt
+++ b/plugins/kotlin/completion/testData/smartMultiFile/StaticMembers1/StaticMembers1.kt
@@ -22,3 +22,5 @@ fun foo(): C {
 // ABSENT: { itemText: "JavaClass1.h" }
 // ABSENT: { itemText: "JavaClass2.f" }
 // ABSENT: { itemText: "JavaClass2.g" }
+
+// IGNORE_K2
diff --git a/plugins/kotlin/completion/testData/smartMultiFile/StaticMembers2/StaticMembers2.kt b/plugins/kotlin/completion/testData/smartMultiFile/StaticMembers2/StaticMembers2.kt
index f423dfd47f42..51cfed3f7c78 100644
--- a/plugins/kotlin/completion/testData/smartMultiFile/StaticMembers2/StaticMembers2.kt
+++ b/plugins/kotlin/completion/testData/smartMultiFile/StaticMembers2/StaticMembers2.kt
@@ -22,3 +22,5 @@ fun foo(): C {
 // ABSENT: { itemText: "JavaClass1.h" }
 // EXIST: { itemText: "JavaClass2.f" }
 // ABSENT: { itemText: "JavaClass2.g" }
+
+// IGNORE_K2