From 394df94474194bce7a5c82f350ada9d7c869b87c Mon Sep 17 00:00:00 2001
From: Dmitry Gridin <dmitry.gridin@jetbrains.com>
Date: Thu, 16 Dec 2021 19:00:41 +0700
Subject: [PATCH] [kotlin] tests: move indentationOnNewline to
 editor/enterHandler

GitOrigin-RevId: d135e3afaa273d5a821787d5adb6cae0157c6c86
---
 .../kotlin/testGenerator/GenerateTests.kt     |  14 +-
 .../TypingIndentationTestBaseGenerated.java   | 834 +++++++++---------
 .../enterHandler}/AfterCatch.after.kt         |   0
 .../enterHandler}/AfterCatch.kt               |   0
 .../AfterClassNameBeforeFun.after.kt          |   0
 .../enterHandler}/AfterClassNameBeforeFun.kt  |   0
 .../AfterExtensionPropertyGetter.after.kt     |   0
 .../AfterExtensionPropertyGetter.kt           |   0
 .../AfterExtensionPropertySetter.after.kt     |   0
 .../AfterExtensionPropertySetter.kt           |   0
 .../enterHandler}/AfterFinally.after.kt       |   0
 .../enterHandler}/AfterFinally.kt             |   0
 .../enterHandler}/AfterImport.after.kt        |   0
 .../enterHandler}/AfterImport.kt              |   0
 .../AfterPropertyGetter.after.kt              |   0
 .../enterHandler}/AfterPropertyGetter.kt      |   0
 .../AfterPropertySetter.after.kt              |   0
 .../enterHandler}/AfterPropertySetter.kt      |   0
 .../enterHandler}/AfterTry.after.kt           |   0
 .../enterHandler}/AfterTry.kt                 |   0
 .../enterHandler}/Annotation.after.kt         |   0
 .../enterHandler}/Annotation.kt               |   0
 .../AnnotationInDeclaration.after.kt          |   0
 .../enterHandler}/AnnotationInDeclaration.kt  |   0
 .../ArgumentListNormalIndent.after.inv.kt     |   0
 .../ArgumentListNormalIndent.after.kt         |   0
 .../enterHandler}/ArgumentListNormalIndent.kt |   0
 .../AutoIndentInWhenClause.after.kt           |   0
 .../enterHandler}/AutoIndentInWhenClause.kt   |   0
 .../BlockCommentAfterCatch.after.kt           |   0
 .../enterHandler}/BlockCommentAfterCatch.kt   |   0
 .../ConsecutiveCallsAfterDot.after.kt         |   0
 .../enterHandler}/ConsecutiveCallsAfterDot.kt |   0
 .../ConsecutiveCallsInSaeCallsMiddle.after.kt |   0
 .../ConsecutiveCallsInSaeCallsMiddle.kt       |   0
 .../ConsecutiveCallsInSafeCallsEnd.after.kt   |   0
 .../ConsecutiveCallsInSafeCallsEnd.kt         |   0
 ...EnterInFunctionWithExpressionBody.after.kt |   0
 .../EnterInFunctionWithExpressionBody.kt      |   0
 .../EnterInMultiDeclaration.after.kt          |   0
 .../enterHandler}/EnterInMultiDeclaration.kt  |   0
 .../EnterInVariableDeclaration.after.kt       |   0
 .../EnterInVariableDeclaration.kt             |   0
 .../EoLCommentAfterCatch.after.kt             |   0
 .../enterHandler}/EoLCommentAfterCatch.kt     |   0
 .../enterHandler}/EoLCommentAfterFor.after.kt |   0
 .../enterHandler}/EoLCommentAfterFor.kt       |   0
 .../enterHandler}/EoLCommentAfterIf.after.kt  |   0
 .../enterHandler}/EoLCommentAfterIf.kt        |   0
 .../enterHandler}/FunctionBlock.after.kt      |   0
 .../enterHandler}/FunctionBlock.kt            |   0
 .../HigherOrderFunction.after.kt              |   0
 .../enterHandler}/HigherOrderFunction.kt      |   0
 .../HigherOrderFunction2.after.inv.kt         |   0
 .../HigherOrderFunction2.after.kt             |   0
 .../enterHandler}/HigherOrderFunction2.kt     |   0
 .../HigherOrderFunction3.after.kt             |   0
 .../enterHandler}/HigherOrderFunction3.kt     |   0
 .../InDelegationListAfterColon.after.inv.kt   |   0
 .../InDelegationListAfterColon.after.kt       |   0
 .../InDelegationListAfterColon.kt             |   0
 .../InDelegationListAfterComma.after.inv.kt   |   0
 .../InDelegationListAfterComma.after.kt       |   0
 .../InDelegationListAfterComma.kt             |   0
 .../InDelegationListNotEmpty.after.inv.kt     |   0
 .../InDelegationListNotEmpty.after.kt         |   0
 .../enterHandler}/InDelegationListNotEmpty.kt |   0
 .../InElseBlockBeforeParenthesis.after.kt     |   0
 .../InElseBlockBeforeParenthesis.kt           |   0
 .../InEnumAfterSemicolon.after.inv.kt         |   0
 .../InEnumAfterSemicolon.after.kt             |   0
 .../enterHandler}/InEnumAfterSemicolon.kt     |   0
 ...EnumInitializerListAfterComma.after.inv.kt |   0
 .../InEnumInitializerListAfterComma.after.kt  |   0
 .../InEnumInitializerListAfterComma.kt        |   0
 ...InEnumInitializerListNotEmpty.after.inv.kt |   0
 .../InEnumInitializerListNotEmpty.after.kt    |   0
 .../InEnumInitializerListNotEmpty.kt          |   0
 .../InIfBlockBeforeParenthesis.after.kt       |   0
 .../InIfBlockBeforeParenthesis.kt             |   0
 .../enterHandler}/InLabmdaAfterArrow.after.kt |   0
 .../enterHandler}/InLabmdaAfterArrow.kt       |   0
 .../InLambdaAfterArrowWithSpaces.after.kt     |   0
 .../InLambdaAfterArrowWithSpaces.kt           |   0
 .../InLambdaBeforeParams.after.kt             |   0
 .../enterHandler}/InLambdaBeforeParams.kt     |   0
 .../InLambdaInsideChainCallSameLine.after.kt  |   0
 .../InLambdaInsideChainCallSameLine.kt        |   0
 ...InsideChainCallSameLineWithSpaces.after.kt |   0
 ...LambdaInsideChainCallSameLineWithSpaces.kt |   0
 ...nLambdaInsideChainCallWithNewLine.after.kt |   0
 .../InLambdaInsideChainCallWithNewLine.kt     |   0
 ...ideChainCallWithNewLineWithSpaces.after.kt |   0
 ...bdaInsideChainCallWithNewLineWithSpaces.kt |   0
 .../InMultilineLambdaAfterArrow.after.kt      |   0
 .../InMultilineLambdaAfterArrow.kt            |   0
 .../IndentBeforeElseWithBlock.after.kt        |   0
 .../IndentBeforeElseWithBlock.kt              |   0
 .../IndentBeforeElseWithoutBlock.after.kt     |   0
 .../IndentBeforeElseWithoutBlock.kt           |   0
 ...NotFinishedVariableEndAfterEquals.after.kt |   0
 ...IndentNotFinishedVariableEndAfterEquals.kt |   0
 ...tOnFinishedVariableEndAfterEquals.after.kt |   0
 .../IndentOnFinishedVariableEndAfterEquals.kt |   0
 .../enterHandler}/KT20783.after.kt            |   0
 .../enterHandler}/KT20783.kt                  |   0
 .../enterHandler}/LambdaInArguments.after.kt  |   0
 .../enterHandler}/LambdaInArguments.kt        |   0
 .../enterHandler}/LambdaInArguments2.after.kt |   0
 .../enterHandler}/LambdaInArguments2.kt       |   0
 .../enterHandler}/LargeFile.after.kt          |   0
 .../enterHandler}/LargeFile.kt                |   0
 .../enterHandler}/LiteralExpression.after.kt  |   0
 .../enterHandler}/LiteralExpression.kt        |   0
 .../enterHandler}/LiteralExpression2.after.kt |   0
 .../enterHandler}/LiteralExpression2.kt       |   0
 .../enterHandler}/LiteralExpression3.after.kt |   0
 .../enterHandler}/LiteralExpression3.kt       |   0
 ...difierListInUnfinishedDeclaration.after.kt |   0
 .../ModifierListInUnfinishedDeclaration.kt    |   0
 .../enterHandler}/NotFirstParameter.after.kt  |   0
 .../enterHandler}/NotFirstParameter.kt        |   0
 .../ReindentOnUnmatchedBrace.after.kt         |   0
 .../enterHandler}/ReindentOnUnmatchedBrace.kt |   0
 .../enterHandler}/ReturnContinue.after.kt     |   0
 .../enterHandler}/ReturnContinue.kt           |   0
 .../enterHandler}/Semicolon.after.kt          |   0
 .../enterHandler}/Semicolon.kt                |   0
 .../enterHandler}/Semicolon2.after.kt         |   0
 .../enterHandler}/Semicolon2.kt               |   0
 ...ignMultilineParametersInCalls.after.inv.kt |   0
 ...ngAlignMultilineParametersInCalls.after.kt |   0
 .../SettingAlignMultilineParametersInCalls.kt |   0
 ...rBetweenOpeningAndClosingBrackets.after.kt |   0
 ...rtEnterBetweenOpeningAndClosingBrackets.kt |   0
 ...etsWithInvertedAlignWhenMultiline.after.kt |   0
 ...gBracketsWithInvertedAlignWhenMultiline.kt |   0
 ...rtEnterWithTabsInMethodParameters.after.kt |   0
 .../SmartEnterWithTabsInMethodParameters.kt   |   0
 ...erWithTabsOnConstructorParameters.after.kt |   0
 ...artEnterWithTabsOnConstructorParameters.kt |   0
 ...ersWithInvertedAlignWhenMultiline.after.kt |   0
 ...arametersWithInvertedAlignWhenMultiline.kt |   0
 ...CommaAndWhitespaceBeforeLineBreak.after.kt |   0
 ...ailingCommaAndWhitespaceBeforeLineBreak.kt |   0
 ...eClosingBracketInMethodParameters.after.kt |   0
 ...kBeforeClosingBracketInMethodParameters.kt |   0
 .../enterHandler}/SplitStringByEnter.after.kt |   0
 .../enterHandler}/SplitStringByEnter.kt       |   0
 .../SplitStringByEnterAddParentheses.after.kt |   0
 .../SplitStringByEnterAddParentheses.kt       |   0
 ...StringByEnterBeforeEscapeSequence.after.kt |   0
 .../SplitStringByEnterBeforeEscapeSequence.kt |   0
 ...itStringByEnterBeforeSubstitution.after.kt |   0
 .../SplitStringByEnterBeforeSubstitution.kt   |   0
 .../SplitStringByEnterEmpty.after.kt          |   0
 .../enterHandler}/SplitStringByEnterEmpty.kt  |   0
 ...tStringByEnterExistingParentheses.after.kt |   0
 .../SplitStringByEnterExistingParentheses.kt  |   0
 .../afterUnmatchedBrace/AtEndOfFile.after.kt  |   0
 .../afterUnmatchedBrace/AtEndOfFile.kt        |   0
 ...ArgumentBeforeFunctionInitializer.after.kt |   0
 ...LambdaArgumentBeforeFunctionInitializer.kt |   0
 ...entBeforeLocalPropertyInitializer.after.kt |   0
 ...aArgumentBeforeLocalPropertyInitializer.kt |   0
 ...ntBeforeMemberPropertyInitializer.after.kt |   0
 ...ArgumentBeforeMemberPropertyInitializer.kt |   0
 ...BeforeTopLevelPropertyInitializer.after.kt |   0
 ...gumentBeforeTopLevelPropertyInitializer.kt |   0
 .../NotApplicableOnInitializer.after.kt       |   0
 .../NotApplicableOnInitializer.kt             |   0
 .../NotApplicableOnInitializer2.after.kt      |   0
 .../NotApplicableOnInitializer2.kt            |   0
 .../UnfinishedLambdaInCode.after.kt           |   0
 .../UnfinishedLambdaInCode.kt                 |   0
 ...ishedLambdaInCodeAsVarInitiailzer.after.kt |   0
 .../UnfinishedLambdaInCodeAsVarInitiailzer.kt |   0
 ...UnfinishedLambdaWithCommentInCode.after.kt |   0
 .../UnfinishedLambdaWithCommentInCode.kt      |   0
 ...henBeforeLocalPropertyInitializer.after.kt |   0
 .../WhenBeforeLocalPropertyInitializer.kt     |   0
 ...enBeforeMemberPropertyInitializer.after.kt |   0
 .../WhenBeforeMemberPropertyInitializer.kt    |   0
 ...BeforeTopLevelPropertyInitializer.after.kt |   0
 .../WhenBeforeTopLevelPropertyInitializer.kt  |   0
 .../arrayAccess/ListAccess.after.kt           |   0
 .../enterHandler}/arrayAccess/ListAccess.kt   |   0
 .../BetweenOpenBraceAndParenthesis.after.kt   |   0
 .../BetweenOpenBraceAndParenthesis.kt         |   0
 .../controlFlowConstructions/Catch.after.kt   |   0
 .../controlFlowConstructions/Catch.kt         |   0
 .../controlFlowConstructions/Catch2.after.kt  |   0
 .../controlFlowConstructions/Catch2.kt        |   0
 .../controlFlowConstructions/Catch3.after.kt  |   0
 .../controlFlowConstructions/Catch3.kt        |   0
 .../controlFlowConstructions/Catch4.after.kt  |   0
 .../controlFlowConstructions/Catch4.kt        |   0
 .../controlFlowConstructions/Do2.after.kt     |   0
 .../controlFlowConstructions/Do2.kt           |   0
 .../controlFlowConstructions/DoInFun.after.kt |   0
 .../controlFlowConstructions/DoInFun.kt       |   0
 .../controlFlowConstructions/DoWhile.after.kt |   0
 .../controlFlowConstructions/DoWhile.kt       |   0
 .../DoWhile2.after.kt                         |   0
 .../controlFlowConstructions/DoWhile2.kt      |   0
 .../DoWhile3.after.kt                         |   0
 .../controlFlowConstructions/DoWhile3.kt      |   0
 .../DoWhile4.after.kt                         |   0
 .../controlFlowConstructions/DoWhile4.kt      |   0
 .../DoWhile5.after.kt                         |   0
 .../controlFlowConstructions/DoWhile5.kt      |   0
 .../DoWhile6.after.kt                         |   0
 .../controlFlowConstructions/DoWhile6.kt      |   0
 .../DoWhile7.after.kt                         |   0
 .../controlFlowConstructions/DoWhile7.kt      |   0
 .../DoWithBraces.after.kt                     |   0
 .../controlFlowConstructions/DoWithBraces.kt  |   0
 .../DoWithBraces2.after.kt                    |   0
 .../controlFlowConstructions/DoWithBraces2.kt |   0
 .../controlFlowConstructions/ElseIf.after.kt  |   0
 .../controlFlowConstructions/ElseIf.kt        |   0
 .../ElseInWhenWithOption.after.kt             |   0
 .../ElseInWhenWithOption.kt                   |   0
 .../ElseInWhenWithoutOption.after.kt          |   0
 .../ElseInWhenWithoutOption.kt                |   0
 .../ElseWithBrace.after.kt                    |   0
 .../controlFlowConstructions/ElseWithBrace.kt |   0
 .../ElseWithBraceAndComment.after.kt          |   0
 .../ElseWithBraceAndComment.kt                |   0
 .../ElseWithBraceAndComment2.after.kt         |   0
 .../ElseWithBraceAndComment2.kt               |   0
 .../ElseWithoutBrace.after.kt                 |   0
 .../ElseWithoutBrace.kt                       |   0
 .../ElseWithoutBrace2.after.kt                |   0
 .../ElseWithoutBrace2.kt                      |   0
 .../controlFlowConstructions/Finally.after.kt |   0
 .../controlFlowConstructions/Finally.kt       |   0
 .../Finally2.after.kt                         |   0
 .../controlFlowConstructions/Finally2.kt      |   0
 .../Finally3.after.kt                         |   0
 .../controlFlowConstructions/Finally3.kt      |   0
 .../Finally4.after.kt                         |   0
 .../controlFlowConstructions/Finally4.kt      |   0
 .../controlFlowConstructions/For.after.kt     |   0
 .../controlFlowConstructions/For.kt           |   0
 .../ForWithBlock.after.kt                     |   0
 .../controlFlowConstructions/ForWithBlock.kt  |   0
 .../ForWithCondition.after.kt                 |   0
 .../ForWithCondition.kt                       |   0
 .../ForWithoutCondition.after.kt              |   0
 .../ForWithoutCondition.kt                    |   0
 .../controlFlowConstructions/If.after.kt      |   0
 .../controlFlowConstructions/If.kt            |   0
 .../IfBeforeCondition.after.kt                |   0
 .../IfBeforeCondition.kt                      |   0
 .../IfBeforeCondition2.after.kt               |   0
 .../IfBeforeCondition2.kt                     |   0
 .../IfBeforeCondition3.after.kt               |   0
 .../IfBeforeCondition3.kt                     |   0
 .../IfBeforeCondition4.after.kt               |   0
 .../IfBeforeCondition4.kt                     |   0
 .../IfWithBraces.after.kt                     |   0
 .../controlFlowConstructions/IfWithBraces.kt  |   0
 .../IfWithBraces2.after.kt                    |   0
 .../controlFlowConstructions/IfWithBraces2.kt |   0
 .../controlFlowConstructions/Try.after.kt     |   0
 .../controlFlowConstructions/Try.kt           |   0
 .../controlFlowConstructions/Try2.after.kt    |   0
 .../controlFlowConstructions/Try2.kt          |   0
 .../WhenWithCondition.after.kt                |   0
 .../WhenWithCondition.kt                      |   0
 .../WhenWithCondition2.after.kt               |   0
 .../WhenWithCondition2.kt                     |   0
 .../WhenWithoutCondition.after.kt             |   0
 .../WhenWithoutCondition.kt                   |   0
 .../controlFlowConstructions/While.after.kt   |   0
 .../controlFlowConstructions/While.kt         |   0
 .../controlFlowConstructions/While2.after.kt  |   0
 .../controlFlowConstructions/While2.kt        |   0
 .../controlFlowConstructions/While3.after.kt  |   0
 .../controlFlowConstructions/While3.kt        |   0
 .../WhileWithBlock.after.kt                   |   0
 .../WhileWithBlock.kt                         |   0
 .../WhileWithCondition.after.kt               |   0
 .../WhileWithCondition.kt                     |   0
 .../WhileWithoutCondition.after.kt            |   0
 .../WhileWithoutCondition.kt                  |   0
 .../elvis/AfterElvis.after.inv.kt             |   0
 .../enterHandler}/elvis/AfterElvis.after.kt   |   0
 .../enterHandler}/elvis/AfterElvis.kt         |   0
 .../elvis/AfterElvis2.after.inv.kt            |   0
 .../enterHandler}/elvis/AfterElvis2.after.kt  |   0
 .../enterHandler}/elvis/AfterElvis2.kt        |   0
 .../AfterElvisInBinaryExpression.after.inv.kt |   0
 .../AfterElvisInBinaryExpression.after.kt     |   0
 .../elvis/AfterElvisInBinaryExpression.kt     |   0
 .../elvis/BeforeElvis.after.inv.kt            |   0
 .../enterHandler}/elvis/BeforeElvis.after.kt  |   0
 .../enterHandler}/elvis/BeforeElvis.kt        |   0
 ...BeforeElvisInBinaryExpression.after.inv.kt |   0
 .../BeforeElvisInBinaryExpression.after.kt    |   0
 .../elvis/BeforeElvisInBinaryExpression.kt    |   0
 .../emptyBraces/ClassWithConstructor.after.kt |   0
 .../emptyBraces/ClassWithConstructor.kt       |   0
 .../ClassWithConstructor2.after.kt            |   0
 .../emptyBraces/ClassWithConstructor2.kt      |   0
 .../ClassWithoutConstructor.after.kt          |   0
 .../emptyBraces/ClassWithoutConstructor.kt    |   0
 .../emptyBraces/FunctionBlock.after.kt        |   0
 .../emptyBraces/FunctionBlock.kt              |   0
 .../emptyBraces/FunctionBlock2.after.kt       |   0
 .../emptyBraces/FunctionBlock2.kt             |   0
 .../emptyBraces/FunctionBody3.after.kt        |   0
 .../emptyBraces/FunctionBody3.kt              |   0
 .../emptyBraces/FunctionBody4.after.kt        |   0
 .../emptyBraces/FunctionBody4.kt              |   0
 .../FunctionBodyInsideClass.after.kt          |   0
 .../emptyBraces/FunctionBodyInsideClass.kt    |   0
 .../FunctionBodyInsideClass2.after.kt         |   0
 .../emptyBraces/FunctionBodyInsideClass2.kt   |   0
 .../EmptyArgumentInCallByArrayAccess.after.kt |   0
 .../EmptyArgumentInCallByArrayAccess.kt       |   0
 ...EmptyArgumentInCallByArrayAccess2.after.kt |   0
 .../EmptyArgumentInCallByArrayAccess2.kt      |   0
 .../EmptyArgumentInCallByDeclaration.after.kt |   0
 .../EmptyArgumentInCallByDeclaration.kt       |   0
 ...EmptyArgumentInCallByDeclaration2.after.kt |   0
 .../EmptyArgumentInCallByDeclaration2.kt      |   0
 .../EmptyArgumentInCallByReference.after.kt   |   0
 .../EmptyArgumentInCallByReference.kt         |   0
 .../EmptyArgumentInCallByReference2.after.kt  |   0
 .../EmptyArgumentInCallByReference2.kt        |   0
 ...umentInCallByReferenceInSuperType.after.kt |   0
 ...ptyArgumentInCallByReferenceInSuperType.kt |   0
 ...mentInCallByReferenceInSuperType2.after.kt |   0
 ...tyArgumentInCallByReferenceInSuperType2.kt |   0
 ...renceInSuperTypeWithTypeArguments.after.kt |   0
 ...ByReferenceInSuperTypeWithTypeArguments.kt |   0
 ...enceInSuperTypeWithTypeArguments2.after.kt |   0
 ...yReferenceInSuperTypeWithTypeArguments2.kt |   0
 ...nCallByReferenceWithTypeArguments.after.kt |   0
 ...umentInCallByReferenceWithTypeArguments.kt |   0
 ...CallByReferenceWithTypeArguments2.after.kt |   0
 ...mentInCallByReferenceWithTypeArguments2.kt |   0
 ...tyArgumentInThisAsClassicFunction.after.kt |   0
 .../EmptyArgumentInThisAsClassicFunction.kt   |   0
 .../EmptyArgumentInThisAsConstructor.after.kt |   0
 .../EmptyArgumentInThisAsConstructor.kt       |   0
 ...EmptyArgumentInThisAsConstructor2.after.kt |   0
 .../EmptyArgumentInThisAsConstructor2.kt      |   0
 .../EmptyConditionInCatch.after.kt            |   0
 .../emptyParameters/EmptyConditionInCatch.kt  |   0
 .../EmptyConditionInCatch2.after.kt           |   0
 .../emptyParameters/EmptyConditionInCatch2.kt |   0
 .../EmptyConditionInDoWhile.after.inv.kt      |   0
 .../EmptyConditionInDoWhile.after.kt          |   0
 .../EmptyConditionInDoWhile.kt                |   0
 .../EmptyConditionInFor.after.inv.kt          |   0
 .../EmptyConditionInFor.after.kt              |   0
 .../emptyParameters/EmptyConditionInFor.kt    |   0
 .../EmptyConditionInIf.after.inv.kt           |   0
 .../EmptyConditionInIf.after.kt               |   0
 .../emptyParameters/EmptyConditionInIf.kt     |   0
 .../EmptyConditionInWhen.after.inv.kt         |   0
 .../EmptyConditionInWhen.after.kt             |   0
 .../emptyParameters/EmptyConditionInWhen.kt   |   0
 .../EmptyConditionInWhile.after.inv.kt        |   0
 .../EmptyConditionInWhile.after.kt            |   0
 .../emptyParameters/EmptyConditionInWhile.kt  |   0
 ...mptyParameterInAnnonymousFunction.after.kt |   0
 .../EmptyParameterInAnnonymousFunction.kt     |   0
 ...ptyParameterInAnnonymousFunction2.after.kt |   0
 .../EmptyParameterInAnnonymousFunction2.kt    |   0
 ...ymousFunctionWithNullableReceiver.after.kt |   0
 ...nAnnonymousFunctionWithNullableReceiver.kt |   0
 ...mousFunctionWithNullableReceiver2.after.kt |   0
 ...AnnonymousFunctionWithNullableReceiver2.kt |   0
 ...rInAnnonymousFunctionWithReceiver.after.kt |   0
 ...rameterInAnnonymousFunctionWithReceiver.kt |   0
 ...InAnnonymousFunctionWithReceiver2.after.kt |   0
 ...ameterInAnnonymousFunctionWithReceiver2.kt |   0
 ...terInDestructuringDeclaration.after.inv.kt |   0
 ...rameterInDestructuringDeclaration.after.kt |   0
 ...mptyParameterInDestructuringDeclaration.kt |   0
 ...erInDestructuringDeclaration2.after.inv.kt |   0
 ...ameterInDestructuringDeclaration2.after.kt |   0
 ...ptyParameterInDestructuringDeclaration2.kt |   0
 ...erInDestructuringDeclaration3.after.inv.kt |   0
 ...ameterInDestructuringDeclaration3.after.kt |   0
 ...ptyParameterInDestructuringDeclaration3.kt |   0
 ...meterInExplicitPrimaryConstructor.after.kt |   0
 ...tyParameterInExplicitPrimaryConstructor.kt |   0
 ...eterInExplicitPrimaryConstructor2.after.kt |   0
 ...yParameterInExplicitPrimaryConstructor2.kt |   0
 .../EmptyParameterInFunction.after.kt         |   0
 .../EmptyParameterInFunction.kt               |   0
 .../EmptyParameterInFunction2.after.kt        |   0
 .../EmptyParameterInFunction2.kt              |   0
 ...tyParameterInFunctionWithReceiver.after.kt |   0
 .../EmptyParameterInFunctionWithReceiver.kt   |   0
 ...yParameterInFunctionWithReceiver2.after.kt |   0
 .../EmptyParameterInFunctionWithReceiver2.kt  |   0
 ...meterInFunctionWithTypeParameters.after.kt |   0
 ...tyParameterInFunctionWithTypeParameters.kt |   0
 ...eterInFunctionWithTypeParameters2.after.kt |   0
 ...yParameterInFunctionWithTypeParameters2.kt |   0
 ...tionWithTypeParametersAndReceiver.after.kt |   0
 ...InFunctionWithTypeParametersAndReceiver.kt |   0
 ...ionWithTypeParametersAndReceiver2.after.kt |   0
 ...nFunctionWithTypeParametersAndReceiver2.kt |   0
 ...ionWithTypeParametersAndReceiver3.after.kt |   0
 ...nFunctionWithTypeParametersAndReceiver3.kt |   0
 ...ionWithTypeParametersAndReceiver4.after.kt |   0
 ...nFunctionWithTypeParametersAndReceiver4.kt |   0
 .../EmptyParameterInGetter.after.kt           |   0
 .../emptyParameters/EmptyParameterInGetter.kt |   0
 .../EmptyParameterInGetter2.after.kt          |   0
 .../EmptyParameterInGetter2.kt                |   0
 ...meterInImplicitPrimaryConstructor.after.kt |   0
 ...tyParameterInImplicitPrimaryConstructor.kt |   0
 ...eterInImplicitPrimaryConstructor2.after.kt |   0
 ...yParameterInImplicitPrimaryConstructor2.kt |   0
 ...maryConstructorWithTypeParameters.after.kt |   0
 ...citPrimaryConstructorWithTypeParameters.kt |   0
 ...aryConstructorWithTypeParameters2.after.kt |   0
 ...itPrimaryConstructorWithTypeParameters2.kt |   0
 ...arameterInInnerAnnonymousFunction.after.kt |   0
 ...EmptyParameterInInnerAnnonymousFunction.kt |   0
 ...rameterInInnerAnnonymousFunction2.after.kt |   0
 ...mptyParameterInInnerAnnonymousFunction2.kt |   0
 ...tyParameterInSecondaryConstructor.after.kt |   0
 .../EmptyParameterInSecondaryConstructor.kt   |   0
 ...yParameterInSecondaryConstructor2.after.kt |   0
 .../EmptyParameterInSecondaryConstructor2.kt  |   0
 .../EmptyParameterInSetter.after.kt           |   0
 .../emptyParameters/EmptyParameterInSetter.kt |   0
 .../EmptyParameterInSetter2.after.kt          |   0
 .../EmptyParameterInSetter2.kt                |   0
 .../emptyParameters/EmptyParameters.after.kt  |   0
 .../emptyParameters/EmptyParameters.kt        |   0
 .../emptyParameters/EmptyParameters2.after.kt |   0
 .../emptyParameters/EmptyParameters2.kt       |   0
 .../AssignmentAfterEq.after.inv.kt            |   0
 .../AssignmentAfterEq.after.kt                |   0
 .../AssignmentAfterEq.kt                      |   0
 .../BinaryWithTypeExpressions.after.inv.kt    |   0
 .../BinaryWithTypeExpressions.after.kt        |   0
 .../BinaryWithTypeExpressions.kt              |   0
 ...tyArgumentInCallByArrayAccess.after.inv.kt |   0
 .../EmptyArgumentInCallByArrayAccess.after.kt |   0
 .../EmptyArgumentInCallByArrayAccess.kt       |   0
 ...tyArgumentInCallByDeclaration.after.inv.kt |   0
 .../EmptyArgumentInCallByDeclaration.after.kt |   0
 .../EmptyArgumentInCallByDeclaration.kt       |   0
 .../InBinaryExpressionInMiddle.after.inv.kt   |   0
 .../InBinaryExpressionInMiddle.after.kt       |   0
 .../InBinaryExpressionInMiddle.kt             |   0
 .../InBinaryExpressionUnfinished.after.inv.kt |   0
 .../InBinaryExpressionUnfinished.after.kt     |   0
 .../InBinaryExpressionUnfinished.kt           |   0
 ...inaryExpressionUnfinishedInIf.after.inv.kt |   0
 .../InBinaryExpressionUnfinishedInIf.after.kt |   0
 .../InBinaryExpressionUnfinishedInIf.kt       |   0
 ...essionsBeforeCloseParenthesis.after.inv.kt |   0
 ...ExpressionsBeforeCloseParenthesis.after.kt |   0
 ...BinaryExpressionsBeforeCloseParenthesis.kt |   0
 .../InExpressionsParentheses.after.kt         |   0
 .../InExpressionsParentheses.kt               |   0
 .../InExpressionsParentheses2.after.kt        |   0
 .../InExpressionsParentheses2.kt              |   0
 .../InExpressionsParentheses3.after.kt        |   0
 .../InExpressionsParentheses3.kt              |   0
 .../InExpressionsParentheses4.after.kt        |   0
 .../InExpressionsParentheses4.kt              |   0
 ...sionsParenthesesBeforeOperand.after.inv.kt |   0
 ...pressionsParenthesesBeforeOperand.after.kt |   0
 .../InExpressionsParenthesesBeforeOperand.kt  |   0
 .../IsExpressionAfterIs.after.inv.kt          |   0
 .../IsExpressionAfterIs.after.kt              |   0
 .../IsExpressionAfterIs.kt                    |   0
 ...AfterFunctionWithExplicitType.after.inv.kt |   0
 .../AfterFunctionWithExplicitType.after.kt    |   0
 .../AfterFunctionWithExplicitType.kt          |   0
 .../AfterFunctionWithInference.after.inv.kt   |   0
 .../AfterFunctionWithInference.after.kt       |   0
 .../AfterFunctionWithInference.kt             |   0
 ...fterFunctionWithTypeParameter.after.inv.kt |   0
 .../AfterFunctionWithTypeParameter.after.kt   |   0
 .../AfterFunctionWithTypeParameter.kt         |   0
 .../AfterMultideclaration.after.inv.kt        |   0
 .../AfterMultideclaration.after.kt            |   0
 .../expressionBody/AfterMultideclaration.kt   |   0
 .../AfterMutableProperty.after.inv.kt         |   0
 .../AfterMutableProperty.after.kt             |   0
 .../expressionBody/AfterMutableProperty.kt    |   0
 ...AfterPropertyWithExplicitType.after.inv.kt |   0
 .../AfterPropertyWithExplicitType.after.kt    |   0
 .../AfterPropertyWithExplicitType.kt          |   0
 .../AfterPropertyWithInference.after.inv.kt   |   0
 .../AfterPropertyWithInference.after.kt       |   0
 .../AfterPropertyWithInference.kt             |   0
 .../AfterPropertyWithReceiver.after.inv.kt    |   0
 .../AfterPropertyWithReceiver.after.kt        |   0
 .../AfterPropertyWithReceiver.kt              |   0
 ...ertyWithTypeParameterReceiver.after.inv.kt |   0
 ...PropertyWithTypeParameterReceiver.after.kt |   0
 .../AfterPropertyWithTypeParameterReceiver.kt |   0
 .../FunctionWithExplicitType.after.inv.kt     |   0
 .../FunctionWithExplicitType.after.kt         |   0
 .../FunctionWithExplicitType.kt               |   0
 .../FunctionWithInference.after.inv.kt        |   0
 .../FunctionWithInference.after.kt            |   0
 .../expressionBody/FunctionWithInference.kt   |   0
 .../FunctionWithTypeParameter.after.inv.kt    |   0
 .../FunctionWithTypeParameter.after.kt        |   0
 .../FunctionWithTypeParameter.kt              |   0
 .../Multideclaration.after.inv.kt             |   0
 .../expressionBody/Multideclaration.after.kt  |   0
 .../expressionBody/Multideclaration.kt        |   0
 .../MutableProperty.after.inv.kt              |   0
 .../expressionBody/MutableProperty.after.kt   |   0
 .../expressionBody/MutableProperty.kt         |   0
 .../PropertyWithExplicitType.after.inv.kt     |   0
 .../PropertyWithExplicitType.after.kt         |   0
 .../PropertyWithExplicitType.kt               |   0
 .../PropertyWithInference.after.inv.kt        |   0
 .../PropertyWithInference.after.kt            |   0
 .../expressionBody/PropertyWithInference.kt   |   0
 .../PropertyWithReceiver.after.inv.kt         |   0
 .../PropertyWithReceiver.after.kt             |   0
 .../expressionBody/PropertyWithReceiver.kt    |   0
 ...ertyWithTypeParameterReceiver.after.inv.kt |   0
 ...PropertyWithTypeParameterReceiver.after.kt |   0
 .../PropertyWithTypeParameterReceiver.kt      |   0
 ...inCharWhenMultilineWithoutMargins.after.kt |   0
 ...ddMarginCharWhenMultilineWithoutMargins.kt |   0
 .../DontAddMarginWhenItIsUnused.after.kt      |   0
 .../spaces/DontAddMarginWhenItIsUnused.kt     |   0
 ...inWhenItIsUnusedWithEmptyPrevious.after.kt |   0
 ...ddMarginWhenItIsUnusedWithEmptyPrevious.kt |   0
 ...ntAddTrimCallWhenAlreadyMultiline.after.kt |   0
 .../DontAddTrimCallWhenAlreadyMultiline.kt    |   0
 ...CallWhenAlreadyMultilineFirstLine.after.kt |   0
 ...ddTrimCallWhenAlreadyMultilineFirstLine.kt |   0
 .../spaces/DontInsertTrimMargin1.after.kt     |   0
 .../spaces/DontInsertTrimMargin1.kt           |   0
 .../spaces/DontInsertTrimMargin2.after.kt     |   0
 .../spaces/DontInsertTrimMargin2.kt           |   0
 .../spaces/DontInsertTrimMargin3.after.kt     |   0
 .../spaces/DontInsertTrimMargin3.kt           |   0
 .../spaces/DontInsertTrimMargin4.after.kt     |   0
 .../spaces/DontInsertTrimMargin4.kt           |   0
 .../spaces/EnterAfterOpenningBrace.after.kt   |   0
 .../spaces/EnterAfterOpenningBrace.kt         |   0
 .../EnterBeforeLongEntryOneLine.after.kt      |   0
 .../spaces/EnterBeforeLongEntryOneLine.kt     |   0
 .../spaces/EnterBeforeMarginChar.after.kt     |   0
 .../spaces/EnterBeforeMarginChar.kt           |   0
 .../EnterBeforeShortEntryOneLine.after.kt     |   0
 .../spaces/EnterBeforeShortEntryOneLine.kt    |   0
 .../spaces/EnterInInfixMargin.after.kt        |   0
 .../spaces/EnterInInfixMargin.kt              |   0
 .../spaces/EnterInInjectedFragment.after.kt   |   0
 .../spaces/EnterInInjectedFragment.kt         |   0
 ...erInLineWithMarginOnNotMargedLine.after.kt |   0
 .../EnterInLineWithMarginOnNotMargedLine.kt   |   0
 .../spaces/EnterInMethodCallMargin.after.kt   |   0
 .../spaces/EnterInMethodCallMargin.kt         |   0
 .../spaces/EnterInOneLineAfterSpaces.after.kt |   0
 .../spaces/EnterInOneLineAfterSpaces.kt       |   0
 .../EnterInTwoLinesNoMarginCall.after.kt      |   0
 .../spaces/EnterInTwoLinesNoMarginCall.kt     |   0
 .../spaces/EnterInsideBraces.after.kt         |   0
 .../spaces/EnterInsideBraces.kt               |   0
 .../spaces/EnterInsideBraces1.after.kt        |   0
 .../spaces/EnterInsideBraces1.kt              |   0
 .../spaces/EnterInsideBraces2.after.kt        |   0
 .../spaces/EnterInsideBraces2.kt              |   0
 .../spaces/EnterInsideTextMargin.after.kt     |   0
 .../spaces/EnterInsideTextMargin.kt           |   0
 .../spaces/EnterMLSimpleMargin.after.kt       |   0
 .../spaces/EnterMLSimpleMargin.kt             |   0
 .../EnterMLStartOnSameLineMargin.after.kt     |   0
 .../spaces/EnterMLStartOnSameLineMargin.kt    |   0
 ...rOnFirstLineWithPresentTrimMargin.after.kt |   0
 .../EnterOnFirstLineWithPresentTrimMargin.kt  |   0
 ...tLineWithPresentTrimMarginAndLine.after.kt |   0
 ...OnFirstLineWithPresentTrimMarginAndLine.kt |   0
 ...NonEmptyLineWithPresentTrimMargin.after.kt |   0
 ...nFirstNonEmptyLineWithPresentTrimMargin.kt |   0
 .../spaces/EnterOnNewLine.after.kt            |   0
 .../multilineString/spaces/EnterOnNewLine.kt  |   0
 .../spaces/EnterSimple.after.kt               |   0
 .../multilineString/spaces/EnterSimple.kt     |   0
 .../spaces/EnterWithTextMargin.after.kt       |   0
 .../spaces/EnterWithTextMargin.kt             |   0
 .../EnterWithTextOnNewLineMargin.after.kt     |   0
 .../spaces/EnterWithTextOnNewLineMargin.kt    |   0
 .../spaces/InsertCustomMargin.after.kt        |   0
 .../spaces/InsertCustomMargin.kt              |   0
 .../InsertCustomMarginInLineStart.after.kt    |   0
 .../spaces/InsertCustomMarginInLineStart.kt   |   0
 .../spaces/InsertDefaultMargin.after.kt       |   0
 .../spaces/InsertDefaultMargin.kt             |   0
 .../spaces/NoTrimIndentInAnnotations.after.kt |   0
 .../spaces/NoTrimIndentInAnnotations.kt       |   0
 .../spaces/NoTrimIndentInConst.after.kt       |   0
 .../spaces/NoTrimIndentInConst.kt             |   0
 .../RestoreIndentFromEmptyLine.after.kt       |   0
 .../spaces/RestoreIndentFromEmptyLine.kt      |   0
 .../tabs2/DontInsertTrimMarginCall.after.kt   |   0
 .../tabs2/DontInsertTrimMarginCall.kt         |   0
 .../tabs2/EnterInMethodCallMargin.after.kt    |   0
 .../withTabs/tabs2/EnterInMethodCallMargin.kt |   0
 .../EnterInTwoLinesNoMarginCall.after.kt      |   0
 .../tabs2/EnterInTwoLinesNoMarginCall.kt      |   0
 .../withTabs/tabs2/EnterInsideBraces.after.kt |   0
 .../withTabs/tabs2/EnterInsideBraces.kt       |   0
 .../withTabs/tabs2/EnterInsideText.after.kt   |   0
 .../withTabs/tabs2/EnterInsideText.kt         |   0
 .../tabs2/EnterMLSimpleMargin.after.kt        |   0
 .../withTabs/tabs2/EnterMLSimpleMargin.kt     |   0
 .../EnterMLStartOnSameLineMargin.after.kt     |   0
 .../tabs2/EnterMLStartOnSameLineMargin.kt     |   0
 .../tabs2/EnterOnNewLineMargin.after.kt       |   0
 .../withTabs/tabs2/EnterOnNewLineMargin.kt    |   0
 .../withTabs/tabs2/EnterSimpleMargin.after.kt |   0
 .../withTabs/tabs2/EnterSimpleMargin.kt       |   0
 .../tabs2/EnterWithTextMargin.after.kt        |   0
 .../withTabs/tabs2/EnterWithTextMargin.kt     |   0
 .../EnterWithTextOnNewLineMargin.after.kt     |   0
 .../tabs2/EnterWithTextOnNewLineMargin.kt     |   0
 .../tabs4/DontInsertTrimMarginCall.after.kt   |   0
 .../tabs4/DontInsertTrimMarginCall.kt         |   0
 .../tabs4/EnterInMethodCallMargin.after.kt    |   0
 .../withTabs/tabs4/EnterInMethodCallMargin.kt |   0
 .../withTabs/tabs4/EnterInsideBraces.after.kt |   0
 .../withTabs/tabs4/EnterInsideBraces.kt       |   0
 .../withTabs/tabs4/EnterInsideText.after.kt   |   0
 .../withTabs/tabs4/EnterInsideText.kt         |   0
 .../tabs4/EnterMLSimpleMargin.after.kt        |   0
 .../withTabs/tabs4/EnterMLSimpleMargin.kt     |   0
 .../EnterMLStartOnSameLineMargin.after.kt     |   0
 .../tabs4/EnterMLStartOnSameLineMargin.kt     |   0
 .../tabs4/EnterOnNewLineMargin.after.kt       |   0
 .../withTabs/tabs4/EnterOnNewLineMargin.kt    |   0
 .../withTabs/tabs4/EnterSimpleMargin.after.kt |   0
 .../withTabs/tabs4/EnterSimpleMargin.kt       |   0
 .../EnterWithTabsAfterMarginChar.after.kt     |   0
 .../tabs4/EnterWithTabsAfterMarginChar.kt     |   0
 .../tabs4/EnterWithTextMargin.after.kt        |   0
 .../withTabs/tabs4/EnterWithTextMargin.kt     |   0
 .../EnterWithTextOnNewLineMargin.after.kt     |   0
 .../tabs4/EnterWithTextOnNewLineMargin.kt     |   0
 .../script/ScriptAfterClosingBrace.after.kts  |   0
 .../script/ScriptAfterClosingBrace.kts        |   0
 .../script/ScriptAfterExpression.after.kts    |   0
 .../script/ScriptAfterExpression.kts          |   0
 .../script/ScriptAfterFun.after.kts           |   0
 .../enterHandler}/script/ScriptAfterFun.kts   |   0
 .../script/ScriptAfterImport.after.kts        |   0
 .../script/ScriptAfterImport.kts              |   0
 .../ScriptBetweenFunctionCalls.after.kts      |   0
 .../script/ScriptBetweenFunctionCalls.kts     |   0
 .../script/ScriptInsideFun.after.kts          |   0
 .../enterHandler}/script/ScriptInsideFun.kts  |   0
 .../LargeFileWithStringTemplate.after.kt      |   0
 .../templates/LargeFileWithStringTemplate.kt  |   0
 .../templates/TemplateEntryClose.after.kt     |   0
 .../templates/TemplateEntryClose.kt           |   0
 .../templates/TemplateEntryClose2.after.kt    |   0
 .../templates/TemplateEntryClose2.kt          |   0
 .../templates/TemplateEntryClose3.after.kt    |   0
 .../templates/TemplateEntryClose3.kt          |   0
 .../templates/TemplateEntryClose4.after.kt    |   0
 .../templates/TemplateEntryClose4.kt          |   0
 .../templates/TemplateEntryClose5.after.kt    |   0
 .../templates/TemplateEntryClose5.kt          |   0
 .../templates/TemplateEntryClose6.after.kt    |   0
 .../templates/TemplateEntryClose6.kt          |   0
 .../templates/TemplateEntryClose7.after.kt    |   0
 .../templates/TemplateEntryClose7.kt          |   0
 ...mplateEntryCloseInMultilineString.after.kt |   0
 .../TemplateEntryCloseInMultilineString.kt    |   0
 ...plateEntryCloseInMultilineString2.after.kt |   0
 .../TemplateEntryCloseInMultilineString2.kt   |   0
 ...plateEntryCloseInMultilineString3.after.kt |   0
 .../TemplateEntryCloseInMultilineString3.kt   |   0
 .../templates/TemplateEntryOpen.after.kt      |   0
 .../templates/TemplateEntryOpen.kt            |   0
 .../templates/TemplateEntryOpen2.after.kt     |   0
 .../templates/TemplateEntryOpen2.kt           |   0
 ...emplateEntryOpenInMultilineString.after.kt |   0
 .../TemplateEntryOpenInMultilineString.kt     |   0
 ...mplateEntryOpenInMultilineString2.after.kt |   0
 .../TemplateEntryOpenInMultilineString2.kt    |   0
 ...mplateEntryOpenInMultilineString3.after.kt |   0
 .../TemplateEntryOpenInMultilineString3.kt    |   0
 .../TemplateEntryOpenWithComment.after.kt     |   0
 .../templates/TemplateEntryOpenWithComment.kt |   0
 .../TemplateEntryOpenWithComment2.after.kt    |   0
 .../TemplateEntryOpenWithComment2.kt          |   0
 .../TemplateEntryOpenWithoutContent.after.kt  |   0
 .../TemplateEntryOpenWithoutContent.kt        |   0
 .../TemplateEntryOpenWithoutContent2.after.kt |   0
 .../TemplateEntryOpenWithoutContent2.kt       |   0
 .../TemplateEntryOpenWithoutContent3.after.kt |   0
 .../TemplateEntryOpenWithoutContent3.kt       |   0
 .../TemplateEntryOpenWithoutContent4.after.kt |   0
 .../TemplateEntryOpenWithoutContent4.kt       |   0
 .../TemplateEntryOpenWithoutContent5.after.kt |   0
 .../TemplateEntryOpenWithoutContent5.kt       |   0
 ...ormanceTypingIndentationTestGenerated.java | 806 ++++++++---------
 713 files changed, 827 insertions(+), 827 deletions(-)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/AfterCatch.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/AfterCatch.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/AfterClassNameBeforeFun.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/AfterClassNameBeforeFun.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/AfterExtensionPropertyGetter.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/AfterExtensionPropertyGetter.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/AfterExtensionPropertySetter.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/AfterExtensionPropertySetter.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/AfterFinally.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/AfterFinally.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/AfterImport.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/AfterImport.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/AfterPropertyGetter.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/AfterPropertyGetter.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/AfterPropertySetter.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/AfterPropertySetter.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/AfterTry.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/AfterTry.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/Annotation.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/Annotation.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/AnnotationInDeclaration.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/AnnotationInDeclaration.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/ArgumentListNormalIndent.after.inv.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/ArgumentListNormalIndent.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/ArgumentListNormalIndent.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/AutoIndentInWhenClause.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/AutoIndentInWhenClause.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/BlockCommentAfterCatch.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/BlockCommentAfterCatch.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/ConsecutiveCallsAfterDot.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/ConsecutiveCallsAfterDot.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/ConsecutiveCallsInSaeCallsMiddle.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/ConsecutiveCallsInSaeCallsMiddle.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/ConsecutiveCallsInSafeCallsEnd.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/ConsecutiveCallsInSafeCallsEnd.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/EnterInFunctionWithExpressionBody.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/EnterInFunctionWithExpressionBody.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/EnterInMultiDeclaration.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/EnterInMultiDeclaration.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/EnterInVariableDeclaration.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/EnterInVariableDeclaration.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/EoLCommentAfterCatch.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/EoLCommentAfterCatch.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/EoLCommentAfterFor.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/EoLCommentAfterFor.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/EoLCommentAfterIf.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/EoLCommentAfterIf.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/FunctionBlock.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/FunctionBlock.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/HigherOrderFunction.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/HigherOrderFunction.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/HigherOrderFunction2.after.inv.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/HigherOrderFunction2.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/HigherOrderFunction2.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/HigherOrderFunction3.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/HigherOrderFunction3.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/InDelegationListAfterColon.after.inv.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/InDelegationListAfterColon.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/InDelegationListAfterColon.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/InDelegationListAfterComma.after.inv.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/InDelegationListAfterComma.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/InDelegationListAfterComma.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/InDelegationListNotEmpty.after.inv.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/InDelegationListNotEmpty.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/InDelegationListNotEmpty.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/InElseBlockBeforeParenthesis.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/InElseBlockBeforeParenthesis.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/InEnumAfterSemicolon.after.inv.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/InEnumAfterSemicolon.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/InEnumAfterSemicolon.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/InEnumInitializerListAfterComma.after.inv.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/InEnumInitializerListAfterComma.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/InEnumInitializerListAfterComma.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/InEnumInitializerListNotEmpty.after.inv.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/InEnumInitializerListNotEmpty.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/InEnumInitializerListNotEmpty.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/InIfBlockBeforeParenthesis.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/InIfBlockBeforeParenthesis.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/InLabmdaAfterArrow.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/InLabmdaAfterArrow.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/InLambdaAfterArrowWithSpaces.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/InLambdaAfterArrowWithSpaces.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/InLambdaBeforeParams.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/InLambdaBeforeParams.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/InLambdaInsideChainCallSameLine.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/InLambdaInsideChainCallSameLine.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/InLambdaInsideChainCallSameLineWithSpaces.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/InLambdaInsideChainCallSameLineWithSpaces.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/InLambdaInsideChainCallWithNewLine.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/InLambdaInsideChainCallWithNewLine.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/InLambdaInsideChainCallWithNewLineWithSpaces.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/InLambdaInsideChainCallWithNewLineWithSpaces.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/InMultilineLambdaAfterArrow.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/InMultilineLambdaAfterArrow.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/IndentBeforeElseWithBlock.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/IndentBeforeElseWithBlock.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/IndentBeforeElseWithoutBlock.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/IndentBeforeElseWithoutBlock.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/IndentNotFinishedVariableEndAfterEquals.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/IndentNotFinishedVariableEndAfterEquals.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/IndentOnFinishedVariableEndAfterEquals.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/IndentOnFinishedVariableEndAfterEquals.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/KT20783.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/KT20783.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/LambdaInArguments.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/LambdaInArguments.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/LambdaInArguments2.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/LambdaInArguments2.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/LargeFile.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/LargeFile.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/LiteralExpression.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/LiteralExpression.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/LiteralExpression2.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/LiteralExpression2.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/LiteralExpression3.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/LiteralExpression3.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/ModifierListInUnfinishedDeclaration.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/ModifierListInUnfinishedDeclaration.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/NotFirstParameter.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/NotFirstParameter.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/ReindentOnUnmatchedBrace.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/ReindentOnUnmatchedBrace.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/ReturnContinue.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/ReturnContinue.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/Semicolon.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/Semicolon.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/Semicolon2.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/Semicolon2.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/SettingAlignMultilineParametersInCalls.after.inv.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/SettingAlignMultilineParametersInCalls.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/SettingAlignMultilineParametersInCalls.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/SmartEnterBetweenOpeningAndClosingBrackets.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/SmartEnterBetweenOpeningAndClosingBrackets.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/SmartEnterBetweenOpeningAndClosingBracketsWithInvertedAlignWhenMultiline.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/SmartEnterBetweenOpeningAndClosingBracketsWithInvertedAlignWhenMultiline.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/SmartEnterWithTabsInMethodParameters.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/SmartEnterWithTabsInMethodParameters.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/SmartEnterWithTabsOnConstructorParameters.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/SmartEnterWithTabsOnConstructorParameters.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/SmartEnterWithTabsOnConstructorParametersWithInvertedAlignWhenMultiline.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/SmartEnterWithTabsOnConstructorParametersWithInvertedAlignWhenMultiline.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/SmartEnterWithTrailingCommaAndWhitespaceBeforeLineBreak.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/SmartEnterWithTrailingCommaAndWhitespaceBeforeLineBreak.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/SmartEnterWithoutLineBreakBeforeClosingBracketInMethodParameters.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/SmartEnterWithoutLineBreakBeforeClosingBracketInMethodParameters.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/SplitStringByEnter.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/SplitStringByEnter.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/SplitStringByEnterAddParentheses.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/SplitStringByEnterAddParentheses.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/SplitStringByEnterBeforeEscapeSequence.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/SplitStringByEnterBeforeEscapeSequence.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/SplitStringByEnterBeforeSubstitution.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/SplitStringByEnterBeforeSubstitution.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/SplitStringByEnterEmpty.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/SplitStringByEnterEmpty.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/SplitStringByEnterExistingParentheses.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/SplitStringByEnterExistingParentheses.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/afterUnmatchedBrace/AtEndOfFile.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/afterUnmatchedBrace/AtEndOfFile.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/afterUnmatchedBrace/LambdaArgumentBeforeFunctionInitializer.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/afterUnmatchedBrace/LambdaArgumentBeforeFunctionInitializer.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/afterUnmatchedBrace/LambdaArgumentBeforeLocalPropertyInitializer.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/afterUnmatchedBrace/LambdaArgumentBeforeLocalPropertyInitializer.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/afterUnmatchedBrace/LambdaArgumentBeforeMemberPropertyInitializer.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/afterUnmatchedBrace/LambdaArgumentBeforeMemberPropertyInitializer.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/afterUnmatchedBrace/LambdaArgumentBeforeTopLevelPropertyInitializer.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/afterUnmatchedBrace/LambdaArgumentBeforeTopLevelPropertyInitializer.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/afterUnmatchedBrace/NotApplicableOnInitializer.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/afterUnmatchedBrace/NotApplicableOnInitializer.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/afterUnmatchedBrace/NotApplicableOnInitializer2.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/afterUnmatchedBrace/NotApplicableOnInitializer2.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/afterUnmatchedBrace/UnfinishedLambdaInCode.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/afterUnmatchedBrace/UnfinishedLambdaInCode.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/afterUnmatchedBrace/UnfinishedLambdaInCodeAsVarInitiailzer.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/afterUnmatchedBrace/UnfinishedLambdaInCodeAsVarInitiailzer.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/afterUnmatchedBrace/UnfinishedLambdaWithCommentInCode.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/afterUnmatchedBrace/UnfinishedLambdaWithCommentInCode.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/afterUnmatchedBrace/WhenBeforeLocalPropertyInitializer.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/afterUnmatchedBrace/WhenBeforeLocalPropertyInitializer.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/afterUnmatchedBrace/WhenBeforeMemberPropertyInitializer.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/afterUnmatchedBrace/WhenBeforeMemberPropertyInitializer.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/afterUnmatchedBrace/WhenBeforeTopLevelPropertyInitializer.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/afterUnmatchedBrace/WhenBeforeTopLevelPropertyInitializer.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/arrayAccess/ListAccess.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/arrayAccess/ListAccess.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/BetweenOpenBraceAndParenthesis.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/BetweenOpenBraceAndParenthesis.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/Catch.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/Catch.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/Catch2.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/Catch2.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/Catch3.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/Catch3.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/Catch4.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/Catch4.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/Do2.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/Do2.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/DoInFun.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/DoInFun.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/DoWhile.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/DoWhile.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/DoWhile2.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/DoWhile2.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/DoWhile3.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/DoWhile3.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/DoWhile4.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/DoWhile4.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/DoWhile5.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/DoWhile5.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/DoWhile6.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/DoWhile6.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/DoWhile7.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/DoWhile7.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/DoWithBraces.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/DoWithBraces.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/DoWithBraces2.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/DoWithBraces2.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/ElseIf.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/ElseIf.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/ElseInWhenWithOption.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/ElseInWhenWithOption.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/ElseInWhenWithoutOption.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/ElseInWhenWithoutOption.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/ElseWithBrace.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/ElseWithBrace.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/ElseWithBraceAndComment.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/ElseWithBraceAndComment.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/ElseWithBraceAndComment2.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/ElseWithBraceAndComment2.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/ElseWithoutBrace.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/ElseWithoutBrace.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/ElseWithoutBrace2.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/ElseWithoutBrace2.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/Finally.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/Finally.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/Finally2.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/Finally2.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/Finally3.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/Finally3.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/Finally4.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/Finally4.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/For.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/For.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/ForWithBlock.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/ForWithBlock.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/ForWithCondition.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/ForWithCondition.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/ForWithoutCondition.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/ForWithoutCondition.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/If.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/If.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/IfBeforeCondition.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/IfBeforeCondition.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/IfBeforeCondition2.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/IfBeforeCondition2.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/IfBeforeCondition3.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/IfBeforeCondition3.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/IfBeforeCondition4.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/IfBeforeCondition4.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/IfWithBraces.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/IfWithBraces.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/IfWithBraces2.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/IfWithBraces2.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/Try.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/Try.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/Try2.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/Try2.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/WhenWithCondition.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/WhenWithCondition.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/WhenWithCondition2.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/WhenWithCondition2.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/WhenWithoutCondition.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/WhenWithoutCondition.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/While.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/While.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/While2.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/While2.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/While3.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/While3.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/WhileWithBlock.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/WhileWithBlock.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/WhileWithCondition.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/WhileWithCondition.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/WhileWithoutCondition.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/controlFlowConstructions/WhileWithoutCondition.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/elvis/AfterElvis.after.inv.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/elvis/AfterElvis.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/elvis/AfterElvis.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/elvis/AfterElvis2.after.inv.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/elvis/AfterElvis2.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/elvis/AfterElvis2.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/elvis/AfterElvisInBinaryExpression.after.inv.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/elvis/AfterElvisInBinaryExpression.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/elvis/AfterElvisInBinaryExpression.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/elvis/BeforeElvis.after.inv.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/elvis/BeforeElvis.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/elvis/BeforeElvis.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/elvis/BeforeElvisInBinaryExpression.after.inv.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/elvis/BeforeElvisInBinaryExpression.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/elvis/BeforeElvisInBinaryExpression.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyBraces/ClassWithConstructor.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyBraces/ClassWithConstructor.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyBraces/ClassWithConstructor2.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyBraces/ClassWithConstructor2.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyBraces/ClassWithoutConstructor.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyBraces/ClassWithoutConstructor.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyBraces/FunctionBlock.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyBraces/FunctionBlock.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyBraces/FunctionBlock2.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyBraces/FunctionBlock2.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyBraces/FunctionBody3.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyBraces/FunctionBody3.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyBraces/FunctionBody4.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyBraces/FunctionBody4.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyBraces/FunctionBodyInsideClass.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyBraces/FunctionBodyInsideClass.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyBraces/FunctionBodyInsideClass2.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyBraces/FunctionBodyInsideClass2.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyArgumentInCallByArrayAccess.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyArgumentInCallByArrayAccess.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyArgumentInCallByArrayAccess2.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyArgumentInCallByArrayAccess2.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyArgumentInCallByDeclaration.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyArgumentInCallByDeclaration.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyArgumentInCallByDeclaration2.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyArgumentInCallByDeclaration2.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyArgumentInCallByReference.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyArgumentInCallByReference.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyArgumentInCallByReference2.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyArgumentInCallByReference2.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyArgumentInCallByReferenceInSuperType.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyArgumentInCallByReferenceInSuperType.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyArgumentInCallByReferenceInSuperType2.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyArgumentInCallByReferenceInSuperType2.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyArgumentInCallByReferenceInSuperTypeWithTypeArguments.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyArgumentInCallByReferenceInSuperTypeWithTypeArguments.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyArgumentInCallByReferenceInSuperTypeWithTypeArguments2.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyArgumentInCallByReferenceInSuperTypeWithTypeArguments2.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyArgumentInCallByReferenceWithTypeArguments.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyArgumentInCallByReferenceWithTypeArguments.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyArgumentInCallByReferenceWithTypeArguments2.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyArgumentInCallByReferenceWithTypeArguments2.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyArgumentInThisAsClassicFunction.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyArgumentInThisAsClassicFunction.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyArgumentInThisAsConstructor.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyArgumentInThisAsConstructor.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyArgumentInThisAsConstructor2.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyArgumentInThisAsConstructor2.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyConditionInCatch.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyConditionInCatch.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyConditionInCatch2.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyConditionInCatch2.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyConditionInDoWhile.after.inv.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyConditionInDoWhile.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyConditionInDoWhile.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyConditionInFor.after.inv.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyConditionInFor.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyConditionInFor.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyConditionInIf.after.inv.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyConditionInIf.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyConditionInIf.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyConditionInWhen.after.inv.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyConditionInWhen.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyConditionInWhen.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyConditionInWhile.after.inv.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyConditionInWhile.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyConditionInWhile.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyParameterInAnnonymousFunction.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyParameterInAnnonymousFunction.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyParameterInAnnonymousFunction2.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyParameterInAnnonymousFunction2.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyParameterInAnnonymousFunctionWithNullableReceiver.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyParameterInAnnonymousFunctionWithNullableReceiver.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyParameterInAnnonymousFunctionWithNullableReceiver2.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyParameterInAnnonymousFunctionWithNullableReceiver2.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyParameterInAnnonymousFunctionWithReceiver.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyParameterInAnnonymousFunctionWithReceiver.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyParameterInAnnonymousFunctionWithReceiver2.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyParameterInAnnonymousFunctionWithReceiver2.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyParameterInDestructuringDeclaration.after.inv.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyParameterInDestructuringDeclaration.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyParameterInDestructuringDeclaration.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyParameterInDestructuringDeclaration2.after.inv.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyParameterInDestructuringDeclaration2.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyParameterInDestructuringDeclaration2.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyParameterInDestructuringDeclaration3.after.inv.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyParameterInDestructuringDeclaration3.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyParameterInDestructuringDeclaration3.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyParameterInExplicitPrimaryConstructor.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyParameterInExplicitPrimaryConstructor.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyParameterInExplicitPrimaryConstructor2.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyParameterInExplicitPrimaryConstructor2.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyParameterInFunction.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyParameterInFunction.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyParameterInFunction2.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyParameterInFunction2.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyParameterInFunctionWithReceiver.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyParameterInFunctionWithReceiver.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyParameterInFunctionWithReceiver2.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyParameterInFunctionWithReceiver2.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyParameterInFunctionWithTypeParameters.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyParameterInFunctionWithTypeParameters.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyParameterInFunctionWithTypeParameters2.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyParameterInFunctionWithTypeParameters2.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyParameterInFunctionWithTypeParametersAndReceiver.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyParameterInFunctionWithTypeParametersAndReceiver.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyParameterInFunctionWithTypeParametersAndReceiver2.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyParameterInFunctionWithTypeParametersAndReceiver2.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyParameterInFunctionWithTypeParametersAndReceiver3.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyParameterInFunctionWithTypeParametersAndReceiver3.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyParameterInFunctionWithTypeParametersAndReceiver4.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyParameterInFunctionWithTypeParametersAndReceiver4.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyParameterInGetter.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyParameterInGetter.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyParameterInGetter2.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyParameterInGetter2.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyParameterInImplicitPrimaryConstructor.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyParameterInImplicitPrimaryConstructor.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyParameterInImplicitPrimaryConstructor2.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyParameterInImplicitPrimaryConstructor2.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyParameterInImplicitPrimaryConstructorWithTypeParameters.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyParameterInImplicitPrimaryConstructorWithTypeParameters.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyParameterInImplicitPrimaryConstructorWithTypeParameters2.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyParameterInImplicitPrimaryConstructorWithTypeParameters2.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyParameterInInnerAnnonymousFunction.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyParameterInInnerAnnonymousFunction.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyParameterInInnerAnnonymousFunction2.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyParameterInInnerAnnonymousFunction2.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyParameterInSecondaryConstructor.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyParameterInSecondaryConstructor.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyParameterInSecondaryConstructor2.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyParameterInSecondaryConstructor2.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyParameterInSetter.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyParameterInSetter.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyParameterInSetter2.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyParameterInSetter2.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyParameters.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyParameters.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyParameters2.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParameters/EmptyParameters2.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParenthesisInBinaryExpression/AssignmentAfterEq.after.inv.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParenthesisInBinaryExpression/AssignmentAfterEq.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParenthesisInBinaryExpression/AssignmentAfterEq.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParenthesisInBinaryExpression/BinaryWithTypeExpressions.after.inv.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParenthesisInBinaryExpression/BinaryWithTypeExpressions.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParenthesisInBinaryExpression/BinaryWithTypeExpressions.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParenthesisInBinaryExpression/EmptyArgumentInCallByArrayAccess.after.inv.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParenthesisInBinaryExpression/EmptyArgumentInCallByArrayAccess.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParenthesisInBinaryExpression/EmptyArgumentInCallByArrayAccess.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParenthesisInBinaryExpression/EmptyArgumentInCallByDeclaration.after.inv.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParenthesisInBinaryExpression/EmptyArgumentInCallByDeclaration.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParenthesisInBinaryExpression/EmptyArgumentInCallByDeclaration.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParenthesisInBinaryExpression/InBinaryExpressionInMiddle.after.inv.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParenthesisInBinaryExpression/InBinaryExpressionInMiddle.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParenthesisInBinaryExpression/InBinaryExpressionInMiddle.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParenthesisInBinaryExpression/InBinaryExpressionUnfinished.after.inv.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParenthesisInBinaryExpression/InBinaryExpressionUnfinished.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParenthesisInBinaryExpression/InBinaryExpressionUnfinished.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParenthesisInBinaryExpression/InBinaryExpressionUnfinishedInIf.after.inv.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParenthesisInBinaryExpression/InBinaryExpressionUnfinishedInIf.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParenthesisInBinaryExpression/InBinaryExpressionUnfinishedInIf.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParenthesisInBinaryExpression/InBinaryExpressionsBeforeCloseParenthesis.after.inv.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParenthesisInBinaryExpression/InBinaryExpressionsBeforeCloseParenthesis.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParenthesisInBinaryExpression/InBinaryExpressionsBeforeCloseParenthesis.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParenthesisInBinaryExpression/InExpressionsParentheses.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParenthesisInBinaryExpression/InExpressionsParentheses.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParenthesisInBinaryExpression/InExpressionsParentheses2.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParenthesisInBinaryExpression/InExpressionsParentheses2.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParenthesisInBinaryExpression/InExpressionsParentheses3.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParenthesisInBinaryExpression/InExpressionsParentheses3.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParenthesisInBinaryExpression/InExpressionsParentheses4.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParenthesisInBinaryExpression/InExpressionsParentheses4.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParenthesisInBinaryExpression/InExpressionsParenthesesBeforeOperand.after.inv.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParenthesisInBinaryExpression/InExpressionsParenthesesBeforeOperand.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParenthesisInBinaryExpression/InExpressionsParenthesesBeforeOperand.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParenthesisInBinaryExpression/IsExpressionAfterIs.after.inv.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParenthesisInBinaryExpression/IsExpressionAfterIs.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/emptyParenthesisInBinaryExpression/IsExpressionAfterIs.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/expressionBody/AfterFunctionWithExplicitType.after.inv.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/expressionBody/AfterFunctionWithExplicitType.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/expressionBody/AfterFunctionWithExplicitType.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/expressionBody/AfterFunctionWithInference.after.inv.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/expressionBody/AfterFunctionWithInference.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/expressionBody/AfterFunctionWithInference.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/expressionBody/AfterFunctionWithTypeParameter.after.inv.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/expressionBody/AfterFunctionWithTypeParameter.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/expressionBody/AfterFunctionWithTypeParameter.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/expressionBody/AfterMultideclaration.after.inv.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/expressionBody/AfterMultideclaration.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/expressionBody/AfterMultideclaration.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/expressionBody/AfterMutableProperty.after.inv.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/expressionBody/AfterMutableProperty.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/expressionBody/AfterMutableProperty.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/expressionBody/AfterPropertyWithExplicitType.after.inv.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/expressionBody/AfterPropertyWithExplicitType.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/expressionBody/AfterPropertyWithExplicitType.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/expressionBody/AfterPropertyWithInference.after.inv.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/expressionBody/AfterPropertyWithInference.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/expressionBody/AfterPropertyWithInference.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/expressionBody/AfterPropertyWithReceiver.after.inv.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/expressionBody/AfterPropertyWithReceiver.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/expressionBody/AfterPropertyWithReceiver.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/expressionBody/AfterPropertyWithTypeParameterReceiver.after.inv.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/expressionBody/AfterPropertyWithTypeParameterReceiver.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/expressionBody/AfterPropertyWithTypeParameterReceiver.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/expressionBody/FunctionWithExplicitType.after.inv.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/expressionBody/FunctionWithExplicitType.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/expressionBody/FunctionWithExplicitType.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/expressionBody/FunctionWithInference.after.inv.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/expressionBody/FunctionWithInference.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/expressionBody/FunctionWithInference.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/expressionBody/FunctionWithTypeParameter.after.inv.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/expressionBody/FunctionWithTypeParameter.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/expressionBody/FunctionWithTypeParameter.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/expressionBody/Multideclaration.after.inv.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/expressionBody/Multideclaration.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/expressionBody/Multideclaration.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/expressionBody/MutableProperty.after.inv.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/expressionBody/MutableProperty.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/expressionBody/MutableProperty.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/expressionBody/PropertyWithExplicitType.after.inv.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/expressionBody/PropertyWithExplicitType.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/expressionBody/PropertyWithExplicitType.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/expressionBody/PropertyWithInference.after.inv.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/expressionBody/PropertyWithInference.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/expressionBody/PropertyWithInference.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/expressionBody/PropertyWithReceiver.after.inv.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/expressionBody/PropertyWithReceiver.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/expressionBody/PropertyWithReceiver.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/expressionBody/PropertyWithTypeParameterReceiver.after.inv.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/expressionBody/PropertyWithTypeParameterReceiver.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/expressionBody/PropertyWithTypeParameterReceiver.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/spaces/DontAddMarginCharWhenMultilineWithoutMargins.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/spaces/DontAddMarginCharWhenMultilineWithoutMargins.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/spaces/DontAddMarginWhenItIsUnused.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/spaces/DontAddMarginWhenItIsUnused.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/spaces/DontAddMarginWhenItIsUnusedWithEmptyPrevious.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/spaces/DontAddMarginWhenItIsUnusedWithEmptyPrevious.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/spaces/DontAddTrimCallWhenAlreadyMultiline.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/spaces/DontAddTrimCallWhenAlreadyMultiline.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/spaces/DontAddTrimCallWhenAlreadyMultilineFirstLine.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/spaces/DontAddTrimCallWhenAlreadyMultilineFirstLine.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/spaces/DontInsertTrimMargin1.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/spaces/DontInsertTrimMargin1.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/spaces/DontInsertTrimMargin2.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/spaces/DontInsertTrimMargin2.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/spaces/DontInsertTrimMargin3.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/spaces/DontInsertTrimMargin3.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/spaces/DontInsertTrimMargin4.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/spaces/DontInsertTrimMargin4.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/spaces/EnterAfterOpenningBrace.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/spaces/EnterAfterOpenningBrace.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/spaces/EnterBeforeLongEntryOneLine.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/spaces/EnterBeforeLongEntryOneLine.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/spaces/EnterBeforeMarginChar.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/spaces/EnterBeforeMarginChar.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/spaces/EnterBeforeShortEntryOneLine.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/spaces/EnterBeforeShortEntryOneLine.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/spaces/EnterInInfixMargin.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/spaces/EnterInInfixMargin.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/spaces/EnterInInjectedFragment.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/spaces/EnterInInjectedFragment.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/spaces/EnterInLineWithMarginOnNotMargedLine.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/spaces/EnterInLineWithMarginOnNotMargedLine.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/spaces/EnterInMethodCallMargin.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/spaces/EnterInMethodCallMargin.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/spaces/EnterInOneLineAfterSpaces.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/spaces/EnterInOneLineAfterSpaces.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/spaces/EnterInTwoLinesNoMarginCall.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/spaces/EnterInTwoLinesNoMarginCall.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/spaces/EnterInsideBraces.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/spaces/EnterInsideBraces.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/spaces/EnterInsideBraces1.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/spaces/EnterInsideBraces1.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/spaces/EnterInsideBraces2.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/spaces/EnterInsideBraces2.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/spaces/EnterInsideTextMargin.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/spaces/EnterInsideTextMargin.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/spaces/EnterMLSimpleMargin.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/spaces/EnterMLSimpleMargin.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/spaces/EnterMLStartOnSameLineMargin.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/spaces/EnterMLStartOnSameLineMargin.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/spaces/EnterOnFirstLineWithPresentTrimMargin.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/spaces/EnterOnFirstLineWithPresentTrimMargin.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/spaces/EnterOnFirstLineWithPresentTrimMarginAndLine.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/spaces/EnterOnFirstLineWithPresentTrimMarginAndLine.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/spaces/EnterOnFirstNonEmptyLineWithPresentTrimMargin.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/spaces/EnterOnFirstNonEmptyLineWithPresentTrimMargin.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/spaces/EnterOnNewLine.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/spaces/EnterOnNewLine.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/spaces/EnterSimple.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/spaces/EnterSimple.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/spaces/EnterWithTextMargin.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/spaces/EnterWithTextMargin.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/spaces/EnterWithTextOnNewLineMargin.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/spaces/EnterWithTextOnNewLineMargin.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/spaces/InsertCustomMargin.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/spaces/InsertCustomMargin.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/spaces/InsertCustomMarginInLineStart.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/spaces/InsertCustomMarginInLineStart.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/spaces/InsertDefaultMargin.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/spaces/InsertDefaultMargin.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/spaces/NoTrimIndentInAnnotations.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/spaces/NoTrimIndentInAnnotations.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/spaces/NoTrimIndentInConst.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/spaces/NoTrimIndentInConst.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/spaces/RestoreIndentFromEmptyLine.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/spaces/RestoreIndentFromEmptyLine.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/withTabs/tabs2/DontInsertTrimMarginCall.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/withTabs/tabs2/DontInsertTrimMarginCall.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/withTabs/tabs2/EnterInMethodCallMargin.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/withTabs/tabs2/EnterInMethodCallMargin.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/withTabs/tabs2/EnterInTwoLinesNoMarginCall.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/withTabs/tabs2/EnterInTwoLinesNoMarginCall.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/withTabs/tabs2/EnterInsideBraces.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/withTabs/tabs2/EnterInsideBraces.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/withTabs/tabs2/EnterInsideText.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/withTabs/tabs2/EnterInsideText.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/withTabs/tabs2/EnterMLSimpleMargin.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/withTabs/tabs2/EnterMLSimpleMargin.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/withTabs/tabs2/EnterMLStartOnSameLineMargin.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/withTabs/tabs2/EnterMLStartOnSameLineMargin.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/withTabs/tabs2/EnterOnNewLineMargin.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/withTabs/tabs2/EnterOnNewLineMargin.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/withTabs/tabs2/EnterSimpleMargin.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/withTabs/tabs2/EnterSimpleMargin.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/withTabs/tabs2/EnterWithTextMargin.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/withTabs/tabs2/EnterWithTextMargin.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/withTabs/tabs2/EnterWithTextOnNewLineMargin.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/withTabs/tabs2/EnterWithTextOnNewLineMargin.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/withTabs/tabs4/DontInsertTrimMarginCall.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/withTabs/tabs4/DontInsertTrimMarginCall.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/withTabs/tabs4/EnterInMethodCallMargin.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/withTabs/tabs4/EnterInMethodCallMargin.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/withTabs/tabs4/EnterInsideBraces.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/withTabs/tabs4/EnterInsideBraces.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/withTabs/tabs4/EnterInsideText.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/withTabs/tabs4/EnterInsideText.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/withTabs/tabs4/EnterMLSimpleMargin.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/withTabs/tabs4/EnterMLSimpleMargin.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/withTabs/tabs4/EnterMLStartOnSameLineMargin.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/withTabs/tabs4/EnterMLStartOnSameLineMargin.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/withTabs/tabs4/EnterOnNewLineMargin.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/withTabs/tabs4/EnterOnNewLineMargin.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/withTabs/tabs4/EnterSimpleMargin.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/withTabs/tabs4/EnterSimpleMargin.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/withTabs/tabs4/EnterWithTabsAfterMarginChar.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/withTabs/tabs4/EnterWithTabsAfterMarginChar.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/withTabs/tabs4/EnterWithTextMargin.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/withTabs/tabs4/EnterWithTextMargin.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/withTabs/tabs4/EnterWithTextOnNewLineMargin.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/multilineString/withTabs/tabs4/EnterWithTextOnNewLineMargin.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/script/ScriptAfterClosingBrace.after.kts (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/script/ScriptAfterClosingBrace.kts (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/script/ScriptAfterExpression.after.kts (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/script/ScriptAfterExpression.kts (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/script/ScriptAfterFun.after.kts (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/script/ScriptAfterFun.kts (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/script/ScriptAfterImport.after.kts (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/script/ScriptAfterImport.kts (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/script/ScriptBetweenFunctionCalls.after.kts (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/script/ScriptBetweenFunctionCalls.kts (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/script/ScriptInsideFun.after.kts (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/script/ScriptInsideFun.kts (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/templates/LargeFileWithStringTemplate.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/templates/LargeFileWithStringTemplate.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/templates/TemplateEntryClose.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/templates/TemplateEntryClose.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/templates/TemplateEntryClose2.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/templates/TemplateEntryClose2.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/templates/TemplateEntryClose3.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/templates/TemplateEntryClose3.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/templates/TemplateEntryClose4.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/templates/TemplateEntryClose4.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/templates/TemplateEntryClose5.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/templates/TemplateEntryClose5.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/templates/TemplateEntryClose6.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/templates/TemplateEntryClose6.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/templates/TemplateEntryClose7.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/templates/TemplateEntryClose7.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/templates/TemplateEntryCloseInMultilineString.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/templates/TemplateEntryCloseInMultilineString.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/templates/TemplateEntryCloseInMultilineString2.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/templates/TemplateEntryCloseInMultilineString2.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/templates/TemplateEntryCloseInMultilineString3.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/templates/TemplateEntryCloseInMultilineString3.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/templates/TemplateEntryOpen.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/templates/TemplateEntryOpen.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/templates/TemplateEntryOpen2.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/templates/TemplateEntryOpen2.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/templates/TemplateEntryOpenInMultilineString.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/templates/TemplateEntryOpenInMultilineString.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/templates/TemplateEntryOpenInMultilineString2.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/templates/TemplateEntryOpenInMultilineString2.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/templates/TemplateEntryOpenInMultilineString3.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/templates/TemplateEntryOpenInMultilineString3.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/templates/TemplateEntryOpenWithComment.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/templates/TemplateEntryOpenWithComment.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/templates/TemplateEntryOpenWithComment2.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/templates/TemplateEntryOpenWithComment2.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/templates/TemplateEntryOpenWithoutContent.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/templates/TemplateEntryOpenWithoutContent.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/templates/TemplateEntryOpenWithoutContent2.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/templates/TemplateEntryOpenWithoutContent2.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/templates/TemplateEntryOpenWithoutContent3.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/templates/TemplateEntryOpenWithoutContent3.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/templates/TemplateEntryOpenWithoutContent4.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/templates/TemplateEntryOpenWithoutContent4.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/templates/TemplateEntryOpenWithoutContent5.after.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{indentationOnNewline => editor/enterHandler}/templates/TemplateEntryOpenWithoutContent5.kt (100%)

diff --git a/plugins/kotlin/generators/test/org/jetbrains/kotlin/testGenerator/GenerateTests.kt b/plugins/kotlin/generators/test/org/jetbrains/kotlin/testGenerator/GenerateTests.kt
index 1fce5cdb4ee9..e6a1c2fb473d 100644
--- a/plugins/kotlin/generators/test/org/jetbrains/kotlin/testGenerator/GenerateTests.kt
+++ b/plugins/kotlin/generators/test/org/jetbrains/kotlin/testGenerator/GenerateTests.kt
@@ -654,11 +654,6 @@ private fun assembleWorkspace(): TWorkspace = workspace {
             )
         }
 
-        testClass<AbstractTypingIndentationTestBase> {
-            model("indentationOnNewline", pattern = """^([^.]+)\.after\.kt.*$""".toRegex(), testMethodName = "doNewlineTest", testClassName = "DirectSettings")
-            model("indentationOnNewline", pattern = """^([^.]+)\.after\.inv\.kt.*$""".toRegex(), testMethodName = "doNewlineTestWithInvert", testClassName = "InvertedSettings")
-        }
-
         testClass<AbstractDiagnosticMessageTest> {
             model("diagnosticMessage", isRecursive = false)
         }
@@ -801,6 +796,11 @@ private fun assembleWorkspace(): TWorkspace = workspace {
             model("editor/optimizeImports/common", pattern = KT_WITHOUT_DOTS)
         }
 
+        testClass<AbstractTypingIndentationTestBase> {
+            model("editor/enterHandler", pattern = """^([^.]+)\.after\.kt.*$""".toRegex(), testMethodName = "doNewlineTest", testClassName = "DirectSettings")
+            model("editor/enterHandler", pattern = """^([^.]+)\.after\.inv\.kt.*$""".toRegex(), testMethodName = "doNewlineTestWithInvert", testClassName = "InvertedSettings")
+        }
+
         testClass<AbstractStubBuilderTest> {
             model("stubs", pattern = KT)
         }
@@ -1484,8 +1484,8 @@ private fun assembleWorkspace(): TWorkspace = workspace {
         }
 
         testClass<AbstractPerformanceTypingIndentationTest> {
-            model("indentationOnNewline", pattern = """^([^.]+)\.after\.kt.*$""".toRegex(), testMethodName = "doNewlineTest", testClassName = "DirectSettings", splitToBuckets = false)
-            model("indentationOnNewline", pattern = """^([^.]+)\.after\.inv\.kt.*$""".toRegex(), testMethodName = "doNewlineTestWithInvert", testClassName = "InvertedSettings", splitToBuckets = false)
+            model("editor/enterHandler", pattern = """^([^.]+)\.after\.kt.*$""".toRegex(), testMethodName = "doNewlineTest", testClassName = "DirectSettings", splitToBuckets = false)
+            model("editor/enterHandler", pattern = """^([^.]+)\.after\.inv\.kt.*$""".toRegex(), testMethodName = "doNewlineTestWithInvert", testClassName = "InvertedSettings", splitToBuckets = false)
         }
     }
 
diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/formatter/TypingIndentationTestBaseGenerated.java b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/formatter/TypingIndentationTestBaseGenerated.java
index 95d3611072bf..0866438b44d2 100644
--- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/formatter/TypingIndentationTestBaseGenerated.java
+++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/formatter/TypingIndentationTestBaseGenerated.java
@@ -19,10 +19,10 @@ import org.junit.runner.RunWith;
 @RunWith(JUnit3RunnerWithInners.class)
 public abstract class TypingIndentationTestBaseGenerated extends AbstractTypingIndentationTestBase {
     @RunWith(JUnit3RunnerWithInners.class)
-    @TestMetadata("testData/indentationOnNewline")
+    @TestMetadata("testData/editor/enterHandler")
     public abstract static class DirectSettings extends AbstractTypingIndentationTestBase {
         @RunWith(JUnit3RunnerWithInners.class)
-        @TestMetadata("testData/indentationOnNewline/afterUnmatchedBrace")
+        @TestMetadata("testData/editor/enterHandler/afterUnmatchedBrace")
         public static class AfterUnmatchedBrace extends AbstractTypingIndentationTestBase {
             private void runTest(String testDataFilePath) throws Exception {
                 KotlinTestUtils.runTest(this::doNewlineTest, this, testDataFilePath);
@@ -30,72 +30,72 @@ public abstract class TypingIndentationTestBaseGenerated extends AbstractTypingI
 
             @TestMetadata("AtEndOfFile.after.kt")
             public void testAtEndOfFile() throws Exception {
-                runTest("testData/indentationOnNewline/afterUnmatchedBrace/AtEndOfFile.after.kt");
+                runTest("testData/editor/enterHandler/afterUnmatchedBrace/AtEndOfFile.after.kt");
             }
 
             @TestMetadata("LambdaArgumentBeforeFunctionInitializer.after.kt")
             public void testLambdaArgumentBeforeFunctionInitializer() throws Exception {
-                runTest("testData/indentationOnNewline/afterUnmatchedBrace/LambdaArgumentBeforeFunctionInitializer.after.kt");
+                runTest("testData/editor/enterHandler/afterUnmatchedBrace/LambdaArgumentBeforeFunctionInitializer.after.kt");
             }
 
             @TestMetadata("LambdaArgumentBeforeLocalPropertyInitializer.after.kt")
             public void testLambdaArgumentBeforeLocalPropertyInitializer() throws Exception {
-                runTest("testData/indentationOnNewline/afterUnmatchedBrace/LambdaArgumentBeforeLocalPropertyInitializer.after.kt");
+                runTest("testData/editor/enterHandler/afterUnmatchedBrace/LambdaArgumentBeforeLocalPropertyInitializer.after.kt");
             }
 
             @TestMetadata("LambdaArgumentBeforeMemberPropertyInitializer.after.kt")
             public void testLambdaArgumentBeforeMemberPropertyInitializer() throws Exception {
-                runTest("testData/indentationOnNewline/afterUnmatchedBrace/LambdaArgumentBeforeMemberPropertyInitializer.after.kt");
+                runTest("testData/editor/enterHandler/afterUnmatchedBrace/LambdaArgumentBeforeMemberPropertyInitializer.after.kt");
             }
 
             @TestMetadata("LambdaArgumentBeforeTopLevelPropertyInitializer.after.kt")
             public void testLambdaArgumentBeforeTopLevelPropertyInitializer() throws Exception {
-                runTest("testData/indentationOnNewline/afterUnmatchedBrace/LambdaArgumentBeforeTopLevelPropertyInitializer.after.kt");
+                runTest("testData/editor/enterHandler/afterUnmatchedBrace/LambdaArgumentBeforeTopLevelPropertyInitializer.after.kt");
             }
 
             @TestMetadata("NotApplicableOnInitializer.after.kt")
             public void testNotApplicableOnInitializer() throws Exception {
-                runTest("testData/indentationOnNewline/afterUnmatchedBrace/NotApplicableOnInitializer.after.kt");
+                runTest("testData/editor/enterHandler/afterUnmatchedBrace/NotApplicableOnInitializer.after.kt");
             }
 
             @TestMetadata("NotApplicableOnInitializer2.after.kt")
             public void testNotApplicableOnInitializer2() throws Exception {
-                runTest("testData/indentationOnNewline/afterUnmatchedBrace/NotApplicableOnInitializer2.after.kt");
+                runTest("testData/editor/enterHandler/afterUnmatchedBrace/NotApplicableOnInitializer2.after.kt");
             }
 
             @TestMetadata("UnfinishedLambdaInCode.after.kt")
             public void testUnfinishedLambdaInCode() throws Exception {
-                runTest("testData/indentationOnNewline/afterUnmatchedBrace/UnfinishedLambdaInCode.after.kt");
+                runTest("testData/editor/enterHandler/afterUnmatchedBrace/UnfinishedLambdaInCode.after.kt");
             }
 
             @TestMetadata("UnfinishedLambdaInCodeAsVarInitiailzer.after.kt")
             public void testUnfinishedLambdaInCodeAsVarInitiailzer() throws Exception {
-                runTest("testData/indentationOnNewline/afterUnmatchedBrace/UnfinishedLambdaInCodeAsVarInitiailzer.after.kt");
+                runTest("testData/editor/enterHandler/afterUnmatchedBrace/UnfinishedLambdaInCodeAsVarInitiailzer.after.kt");
             }
 
             @TestMetadata("UnfinishedLambdaWithCommentInCode.after.kt")
             public void testUnfinishedLambdaWithCommentInCode() throws Exception {
-                runTest("testData/indentationOnNewline/afterUnmatchedBrace/UnfinishedLambdaWithCommentInCode.after.kt");
+                runTest("testData/editor/enterHandler/afterUnmatchedBrace/UnfinishedLambdaWithCommentInCode.after.kt");
             }
 
             @TestMetadata("WhenBeforeLocalPropertyInitializer.after.kt")
             public void testWhenBeforeLocalPropertyInitializer() throws Exception {
-                runTest("testData/indentationOnNewline/afterUnmatchedBrace/WhenBeforeLocalPropertyInitializer.after.kt");
+                runTest("testData/editor/enterHandler/afterUnmatchedBrace/WhenBeforeLocalPropertyInitializer.after.kt");
             }
 
             @TestMetadata("WhenBeforeMemberPropertyInitializer.after.kt")
             public void testWhenBeforeMemberPropertyInitializer() throws Exception {
-                runTest("testData/indentationOnNewline/afterUnmatchedBrace/WhenBeforeMemberPropertyInitializer.after.kt");
+                runTest("testData/editor/enterHandler/afterUnmatchedBrace/WhenBeforeMemberPropertyInitializer.after.kt");
             }
 
             @TestMetadata("WhenBeforeTopLevelPropertyInitializer.after.kt")
             public void testWhenBeforeTopLevelPropertyInitializer() throws Exception {
-                runTest("testData/indentationOnNewline/afterUnmatchedBrace/WhenBeforeTopLevelPropertyInitializer.after.kt");
+                runTest("testData/editor/enterHandler/afterUnmatchedBrace/WhenBeforeTopLevelPropertyInitializer.after.kt");
             }
         }
 
         @RunWith(JUnit3RunnerWithInners.class)
-        @TestMetadata("testData/indentationOnNewline/arrayAccess")
+        @TestMetadata("testData/editor/enterHandler/arrayAccess")
         public static class ArrayAccess extends AbstractTypingIndentationTestBase {
             private void runTest(String testDataFilePath) throws Exception {
                 KotlinTestUtils.runTest(this::doNewlineTest, this, testDataFilePath);
@@ -103,15 +103,15 @@ public abstract class TypingIndentationTestBaseGenerated extends AbstractTypingI
 
             @TestMetadata("ListAccess.after.kt")
             public void testListAccess() throws Exception {
-                runTest("testData/indentationOnNewline/arrayAccess/ListAccess.after.kt");
+                runTest("testData/editor/enterHandler/arrayAccess/ListAccess.after.kt");
             }
         }
 
         @RunWith(JUnit3RunnerWithInners.class)
-        @TestMetadata("testData/indentationOnNewline/controlFlowConstructions")
+        @TestMetadata("testData/editor/enterHandler/controlFlowConstructions")
         public abstract static class ControlFlowConstructions extends AbstractTypingIndentationTestBase {
             @RunWith(JUnit3RunnerWithInners.class)
-            @TestMetadata("testData/indentationOnNewline/controlFlowConstructions")
+            @TestMetadata("testData/editor/enterHandler/controlFlowConstructions")
             public static class TestBucket001 extends AbstractTypingIndentationTestBase {
                 private void runTest(String testDataFilePath) throws Exception {
                     KotlinTestUtils.runTest(this::doNewlineTest, this, testDataFilePath);
@@ -119,107 +119,107 @@ public abstract class TypingIndentationTestBaseGenerated extends AbstractTypingI
 
                 @TestMetadata("BetweenOpenBraceAndParenthesis.after.kt")
                 public void testBetweenOpenBraceAndParenthesis() throws Exception {
-                    runTest("testData/indentationOnNewline/controlFlowConstructions/BetweenOpenBraceAndParenthesis.after.kt");
+                    runTest("testData/editor/enterHandler/controlFlowConstructions/BetweenOpenBraceAndParenthesis.after.kt");
                 }
 
                 @TestMetadata("Catch.after.kt")
                 public void testCatch() throws Exception {
-                    runTest("testData/indentationOnNewline/controlFlowConstructions/Catch.after.kt");
+                    runTest("testData/editor/enterHandler/controlFlowConstructions/Catch.after.kt");
                 }
 
                 @TestMetadata("Catch2.after.kt")
                 public void testCatch2() throws Exception {
-                    runTest("testData/indentationOnNewline/controlFlowConstructions/Catch2.after.kt");
+                    runTest("testData/editor/enterHandler/controlFlowConstructions/Catch2.after.kt");
                 }
 
                 @TestMetadata("Catch3.after.kt")
                 public void testCatch3() throws Exception {
-                    runTest("testData/indentationOnNewline/controlFlowConstructions/Catch3.after.kt");
+                    runTest("testData/editor/enterHandler/controlFlowConstructions/Catch3.after.kt");
                 }
 
                 @TestMetadata("Catch4.after.kt")
                 public void testCatch4() throws Exception {
-                    runTest("testData/indentationOnNewline/controlFlowConstructions/Catch4.after.kt");
+                    runTest("testData/editor/enterHandler/controlFlowConstructions/Catch4.after.kt");
                 }
 
                 @TestMetadata("Do2.after.kt")
                 public void testDo2() throws Exception {
-                    runTest("testData/indentationOnNewline/controlFlowConstructions/Do2.after.kt");
+                    runTest("testData/editor/enterHandler/controlFlowConstructions/Do2.after.kt");
                 }
 
                 @TestMetadata("DoInFun.after.kt")
                 public void testDoInFun() throws Exception {
-                    runTest("testData/indentationOnNewline/controlFlowConstructions/DoInFun.after.kt");
+                    runTest("testData/editor/enterHandler/controlFlowConstructions/DoInFun.after.kt");
                 }
 
                 @TestMetadata("DoWhile.after.kt")
                 public void testDoWhile() throws Exception {
-                    runTest("testData/indentationOnNewline/controlFlowConstructions/DoWhile.after.kt");
+                    runTest("testData/editor/enterHandler/controlFlowConstructions/DoWhile.after.kt");
                 }
 
                 @TestMetadata("DoWhile2.after.kt")
                 public void testDoWhile2() throws Exception {
-                    runTest("testData/indentationOnNewline/controlFlowConstructions/DoWhile2.after.kt");
+                    runTest("testData/editor/enterHandler/controlFlowConstructions/DoWhile2.after.kt");
                 }
 
                 @TestMetadata("DoWhile3.after.kt")
                 public void testDoWhile3() throws Exception {
-                    runTest("testData/indentationOnNewline/controlFlowConstructions/DoWhile3.after.kt");
+                    runTest("testData/editor/enterHandler/controlFlowConstructions/DoWhile3.after.kt");
                 }
 
                 @TestMetadata("DoWhile4.after.kt")
                 public void testDoWhile4() throws Exception {
-                    runTest("testData/indentationOnNewline/controlFlowConstructions/DoWhile4.after.kt");
+                    runTest("testData/editor/enterHandler/controlFlowConstructions/DoWhile4.after.kt");
                 }
 
                 @TestMetadata("DoWhile5.after.kt")
                 public void testDoWhile5() throws Exception {
-                    runTest("testData/indentationOnNewline/controlFlowConstructions/DoWhile5.after.kt");
+                    runTest("testData/editor/enterHandler/controlFlowConstructions/DoWhile5.after.kt");
                 }
 
                 @TestMetadata("DoWhile6.after.kt")
                 public void testDoWhile6() throws Exception {
-                    runTest("testData/indentationOnNewline/controlFlowConstructions/DoWhile6.after.kt");
+                    runTest("testData/editor/enterHandler/controlFlowConstructions/DoWhile6.after.kt");
                 }
 
                 @TestMetadata("DoWhile7.after.kt")
                 public void testDoWhile7() throws Exception {
-                    runTest("testData/indentationOnNewline/controlFlowConstructions/DoWhile7.after.kt");
+                    runTest("testData/editor/enterHandler/controlFlowConstructions/DoWhile7.after.kt");
                 }
 
                 @TestMetadata("DoWithBraces.after.kt")
                 public void testDoWithBraces() throws Exception {
-                    runTest("testData/indentationOnNewline/controlFlowConstructions/DoWithBraces.after.kt");
+                    runTest("testData/editor/enterHandler/controlFlowConstructions/DoWithBraces.after.kt");
                 }
 
                 @TestMetadata("DoWithBraces2.after.kt")
                 public void testDoWithBraces2() throws Exception {
-                    runTest("testData/indentationOnNewline/controlFlowConstructions/DoWithBraces2.after.kt");
+                    runTest("testData/editor/enterHandler/controlFlowConstructions/DoWithBraces2.after.kt");
                 }
 
                 @TestMetadata("ElseIf.after.kt")
                 public void testElseIf() throws Exception {
-                    runTest("testData/indentationOnNewline/controlFlowConstructions/ElseIf.after.kt");
+                    runTest("testData/editor/enterHandler/controlFlowConstructions/ElseIf.after.kt");
                 }
 
                 @TestMetadata("ElseInWhenWithOption.after.kt")
                 public void testElseInWhenWithOption() throws Exception {
-                    runTest("testData/indentationOnNewline/controlFlowConstructions/ElseInWhenWithOption.after.kt");
+                    runTest("testData/editor/enterHandler/controlFlowConstructions/ElseInWhenWithOption.after.kt");
                 }
 
                 @TestMetadata("ElseInWhenWithoutOption.after.kt")
                 public void testElseInWhenWithoutOption() throws Exception {
-                    runTest("testData/indentationOnNewline/controlFlowConstructions/ElseInWhenWithoutOption.after.kt");
+                    runTest("testData/editor/enterHandler/controlFlowConstructions/ElseInWhenWithoutOption.after.kt");
                 }
 
                 @TestMetadata("ElseWithBrace.after.kt")
                 public void testElseWithBrace() throws Exception {
-                    runTest("testData/indentationOnNewline/controlFlowConstructions/ElseWithBrace.after.kt");
+                    runTest("testData/editor/enterHandler/controlFlowConstructions/ElseWithBrace.after.kt");
                 }
             }
 
             @RunWith(JUnit3RunnerWithInners.class)
-            @TestMetadata("testData/indentationOnNewline/controlFlowConstructions")
+            @TestMetadata("testData/editor/enterHandler/controlFlowConstructions")
             public static class TestBucket002 extends AbstractTypingIndentationTestBase {
                 private void runTest(String testDataFilePath) throws Exception {
                     KotlinTestUtils.runTest(this::doNewlineTest, this, testDataFilePath);
@@ -227,107 +227,107 @@ public abstract class TypingIndentationTestBaseGenerated extends AbstractTypingI
 
                 @TestMetadata("ElseWithBraceAndComment.after.kt")
                 public void testElseWithBraceAndComment() throws Exception {
-                    runTest("testData/indentationOnNewline/controlFlowConstructions/ElseWithBraceAndComment.after.kt");
+                    runTest("testData/editor/enterHandler/controlFlowConstructions/ElseWithBraceAndComment.after.kt");
                 }
 
                 @TestMetadata("ElseWithBraceAndComment2.after.kt")
                 public void testElseWithBraceAndComment2() throws Exception {
-                    runTest("testData/indentationOnNewline/controlFlowConstructions/ElseWithBraceAndComment2.after.kt");
+                    runTest("testData/editor/enterHandler/controlFlowConstructions/ElseWithBraceAndComment2.after.kt");
                 }
 
                 @TestMetadata("ElseWithoutBrace.after.kt")
                 public void testElseWithoutBrace() throws Exception {
-                    runTest("testData/indentationOnNewline/controlFlowConstructions/ElseWithoutBrace.after.kt");
+                    runTest("testData/editor/enterHandler/controlFlowConstructions/ElseWithoutBrace.after.kt");
                 }
 
                 @TestMetadata("ElseWithoutBrace2.after.kt")
                 public void testElseWithoutBrace2() throws Exception {
-                    runTest("testData/indentationOnNewline/controlFlowConstructions/ElseWithoutBrace2.after.kt");
+                    runTest("testData/editor/enterHandler/controlFlowConstructions/ElseWithoutBrace2.after.kt");
                 }
 
                 @TestMetadata("Finally.after.kt")
                 public void testFinally() throws Exception {
-                    runTest("testData/indentationOnNewline/controlFlowConstructions/Finally.after.kt");
+                    runTest("testData/editor/enterHandler/controlFlowConstructions/Finally.after.kt");
                 }
 
                 @TestMetadata("Finally2.after.kt")
                 public void testFinally2() throws Exception {
-                    runTest("testData/indentationOnNewline/controlFlowConstructions/Finally2.after.kt");
+                    runTest("testData/editor/enterHandler/controlFlowConstructions/Finally2.after.kt");
                 }
 
                 @TestMetadata("Finally3.after.kt")
                 public void testFinally3() throws Exception {
-                    runTest("testData/indentationOnNewline/controlFlowConstructions/Finally3.after.kt");
+                    runTest("testData/editor/enterHandler/controlFlowConstructions/Finally3.after.kt");
                 }
 
                 @TestMetadata("Finally4.after.kt")
                 public void testFinally4() throws Exception {
-                    runTest("testData/indentationOnNewline/controlFlowConstructions/Finally4.after.kt");
+                    runTest("testData/editor/enterHandler/controlFlowConstructions/Finally4.after.kt");
                 }
 
                 @TestMetadata("For.after.kt")
                 public void testFor() throws Exception {
-                    runTest("testData/indentationOnNewline/controlFlowConstructions/For.after.kt");
+                    runTest("testData/editor/enterHandler/controlFlowConstructions/For.after.kt");
                 }
 
                 @TestMetadata("ForWithBlock.after.kt")
                 public void testForWithBlock() throws Exception {
-                    runTest("testData/indentationOnNewline/controlFlowConstructions/ForWithBlock.after.kt");
+                    runTest("testData/editor/enterHandler/controlFlowConstructions/ForWithBlock.after.kt");
                 }
 
                 @TestMetadata("ForWithCondition.after.kt")
                 public void testForWithCondition() throws Exception {
-                    runTest("testData/indentationOnNewline/controlFlowConstructions/ForWithCondition.after.kt");
+                    runTest("testData/editor/enterHandler/controlFlowConstructions/ForWithCondition.after.kt");
                 }
 
                 @TestMetadata("ForWithoutCondition.after.kt")
                 public void testForWithoutCondition() throws Exception {
-                    runTest("testData/indentationOnNewline/controlFlowConstructions/ForWithoutCondition.after.kt");
+                    runTest("testData/editor/enterHandler/controlFlowConstructions/ForWithoutCondition.after.kt");
                 }
 
                 @TestMetadata("If.after.kt")
                 public void testIf() throws Exception {
-                    runTest("testData/indentationOnNewline/controlFlowConstructions/If.after.kt");
+                    runTest("testData/editor/enterHandler/controlFlowConstructions/If.after.kt");
                 }
 
                 @TestMetadata("IfBeforeCondition.after.kt")
                 public void testIfBeforeCondition() throws Exception {
-                    runTest("testData/indentationOnNewline/controlFlowConstructions/IfBeforeCondition.after.kt");
+                    runTest("testData/editor/enterHandler/controlFlowConstructions/IfBeforeCondition.after.kt");
                 }
 
                 @TestMetadata("IfBeforeCondition2.after.kt")
                 public void testIfBeforeCondition2() throws Exception {
-                    runTest("testData/indentationOnNewline/controlFlowConstructions/IfBeforeCondition2.after.kt");
+                    runTest("testData/editor/enterHandler/controlFlowConstructions/IfBeforeCondition2.after.kt");
                 }
 
                 @TestMetadata("IfBeforeCondition3.after.kt")
                 public void testIfBeforeCondition3() throws Exception {
-                    runTest("testData/indentationOnNewline/controlFlowConstructions/IfBeforeCondition3.after.kt");
+                    runTest("testData/editor/enterHandler/controlFlowConstructions/IfBeforeCondition3.after.kt");
                 }
 
                 @TestMetadata("IfBeforeCondition4.after.kt")
                 public void testIfBeforeCondition4() throws Exception {
-                    runTest("testData/indentationOnNewline/controlFlowConstructions/IfBeforeCondition4.after.kt");
+                    runTest("testData/editor/enterHandler/controlFlowConstructions/IfBeforeCondition4.after.kt");
                 }
 
                 @TestMetadata("IfWithBraces.after.kt")
                 public void testIfWithBraces() throws Exception {
-                    runTest("testData/indentationOnNewline/controlFlowConstructions/IfWithBraces.after.kt");
+                    runTest("testData/editor/enterHandler/controlFlowConstructions/IfWithBraces.after.kt");
                 }
 
                 @TestMetadata("IfWithBraces2.after.kt")
                 public void testIfWithBraces2() throws Exception {
-                    runTest("testData/indentationOnNewline/controlFlowConstructions/IfWithBraces2.after.kt");
+                    runTest("testData/editor/enterHandler/controlFlowConstructions/IfWithBraces2.after.kt");
                 }
 
                 @TestMetadata("Try.after.kt")
                 public void testTry() throws Exception {
-                    runTest("testData/indentationOnNewline/controlFlowConstructions/Try.after.kt");
+                    runTest("testData/editor/enterHandler/controlFlowConstructions/Try.after.kt");
                 }
             }
 
             @RunWith(JUnit3RunnerWithInners.class)
-            @TestMetadata("testData/indentationOnNewline/controlFlowConstructions")
+            @TestMetadata("testData/editor/enterHandler/controlFlowConstructions")
             public static class TestBucket003 extends AbstractTypingIndentationTestBase {
                 private void runTest(String testDataFilePath) throws Exception {
                     KotlinTestUtils.runTest(this::doNewlineTest, this, testDataFilePath);
@@ -335,58 +335,58 @@ public abstract class TypingIndentationTestBaseGenerated extends AbstractTypingI
 
                 @TestMetadata("Try2.after.kt")
                 public void testTry2() throws Exception {
-                    runTest("testData/indentationOnNewline/controlFlowConstructions/Try2.after.kt");
+                    runTest("testData/editor/enterHandler/controlFlowConstructions/Try2.after.kt");
                 }
 
                 @TestMetadata("WhenWithCondition.after.kt")
                 public void testWhenWithCondition() throws Exception {
-                    runTest("testData/indentationOnNewline/controlFlowConstructions/WhenWithCondition.after.kt");
+                    runTest("testData/editor/enterHandler/controlFlowConstructions/WhenWithCondition.after.kt");
                 }
 
                 @TestMetadata("WhenWithCondition2.after.kt")
                 public void testWhenWithCondition2() throws Exception {
-                    runTest("testData/indentationOnNewline/controlFlowConstructions/WhenWithCondition2.after.kt");
+                    runTest("testData/editor/enterHandler/controlFlowConstructions/WhenWithCondition2.after.kt");
                 }
 
                 @TestMetadata("WhenWithoutCondition.after.kt")
                 public void testWhenWithoutCondition() throws Exception {
-                    runTest("testData/indentationOnNewline/controlFlowConstructions/WhenWithoutCondition.after.kt");
+                    runTest("testData/editor/enterHandler/controlFlowConstructions/WhenWithoutCondition.after.kt");
                 }
 
                 @TestMetadata("While.after.kt")
                 public void testWhile() throws Exception {
-                    runTest("testData/indentationOnNewline/controlFlowConstructions/While.after.kt");
+                    runTest("testData/editor/enterHandler/controlFlowConstructions/While.after.kt");
                 }
 
                 @TestMetadata("While2.after.kt")
                 public void testWhile2() throws Exception {
-                    runTest("testData/indentationOnNewline/controlFlowConstructions/While2.after.kt");
+                    runTest("testData/editor/enterHandler/controlFlowConstructions/While2.after.kt");
                 }
 
                 @TestMetadata("While3.after.kt")
                 public void testWhile3() throws Exception {
-                    runTest("testData/indentationOnNewline/controlFlowConstructions/While3.after.kt");
+                    runTest("testData/editor/enterHandler/controlFlowConstructions/While3.after.kt");
                 }
 
                 @TestMetadata("WhileWithBlock.after.kt")
                 public void testWhileWithBlock() throws Exception {
-                    runTest("testData/indentationOnNewline/controlFlowConstructions/WhileWithBlock.after.kt");
+                    runTest("testData/editor/enterHandler/controlFlowConstructions/WhileWithBlock.after.kt");
                 }
 
                 @TestMetadata("WhileWithCondition.after.kt")
                 public void testWhileWithCondition() throws Exception {
-                    runTest("testData/indentationOnNewline/controlFlowConstructions/WhileWithCondition.after.kt");
+                    runTest("testData/editor/enterHandler/controlFlowConstructions/WhileWithCondition.after.kt");
                 }
 
                 @TestMetadata("WhileWithoutCondition.after.kt")
                 public void testWhileWithoutCondition() throws Exception {
-                    runTest("testData/indentationOnNewline/controlFlowConstructions/WhileWithoutCondition.after.kt");
+                    runTest("testData/editor/enterHandler/controlFlowConstructions/WhileWithoutCondition.after.kt");
                 }
             }
         }
 
         @RunWith(JUnit3RunnerWithInners.class)
-        @TestMetadata("testData/indentationOnNewline/elvis")
+        @TestMetadata("testData/editor/enterHandler/elvis")
         public static class Elvis extends AbstractTypingIndentationTestBase {
             private void runTest(String testDataFilePath) throws Exception {
                 KotlinTestUtils.runTest(this::doNewlineTest, this, testDataFilePath);
@@ -394,32 +394,32 @@ public abstract class TypingIndentationTestBaseGenerated extends AbstractTypingI
 
             @TestMetadata("AfterElvis.after.kt")
             public void testAfterElvis() throws Exception {
-                runTest("testData/indentationOnNewline/elvis/AfterElvis.after.kt");
+                runTest("testData/editor/enterHandler/elvis/AfterElvis.after.kt");
             }
 
             @TestMetadata("AfterElvis2.after.kt")
             public void testAfterElvis2() throws Exception {
-                runTest("testData/indentationOnNewline/elvis/AfterElvis2.after.kt");
+                runTest("testData/editor/enterHandler/elvis/AfterElvis2.after.kt");
             }
 
             @TestMetadata("AfterElvisInBinaryExpression.after.kt")
             public void testAfterElvisInBinaryExpression() throws Exception {
-                runTest("testData/indentationOnNewline/elvis/AfterElvisInBinaryExpression.after.kt");
+                runTest("testData/editor/enterHandler/elvis/AfterElvisInBinaryExpression.after.kt");
             }
 
             @TestMetadata("BeforeElvis.after.kt")
             public void testBeforeElvis() throws Exception {
-                runTest("testData/indentationOnNewline/elvis/BeforeElvis.after.kt");
+                runTest("testData/editor/enterHandler/elvis/BeforeElvis.after.kt");
             }
 
             @TestMetadata("BeforeElvisInBinaryExpression.after.kt")
             public void testBeforeElvisInBinaryExpression() throws Exception {
-                runTest("testData/indentationOnNewline/elvis/BeforeElvisInBinaryExpression.after.kt");
+                runTest("testData/editor/enterHandler/elvis/BeforeElvisInBinaryExpression.after.kt");
             }
         }
 
         @RunWith(JUnit3RunnerWithInners.class)
-        @TestMetadata("testData/indentationOnNewline/emptyBraces")
+        @TestMetadata("testData/editor/enterHandler/emptyBraces")
         public static class EmptyBraces extends AbstractTypingIndentationTestBase {
             private void runTest(String testDataFilePath) throws Exception {
                 KotlinTestUtils.runTest(this::doNewlineTest, this, testDataFilePath);
@@ -427,55 +427,55 @@ public abstract class TypingIndentationTestBaseGenerated extends AbstractTypingI
 
             @TestMetadata("ClassWithConstructor.after.kt")
             public void testClassWithConstructor() throws Exception {
-                runTest("testData/indentationOnNewline/emptyBraces/ClassWithConstructor.after.kt");
+                runTest("testData/editor/enterHandler/emptyBraces/ClassWithConstructor.after.kt");
             }
 
             @TestMetadata("ClassWithConstructor2.after.kt")
             public void testClassWithConstructor2() throws Exception {
-                runTest("testData/indentationOnNewline/emptyBraces/ClassWithConstructor2.after.kt");
+                runTest("testData/editor/enterHandler/emptyBraces/ClassWithConstructor2.after.kt");
             }
 
             @TestMetadata("ClassWithoutConstructor.after.kt")
             public void testClassWithoutConstructor() throws Exception {
-                runTest("testData/indentationOnNewline/emptyBraces/ClassWithoutConstructor.after.kt");
+                runTest("testData/editor/enterHandler/emptyBraces/ClassWithoutConstructor.after.kt");
             }
 
             @TestMetadata("FunctionBlock.after.kt")
             public void testFunctionBlock() throws Exception {
-                runTest("testData/indentationOnNewline/emptyBraces/FunctionBlock.after.kt");
+                runTest("testData/editor/enterHandler/emptyBraces/FunctionBlock.after.kt");
             }
 
             @TestMetadata("FunctionBlock2.after.kt")
             public void testFunctionBlock2() throws Exception {
-                runTest("testData/indentationOnNewline/emptyBraces/FunctionBlock2.after.kt");
+                runTest("testData/editor/enterHandler/emptyBraces/FunctionBlock2.after.kt");
             }
 
             @TestMetadata("FunctionBody3.after.kt")
             public void testFunctionBody3() throws Exception {
-                runTest("testData/indentationOnNewline/emptyBraces/FunctionBody3.after.kt");
+                runTest("testData/editor/enterHandler/emptyBraces/FunctionBody3.after.kt");
             }
 
             @TestMetadata("FunctionBody4.after.kt")
             public void testFunctionBody4() throws Exception {
-                runTest("testData/indentationOnNewline/emptyBraces/FunctionBody4.after.kt");
+                runTest("testData/editor/enterHandler/emptyBraces/FunctionBody4.after.kt");
             }
 
             @TestMetadata("FunctionBodyInsideClass.after.kt")
             public void testFunctionBodyInsideClass() throws Exception {
-                runTest("testData/indentationOnNewline/emptyBraces/FunctionBodyInsideClass.after.kt");
+                runTest("testData/editor/enterHandler/emptyBraces/FunctionBodyInsideClass.after.kt");
             }
 
             @TestMetadata("FunctionBodyInsideClass2.after.kt")
             public void testFunctionBodyInsideClass2() throws Exception {
-                runTest("testData/indentationOnNewline/emptyBraces/FunctionBodyInsideClass2.after.kt");
+                runTest("testData/editor/enterHandler/emptyBraces/FunctionBodyInsideClass2.after.kt");
             }
         }
 
         @RunWith(JUnit3RunnerWithInners.class)
-        @TestMetadata("testData/indentationOnNewline/emptyParameters")
+        @TestMetadata("testData/editor/enterHandler/emptyParameters")
         public abstract static class EmptyParameters extends AbstractTypingIndentationTestBase {
             @RunWith(JUnit3RunnerWithInners.class)
-            @TestMetadata("testData/indentationOnNewline/emptyParameters")
+            @TestMetadata("testData/editor/enterHandler/emptyParameters")
             public static class TestBucket001 extends AbstractTypingIndentationTestBase {
                 private void runTest(String testDataFilePath) throws Exception {
                     KotlinTestUtils.runTest(this::doNewlineTest, this, testDataFilePath);
@@ -483,107 +483,107 @@ public abstract class TypingIndentationTestBaseGenerated extends AbstractTypingI
 
                 @TestMetadata("EmptyArgumentInCallByArrayAccess.after.kt")
                 public void testEmptyArgumentInCallByArrayAccess() throws Exception {
-                    runTest("testData/indentationOnNewline/emptyParameters/EmptyArgumentInCallByArrayAccess.after.kt");
+                    runTest("testData/editor/enterHandler/emptyParameters/EmptyArgumentInCallByArrayAccess.after.kt");
                 }
 
                 @TestMetadata("EmptyArgumentInCallByArrayAccess2.after.kt")
                 public void testEmptyArgumentInCallByArrayAccess2() throws Exception {
-                    runTest("testData/indentationOnNewline/emptyParameters/EmptyArgumentInCallByArrayAccess2.after.kt");
+                    runTest("testData/editor/enterHandler/emptyParameters/EmptyArgumentInCallByArrayAccess2.after.kt");
                 }
 
                 @TestMetadata("EmptyArgumentInCallByDeclaration.after.kt")
                 public void testEmptyArgumentInCallByDeclaration() throws Exception {
-                    runTest("testData/indentationOnNewline/emptyParameters/EmptyArgumentInCallByDeclaration.after.kt");
+                    runTest("testData/editor/enterHandler/emptyParameters/EmptyArgumentInCallByDeclaration.after.kt");
                 }
 
                 @TestMetadata("EmptyArgumentInCallByDeclaration2.after.kt")
                 public void testEmptyArgumentInCallByDeclaration2() throws Exception {
-                    runTest("testData/indentationOnNewline/emptyParameters/EmptyArgumentInCallByDeclaration2.after.kt");
+                    runTest("testData/editor/enterHandler/emptyParameters/EmptyArgumentInCallByDeclaration2.after.kt");
                 }
 
                 @TestMetadata("EmptyArgumentInCallByReference.after.kt")
                 public void testEmptyArgumentInCallByReference() throws Exception {
-                    runTest("testData/indentationOnNewline/emptyParameters/EmptyArgumentInCallByReference.after.kt");
+                    runTest("testData/editor/enterHandler/emptyParameters/EmptyArgumentInCallByReference.after.kt");
                 }
 
                 @TestMetadata("EmptyArgumentInCallByReference2.after.kt")
                 public void testEmptyArgumentInCallByReference2() throws Exception {
-                    runTest("testData/indentationOnNewline/emptyParameters/EmptyArgumentInCallByReference2.after.kt");
+                    runTest("testData/editor/enterHandler/emptyParameters/EmptyArgumentInCallByReference2.after.kt");
                 }
 
                 @TestMetadata("EmptyArgumentInCallByReferenceInSuperType.after.kt")
                 public void testEmptyArgumentInCallByReferenceInSuperType() throws Exception {
-                    runTest("testData/indentationOnNewline/emptyParameters/EmptyArgumentInCallByReferenceInSuperType.after.kt");
+                    runTest("testData/editor/enterHandler/emptyParameters/EmptyArgumentInCallByReferenceInSuperType.after.kt");
                 }
 
                 @TestMetadata("EmptyArgumentInCallByReferenceInSuperType2.after.kt")
                 public void testEmptyArgumentInCallByReferenceInSuperType2() throws Exception {
-                    runTest("testData/indentationOnNewline/emptyParameters/EmptyArgumentInCallByReferenceInSuperType2.after.kt");
+                    runTest("testData/editor/enterHandler/emptyParameters/EmptyArgumentInCallByReferenceInSuperType2.after.kt");
                 }
 
                 @TestMetadata("EmptyArgumentInCallByReferenceInSuperTypeWithTypeArguments.after.kt")
                 public void testEmptyArgumentInCallByReferenceInSuperTypeWithTypeArguments() throws Exception {
-                    runTest("testData/indentationOnNewline/emptyParameters/EmptyArgumentInCallByReferenceInSuperTypeWithTypeArguments.after.kt");
+                    runTest("testData/editor/enterHandler/emptyParameters/EmptyArgumentInCallByReferenceInSuperTypeWithTypeArguments.after.kt");
                 }
 
                 @TestMetadata("EmptyArgumentInCallByReferenceInSuperTypeWithTypeArguments2.after.kt")
                 public void testEmptyArgumentInCallByReferenceInSuperTypeWithTypeArguments2() throws Exception {
-                    runTest("testData/indentationOnNewline/emptyParameters/EmptyArgumentInCallByReferenceInSuperTypeWithTypeArguments2.after.kt");
+                    runTest("testData/editor/enterHandler/emptyParameters/EmptyArgumentInCallByReferenceInSuperTypeWithTypeArguments2.after.kt");
                 }
 
                 @TestMetadata("EmptyArgumentInCallByReferenceWithTypeArguments.after.kt")
                 public void testEmptyArgumentInCallByReferenceWithTypeArguments() throws Exception {
-                    runTest("testData/indentationOnNewline/emptyParameters/EmptyArgumentInCallByReferenceWithTypeArguments.after.kt");
+                    runTest("testData/editor/enterHandler/emptyParameters/EmptyArgumentInCallByReferenceWithTypeArguments.after.kt");
                 }
 
                 @TestMetadata("EmptyArgumentInCallByReferenceWithTypeArguments2.after.kt")
                 public void testEmptyArgumentInCallByReferenceWithTypeArguments2() throws Exception {
-                    runTest("testData/indentationOnNewline/emptyParameters/EmptyArgumentInCallByReferenceWithTypeArguments2.after.kt");
+                    runTest("testData/editor/enterHandler/emptyParameters/EmptyArgumentInCallByReferenceWithTypeArguments2.after.kt");
                 }
 
                 @TestMetadata("EmptyArgumentInThisAsClassicFunction.after.kt")
                 public void testEmptyArgumentInThisAsClassicFunction() throws Exception {
-                    runTest("testData/indentationOnNewline/emptyParameters/EmptyArgumentInThisAsClassicFunction.after.kt");
+                    runTest("testData/editor/enterHandler/emptyParameters/EmptyArgumentInThisAsClassicFunction.after.kt");
                 }
 
                 @TestMetadata("EmptyArgumentInThisAsConstructor.after.kt")
                 public void testEmptyArgumentInThisAsConstructor() throws Exception {
-                    runTest("testData/indentationOnNewline/emptyParameters/EmptyArgumentInThisAsConstructor.after.kt");
+                    runTest("testData/editor/enterHandler/emptyParameters/EmptyArgumentInThisAsConstructor.after.kt");
                 }
 
                 @TestMetadata("EmptyArgumentInThisAsConstructor2.after.kt")
                 public void testEmptyArgumentInThisAsConstructor2() throws Exception {
-                    runTest("testData/indentationOnNewline/emptyParameters/EmptyArgumentInThisAsConstructor2.after.kt");
+                    runTest("testData/editor/enterHandler/emptyParameters/EmptyArgumentInThisAsConstructor2.after.kt");
                 }
 
                 @TestMetadata("EmptyConditionInCatch.after.kt")
                 public void testEmptyConditionInCatch() throws Exception {
-                    runTest("testData/indentationOnNewline/emptyParameters/EmptyConditionInCatch.after.kt");
+                    runTest("testData/editor/enterHandler/emptyParameters/EmptyConditionInCatch.after.kt");
                 }
 
                 @TestMetadata("EmptyConditionInCatch2.after.kt")
                 public void testEmptyConditionInCatch2() throws Exception {
-                    runTest("testData/indentationOnNewline/emptyParameters/EmptyConditionInCatch2.after.kt");
+                    runTest("testData/editor/enterHandler/emptyParameters/EmptyConditionInCatch2.after.kt");
                 }
 
                 @TestMetadata("EmptyConditionInDoWhile.after.kt")
                 public void testEmptyConditionInDoWhile() throws Exception {
-                    runTest("testData/indentationOnNewline/emptyParameters/EmptyConditionInDoWhile.after.kt");
+                    runTest("testData/editor/enterHandler/emptyParameters/EmptyConditionInDoWhile.after.kt");
                 }
 
                 @TestMetadata("EmptyConditionInFor.after.kt")
                 public void testEmptyConditionInFor() throws Exception {
-                    runTest("testData/indentationOnNewline/emptyParameters/EmptyConditionInFor.after.kt");
+                    runTest("testData/editor/enterHandler/emptyParameters/EmptyConditionInFor.after.kt");
                 }
 
                 @TestMetadata("EmptyConditionInIf.after.kt")
                 public void testEmptyConditionInIf() throws Exception {
-                    runTest("testData/indentationOnNewline/emptyParameters/EmptyConditionInIf.after.kt");
+                    runTest("testData/editor/enterHandler/emptyParameters/EmptyConditionInIf.after.kt");
                 }
             }
 
             @RunWith(JUnit3RunnerWithInners.class)
-            @TestMetadata("testData/indentationOnNewline/emptyParameters")
+            @TestMetadata("testData/editor/enterHandler/emptyParameters")
             public static class TestBucket002 extends AbstractTypingIndentationTestBase {
                 private void runTest(String testDataFilePath) throws Exception {
                     KotlinTestUtils.runTest(this::doNewlineTest, this, testDataFilePath);
@@ -591,107 +591,107 @@ public abstract class TypingIndentationTestBaseGenerated extends AbstractTypingI
 
                 @TestMetadata("EmptyConditionInWhen.after.kt")
                 public void testEmptyConditionInWhen() throws Exception {
-                    runTest("testData/indentationOnNewline/emptyParameters/EmptyConditionInWhen.after.kt");
+                    runTest("testData/editor/enterHandler/emptyParameters/EmptyConditionInWhen.after.kt");
                 }
 
                 @TestMetadata("EmptyConditionInWhile.after.kt")
                 public void testEmptyConditionInWhile() throws Exception {
-                    runTest("testData/indentationOnNewline/emptyParameters/EmptyConditionInWhile.after.kt");
+                    runTest("testData/editor/enterHandler/emptyParameters/EmptyConditionInWhile.after.kt");
                 }
 
                 @TestMetadata("EmptyParameterInAnnonymousFunction.after.kt")
                 public void testEmptyParameterInAnnonymousFunction() throws Exception {
-                    runTest("testData/indentationOnNewline/emptyParameters/EmptyParameterInAnnonymousFunction.after.kt");
+                    runTest("testData/editor/enterHandler/emptyParameters/EmptyParameterInAnnonymousFunction.after.kt");
                 }
 
                 @TestMetadata("EmptyParameterInAnnonymousFunction2.after.kt")
                 public void testEmptyParameterInAnnonymousFunction2() throws Exception {
-                    runTest("testData/indentationOnNewline/emptyParameters/EmptyParameterInAnnonymousFunction2.after.kt");
+                    runTest("testData/editor/enterHandler/emptyParameters/EmptyParameterInAnnonymousFunction2.after.kt");
                 }
 
                 @TestMetadata("EmptyParameterInAnnonymousFunctionWithNullableReceiver.after.kt")
                 public void testEmptyParameterInAnnonymousFunctionWithNullableReceiver() throws Exception {
-                    runTest("testData/indentationOnNewline/emptyParameters/EmptyParameterInAnnonymousFunctionWithNullableReceiver.after.kt");
+                    runTest("testData/editor/enterHandler/emptyParameters/EmptyParameterInAnnonymousFunctionWithNullableReceiver.after.kt");
                 }
 
                 @TestMetadata("EmptyParameterInAnnonymousFunctionWithNullableReceiver2.after.kt")
                 public void testEmptyParameterInAnnonymousFunctionWithNullableReceiver2() throws Exception {
-                    runTest("testData/indentationOnNewline/emptyParameters/EmptyParameterInAnnonymousFunctionWithNullableReceiver2.after.kt");
+                    runTest("testData/editor/enterHandler/emptyParameters/EmptyParameterInAnnonymousFunctionWithNullableReceiver2.after.kt");
                 }
 
                 @TestMetadata("EmptyParameterInAnnonymousFunctionWithReceiver.after.kt")
                 public void testEmptyParameterInAnnonymousFunctionWithReceiver() throws Exception {
-                    runTest("testData/indentationOnNewline/emptyParameters/EmptyParameterInAnnonymousFunctionWithReceiver.after.kt");
+                    runTest("testData/editor/enterHandler/emptyParameters/EmptyParameterInAnnonymousFunctionWithReceiver.after.kt");
                 }
 
                 @TestMetadata("EmptyParameterInAnnonymousFunctionWithReceiver2.after.kt")
                 public void testEmptyParameterInAnnonymousFunctionWithReceiver2() throws Exception {
-                    runTest("testData/indentationOnNewline/emptyParameters/EmptyParameterInAnnonymousFunctionWithReceiver2.after.kt");
+                    runTest("testData/editor/enterHandler/emptyParameters/EmptyParameterInAnnonymousFunctionWithReceiver2.after.kt");
                 }
 
                 @TestMetadata("EmptyParameterInDestructuringDeclaration.after.kt")
                 public void testEmptyParameterInDestructuringDeclaration() throws Exception {
-                    runTest("testData/indentationOnNewline/emptyParameters/EmptyParameterInDestructuringDeclaration.after.kt");
+                    runTest("testData/editor/enterHandler/emptyParameters/EmptyParameterInDestructuringDeclaration.after.kt");
                 }
 
                 @TestMetadata("EmptyParameterInDestructuringDeclaration2.after.kt")
                 public void testEmptyParameterInDestructuringDeclaration2() throws Exception {
-                    runTest("testData/indentationOnNewline/emptyParameters/EmptyParameterInDestructuringDeclaration2.after.kt");
+                    runTest("testData/editor/enterHandler/emptyParameters/EmptyParameterInDestructuringDeclaration2.after.kt");
                 }
 
                 @TestMetadata("EmptyParameterInDestructuringDeclaration3.after.kt")
                 public void testEmptyParameterInDestructuringDeclaration3() throws Exception {
-                    runTest("testData/indentationOnNewline/emptyParameters/EmptyParameterInDestructuringDeclaration3.after.kt");
+                    runTest("testData/editor/enterHandler/emptyParameters/EmptyParameterInDestructuringDeclaration3.after.kt");
                 }
 
                 @TestMetadata("EmptyParameterInExplicitPrimaryConstructor.after.kt")
                 public void testEmptyParameterInExplicitPrimaryConstructor() throws Exception {
-                    runTest("testData/indentationOnNewline/emptyParameters/EmptyParameterInExplicitPrimaryConstructor.after.kt");
+                    runTest("testData/editor/enterHandler/emptyParameters/EmptyParameterInExplicitPrimaryConstructor.after.kt");
                 }
 
                 @TestMetadata("EmptyParameterInExplicitPrimaryConstructor2.after.kt")
                 public void testEmptyParameterInExplicitPrimaryConstructor2() throws Exception {
-                    runTest("testData/indentationOnNewline/emptyParameters/EmptyParameterInExplicitPrimaryConstructor2.after.kt");
+                    runTest("testData/editor/enterHandler/emptyParameters/EmptyParameterInExplicitPrimaryConstructor2.after.kt");
                 }
 
                 @TestMetadata("EmptyParameterInFunction.after.kt")
                 public void testEmptyParameterInFunction() throws Exception {
-                    runTest("testData/indentationOnNewline/emptyParameters/EmptyParameterInFunction.after.kt");
+                    runTest("testData/editor/enterHandler/emptyParameters/EmptyParameterInFunction.after.kt");
                 }
 
                 @TestMetadata("EmptyParameterInFunction2.after.kt")
                 public void testEmptyParameterInFunction2() throws Exception {
-                    runTest("testData/indentationOnNewline/emptyParameters/EmptyParameterInFunction2.after.kt");
+                    runTest("testData/editor/enterHandler/emptyParameters/EmptyParameterInFunction2.after.kt");
                 }
 
                 @TestMetadata("EmptyParameterInFunctionWithReceiver.after.kt")
                 public void testEmptyParameterInFunctionWithReceiver() throws Exception {
-                    runTest("testData/indentationOnNewline/emptyParameters/EmptyParameterInFunctionWithReceiver.after.kt");
+                    runTest("testData/editor/enterHandler/emptyParameters/EmptyParameterInFunctionWithReceiver.after.kt");
                 }
 
                 @TestMetadata("EmptyParameterInFunctionWithReceiver2.after.kt")
                 public void testEmptyParameterInFunctionWithReceiver2() throws Exception {
-                    runTest("testData/indentationOnNewline/emptyParameters/EmptyParameterInFunctionWithReceiver2.after.kt");
+                    runTest("testData/editor/enterHandler/emptyParameters/EmptyParameterInFunctionWithReceiver2.after.kt");
                 }
 
                 @TestMetadata("EmptyParameterInFunctionWithTypeParameters.after.kt")
                 public void testEmptyParameterInFunctionWithTypeParameters() throws Exception {
-                    runTest("testData/indentationOnNewline/emptyParameters/EmptyParameterInFunctionWithTypeParameters.after.kt");
+                    runTest("testData/editor/enterHandler/emptyParameters/EmptyParameterInFunctionWithTypeParameters.after.kt");
                 }
 
                 @TestMetadata("EmptyParameterInFunctionWithTypeParameters2.after.kt")
                 public void testEmptyParameterInFunctionWithTypeParameters2() throws Exception {
-                    runTest("testData/indentationOnNewline/emptyParameters/EmptyParameterInFunctionWithTypeParameters2.after.kt");
+                    runTest("testData/editor/enterHandler/emptyParameters/EmptyParameterInFunctionWithTypeParameters2.after.kt");
                 }
 
                 @TestMetadata("EmptyParameterInFunctionWithTypeParametersAndReceiver.after.kt")
                 public void testEmptyParameterInFunctionWithTypeParametersAndReceiver() throws Exception {
-                    runTest("testData/indentationOnNewline/emptyParameters/EmptyParameterInFunctionWithTypeParametersAndReceiver.after.kt");
+                    runTest("testData/editor/enterHandler/emptyParameters/EmptyParameterInFunctionWithTypeParametersAndReceiver.after.kt");
                 }
             }
 
             @RunWith(JUnit3RunnerWithInners.class)
-            @TestMetadata("testData/indentationOnNewline/emptyParameters")
+            @TestMetadata("testData/editor/enterHandler/emptyParameters")
             public static class TestBucket003 extends AbstractTypingIndentationTestBase {
                 private void runTest(String testDataFilePath) throws Exception {
                     KotlinTestUtils.runTest(this::doNewlineTest, this, testDataFilePath);
@@ -699,93 +699,93 @@ public abstract class TypingIndentationTestBaseGenerated extends AbstractTypingI
 
                 @TestMetadata("EmptyParameterInFunctionWithTypeParametersAndReceiver2.after.kt")
                 public void testEmptyParameterInFunctionWithTypeParametersAndReceiver2() throws Exception {
-                    runTest("testData/indentationOnNewline/emptyParameters/EmptyParameterInFunctionWithTypeParametersAndReceiver2.after.kt");
+                    runTest("testData/editor/enterHandler/emptyParameters/EmptyParameterInFunctionWithTypeParametersAndReceiver2.after.kt");
                 }
 
                 @TestMetadata("EmptyParameterInFunctionWithTypeParametersAndReceiver3.after.kt")
                 public void testEmptyParameterInFunctionWithTypeParametersAndReceiver3() throws Exception {
-                    runTest("testData/indentationOnNewline/emptyParameters/EmptyParameterInFunctionWithTypeParametersAndReceiver3.after.kt");
+                    runTest("testData/editor/enterHandler/emptyParameters/EmptyParameterInFunctionWithTypeParametersAndReceiver3.after.kt");
                 }
 
                 @TestMetadata("EmptyParameterInFunctionWithTypeParametersAndReceiver4.after.kt")
                 public void testEmptyParameterInFunctionWithTypeParametersAndReceiver4() throws Exception {
-                    runTest("testData/indentationOnNewline/emptyParameters/EmptyParameterInFunctionWithTypeParametersAndReceiver4.after.kt");
+                    runTest("testData/editor/enterHandler/emptyParameters/EmptyParameterInFunctionWithTypeParametersAndReceiver4.after.kt");
                 }
 
                 @TestMetadata("EmptyParameterInGetter.after.kt")
                 public void testEmptyParameterInGetter() throws Exception {
-                    runTest("testData/indentationOnNewline/emptyParameters/EmptyParameterInGetter.after.kt");
+                    runTest("testData/editor/enterHandler/emptyParameters/EmptyParameterInGetter.after.kt");
                 }
 
                 @TestMetadata("EmptyParameterInGetter2.after.kt")
                 public void testEmptyParameterInGetter2() throws Exception {
-                    runTest("testData/indentationOnNewline/emptyParameters/EmptyParameterInGetter2.after.kt");
+                    runTest("testData/editor/enterHandler/emptyParameters/EmptyParameterInGetter2.after.kt");
                 }
 
                 @TestMetadata("EmptyParameterInImplicitPrimaryConstructor.after.kt")
                 public void testEmptyParameterInImplicitPrimaryConstructor() throws Exception {
-                    runTest("testData/indentationOnNewline/emptyParameters/EmptyParameterInImplicitPrimaryConstructor.after.kt");
+                    runTest("testData/editor/enterHandler/emptyParameters/EmptyParameterInImplicitPrimaryConstructor.after.kt");
                 }
 
                 @TestMetadata("EmptyParameterInImplicitPrimaryConstructor2.after.kt")
                 public void testEmptyParameterInImplicitPrimaryConstructor2() throws Exception {
-                    runTest("testData/indentationOnNewline/emptyParameters/EmptyParameterInImplicitPrimaryConstructor2.after.kt");
+                    runTest("testData/editor/enterHandler/emptyParameters/EmptyParameterInImplicitPrimaryConstructor2.after.kt");
                 }
 
                 @TestMetadata("EmptyParameterInImplicitPrimaryConstructorWithTypeParameters.after.kt")
                 public void testEmptyParameterInImplicitPrimaryConstructorWithTypeParameters() throws Exception {
-                    runTest("testData/indentationOnNewline/emptyParameters/EmptyParameterInImplicitPrimaryConstructorWithTypeParameters.after.kt");
+                    runTest("testData/editor/enterHandler/emptyParameters/EmptyParameterInImplicitPrimaryConstructorWithTypeParameters.after.kt");
                 }
 
                 @TestMetadata("EmptyParameterInImplicitPrimaryConstructorWithTypeParameters2.after.kt")
                 public void testEmptyParameterInImplicitPrimaryConstructorWithTypeParameters2() throws Exception {
-                    runTest("testData/indentationOnNewline/emptyParameters/EmptyParameterInImplicitPrimaryConstructorWithTypeParameters2.after.kt");
+                    runTest("testData/editor/enterHandler/emptyParameters/EmptyParameterInImplicitPrimaryConstructorWithTypeParameters2.after.kt");
                 }
 
                 @TestMetadata("EmptyParameterInInnerAnnonymousFunction.after.kt")
                 public void testEmptyParameterInInnerAnnonymousFunction() throws Exception {
-                    runTest("testData/indentationOnNewline/emptyParameters/EmptyParameterInInnerAnnonymousFunction.after.kt");
+                    runTest("testData/editor/enterHandler/emptyParameters/EmptyParameterInInnerAnnonymousFunction.after.kt");
                 }
 
                 @TestMetadata("EmptyParameterInInnerAnnonymousFunction2.after.kt")
                 public void testEmptyParameterInInnerAnnonymousFunction2() throws Exception {
-                    runTest("testData/indentationOnNewline/emptyParameters/EmptyParameterInInnerAnnonymousFunction2.after.kt");
+                    runTest("testData/editor/enterHandler/emptyParameters/EmptyParameterInInnerAnnonymousFunction2.after.kt");
                 }
 
                 @TestMetadata("EmptyParameterInSecondaryConstructor.after.kt")
                 public void testEmptyParameterInSecondaryConstructor() throws Exception {
-                    runTest("testData/indentationOnNewline/emptyParameters/EmptyParameterInSecondaryConstructor.after.kt");
+                    runTest("testData/editor/enterHandler/emptyParameters/EmptyParameterInSecondaryConstructor.after.kt");
                 }
 
                 @TestMetadata("EmptyParameterInSecondaryConstructor2.after.kt")
                 public void testEmptyParameterInSecondaryConstructor2() throws Exception {
-                    runTest("testData/indentationOnNewline/emptyParameters/EmptyParameterInSecondaryConstructor2.after.kt");
+                    runTest("testData/editor/enterHandler/emptyParameters/EmptyParameterInSecondaryConstructor2.after.kt");
                 }
 
                 @TestMetadata("EmptyParameterInSetter.after.kt")
                 public void testEmptyParameterInSetter() throws Exception {
-                    runTest("testData/indentationOnNewline/emptyParameters/EmptyParameterInSetter.after.kt");
+                    runTest("testData/editor/enterHandler/emptyParameters/EmptyParameterInSetter.after.kt");
                 }
 
                 @TestMetadata("EmptyParameterInSetter2.after.kt")
                 public void testEmptyParameterInSetter2() throws Exception {
-                    runTest("testData/indentationOnNewline/emptyParameters/EmptyParameterInSetter2.after.kt");
+                    runTest("testData/editor/enterHandler/emptyParameters/EmptyParameterInSetter2.after.kt");
                 }
 
                 @TestMetadata("EmptyParameters.after.kt")
                 public void testEmptyParameters() throws Exception {
-                    runTest("testData/indentationOnNewline/emptyParameters/EmptyParameters.after.kt");
+                    runTest("testData/editor/enterHandler/emptyParameters/EmptyParameters.after.kt");
                 }
 
                 @TestMetadata("EmptyParameters2.after.kt")
                 public void testEmptyParameters2() throws Exception {
-                    runTest("testData/indentationOnNewline/emptyParameters/EmptyParameters2.after.kt");
+                    runTest("testData/editor/enterHandler/emptyParameters/EmptyParameters2.after.kt");
                 }
             }
         }
 
         @RunWith(JUnit3RunnerWithInners.class)
-        @TestMetadata("testData/indentationOnNewline/emptyParenthesisInBinaryExpression")
+        @TestMetadata("testData/editor/enterHandler/emptyParenthesisInBinaryExpression")
         public static class EmptyParenthesisInBinaryExpression extends AbstractTypingIndentationTestBase {
             private void runTest(String testDataFilePath) throws Exception {
                 KotlinTestUtils.runTest(this::doNewlineTest, this, testDataFilePath);
@@ -793,77 +793,77 @@ public abstract class TypingIndentationTestBaseGenerated extends AbstractTypingI
 
             @TestMetadata("AssignmentAfterEq.after.kt")
             public void testAssignmentAfterEq() throws Exception {
-                runTest("testData/indentationOnNewline/emptyParenthesisInBinaryExpression/AssignmentAfterEq.after.kt");
+                runTest("testData/editor/enterHandler/emptyParenthesisInBinaryExpression/AssignmentAfterEq.after.kt");
             }
 
             @TestMetadata("BinaryWithTypeExpressions.after.kt")
             public void testBinaryWithTypeExpressions() throws Exception {
-                runTest("testData/indentationOnNewline/emptyParenthesisInBinaryExpression/BinaryWithTypeExpressions.after.kt");
+                runTest("testData/editor/enterHandler/emptyParenthesisInBinaryExpression/BinaryWithTypeExpressions.after.kt");
             }
 
             @TestMetadata("EmptyArgumentInCallByArrayAccess.after.kt")
             public void testEmptyArgumentInCallByArrayAccess() throws Exception {
-                runTest("testData/indentationOnNewline/emptyParenthesisInBinaryExpression/EmptyArgumentInCallByArrayAccess.after.kt");
+                runTest("testData/editor/enterHandler/emptyParenthesisInBinaryExpression/EmptyArgumentInCallByArrayAccess.after.kt");
             }
 
             @TestMetadata("EmptyArgumentInCallByDeclaration.after.kt")
             public void testEmptyArgumentInCallByDeclaration() throws Exception {
-                runTest("testData/indentationOnNewline/emptyParenthesisInBinaryExpression/EmptyArgumentInCallByDeclaration.after.kt");
+                runTest("testData/editor/enterHandler/emptyParenthesisInBinaryExpression/EmptyArgumentInCallByDeclaration.after.kt");
             }
 
             @TestMetadata("InBinaryExpressionInMiddle.after.kt")
             public void testInBinaryExpressionInMiddle() throws Exception {
-                runTest("testData/indentationOnNewline/emptyParenthesisInBinaryExpression/InBinaryExpressionInMiddle.after.kt");
+                runTest("testData/editor/enterHandler/emptyParenthesisInBinaryExpression/InBinaryExpressionInMiddle.after.kt");
             }
 
             @TestMetadata("InBinaryExpressionUnfinished.after.kt")
             public void testInBinaryExpressionUnfinished() throws Exception {
-                runTest("testData/indentationOnNewline/emptyParenthesisInBinaryExpression/InBinaryExpressionUnfinished.after.kt");
+                runTest("testData/editor/enterHandler/emptyParenthesisInBinaryExpression/InBinaryExpressionUnfinished.after.kt");
             }
 
             @TestMetadata("InBinaryExpressionUnfinishedInIf.after.kt")
             public void testInBinaryExpressionUnfinishedInIf() throws Exception {
-                runTest("testData/indentationOnNewline/emptyParenthesisInBinaryExpression/InBinaryExpressionUnfinishedInIf.after.kt");
+                runTest("testData/editor/enterHandler/emptyParenthesisInBinaryExpression/InBinaryExpressionUnfinishedInIf.after.kt");
             }
 
             @TestMetadata("InBinaryExpressionsBeforeCloseParenthesis.after.kt")
             public void testInBinaryExpressionsBeforeCloseParenthesis() throws Exception {
-                runTest("testData/indentationOnNewline/emptyParenthesisInBinaryExpression/InBinaryExpressionsBeforeCloseParenthesis.after.kt");
+                runTest("testData/editor/enterHandler/emptyParenthesisInBinaryExpression/InBinaryExpressionsBeforeCloseParenthesis.after.kt");
             }
 
             @TestMetadata("InExpressionsParentheses.after.kt")
             public void testInExpressionsParentheses() throws Exception {
-                runTest("testData/indentationOnNewline/emptyParenthesisInBinaryExpression/InExpressionsParentheses.after.kt");
+                runTest("testData/editor/enterHandler/emptyParenthesisInBinaryExpression/InExpressionsParentheses.after.kt");
             }
 
             @TestMetadata("InExpressionsParentheses2.after.kt")
             public void testInExpressionsParentheses2() throws Exception {
-                runTest("testData/indentationOnNewline/emptyParenthesisInBinaryExpression/InExpressionsParentheses2.after.kt");
+                runTest("testData/editor/enterHandler/emptyParenthesisInBinaryExpression/InExpressionsParentheses2.after.kt");
             }
 
             @TestMetadata("InExpressionsParentheses3.after.kt")
             public void testInExpressionsParentheses3() throws Exception {
-                runTest("testData/indentationOnNewline/emptyParenthesisInBinaryExpression/InExpressionsParentheses3.after.kt");
+                runTest("testData/editor/enterHandler/emptyParenthesisInBinaryExpression/InExpressionsParentheses3.after.kt");
             }
 
             @TestMetadata("InExpressionsParentheses4.after.kt")
             public void testInExpressionsParentheses4() throws Exception {
-                runTest("testData/indentationOnNewline/emptyParenthesisInBinaryExpression/InExpressionsParentheses4.after.kt");
+                runTest("testData/editor/enterHandler/emptyParenthesisInBinaryExpression/InExpressionsParentheses4.after.kt");
             }
 
             @TestMetadata("InExpressionsParenthesesBeforeOperand.after.kt")
             public void testInExpressionsParenthesesBeforeOperand() throws Exception {
-                runTest("testData/indentationOnNewline/emptyParenthesisInBinaryExpression/InExpressionsParenthesesBeforeOperand.after.kt");
+                runTest("testData/editor/enterHandler/emptyParenthesisInBinaryExpression/InExpressionsParenthesesBeforeOperand.after.kt");
             }
 
             @TestMetadata("IsExpressionAfterIs.after.kt")
             public void testIsExpressionAfterIs() throws Exception {
-                runTest("testData/indentationOnNewline/emptyParenthesisInBinaryExpression/IsExpressionAfterIs.after.kt");
+                runTest("testData/editor/enterHandler/emptyParenthesisInBinaryExpression/IsExpressionAfterIs.after.kt");
             }
         }
 
         @RunWith(JUnit3RunnerWithInners.class)
-        @TestMetadata("testData/indentationOnNewline/expressionBody")
+        @TestMetadata("testData/editor/enterHandler/expressionBody")
         public static class ExpressionBody extends AbstractTypingIndentationTestBase {
             private void runTest(String testDataFilePath) throws Exception {
                 KotlinTestUtils.runTest(this::doNewlineTest, this, testDataFilePath);
@@ -871,103 +871,103 @@ public abstract class TypingIndentationTestBaseGenerated extends AbstractTypingI
 
             @TestMetadata("AfterFunctionWithExplicitType.after.kt")
             public void testAfterFunctionWithExplicitType() throws Exception {
-                runTest("testData/indentationOnNewline/expressionBody/AfterFunctionWithExplicitType.after.kt");
+                runTest("testData/editor/enterHandler/expressionBody/AfterFunctionWithExplicitType.after.kt");
             }
 
             @TestMetadata("AfterFunctionWithInference.after.kt")
             public void testAfterFunctionWithInference() throws Exception {
-                runTest("testData/indentationOnNewline/expressionBody/AfterFunctionWithInference.after.kt");
+                runTest("testData/editor/enterHandler/expressionBody/AfterFunctionWithInference.after.kt");
             }
 
             @TestMetadata("AfterFunctionWithTypeParameter.after.kt")
             public void testAfterFunctionWithTypeParameter() throws Exception {
-                runTest("testData/indentationOnNewline/expressionBody/AfterFunctionWithTypeParameter.after.kt");
+                runTest("testData/editor/enterHandler/expressionBody/AfterFunctionWithTypeParameter.after.kt");
             }
 
             @TestMetadata("AfterMultideclaration.after.kt")
             public void testAfterMultideclaration() throws Exception {
-                runTest("testData/indentationOnNewline/expressionBody/AfterMultideclaration.after.kt");
+                runTest("testData/editor/enterHandler/expressionBody/AfterMultideclaration.after.kt");
             }
 
             @TestMetadata("AfterMutableProperty.after.kt")
             public void testAfterMutableProperty() throws Exception {
-                runTest("testData/indentationOnNewline/expressionBody/AfterMutableProperty.after.kt");
+                runTest("testData/editor/enterHandler/expressionBody/AfterMutableProperty.after.kt");
             }
 
             @TestMetadata("AfterPropertyWithExplicitType.after.kt")
             public void testAfterPropertyWithExplicitType() throws Exception {
-                runTest("testData/indentationOnNewline/expressionBody/AfterPropertyWithExplicitType.after.kt");
+                runTest("testData/editor/enterHandler/expressionBody/AfterPropertyWithExplicitType.after.kt");
             }
 
             @TestMetadata("AfterPropertyWithInference.after.kt")
             public void testAfterPropertyWithInference() throws Exception {
-                runTest("testData/indentationOnNewline/expressionBody/AfterPropertyWithInference.after.kt");
+                runTest("testData/editor/enterHandler/expressionBody/AfterPropertyWithInference.after.kt");
             }
 
             @TestMetadata("AfterPropertyWithReceiver.after.kt")
             public void testAfterPropertyWithReceiver() throws Exception {
-                runTest("testData/indentationOnNewline/expressionBody/AfterPropertyWithReceiver.after.kt");
+                runTest("testData/editor/enterHandler/expressionBody/AfterPropertyWithReceiver.after.kt");
             }
 
             @TestMetadata("AfterPropertyWithTypeParameterReceiver.after.kt")
             public void testAfterPropertyWithTypeParameterReceiver() throws Exception {
-                runTest("testData/indentationOnNewline/expressionBody/AfterPropertyWithTypeParameterReceiver.after.kt");
+                runTest("testData/editor/enterHandler/expressionBody/AfterPropertyWithTypeParameterReceiver.after.kt");
             }
 
             @TestMetadata("FunctionWithExplicitType.after.kt")
             public void testFunctionWithExplicitType() throws Exception {
-                runTest("testData/indentationOnNewline/expressionBody/FunctionWithExplicitType.after.kt");
+                runTest("testData/editor/enterHandler/expressionBody/FunctionWithExplicitType.after.kt");
             }
 
             @TestMetadata("FunctionWithInference.after.kt")
             public void testFunctionWithInference() throws Exception {
-                runTest("testData/indentationOnNewline/expressionBody/FunctionWithInference.after.kt");
+                runTest("testData/editor/enterHandler/expressionBody/FunctionWithInference.after.kt");
             }
 
             @TestMetadata("FunctionWithTypeParameter.after.kt")
             public void testFunctionWithTypeParameter() throws Exception {
-                runTest("testData/indentationOnNewline/expressionBody/FunctionWithTypeParameter.after.kt");
+                runTest("testData/editor/enterHandler/expressionBody/FunctionWithTypeParameter.after.kt");
             }
 
             @TestMetadata("Multideclaration.after.kt")
             public void testMultideclaration() throws Exception {
-                runTest("testData/indentationOnNewline/expressionBody/Multideclaration.after.kt");
+                runTest("testData/editor/enterHandler/expressionBody/Multideclaration.after.kt");
             }
 
             @TestMetadata("MutableProperty.after.kt")
             public void testMutableProperty() throws Exception {
-                runTest("testData/indentationOnNewline/expressionBody/MutableProperty.after.kt");
+                runTest("testData/editor/enterHandler/expressionBody/MutableProperty.after.kt");
             }
 
             @TestMetadata("PropertyWithExplicitType.after.kt")
             public void testPropertyWithExplicitType() throws Exception {
-                runTest("testData/indentationOnNewline/expressionBody/PropertyWithExplicitType.after.kt");
+                runTest("testData/editor/enterHandler/expressionBody/PropertyWithExplicitType.after.kt");
             }
 
             @TestMetadata("PropertyWithInference.after.kt")
             public void testPropertyWithInference() throws Exception {
-                runTest("testData/indentationOnNewline/expressionBody/PropertyWithInference.after.kt");
+                runTest("testData/editor/enterHandler/expressionBody/PropertyWithInference.after.kt");
             }
 
             @TestMetadata("PropertyWithReceiver.after.kt")
             public void testPropertyWithReceiver() throws Exception {
-                runTest("testData/indentationOnNewline/expressionBody/PropertyWithReceiver.after.kt");
+                runTest("testData/editor/enterHandler/expressionBody/PropertyWithReceiver.after.kt");
             }
 
             @TestMetadata("PropertyWithTypeParameterReceiver.after.kt")
             public void testPropertyWithTypeParameterReceiver() throws Exception {
-                runTest("testData/indentationOnNewline/expressionBody/PropertyWithTypeParameterReceiver.after.kt");
+                runTest("testData/editor/enterHandler/expressionBody/PropertyWithTypeParameterReceiver.after.kt");
             }
         }
 
         @RunWith(JUnit3RunnerWithInners.class)
-        @TestMetadata("testData/indentationOnNewline/multilineString")
+        @TestMetadata("testData/editor/enterHandler/multilineString")
         public abstract static class MultilineString extends AbstractTypingIndentationTestBase {
             @RunWith(JUnit3RunnerWithInners.class)
-            @TestMetadata("testData/indentationOnNewline/multilineString/spaces")
+            @TestMetadata("testData/editor/enterHandler/multilineString/spaces")
             public abstract static class Spaces extends AbstractTypingIndentationTestBase {
                 @RunWith(JUnit3RunnerWithInners.class)
-                @TestMetadata("testData/indentationOnNewline/multilineString/spaces")
+                @TestMetadata("testData/editor/enterHandler/multilineString/spaces")
                 public static class TestBucket001 extends AbstractTypingIndentationTestBase {
                     private void runTest(String testDataFilePath) throws Exception {
                         KotlinTestUtils.runTest(this::doNewlineTest, this, testDataFilePath);
@@ -975,107 +975,107 @@ public abstract class TypingIndentationTestBaseGenerated extends AbstractTypingI
 
                     @TestMetadata("DontAddMarginCharWhenMultilineWithoutMargins.after.kt")
                     public void testDontAddMarginCharWhenMultilineWithoutMargins() throws Exception {
-                        runTest("testData/indentationOnNewline/multilineString/spaces/DontAddMarginCharWhenMultilineWithoutMargins.after.kt");
+                        runTest("testData/editor/enterHandler/multilineString/spaces/DontAddMarginCharWhenMultilineWithoutMargins.after.kt");
                     }
 
                     @TestMetadata("DontAddMarginWhenItIsUnused.after.kt")
                     public void testDontAddMarginWhenItIsUnused() throws Exception {
-                        runTest("testData/indentationOnNewline/multilineString/spaces/DontAddMarginWhenItIsUnused.after.kt");
+                        runTest("testData/editor/enterHandler/multilineString/spaces/DontAddMarginWhenItIsUnused.after.kt");
                     }
 
                     @TestMetadata("DontAddMarginWhenItIsUnusedWithEmptyPrevious.after.kt")
                     public void testDontAddMarginWhenItIsUnusedWithEmptyPrevious() throws Exception {
-                        runTest("testData/indentationOnNewline/multilineString/spaces/DontAddMarginWhenItIsUnusedWithEmptyPrevious.after.kt");
+                        runTest("testData/editor/enterHandler/multilineString/spaces/DontAddMarginWhenItIsUnusedWithEmptyPrevious.after.kt");
                     }
 
                     @TestMetadata("DontAddTrimCallWhenAlreadyMultiline.after.kt")
                     public void testDontAddTrimCallWhenAlreadyMultiline() throws Exception {
-                        runTest("testData/indentationOnNewline/multilineString/spaces/DontAddTrimCallWhenAlreadyMultiline.after.kt");
+                        runTest("testData/editor/enterHandler/multilineString/spaces/DontAddTrimCallWhenAlreadyMultiline.after.kt");
                     }
 
                     @TestMetadata("DontAddTrimCallWhenAlreadyMultilineFirstLine.after.kt")
                     public void testDontAddTrimCallWhenAlreadyMultilineFirstLine() throws Exception {
-                        runTest("testData/indentationOnNewline/multilineString/spaces/DontAddTrimCallWhenAlreadyMultilineFirstLine.after.kt");
+                        runTest("testData/editor/enterHandler/multilineString/spaces/DontAddTrimCallWhenAlreadyMultilineFirstLine.after.kt");
                     }
 
                     @TestMetadata("DontInsertTrimMargin1.after.kt")
                     public void testDontInsertTrimMargin1() throws Exception {
-                        runTest("testData/indentationOnNewline/multilineString/spaces/DontInsertTrimMargin1.after.kt");
+                        runTest("testData/editor/enterHandler/multilineString/spaces/DontInsertTrimMargin1.after.kt");
                     }
 
                     @TestMetadata("DontInsertTrimMargin2.after.kt")
                     public void testDontInsertTrimMargin2() throws Exception {
-                        runTest("testData/indentationOnNewline/multilineString/spaces/DontInsertTrimMargin2.after.kt");
+                        runTest("testData/editor/enterHandler/multilineString/spaces/DontInsertTrimMargin2.after.kt");
                     }
 
                     @TestMetadata("DontInsertTrimMargin3.after.kt")
                     public void testDontInsertTrimMargin3() throws Exception {
-                        runTest("testData/indentationOnNewline/multilineString/spaces/DontInsertTrimMargin3.after.kt");
+                        runTest("testData/editor/enterHandler/multilineString/spaces/DontInsertTrimMargin3.after.kt");
                     }
 
                     @TestMetadata("DontInsertTrimMargin4.after.kt")
                     public void testDontInsertTrimMargin4() throws Exception {
-                        runTest("testData/indentationOnNewline/multilineString/spaces/DontInsertTrimMargin4.after.kt");
+                        runTest("testData/editor/enterHandler/multilineString/spaces/DontInsertTrimMargin4.after.kt");
                     }
 
                     @TestMetadata("EnterAfterOpenningBrace.after.kt")
                     public void testEnterAfterOpenningBrace() throws Exception {
-                        runTest("testData/indentationOnNewline/multilineString/spaces/EnterAfterOpenningBrace.after.kt");
+                        runTest("testData/editor/enterHandler/multilineString/spaces/EnterAfterOpenningBrace.after.kt");
                     }
 
                     @TestMetadata("EnterBeforeLongEntryOneLine.after.kt")
                     public void testEnterBeforeLongEntryOneLine() throws Exception {
-                        runTest("testData/indentationOnNewline/multilineString/spaces/EnterBeforeLongEntryOneLine.after.kt");
+                        runTest("testData/editor/enterHandler/multilineString/spaces/EnterBeforeLongEntryOneLine.after.kt");
                     }
 
                     @TestMetadata("EnterBeforeMarginChar.after.kt")
                     public void testEnterBeforeMarginChar() throws Exception {
-                        runTest("testData/indentationOnNewline/multilineString/spaces/EnterBeforeMarginChar.after.kt");
+                        runTest("testData/editor/enterHandler/multilineString/spaces/EnterBeforeMarginChar.after.kt");
                     }
 
                     @TestMetadata("EnterBeforeShortEntryOneLine.after.kt")
                     public void testEnterBeforeShortEntryOneLine() throws Exception {
-                        runTest("testData/indentationOnNewline/multilineString/spaces/EnterBeforeShortEntryOneLine.after.kt");
+                        runTest("testData/editor/enterHandler/multilineString/spaces/EnterBeforeShortEntryOneLine.after.kt");
                     }
 
                     @TestMetadata("EnterInInfixMargin.after.kt")
                     public void testEnterInInfixMargin() throws Exception {
-                        runTest("testData/indentationOnNewline/multilineString/spaces/EnterInInfixMargin.after.kt");
+                        runTest("testData/editor/enterHandler/multilineString/spaces/EnterInInfixMargin.after.kt");
                     }
 
                     @TestMetadata("EnterInInjectedFragment.after.kt")
                     public void testEnterInInjectedFragment() throws Exception {
-                        runTest("testData/indentationOnNewline/multilineString/spaces/EnterInInjectedFragment.after.kt");
+                        runTest("testData/editor/enterHandler/multilineString/spaces/EnterInInjectedFragment.after.kt");
                     }
 
                     @TestMetadata("EnterInLineWithMarginOnNotMargedLine.after.kt")
                     public void testEnterInLineWithMarginOnNotMargedLine() throws Exception {
-                        runTest("testData/indentationOnNewline/multilineString/spaces/EnterInLineWithMarginOnNotMargedLine.after.kt");
+                        runTest("testData/editor/enterHandler/multilineString/spaces/EnterInLineWithMarginOnNotMargedLine.after.kt");
                     }
 
                     @TestMetadata("EnterInMethodCallMargin.after.kt")
                     public void testEnterInMethodCallMargin() throws Exception {
-                        runTest("testData/indentationOnNewline/multilineString/spaces/EnterInMethodCallMargin.after.kt");
+                        runTest("testData/editor/enterHandler/multilineString/spaces/EnterInMethodCallMargin.after.kt");
                     }
 
                     @TestMetadata("EnterInOneLineAfterSpaces.after.kt")
                     public void testEnterInOneLineAfterSpaces() throws Exception {
-                        runTest("testData/indentationOnNewline/multilineString/spaces/EnterInOneLineAfterSpaces.after.kt");
+                        runTest("testData/editor/enterHandler/multilineString/spaces/EnterInOneLineAfterSpaces.after.kt");
                     }
 
                     @TestMetadata("EnterInTwoLinesNoMarginCall.after.kt")
                     public void testEnterInTwoLinesNoMarginCall() throws Exception {
-                        runTest("testData/indentationOnNewline/multilineString/spaces/EnterInTwoLinesNoMarginCall.after.kt");
+                        runTest("testData/editor/enterHandler/multilineString/spaces/EnterInTwoLinesNoMarginCall.after.kt");
                     }
 
                     @TestMetadata("EnterInsideBraces.after.kt")
                     public void testEnterInsideBraces() throws Exception {
-                        runTest("testData/indentationOnNewline/multilineString/spaces/EnterInsideBraces.after.kt");
+                        runTest("testData/editor/enterHandler/multilineString/spaces/EnterInsideBraces.after.kt");
                     }
                 }
 
                 @RunWith(JUnit3RunnerWithInners.class)
-                @TestMetadata("testData/indentationOnNewline/multilineString/spaces")
+                @TestMetadata("testData/editor/enterHandler/multilineString/spaces")
                 public static class TestBucket002 extends AbstractTypingIndentationTestBase {
                     private void runTest(String testDataFilePath) throws Exception {
                         KotlinTestUtils.runTest(this::doNewlineTest, this, testDataFilePath);
@@ -1083,101 +1083,101 @@ public abstract class TypingIndentationTestBaseGenerated extends AbstractTypingI
 
                     @TestMetadata("EnterInsideBraces1.after.kt")
                     public void testEnterInsideBraces1() throws Exception {
-                        runTest("testData/indentationOnNewline/multilineString/spaces/EnterInsideBraces1.after.kt");
+                        runTest("testData/editor/enterHandler/multilineString/spaces/EnterInsideBraces1.after.kt");
                     }
 
                     @TestMetadata("EnterInsideBraces2.after.kt")
                     public void testEnterInsideBraces2() throws Exception {
-                        runTest("testData/indentationOnNewline/multilineString/spaces/EnterInsideBraces2.after.kt");
+                        runTest("testData/editor/enterHandler/multilineString/spaces/EnterInsideBraces2.after.kt");
                     }
 
                     @TestMetadata("EnterInsideTextMargin.after.kt")
                     public void testEnterInsideTextMargin() throws Exception {
-                        runTest("testData/indentationOnNewline/multilineString/spaces/EnterInsideTextMargin.after.kt");
+                        runTest("testData/editor/enterHandler/multilineString/spaces/EnterInsideTextMargin.after.kt");
                     }
 
                     @TestMetadata("EnterMLSimpleMargin.after.kt")
                     public void testEnterMLSimpleMargin() throws Exception {
-                        runTest("testData/indentationOnNewline/multilineString/spaces/EnterMLSimpleMargin.after.kt");
+                        runTest("testData/editor/enterHandler/multilineString/spaces/EnterMLSimpleMargin.after.kt");
                     }
 
                     @TestMetadata("EnterMLStartOnSameLineMargin.after.kt")
                     public void testEnterMLStartOnSameLineMargin() throws Exception {
-                        runTest("testData/indentationOnNewline/multilineString/spaces/EnterMLStartOnSameLineMargin.after.kt");
+                        runTest("testData/editor/enterHandler/multilineString/spaces/EnterMLStartOnSameLineMargin.after.kt");
                     }
 
                     @TestMetadata("EnterOnFirstLineWithPresentTrimMargin.after.kt")
                     public void testEnterOnFirstLineWithPresentTrimMargin() throws Exception {
-                        runTest("testData/indentationOnNewline/multilineString/spaces/EnterOnFirstLineWithPresentTrimMargin.after.kt");
+                        runTest("testData/editor/enterHandler/multilineString/spaces/EnterOnFirstLineWithPresentTrimMargin.after.kt");
                     }
 
                     @TestMetadata("EnterOnFirstLineWithPresentTrimMarginAndLine.after.kt")
                     public void testEnterOnFirstLineWithPresentTrimMarginAndLine() throws Exception {
-                        runTest("testData/indentationOnNewline/multilineString/spaces/EnterOnFirstLineWithPresentTrimMarginAndLine.after.kt");
+                        runTest("testData/editor/enterHandler/multilineString/spaces/EnterOnFirstLineWithPresentTrimMarginAndLine.after.kt");
                     }
 
                     @TestMetadata("EnterOnFirstNonEmptyLineWithPresentTrimMargin.after.kt")
                     public void testEnterOnFirstNonEmptyLineWithPresentTrimMargin() throws Exception {
-                        runTest("testData/indentationOnNewline/multilineString/spaces/EnterOnFirstNonEmptyLineWithPresentTrimMargin.after.kt");
+                        runTest("testData/editor/enterHandler/multilineString/spaces/EnterOnFirstNonEmptyLineWithPresentTrimMargin.after.kt");
                     }
 
                     @TestMetadata("EnterOnNewLine.after.kt")
                     public void testEnterOnNewLine() throws Exception {
-                        runTest("testData/indentationOnNewline/multilineString/spaces/EnterOnNewLine.after.kt");
+                        runTest("testData/editor/enterHandler/multilineString/spaces/EnterOnNewLine.after.kt");
                     }
 
                     @TestMetadata("EnterSimple.after.kt")
                     public void testEnterSimple() throws Exception {
-                        runTest("testData/indentationOnNewline/multilineString/spaces/EnterSimple.after.kt");
+                        runTest("testData/editor/enterHandler/multilineString/spaces/EnterSimple.after.kt");
                     }
 
                     @TestMetadata("EnterWithTextMargin.after.kt")
                     public void testEnterWithTextMargin() throws Exception {
-                        runTest("testData/indentationOnNewline/multilineString/spaces/EnterWithTextMargin.after.kt");
+                        runTest("testData/editor/enterHandler/multilineString/spaces/EnterWithTextMargin.after.kt");
                     }
 
                     @TestMetadata("EnterWithTextOnNewLineMargin.after.kt")
                     public void testEnterWithTextOnNewLineMargin() throws Exception {
-                        runTest("testData/indentationOnNewline/multilineString/spaces/EnterWithTextOnNewLineMargin.after.kt");
+                        runTest("testData/editor/enterHandler/multilineString/spaces/EnterWithTextOnNewLineMargin.after.kt");
                     }
 
                     @TestMetadata("InsertCustomMargin.after.kt")
                     public void testInsertCustomMargin() throws Exception {
-                        runTest("testData/indentationOnNewline/multilineString/spaces/InsertCustomMargin.after.kt");
+                        runTest("testData/editor/enterHandler/multilineString/spaces/InsertCustomMargin.after.kt");
                     }
 
                     @TestMetadata("InsertCustomMarginInLineStart.after.kt")
                     public void testInsertCustomMarginInLineStart() throws Exception {
-                        runTest("testData/indentationOnNewline/multilineString/spaces/InsertCustomMarginInLineStart.after.kt");
+                        runTest("testData/editor/enterHandler/multilineString/spaces/InsertCustomMarginInLineStart.after.kt");
                     }
 
                     @TestMetadata("InsertDefaultMargin.after.kt")
                     public void testInsertDefaultMargin() throws Exception {
-                        runTest("testData/indentationOnNewline/multilineString/spaces/InsertDefaultMargin.after.kt");
+                        runTest("testData/editor/enterHandler/multilineString/spaces/InsertDefaultMargin.after.kt");
                     }
 
                     @TestMetadata("NoTrimIndentInAnnotations.after.kt")
                     public void testNoTrimIndentInAnnotations() throws Exception {
-                        runTest("testData/indentationOnNewline/multilineString/spaces/NoTrimIndentInAnnotations.after.kt");
+                        runTest("testData/editor/enterHandler/multilineString/spaces/NoTrimIndentInAnnotations.after.kt");
                     }
 
                     @TestMetadata("NoTrimIndentInConst.after.kt")
                     public void testNoTrimIndentInConst() throws Exception {
-                        runTest("testData/indentationOnNewline/multilineString/spaces/NoTrimIndentInConst.after.kt");
+                        runTest("testData/editor/enterHandler/multilineString/spaces/NoTrimIndentInConst.after.kt");
                     }
 
                     @TestMetadata("RestoreIndentFromEmptyLine.after.kt")
                     public void testRestoreIndentFromEmptyLine() throws Exception {
-                        runTest("testData/indentationOnNewline/multilineString/spaces/RestoreIndentFromEmptyLine.after.kt");
+                        runTest("testData/editor/enterHandler/multilineString/spaces/RestoreIndentFromEmptyLine.after.kt");
                     }
                 }
             }
 
             @RunWith(JUnit3RunnerWithInners.class)
-            @TestMetadata("testData/indentationOnNewline/multilineString/withTabs")
+            @TestMetadata("testData/editor/enterHandler/multilineString/withTabs")
             public abstract static class WithTabs extends AbstractTypingIndentationTestBase {
                 @RunWith(JUnit3RunnerWithInners.class)
-                @TestMetadata("testData/indentationOnNewline/multilineString/withTabs/tabs2")
+                @TestMetadata("testData/editor/enterHandler/multilineString/withTabs/tabs2")
                 public static class Tabs2 extends AbstractTypingIndentationTestBase {
                     private void runTest(String testDataFilePath) throws Exception {
                         KotlinTestUtils.runTest(this::doNewlineTest, this, testDataFilePath);
@@ -1185,62 +1185,62 @@ public abstract class TypingIndentationTestBaseGenerated extends AbstractTypingI
 
                     @TestMetadata("DontInsertTrimMarginCall.after.kt")
                     public void testDontInsertTrimMarginCall() throws Exception {
-                        runTest("testData/indentationOnNewline/multilineString/withTabs/tabs2/DontInsertTrimMarginCall.after.kt");
+                        runTest("testData/editor/enterHandler/multilineString/withTabs/tabs2/DontInsertTrimMarginCall.after.kt");
                     }
 
                     @TestMetadata("EnterInMethodCallMargin.after.kt")
                     public void testEnterInMethodCallMargin() throws Exception {
-                        runTest("testData/indentationOnNewline/multilineString/withTabs/tabs2/EnterInMethodCallMargin.after.kt");
+                        runTest("testData/editor/enterHandler/multilineString/withTabs/tabs2/EnterInMethodCallMargin.after.kt");
                     }
 
                     @TestMetadata("EnterInTwoLinesNoMarginCall.after.kt")
                     public void testEnterInTwoLinesNoMarginCall() throws Exception {
-                        runTest("testData/indentationOnNewline/multilineString/withTabs/tabs2/EnterInTwoLinesNoMarginCall.after.kt");
+                        runTest("testData/editor/enterHandler/multilineString/withTabs/tabs2/EnterInTwoLinesNoMarginCall.after.kt");
                     }
 
                     @TestMetadata("EnterInsideBraces.after.kt")
                     public void testEnterInsideBraces() throws Exception {
-                        runTest("testData/indentationOnNewline/multilineString/withTabs/tabs2/EnterInsideBraces.after.kt");
+                        runTest("testData/editor/enterHandler/multilineString/withTabs/tabs2/EnterInsideBraces.after.kt");
                     }
 
                     @TestMetadata("EnterInsideText.after.kt")
                     public void testEnterInsideText() throws Exception {
-                        runTest("testData/indentationOnNewline/multilineString/withTabs/tabs2/EnterInsideText.after.kt");
+                        runTest("testData/editor/enterHandler/multilineString/withTabs/tabs2/EnterInsideText.after.kt");
                     }
 
                     @TestMetadata("EnterMLSimpleMargin.after.kt")
                     public void testEnterMLSimpleMargin() throws Exception {
-                        runTest("testData/indentationOnNewline/multilineString/withTabs/tabs2/EnterMLSimpleMargin.after.kt");
+                        runTest("testData/editor/enterHandler/multilineString/withTabs/tabs2/EnterMLSimpleMargin.after.kt");
                     }
 
                     @TestMetadata("EnterMLStartOnSameLineMargin.after.kt")
                     public void testEnterMLStartOnSameLineMargin() throws Exception {
-                        runTest("testData/indentationOnNewline/multilineString/withTabs/tabs2/EnterMLStartOnSameLineMargin.after.kt");
+                        runTest("testData/editor/enterHandler/multilineString/withTabs/tabs2/EnterMLStartOnSameLineMargin.after.kt");
                     }
 
                     @TestMetadata("EnterOnNewLineMargin.after.kt")
                     public void testEnterOnNewLineMargin() throws Exception {
-                        runTest("testData/indentationOnNewline/multilineString/withTabs/tabs2/EnterOnNewLineMargin.after.kt");
+                        runTest("testData/editor/enterHandler/multilineString/withTabs/tabs2/EnterOnNewLineMargin.after.kt");
                     }
 
                     @TestMetadata("EnterSimpleMargin.after.kt")
                     public void testEnterSimpleMargin() throws Exception {
-                        runTest("testData/indentationOnNewline/multilineString/withTabs/tabs2/EnterSimpleMargin.after.kt");
+                        runTest("testData/editor/enterHandler/multilineString/withTabs/tabs2/EnterSimpleMargin.after.kt");
                     }
 
                     @TestMetadata("EnterWithTextMargin.after.kt")
                     public void testEnterWithTextMargin() throws Exception {
-                        runTest("testData/indentationOnNewline/multilineString/withTabs/tabs2/EnterWithTextMargin.after.kt");
+                        runTest("testData/editor/enterHandler/multilineString/withTabs/tabs2/EnterWithTextMargin.after.kt");
                     }
 
                     @TestMetadata("EnterWithTextOnNewLineMargin.after.kt")
                     public void testEnterWithTextOnNewLineMargin() throws Exception {
-                        runTest("testData/indentationOnNewline/multilineString/withTabs/tabs2/EnterWithTextOnNewLineMargin.after.kt");
+                        runTest("testData/editor/enterHandler/multilineString/withTabs/tabs2/EnterWithTextOnNewLineMargin.after.kt");
                     }
                 }
 
                 @RunWith(JUnit3RunnerWithInners.class)
-                @TestMetadata("testData/indentationOnNewline/multilineString/withTabs/tabs4")
+                @TestMetadata("testData/editor/enterHandler/multilineString/withTabs/tabs4")
                 public static class Tabs4 extends AbstractTypingIndentationTestBase {
                     private void runTest(String testDataFilePath) throws Exception {
                         KotlinTestUtils.runTest(this::doNewlineTest, this, testDataFilePath);
@@ -1248,64 +1248,64 @@ public abstract class TypingIndentationTestBaseGenerated extends AbstractTypingI
 
                     @TestMetadata("DontInsertTrimMarginCall.after.kt")
                     public void testDontInsertTrimMarginCall() throws Exception {
-                        runTest("testData/indentationOnNewline/multilineString/withTabs/tabs4/DontInsertTrimMarginCall.after.kt");
+                        runTest("testData/editor/enterHandler/multilineString/withTabs/tabs4/DontInsertTrimMarginCall.after.kt");
                     }
 
                     @TestMetadata("EnterInMethodCallMargin.after.kt")
                     public void testEnterInMethodCallMargin() throws Exception {
-                        runTest("testData/indentationOnNewline/multilineString/withTabs/tabs4/EnterInMethodCallMargin.after.kt");
+                        runTest("testData/editor/enterHandler/multilineString/withTabs/tabs4/EnterInMethodCallMargin.after.kt");
                     }
 
                     @TestMetadata("EnterInsideBraces.after.kt")
                     public void testEnterInsideBraces() throws Exception {
-                        runTest("testData/indentationOnNewline/multilineString/withTabs/tabs4/EnterInsideBraces.after.kt");
+                        runTest("testData/editor/enterHandler/multilineString/withTabs/tabs4/EnterInsideBraces.after.kt");
                     }
 
                     @TestMetadata("EnterInsideText.after.kt")
                     public void testEnterInsideText() throws Exception {
-                        runTest("testData/indentationOnNewline/multilineString/withTabs/tabs4/EnterInsideText.after.kt");
+                        runTest("testData/editor/enterHandler/multilineString/withTabs/tabs4/EnterInsideText.after.kt");
                     }
 
                     @TestMetadata("EnterMLSimpleMargin.after.kt")
                     public void testEnterMLSimpleMargin() throws Exception {
-                        runTest("testData/indentationOnNewline/multilineString/withTabs/tabs4/EnterMLSimpleMargin.after.kt");
+                        runTest("testData/editor/enterHandler/multilineString/withTabs/tabs4/EnterMLSimpleMargin.after.kt");
                     }
 
                     @TestMetadata("EnterMLStartOnSameLineMargin.after.kt")
                     public void testEnterMLStartOnSameLineMargin() throws Exception {
-                        runTest("testData/indentationOnNewline/multilineString/withTabs/tabs4/EnterMLStartOnSameLineMargin.after.kt");
+                        runTest("testData/editor/enterHandler/multilineString/withTabs/tabs4/EnterMLStartOnSameLineMargin.after.kt");
                     }
 
                     @TestMetadata("EnterOnNewLineMargin.after.kt")
                     public void testEnterOnNewLineMargin() throws Exception {
-                        runTest("testData/indentationOnNewline/multilineString/withTabs/tabs4/EnterOnNewLineMargin.after.kt");
+                        runTest("testData/editor/enterHandler/multilineString/withTabs/tabs4/EnterOnNewLineMargin.after.kt");
                     }
 
                     @TestMetadata("EnterSimpleMargin.after.kt")
                     public void testEnterSimpleMargin() throws Exception {
-                        runTest("testData/indentationOnNewline/multilineString/withTabs/tabs4/EnterSimpleMargin.after.kt");
+                        runTest("testData/editor/enterHandler/multilineString/withTabs/tabs4/EnterSimpleMargin.after.kt");
                     }
 
                     @TestMetadata("EnterWithTabsAfterMarginChar.after.kt")
                     public void testEnterWithTabsAfterMarginChar() throws Exception {
-                        runTest("testData/indentationOnNewline/multilineString/withTabs/tabs4/EnterWithTabsAfterMarginChar.after.kt");
+                        runTest("testData/editor/enterHandler/multilineString/withTabs/tabs4/EnterWithTabsAfterMarginChar.after.kt");
                     }
 
                     @TestMetadata("EnterWithTextMargin.after.kt")
                     public void testEnterWithTextMargin() throws Exception {
-                        runTest("testData/indentationOnNewline/multilineString/withTabs/tabs4/EnterWithTextMargin.after.kt");
+                        runTest("testData/editor/enterHandler/multilineString/withTabs/tabs4/EnterWithTextMargin.after.kt");
                     }
 
                     @TestMetadata("EnterWithTextOnNewLineMargin.after.kt")
                     public void testEnterWithTextOnNewLineMargin() throws Exception {
-                        runTest("testData/indentationOnNewline/multilineString/withTabs/tabs4/EnterWithTextOnNewLineMargin.after.kt");
+                        runTest("testData/editor/enterHandler/multilineString/withTabs/tabs4/EnterWithTextOnNewLineMargin.after.kt");
                     }
                 }
             }
         }
 
         @RunWith(JUnit3RunnerWithInners.class)
-        @TestMetadata("testData/indentationOnNewline/script")
+        @TestMetadata("testData/editor/enterHandler/script")
         public static class Script extends AbstractTypingIndentationTestBase {
             private void runTest(String testDataFilePath) throws Exception {
                 KotlinTestUtils.runTest(this::doNewlineTest, this, testDataFilePath);
@@ -1313,40 +1313,40 @@ public abstract class TypingIndentationTestBaseGenerated extends AbstractTypingI
 
             @TestMetadata("ScriptAfterClosingBrace.after.kts")
             public void testScriptAfterClosingBrace() throws Exception {
-                runTest("testData/indentationOnNewline/script/ScriptAfterClosingBrace.after.kts");
+                runTest("testData/editor/enterHandler/script/ScriptAfterClosingBrace.after.kts");
             }
 
             @TestMetadata("ScriptAfterExpression.after.kts")
             public void testScriptAfterExpression() throws Exception {
-                runTest("testData/indentationOnNewline/script/ScriptAfterExpression.after.kts");
+                runTest("testData/editor/enterHandler/script/ScriptAfterExpression.after.kts");
             }
 
             @TestMetadata("ScriptAfterFun.after.kts")
             public void testScriptAfterFun() throws Exception {
-                runTest("testData/indentationOnNewline/script/ScriptAfterFun.after.kts");
+                runTest("testData/editor/enterHandler/script/ScriptAfterFun.after.kts");
             }
 
             @TestMetadata("ScriptAfterImport.after.kts")
             public void testScriptAfterImport() throws Exception {
-                runTest("testData/indentationOnNewline/script/ScriptAfterImport.after.kts");
+                runTest("testData/editor/enterHandler/script/ScriptAfterImport.after.kts");
             }
 
             @TestMetadata("ScriptBetweenFunctionCalls.after.kts")
             public void testScriptBetweenFunctionCalls() throws Exception {
-                runTest("testData/indentationOnNewline/script/ScriptBetweenFunctionCalls.after.kts");
+                runTest("testData/editor/enterHandler/script/ScriptBetweenFunctionCalls.after.kts");
             }
 
             @TestMetadata("ScriptInsideFun.after.kts")
             public void testScriptInsideFun() throws Exception {
-                runTest("testData/indentationOnNewline/script/ScriptInsideFun.after.kts");
+                runTest("testData/editor/enterHandler/script/ScriptInsideFun.after.kts");
             }
         }
 
         @RunWith(JUnit3RunnerWithInners.class)
-        @TestMetadata("testData/indentationOnNewline/templates")
+        @TestMetadata("testData/editor/enterHandler/templates")
         public abstract static class Templates extends AbstractTypingIndentationTestBase {
             @RunWith(JUnit3RunnerWithInners.class)
-            @TestMetadata("testData/indentationOnNewline/templates")
+            @TestMetadata("testData/editor/enterHandler/templates")
             public static class TestBucket001 extends AbstractTypingIndentationTestBase {
                 private void runTest(String testDataFilePath) throws Exception {
                     KotlinTestUtils.runTest(this::doNewlineTest, this, testDataFilePath);
@@ -1354,107 +1354,107 @@ public abstract class TypingIndentationTestBaseGenerated extends AbstractTypingI
 
                 @TestMetadata("LargeFileWithStringTemplate.after.kt")
                 public void testLargeFileWithStringTemplate() throws Exception {
-                    runTest("testData/indentationOnNewline/templates/LargeFileWithStringTemplate.after.kt");
+                    runTest("testData/editor/enterHandler/templates/LargeFileWithStringTemplate.after.kt");
                 }
 
                 @TestMetadata("TemplateEntryClose.after.kt")
                 public void testTemplateEntryClose() throws Exception {
-                    runTest("testData/indentationOnNewline/templates/TemplateEntryClose.after.kt");
+                    runTest("testData/editor/enterHandler/templates/TemplateEntryClose.after.kt");
                 }
 
                 @TestMetadata("TemplateEntryClose2.after.kt")
                 public void testTemplateEntryClose2() throws Exception {
-                    runTest("testData/indentationOnNewline/templates/TemplateEntryClose2.after.kt");
+                    runTest("testData/editor/enterHandler/templates/TemplateEntryClose2.after.kt");
                 }
 
                 @TestMetadata("TemplateEntryClose3.after.kt")
                 public void testTemplateEntryClose3() throws Exception {
-                    runTest("testData/indentationOnNewline/templates/TemplateEntryClose3.after.kt");
+                    runTest("testData/editor/enterHandler/templates/TemplateEntryClose3.after.kt");
                 }
 
                 @TestMetadata("TemplateEntryClose4.after.kt")
                 public void testTemplateEntryClose4() throws Exception {
-                    runTest("testData/indentationOnNewline/templates/TemplateEntryClose4.after.kt");
+                    runTest("testData/editor/enterHandler/templates/TemplateEntryClose4.after.kt");
                 }
 
                 @TestMetadata("TemplateEntryClose5.after.kt")
                 public void testTemplateEntryClose5() throws Exception {
-                    runTest("testData/indentationOnNewline/templates/TemplateEntryClose5.after.kt");
+                    runTest("testData/editor/enterHandler/templates/TemplateEntryClose5.after.kt");
                 }
 
                 @TestMetadata("TemplateEntryClose6.after.kt")
                 public void testTemplateEntryClose6() throws Exception {
-                    runTest("testData/indentationOnNewline/templates/TemplateEntryClose6.after.kt");
+                    runTest("testData/editor/enterHandler/templates/TemplateEntryClose6.after.kt");
                 }
 
                 @TestMetadata("TemplateEntryClose7.after.kt")
                 public void testTemplateEntryClose7() throws Exception {
-                    runTest("testData/indentationOnNewline/templates/TemplateEntryClose7.after.kt");
+                    runTest("testData/editor/enterHandler/templates/TemplateEntryClose7.after.kt");
                 }
 
                 @TestMetadata("TemplateEntryCloseInMultilineString.after.kt")
                 public void testTemplateEntryCloseInMultilineString() throws Exception {
-                    runTest("testData/indentationOnNewline/templates/TemplateEntryCloseInMultilineString.after.kt");
+                    runTest("testData/editor/enterHandler/templates/TemplateEntryCloseInMultilineString.after.kt");
                 }
 
                 @TestMetadata("TemplateEntryCloseInMultilineString2.after.kt")
                 public void testTemplateEntryCloseInMultilineString2() throws Exception {
-                    runTest("testData/indentationOnNewline/templates/TemplateEntryCloseInMultilineString2.after.kt");
+                    runTest("testData/editor/enterHandler/templates/TemplateEntryCloseInMultilineString2.after.kt");
                 }
 
                 @TestMetadata("TemplateEntryCloseInMultilineString3.after.kt")
                 public void testTemplateEntryCloseInMultilineString3() throws Exception {
-                    runTest("testData/indentationOnNewline/templates/TemplateEntryCloseInMultilineString3.after.kt");
+                    runTest("testData/editor/enterHandler/templates/TemplateEntryCloseInMultilineString3.after.kt");
                 }
 
                 @TestMetadata("TemplateEntryOpen.after.kt")
                 public void testTemplateEntryOpen() throws Exception {
-                    runTest("testData/indentationOnNewline/templates/TemplateEntryOpen.after.kt");
+                    runTest("testData/editor/enterHandler/templates/TemplateEntryOpen.after.kt");
                 }
 
                 @TestMetadata("TemplateEntryOpen2.after.kt")
                 public void testTemplateEntryOpen2() throws Exception {
-                    runTest("testData/indentationOnNewline/templates/TemplateEntryOpen2.after.kt");
+                    runTest("testData/editor/enterHandler/templates/TemplateEntryOpen2.after.kt");
                 }
 
                 @TestMetadata("TemplateEntryOpenInMultilineString.after.kt")
                 public void testTemplateEntryOpenInMultilineString() throws Exception {
-                    runTest("testData/indentationOnNewline/templates/TemplateEntryOpenInMultilineString.after.kt");
+                    runTest("testData/editor/enterHandler/templates/TemplateEntryOpenInMultilineString.after.kt");
                 }
 
                 @TestMetadata("TemplateEntryOpenInMultilineString2.after.kt")
                 public void testTemplateEntryOpenInMultilineString2() throws Exception {
-                    runTest("testData/indentationOnNewline/templates/TemplateEntryOpenInMultilineString2.after.kt");
+                    runTest("testData/editor/enterHandler/templates/TemplateEntryOpenInMultilineString2.after.kt");
                 }
 
                 @TestMetadata("TemplateEntryOpenInMultilineString3.after.kt")
                 public void testTemplateEntryOpenInMultilineString3() throws Exception {
-                    runTest("testData/indentationOnNewline/templates/TemplateEntryOpenInMultilineString3.after.kt");
+                    runTest("testData/editor/enterHandler/templates/TemplateEntryOpenInMultilineString3.after.kt");
                 }
 
                 @TestMetadata("TemplateEntryOpenWithComment.after.kt")
                 public void testTemplateEntryOpenWithComment() throws Exception {
-                    runTest("testData/indentationOnNewline/templates/TemplateEntryOpenWithComment.after.kt");
+                    runTest("testData/editor/enterHandler/templates/TemplateEntryOpenWithComment.after.kt");
                 }
 
                 @TestMetadata("TemplateEntryOpenWithComment2.after.kt")
                 public void testTemplateEntryOpenWithComment2() throws Exception {
-                    runTest("testData/indentationOnNewline/templates/TemplateEntryOpenWithComment2.after.kt");
+                    runTest("testData/editor/enterHandler/templates/TemplateEntryOpenWithComment2.after.kt");
                 }
 
                 @TestMetadata("TemplateEntryOpenWithoutContent.after.kt")
                 public void testTemplateEntryOpenWithoutContent() throws Exception {
-                    runTest("testData/indentationOnNewline/templates/TemplateEntryOpenWithoutContent.after.kt");
+                    runTest("testData/editor/enterHandler/templates/TemplateEntryOpenWithoutContent.after.kt");
                 }
 
                 @TestMetadata("TemplateEntryOpenWithoutContent2.after.kt")
                 public void testTemplateEntryOpenWithoutContent2() throws Exception {
-                    runTest("testData/indentationOnNewline/templates/TemplateEntryOpenWithoutContent2.after.kt");
+                    runTest("testData/editor/enterHandler/templates/TemplateEntryOpenWithoutContent2.after.kt");
                 }
             }
 
             @RunWith(JUnit3RunnerWithInners.class)
-            @TestMetadata("testData/indentationOnNewline/templates")
+            @TestMetadata("testData/editor/enterHandler/templates")
             public static class TestBucket002 extends AbstractTypingIndentationTestBase {
                 private void runTest(String testDataFilePath) throws Exception {
                     KotlinTestUtils.runTest(this::doNewlineTest, this, testDataFilePath);
@@ -1462,26 +1462,26 @@ public abstract class TypingIndentationTestBaseGenerated extends AbstractTypingI
 
                 @TestMetadata("TemplateEntryOpenWithoutContent3.after.kt")
                 public void testTemplateEntryOpenWithoutContent3() throws Exception {
-                    runTest("testData/indentationOnNewline/templates/TemplateEntryOpenWithoutContent3.after.kt");
+                    runTest("testData/editor/enterHandler/templates/TemplateEntryOpenWithoutContent3.after.kt");
                 }
 
                 @TestMetadata("TemplateEntryOpenWithoutContent4.after.kt")
                 public void testTemplateEntryOpenWithoutContent4() throws Exception {
-                    runTest("testData/indentationOnNewline/templates/TemplateEntryOpenWithoutContent4.after.kt");
+                    runTest("testData/editor/enterHandler/templates/TemplateEntryOpenWithoutContent4.after.kt");
                 }
 
                 @TestMetadata("TemplateEntryOpenWithoutContent5.after.kt")
                 public void testTemplateEntryOpenWithoutContent5() throws Exception {
-                    runTest("testData/indentationOnNewline/templates/TemplateEntryOpenWithoutContent5.after.kt");
+                    runTest("testData/editor/enterHandler/templates/TemplateEntryOpenWithoutContent5.after.kt");
                 }
             }
         }
 
         @RunWith(JUnit3RunnerWithInners.class)
-        @TestMetadata("testData/indentationOnNewline")
+        @TestMetadata("testData/editor/enterHandler")
         public abstract static class Uncategorized extends AbstractTypingIndentationTestBase {
             @RunWith(JUnit3RunnerWithInners.class)
-            @TestMetadata("testData/indentationOnNewline")
+            @TestMetadata("testData/editor/enterHandler")
             public static class TestBucket001 extends AbstractTypingIndentationTestBase {
                 private void runTest(String testDataFilePath) throws Exception {
                     KotlinTestUtils.runTest(this::doNewlineTest, this, testDataFilePath);
@@ -1489,107 +1489,107 @@ public abstract class TypingIndentationTestBaseGenerated extends AbstractTypingI
 
                 @TestMetadata("AfterCatch.after.kt")
                 public void testAfterCatch() throws Exception {
-                    runTest("testData/indentationOnNewline/AfterCatch.after.kt");
+                    runTest("testData/editor/enterHandler/AfterCatch.after.kt");
                 }
 
                 @TestMetadata("AfterClassNameBeforeFun.after.kt")
                 public void testAfterClassNameBeforeFun() throws Exception {
-                    runTest("testData/indentationOnNewline/AfterClassNameBeforeFun.after.kt");
+                    runTest("testData/editor/enterHandler/AfterClassNameBeforeFun.after.kt");
                 }
 
                 @TestMetadata("AfterExtensionPropertyGetter.after.kt")
                 public void testAfterExtensionPropertyGetter() throws Exception {
-                    runTest("testData/indentationOnNewline/AfterExtensionPropertyGetter.after.kt");
+                    runTest("testData/editor/enterHandler/AfterExtensionPropertyGetter.after.kt");
                 }
 
                 @TestMetadata("AfterExtensionPropertySetter.after.kt")
                 public void testAfterExtensionPropertySetter() throws Exception {
-                    runTest("testData/indentationOnNewline/AfterExtensionPropertySetter.after.kt");
+                    runTest("testData/editor/enterHandler/AfterExtensionPropertySetter.after.kt");
                 }
 
                 @TestMetadata("AfterFinally.after.kt")
                 public void testAfterFinally() throws Exception {
-                    runTest("testData/indentationOnNewline/AfterFinally.after.kt");
+                    runTest("testData/editor/enterHandler/AfterFinally.after.kt");
                 }
 
                 @TestMetadata("AfterImport.after.kt")
                 public void testAfterImport() throws Exception {
-                    runTest("testData/indentationOnNewline/AfterImport.after.kt");
+                    runTest("testData/editor/enterHandler/AfterImport.after.kt");
                 }
 
                 @TestMetadata("AfterPropertyGetter.after.kt")
                 public void testAfterPropertyGetter() throws Exception {
-                    runTest("testData/indentationOnNewline/AfterPropertyGetter.after.kt");
+                    runTest("testData/editor/enterHandler/AfterPropertyGetter.after.kt");
                 }
 
                 @TestMetadata("AfterPropertySetter.after.kt")
                 public void testAfterPropertySetter() throws Exception {
-                    runTest("testData/indentationOnNewline/AfterPropertySetter.after.kt");
+                    runTest("testData/editor/enterHandler/AfterPropertySetter.after.kt");
                 }
 
                 @TestMetadata("AfterTry.after.kt")
                 public void testAfterTry() throws Exception {
-                    runTest("testData/indentationOnNewline/AfterTry.after.kt");
+                    runTest("testData/editor/enterHandler/AfterTry.after.kt");
                 }
 
                 @TestMetadata("Annotation.after.kt")
                 public void testAnnotation() throws Exception {
-                    runTest("testData/indentationOnNewline/Annotation.after.kt");
+                    runTest("testData/editor/enterHandler/Annotation.after.kt");
                 }
 
                 @TestMetadata("AnnotationInDeclaration.after.kt")
                 public void testAnnotationInDeclaration() throws Exception {
-                    runTest("testData/indentationOnNewline/AnnotationInDeclaration.after.kt");
+                    runTest("testData/editor/enterHandler/AnnotationInDeclaration.after.kt");
                 }
 
                 @TestMetadata("ArgumentListNormalIndent.after.kt")
                 public void testArgumentListNormalIndent() throws Exception {
-                    runTest("testData/indentationOnNewline/ArgumentListNormalIndent.after.kt");
+                    runTest("testData/editor/enterHandler/ArgumentListNormalIndent.after.kt");
                 }
 
                 @TestMetadata("AutoIndentInWhenClause.after.kt")
                 public void testAutoIndentInWhenClause() throws Exception {
-                    runTest("testData/indentationOnNewline/AutoIndentInWhenClause.after.kt");
+                    runTest("testData/editor/enterHandler/AutoIndentInWhenClause.after.kt");
                 }
 
                 @TestMetadata("BlockCommentAfterCatch.after.kt")
                 public void testBlockCommentAfterCatch() throws Exception {
-                    runTest("testData/indentationOnNewline/BlockCommentAfterCatch.after.kt");
+                    runTest("testData/editor/enterHandler/BlockCommentAfterCatch.after.kt");
                 }
 
                 @TestMetadata("ConsecutiveCallsAfterDot.after.kt")
                 public void testConsecutiveCallsAfterDot() throws Exception {
-                    runTest("testData/indentationOnNewline/ConsecutiveCallsAfterDot.after.kt");
+                    runTest("testData/editor/enterHandler/ConsecutiveCallsAfterDot.after.kt");
                 }
 
                 @TestMetadata("ConsecutiveCallsInSaeCallsMiddle.after.kt")
                 public void testConsecutiveCallsInSaeCallsMiddle() throws Exception {
-                    runTest("testData/indentationOnNewline/ConsecutiveCallsInSaeCallsMiddle.after.kt");
+                    runTest("testData/editor/enterHandler/ConsecutiveCallsInSaeCallsMiddle.after.kt");
                 }
 
                 @TestMetadata("ConsecutiveCallsInSafeCallsEnd.after.kt")
                 public void testConsecutiveCallsInSafeCallsEnd() throws Exception {
-                    runTest("testData/indentationOnNewline/ConsecutiveCallsInSafeCallsEnd.after.kt");
+                    runTest("testData/editor/enterHandler/ConsecutiveCallsInSafeCallsEnd.after.kt");
                 }
 
                 @TestMetadata("EnterInFunctionWithExpressionBody.after.kt")
                 public void testEnterInFunctionWithExpressionBody() throws Exception {
-                    runTest("testData/indentationOnNewline/EnterInFunctionWithExpressionBody.after.kt");
+                    runTest("testData/editor/enterHandler/EnterInFunctionWithExpressionBody.after.kt");
                 }
 
                 @TestMetadata("EnterInMultiDeclaration.after.kt")
                 public void testEnterInMultiDeclaration() throws Exception {
-                    runTest("testData/indentationOnNewline/EnterInMultiDeclaration.after.kt");
+                    runTest("testData/editor/enterHandler/EnterInMultiDeclaration.after.kt");
                 }
 
                 @TestMetadata("EnterInVariableDeclaration.after.kt")
                 public void testEnterInVariableDeclaration() throws Exception {
-                    runTest("testData/indentationOnNewline/EnterInVariableDeclaration.after.kt");
+                    runTest("testData/editor/enterHandler/EnterInVariableDeclaration.after.kt");
                 }
             }
 
             @RunWith(JUnit3RunnerWithInners.class)
-            @TestMetadata("testData/indentationOnNewline")
+            @TestMetadata("testData/editor/enterHandler")
             public static class TestBucket002 extends AbstractTypingIndentationTestBase {
                 private void runTest(String testDataFilePath) throws Exception {
                     KotlinTestUtils.runTest(this::doNewlineTest, this, testDataFilePath);
@@ -1597,107 +1597,107 @@ public abstract class TypingIndentationTestBaseGenerated extends AbstractTypingI
 
                 @TestMetadata("EoLCommentAfterCatch.after.kt")
                 public void testEoLCommentAfterCatch() throws Exception {
-                    runTest("testData/indentationOnNewline/EoLCommentAfterCatch.after.kt");
+                    runTest("testData/editor/enterHandler/EoLCommentAfterCatch.after.kt");
                 }
 
                 @TestMetadata("EoLCommentAfterFor.after.kt")
                 public void testEoLCommentAfterFor() throws Exception {
-                    runTest("testData/indentationOnNewline/EoLCommentAfterFor.after.kt");
+                    runTest("testData/editor/enterHandler/EoLCommentAfterFor.after.kt");
                 }
 
                 @TestMetadata("EoLCommentAfterIf.after.kt")
                 public void testEoLCommentAfterIf() throws Exception {
-                    runTest("testData/indentationOnNewline/EoLCommentAfterIf.after.kt");
+                    runTest("testData/editor/enterHandler/EoLCommentAfterIf.after.kt");
                 }
 
                 @TestMetadata("FunctionBlock.after.kt")
                 public void testFunctionBlock() throws Exception {
-                    runTest("testData/indentationOnNewline/FunctionBlock.after.kt");
+                    runTest("testData/editor/enterHandler/FunctionBlock.after.kt");
                 }
 
                 @TestMetadata("HigherOrderFunction.after.kt")
                 public void testHigherOrderFunction() throws Exception {
-                    runTest("testData/indentationOnNewline/HigherOrderFunction.after.kt");
+                    runTest("testData/editor/enterHandler/HigherOrderFunction.after.kt");
                 }
 
                 @TestMetadata("HigherOrderFunction2.after.kt")
                 public void testHigherOrderFunction2() throws Exception {
-                    runTest("testData/indentationOnNewline/HigherOrderFunction2.after.kt");
+                    runTest("testData/editor/enterHandler/HigherOrderFunction2.after.kt");
                 }
 
                 @TestMetadata("HigherOrderFunction3.after.kt")
                 public void testHigherOrderFunction3() throws Exception {
-                    runTest("testData/indentationOnNewline/HigherOrderFunction3.after.kt");
+                    runTest("testData/editor/enterHandler/HigherOrderFunction3.after.kt");
                 }
 
                 @TestMetadata("InDelegationListAfterColon.after.kt")
                 public void testInDelegationListAfterColon() throws Exception {
-                    runTest("testData/indentationOnNewline/InDelegationListAfterColon.after.kt");
+                    runTest("testData/editor/enterHandler/InDelegationListAfterColon.after.kt");
                 }
 
                 @TestMetadata("InDelegationListAfterComma.after.kt")
                 public void testInDelegationListAfterComma() throws Exception {
-                    runTest("testData/indentationOnNewline/InDelegationListAfterComma.after.kt");
+                    runTest("testData/editor/enterHandler/InDelegationListAfterComma.after.kt");
                 }
 
                 @TestMetadata("InDelegationListNotEmpty.after.kt")
                 public void testInDelegationListNotEmpty() throws Exception {
-                    runTest("testData/indentationOnNewline/InDelegationListNotEmpty.after.kt");
+                    runTest("testData/editor/enterHandler/InDelegationListNotEmpty.after.kt");
                 }
 
                 @TestMetadata("InElseBlockBeforeParenthesis.after.kt")
                 public void testInElseBlockBeforeParenthesis() throws Exception {
-                    runTest("testData/indentationOnNewline/InElseBlockBeforeParenthesis.after.kt");
+                    runTest("testData/editor/enterHandler/InElseBlockBeforeParenthesis.after.kt");
                 }
 
                 @TestMetadata("InEnumAfterSemicolon.after.kt")
                 public void testInEnumAfterSemicolon() throws Exception {
-                    runTest("testData/indentationOnNewline/InEnumAfterSemicolon.after.kt");
+                    runTest("testData/editor/enterHandler/InEnumAfterSemicolon.after.kt");
                 }
 
                 @TestMetadata("InEnumInitializerListAfterComma.after.kt")
                 public void testInEnumInitializerListAfterComma() throws Exception {
-                    runTest("testData/indentationOnNewline/InEnumInitializerListAfterComma.after.kt");
+                    runTest("testData/editor/enterHandler/InEnumInitializerListAfterComma.after.kt");
                 }
 
                 @TestMetadata("InEnumInitializerListNotEmpty.after.kt")
                 public void testInEnumInitializerListNotEmpty() throws Exception {
-                    runTest("testData/indentationOnNewline/InEnumInitializerListNotEmpty.after.kt");
+                    runTest("testData/editor/enterHandler/InEnumInitializerListNotEmpty.after.kt");
                 }
 
                 @TestMetadata("InIfBlockBeforeParenthesis.after.kt")
                 public void testInIfBlockBeforeParenthesis() throws Exception {
-                    runTest("testData/indentationOnNewline/InIfBlockBeforeParenthesis.after.kt");
+                    runTest("testData/editor/enterHandler/InIfBlockBeforeParenthesis.after.kt");
                 }
 
                 @TestMetadata("InLabmdaAfterArrow.after.kt")
                 public void testInLabmdaAfterArrow() throws Exception {
-                    runTest("testData/indentationOnNewline/InLabmdaAfterArrow.after.kt");
+                    runTest("testData/editor/enterHandler/InLabmdaAfterArrow.after.kt");
                 }
 
                 @TestMetadata("InLambdaAfterArrowWithSpaces.after.kt")
                 public void testInLambdaAfterArrowWithSpaces() throws Exception {
-                    runTest("testData/indentationOnNewline/InLambdaAfterArrowWithSpaces.after.kt");
+                    runTest("testData/editor/enterHandler/InLambdaAfterArrowWithSpaces.after.kt");
                 }
 
                 @TestMetadata("InLambdaBeforeParams.after.kt")
                 public void testInLambdaBeforeParams() throws Exception {
-                    runTest("testData/indentationOnNewline/InLambdaBeforeParams.after.kt");
+                    runTest("testData/editor/enterHandler/InLambdaBeforeParams.after.kt");
                 }
 
                 @TestMetadata("InLambdaInsideChainCallSameLine.after.kt")
                 public void testInLambdaInsideChainCallSameLine() throws Exception {
-                    runTest("testData/indentationOnNewline/InLambdaInsideChainCallSameLine.after.kt");
+                    runTest("testData/editor/enterHandler/InLambdaInsideChainCallSameLine.after.kt");
                 }
 
                 @TestMetadata("InLambdaInsideChainCallSameLineWithSpaces.after.kt")
                 public void testInLambdaInsideChainCallSameLineWithSpaces() throws Exception {
-                    runTest("testData/indentationOnNewline/InLambdaInsideChainCallSameLineWithSpaces.after.kt");
+                    runTest("testData/editor/enterHandler/InLambdaInsideChainCallSameLineWithSpaces.after.kt");
                 }
             }
 
             @RunWith(JUnit3RunnerWithInners.class)
-            @TestMetadata("testData/indentationOnNewline")
+            @TestMetadata("testData/editor/enterHandler")
             public static class TestBucket003 extends AbstractTypingIndentationTestBase {
                 private void runTest(String testDataFilePath) throws Exception {
                     KotlinTestUtils.runTest(this::doNewlineTest, this, testDataFilePath);
@@ -1705,107 +1705,107 @@ public abstract class TypingIndentationTestBaseGenerated extends AbstractTypingI
 
                 @TestMetadata("InLambdaInsideChainCallWithNewLine.after.kt")
                 public void testInLambdaInsideChainCallWithNewLine() throws Exception {
-                    runTest("testData/indentationOnNewline/InLambdaInsideChainCallWithNewLine.after.kt");
+                    runTest("testData/editor/enterHandler/InLambdaInsideChainCallWithNewLine.after.kt");
                 }
 
                 @TestMetadata("InLambdaInsideChainCallWithNewLineWithSpaces.after.kt")
                 public void testInLambdaInsideChainCallWithNewLineWithSpaces() throws Exception {
-                    runTest("testData/indentationOnNewline/InLambdaInsideChainCallWithNewLineWithSpaces.after.kt");
+                    runTest("testData/editor/enterHandler/InLambdaInsideChainCallWithNewLineWithSpaces.after.kt");
                 }
 
                 @TestMetadata("InMultilineLambdaAfterArrow.after.kt")
                 public void testInMultilineLambdaAfterArrow() throws Exception {
-                    runTest("testData/indentationOnNewline/InMultilineLambdaAfterArrow.after.kt");
+                    runTest("testData/editor/enterHandler/InMultilineLambdaAfterArrow.after.kt");
                 }
 
                 @TestMetadata("IndentBeforeElseWithBlock.after.kt")
                 public void testIndentBeforeElseWithBlock() throws Exception {
-                    runTest("testData/indentationOnNewline/IndentBeforeElseWithBlock.after.kt");
+                    runTest("testData/editor/enterHandler/IndentBeforeElseWithBlock.after.kt");
                 }
 
                 @TestMetadata("IndentBeforeElseWithoutBlock.after.kt")
                 public void testIndentBeforeElseWithoutBlock() throws Exception {
-                    runTest("testData/indentationOnNewline/IndentBeforeElseWithoutBlock.after.kt");
+                    runTest("testData/editor/enterHandler/IndentBeforeElseWithoutBlock.after.kt");
                 }
 
                 @TestMetadata("IndentNotFinishedVariableEndAfterEquals.after.kt")
                 public void testIndentNotFinishedVariableEndAfterEquals() throws Exception {
-                    runTest("testData/indentationOnNewline/IndentNotFinishedVariableEndAfterEquals.after.kt");
+                    runTest("testData/editor/enterHandler/IndentNotFinishedVariableEndAfterEquals.after.kt");
                 }
 
                 @TestMetadata("IndentOnFinishedVariableEndAfterEquals.after.kt")
                 public void testIndentOnFinishedVariableEndAfterEquals() throws Exception {
-                    runTest("testData/indentationOnNewline/IndentOnFinishedVariableEndAfterEquals.after.kt");
+                    runTest("testData/editor/enterHandler/IndentOnFinishedVariableEndAfterEquals.after.kt");
                 }
 
                 @TestMetadata("KT20783.after.kt")
                 public void testKT20783() throws Exception {
-                    runTest("testData/indentationOnNewline/KT20783.after.kt");
+                    runTest("testData/editor/enterHandler/KT20783.after.kt");
                 }
 
                 @TestMetadata("LambdaInArguments.after.kt")
                 public void testLambdaInArguments() throws Exception {
-                    runTest("testData/indentationOnNewline/LambdaInArguments.after.kt");
+                    runTest("testData/editor/enterHandler/LambdaInArguments.after.kt");
                 }
 
                 @TestMetadata("LambdaInArguments2.after.kt")
                 public void testLambdaInArguments2() throws Exception {
-                    runTest("testData/indentationOnNewline/LambdaInArguments2.after.kt");
+                    runTest("testData/editor/enterHandler/LambdaInArguments2.after.kt");
                 }
 
                 @TestMetadata("LargeFile.after.kt")
                 public void testLargeFile() throws Exception {
-                    runTest("testData/indentationOnNewline/LargeFile.after.kt");
+                    runTest("testData/editor/enterHandler/LargeFile.after.kt");
                 }
 
                 @TestMetadata("LiteralExpression.after.kt")
                 public void testLiteralExpression() throws Exception {
-                    runTest("testData/indentationOnNewline/LiteralExpression.after.kt");
+                    runTest("testData/editor/enterHandler/LiteralExpression.after.kt");
                 }
 
                 @TestMetadata("LiteralExpression2.after.kt")
                 public void testLiteralExpression2() throws Exception {
-                    runTest("testData/indentationOnNewline/LiteralExpression2.after.kt");
+                    runTest("testData/editor/enterHandler/LiteralExpression2.after.kt");
                 }
 
                 @TestMetadata("LiteralExpression3.after.kt")
                 public void testLiteralExpression3() throws Exception {
-                    runTest("testData/indentationOnNewline/LiteralExpression3.after.kt");
+                    runTest("testData/editor/enterHandler/LiteralExpression3.after.kt");
                 }
 
                 @TestMetadata("ModifierListInUnfinishedDeclaration.after.kt")
                 public void testModifierListInUnfinishedDeclaration() throws Exception {
-                    runTest("testData/indentationOnNewline/ModifierListInUnfinishedDeclaration.after.kt");
+                    runTest("testData/editor/enterHandler/ModifierListInUnfinishedDeclaration.after.kt");
                 }
 
                 @TestMetadata("NotFirstParameter.after.kt")
                 public void testNotFirstParameter() throws Exception {
-                    runTest("testData/indentationOnNewline/NotFirstParameter.after.kt");
+                    runTest("testData/editor/enterHandler/NotFirstParameter.after.kt");
                 }
 
                 @TestMetadata("ReindentOnUnmatchedBrace.after.kt")
                 public void testReindentOnUnmatchedBrace() throws Exception {
-                    runTest("testData/indentationOnNewline/ReindentOnUnmatchedBrace.after.kt");
+                    runTest("testData/editor/enterHandler/ReindentOnUnmatchedBrace.after.kt");
                 }
 
                 @TestMetadata("ReturnContinue.after.kt")
                 public void testReturnContinue() throws Exception {
-                    runTest("testData/indentationOnNewline/ReturnContinue.after.kt");
+                    runTest("testData/editor/enterHandler/ReturnContinue.after.kt");
                 }
 
                 @TestMetadata("Semicolon.after.kt")
                 public void testSemicolon() throws Exception {
-                    runTest("testData/indentationOnNewline/Semicolon.after.kt");
+                    runTest("testData/editor/enterHandler/Semicolon.after.kt");
                 }
 
                 @TestMetadata("Semicolon2.after.kt")
                 public void testSemicolon2() throws Exception {
-                    runTest("testData/indentationOnNewline/Semicolon2.after.kt");
+                    runTest("testData/editor/enterHandler/Semicolon2.after.kt");
                 }
             }
 
             @RunWith(JUnit3RunnerWithInners.class)
-            @TestMetadata("testData/indentationOnNewline")
+            @TestMetadata("testData/editor/enterHandler")
             public static class TestBucket004 extends AbstractTypingIndentationTestBase {
                 private void runTest(String testDataFilePath) throws Exception {
                     KotlinTestUtils.runTest(this::doNewlineTest, this, testDataFilePath);
@@ -1813,82 +1813,82 @@ public abstract class TypingIndentationTestBaseGenerated extends AbstractTypingI
 
                 @TestMetadata("SettingAlignMultilineParametersInCalls.after.kt")
                 public void testSettingAlignMultilineParametersInCalls() throws Exception {
-                    runTest("testData/indentationOnNewline/SettingAlignMultilineParametersInCalls.after.kt");
+                    runTest("testData/editor/enterHandler/SettingAlignMultilineParametersInCalls.after.kt");
                 }
 
                 @TestMetadata("SmartEnterBetweenOpeningAndClosingBrackets.after.kt")
                 public void testSmartEnterBetweenOpeningAndClosingBrackets() throws Exception {
-                    runTest("testData/indentationOnNewline/SmartEnterBetweenOpeningAndClosingBrackets.after.kt");
+                    runTest("testData/editor/enterHandler/SmartEnterBetweenOpeningAndClosingBrackets.after.kt");
                 }
 
                 @TestMetadata("SmartEnterBetweenOpeningAndClosingBracketsWithInvertedAlignWhenMultiline.after.kt")
                 public void testSmartEnterBetweenOpeningAndClosingBracketsWithInvertedAlignWhenMultiline() throws Exception {
-                    runTest("testData/indentationOnNewline/SmartEnterBetweenOpeningAndClosingBracketsWithInvertedAlignWhenMultiline.after.kt");
+                    runTest("testData/editor/enterHandler/SmartEnterBetweenOpeningAndClosingBracketsWithInvertedAlignWhenMultiline.after.kt");
                 }
 
                 @TestMetadata("SmartEnterWithTabsInMethodParameters.after.kt")
                 public void testSmartEnterWithTabsInMethodParameters() throws Exception {
-                    runTest("testData/indentationOnNewline/SmartEnterWithTabsInMethodParameters.after.kt");
+                    runTest("testData/editor/enterHandler/SmartEnterWithTabsInMethodParameters.after.kt");
                 }
 
                 @TestMetadata("SmartEnterWithTabsOnConstructorParameters.after.kt")
                 public void testSmartEnterWithTabsOnConstructorParameters() throws Exception {
-                    runTest("testData/indentationOnNewline/SmartEnterWithTabsOnConstructorParameters.after.kt");
+                    runTest("testData/editor/enterHandler/SmartEnterWithTabsOnConstructorParameters.after.kt");
                 }
 
                 @TestMetadata("SmartEnterWithTabsOnConstructorParametersWithInvertedAlignWhenMultiline.after.kt")
                 public void testSmartEnterWithTabsOnConstructorParametersWithInvertedAlignWhenMultiline() throws Exception {
-                    runTest("testData/indentationOnNewline/SmartEnterWithTabsOnConstructorParametersWithInvertedAlignWhenMultiline.after.kt");
+                    runTest("testData/editor/enterHandler/SmartEnterWithTabsOnConstructorParametersWithInvertedAlignWhenMultiline.after.kt");
                 }
 
                 @TestMetadata("SmartEnterWithTrailingCommaAndWhitespaceBeforeLineBreak.after.kt")
                 public void testSmartEnterWithTrailingCommaAndWhitespaceBeforeLineBreak() throws Exception {
-                    runTest("testData/indentationOnNewline/SmartEnterWithTrailingCommaAndWhitespaceBeforeLineBreak.after.kt");
+                    runTest("testData/editor/enterHandler/SmartEnterWithTrailingCommaAndWhitespaceBeforeLineBreak.after.kt");
                 }
 
                 @TestMetadata("SmartEnterWithoutLineBreakBeforeClosingBracketInMethodParameters.after.kt")
                 public void testSmartEnterWithoutLineBreakBeforeClosingBracketInMethodParameters() throws Exception {
-                    runTest("testData/indentationOnNewline/SmartEnterWithoutLineBreakBeforeClosingBracketInMethodParameters.after.kt");
+                    runTest("testData/editor/enterHandler/SmartEnterWithoutLineBreakBeforeClosingBracketInMethodParameters.after.kt");
                 }
 
                 @TestMetadata("SplitStringByEnter.after.kt")
                 public void testSplitStringByEnter() throws Exception {
-                    runTest("testData/indentationOnNewline/SplitStringByEnter.after.kt");
+                    runTest("testData/editor/enterHandler/SplitStringByEnter.after.kt");
                 }
 
                 @TestMetadata("SplitStringByEnterAddParentheses.after.kt")
                 public void testSplitStringByEnterAddParentheses() throws Exception {
-                    runTest("testData/indentationOnNewline/SplitStringByEnterAddParentheses.after.kt");
+                    runTest("testData/editor/enterHandler/SplitStringByEnterAddParentheses.after.kt");
                 }
 
                 @TestMetadata("SplitStringByEnterBeforeEscapeSequence.after.kt")
                 public void testSplitStringByEnterBeforeEscapeSequence() throws Exception {
-                    runTest("testData/indentationOnNewline/SplitStringByEnterBeforeEscapeSequence.after.kt");
+                    runTest("testData/editor/enterHandler/SplitStringByEnterBeforeEscapeSequence.after.kt");
                 }
 
                 @TestMetadata("SplitStringByEnterBeforeSubstitution.after.kt")
                 public void testSplitStringByEnterBeforeSubstitution() throws Exception {
-                    runTest("testData/indentationOnNewline/SplitStringByEnterBeforeSubstitution.after.kt");
+                    runTest("testData/editor/enterHandler/SplitStringByEnterBeforeSubstitution.after.kt");
                 }
 
                 @TestMetadata("SplitStringByEnterEmpty.after.kt")
                 public void testSplitStringByEnterEmpty() throws Exception {
-                    runTest("testData/indentationOnNewline/SplitStringByEnterEmpty.after.kt");
+                    runTest("testData/editor/enterHandler/SplitStringByEnterEmpty.after.kt");
                 }
 
                 @TestMetadata("SplitStringByEnterExistingParentheses.after.kt")
                 public void testSplitStringByEnterExistingParentheses() throws Exception {
-                    runTest("testData/indentationOnNewline/SplitStringByEnterExistingParentheses.after.kt");
+                    runTest("testData/editor/enterHandler/SplitStringByEnterExistingParentheses.after.kt");
                 }
             }
         }
     }
 
     @RunWith(JUnit3RunnerWithInners.class)
-    @TestMetadata("testData/indentationOnNewline")
+    @TestMetadata("testData/editor/enterHandler")
     public abstract static class InvertedSettings extends AbstractTypingIndentationTestBase {
         @RunWith(JUnit3RunnerWithInners.class)
-        @TestMetadata("testData/indentationOnNewline/elvis")
+        @TestMetadata("testData/editor/enterHandler/elvis")
         public static class Elvis extends AbstractTypingIndentationTestBase {
             private void runTest(String testDataFilePath) throws Exception {
                 KotlinTestUtils.runTest(this::doNewlineTestWithInvert, this, testDataFilePath);
@@ -1896,32 +1896,32 @@ public abstract class TypingIndentationTestBaseGenerated extends AbstractTypingI
 
             @TestMetadata("AfterElvis.after.inv.kt")
             public void testAfterElvis() throws Exception {
-                runTest("testData/indentationOnNewline/elvis/AfterElvis.after.inv.kt");
+                runTest("testData/editor/enterHandler/elvis/AfterElvis.after.inv.kt");
             }
 
             @TestMetadata("AfterElvis2.after.inv.kt")
             public void testAfterElvis2() throws Exception {
-                runTest("testData/indentationOnNewline/elvis/AfterElvis2.after.inv.kt");
+                runTest("testData/editor/enterHandler/elvis/AfterElvis2.after.inv.kt");
             }
 
             @TestMetadata("AfterElvisInBinaryExpression.after.inv.kt")
             public void testAfterElvisInBinaryExpression() throws Exception {
-                runTest("testData/indentationOnNewline/elvis/AfterElvisInBinaryExpression.after.inv.kt");
+                runTest("testData/editor/enterHandler/elvis/AfterElvisInBinaryExpression.after.inv.kt");
             }
 
             @TestMetadata("BeforeElvis.after.inv.kt")
             public void testBeforeElvis() throws Exception {
-                runTest("testData/indentationOnNewline/elvis/BeforeElvis.after.inv.kt");
+                runTest("testData/editor/enterHandler/elvis/BeforeElvis.after.inv.kt");
             }
 
             @TestMetadata("BeforeElvisInBinaryExpression.after.inv.kt")
             public void testBeforeElvisInBinaryExpression() throws Exception {
-                runTest("testData/indentationOnNewline/elvis/BeforeElvisInBinaryExpression.after.inv.kt");
+                runTest("testData/editor/enterHandler/elvis/BeforeElvisInBinaryExpression.after.inv.kt");
             }
         }
 
         @RunWith(JUnit3RunnerWithInners.class)
-        @TestMetadata("testData/indentationOnNewline/emptyParameters")
+        @TestMetadata("testData/editor/enterHandler/emptyParameters")
         public static class EmptyParameters extends AbstractTypingIndentationTestBase {
             private void runTest(String testDataFilePath) throws Exception {
                 KotlinTestUtils.runTest(this::doNewlineTestWithInvert, this, testDataFilePath);
@@ -1929,47 +1929,47 @@ public abstract class TypingIndentationTestBaseGenerated extends AbstractTypingI
 
             @TestMetadata("EmptyConditionInDoWhile.after.inv.kt")
             public void testEmptyConditionInDoWhile() throws Exception {
-                runTest("testData/indentationOnNewline/emptyParameters/EmptyConditionInDoWhile.after.inv.kt");
+                runTest("testData/editor/enterHandler/emptyParameters/EmptyConditionInDoWhile.after.inv.kt");
             }
 
             @TestMetadata("EmptyConditionInFor.after.inv.kt")
             public void testEmptyConditionInFor() throws Exception {
-                runTest("testData/indentationOnNewline/emptyParameters/EmptyConditionInFor.after.inv.kt");
+                runTest("testData/editor/enterHandler/emptyParameters/EmptyConditionInFor.after.inv.kt");
             }
 
             @TestMetadata("EmptyConditionInIf.after.inv.kt")
             public void testEmptyConditionInIf() throws Exception {
-                runTest("testData/indentationOnNewline/emptyParameters/EmptyConditionInIf.after.inv.kt");
+                runTest("testData/editor/enterHandler/emptyParameters/EmptyConditionInIf.after.inv.kt");
             }
 
             @TestMetadata("EmptyConditionInWhen.after.inv.kt")
             public void testEmptyConditionInWhen() throws Exception {
-                runTest("testData/indentationOnNewline/emptyParameters/EmptyConditionInWhen.after.inv.kt");
+                runTest("testData/editor/enterHandler/emptyParameters/EmptyConditionInWhen.after.inv.kt");
             }
 
             @TestMetadata("EmptyConditionInWhile.after.inv.kt")
             public void testEmptyConditionInWhile() throws Exception {
-                runTest("testData/indentationOnNewline/emptyParameters/EmptyConditionInWhile.after.inv.kt");
+                runTest("testData/editor/enterHandler/emptyParameters/EmptyConditionInWhile.after.inv.kt");
             }
 
             @TestMetadata("EmptyParameterInDestructuringDeclaration.after.inv.kt")
             public void testEmptyParameterInDestructuringDeclaration() throws Exception {
-                runTest("testData/indentationOnNewline/emptyParameters/EmptyParameterInDestructuringDeclaration.after.inv.kt");
+                runTest("testData/editor/enterHandler/emptyParameters/EmptyParameterInDestructuringDeclaration.after.inv.kt");
             }
 
             @TestMetadata("EmptyParameterInDestructuringDeclaration2.after.inv.kt")
             public void testEmptyParameterInDestructuringDeclaration2() throws Exception {
-                runTest("testData/indentationOnNewline/emptyParameters/EmptyParameterInDestructuringDeclaration2.after.inv.kt");
+                runTest("testData/editor/enterHandler/emptyParameters/EmptyParameterInDestructuringDeclaration2.after.inv.kt");
             }
 
             @TestMetadata("EmptyParameterInDestructuringDeclaration3.after.inv.kt")
             public void testEmptyParameterInDestructuringDeclaration3() throws Exception {
-                runTest("testData/indentationOnNewline/emptyParameters/EmptyParameterInDestructuringDeclaration3.after.inv.kt");
+                runTest("testData/editor/enterHandler/emptyParameters/EmptyParameterInDestructuringDeclaration3.after.inv.kt");
             }
         }
 
         @RunWith(JUnit3RunnerWithInners.class)
-        @TestMetadata("testData/indentationOnNewline/emptyParenthesisInBinaryExpression")
+        @TestMetadata("testData/editor/enterHandler/emptyParenthesisInBinaryExpression")
         public static class EmptyParenthesisInBinaryExpression extends AbstractTypingIndentationTestBase {
             private void runTest(String testDataFilePath) throws Exception {
                 KotlinTestUtils.runTest(this::doNewlineTestWithInvert, this, testDataFilePath);
@@ -1977,57 +1977,57 @@ public abstract class TypingIndentationTestBaseGenerated extends AbstractTypingI
 
             @TestMetadata("AssignmentAfterEq.after.inv.kt")
             public void testAssignmentAfterEq() throws Exception {
-                runTest("testData/indentationOnNewline/emptyParenthesisInBinaryExpression/AssignmentAfterEq.after.inv.kt");
+                runTest("testData/editor/enterHandler/emptyParenthesisInBinaryExpression/AssignmentAfterEq.after.inv.kt");
             }
 
             @TestMetadata("BinaryWithTypeExpressions.after.inv.kt")
             public void testBinaryWithTypeExpressions() throws Exception {
-                runTest("testData/indentationOnNewline/emptyParenthesisInBinaryExpression/BinaryWithTypeExpressions.after.inv.kt");
+                runTest("testData/editor/enterHandler/emptyParenthesisInBinaryExpression/BinaryWithTypeExpressions.after.inv.kt");
             }
 
             @TestMetadata("EmptyArgumentInCallByArrayAccess.after.inv.kt")
             public void testEmptyArgumentInCallByArrayAccess() throws Exception {
-                runTest("testData/indentationOnNewline/emptyParenthesisInBinaryExpression/EmptyArgumentInCallByArrayAccess.after.inv.kt");
+                runTest("testData/editor/enterHandler/emptyParenthesisInBinaryExpression/EmptyArgumentInCallByArrayAccess.after.inv.kt");
             }
 
             @TestMetadata("EmptyArgumentInCallByDeclaration.after.inv.kt")
             public void testEmptyArgumentInCallByDeclaration() throws Exception {
-                runTest("testData/indentationOnNewline/emptyParenthesisInBinaryExpression/EmptyArgumentInCallByDeclaration.after.inv.kt");
+                runTest("testData/editor/enterHandler/emptyParenthesisInBinaryExpression/EmptyArgumentInCallByDeclaration.after.inv.kt");
             }
 
             @TestMetadata("InBinaryExpressionInMiddle.after.inv.kt")
             public void testInBinaryExpressionInMiddle() throws Exception {
-                runTest("testData/indentationOnNewline/emptyParenthesisInBinaryExpression/InBinaryExpressionInMiddle.after.inv.kt");
+                runTest("testData/editor/enterHandler/emptyParenthesisInBinaryExpression/InBinaryExpressionInMiddle.after.inv.kt");
             }
 
             @TestMetadata("InBinaryExpressionUnfinished.after.inv.kt")
             public void testInBinaryExpressionUnfinished() throws Exception {
-                runTest("testData/indentationOnNewline/emptyParenthesisInBinaryExpression/InBinaryExpressionUnfinished.after.inv.kt");
+                runTest("testData/editor/enterHandler/emptyParenthesisInBinaryExpression/InBinaryExpressionUnfinished.after.inv.kt");
             }
 
             @TestMetadata("InBinaryExpressionUnfinishedInIf.after.inv.kt")
             public void testInBinaryExpressionUnfinishedInIf() throws Exception {
-                runTest("testData/indentationOnNewline/emptyParenthesisInBinaryExpression/InBinaryExpressionUnfinishedInIf.after.inv.kt");
+                runTest("testData/editor/enterHandler/emptyParenthesisInBinaryExpression/InBinaryExpressionUnfinishedInIf.after.inv.kt");
             }
 
             @TestMetadata("InBinaryExpressionsBeforeCloseParenthesis.after.inv.kt")
             public void testInBinaryExpressionsBeforeCloseParenthesis() throws Exception {
-                runTest("testData/indentationOnNewline/emptyParenthesisInBinaryExpression/InBinaryExpressionsBeforeCloseParenthesis.after.inv.kt");
+                runTest("testData/editor/enterHandler/emptyParenthesisInBinaryExpression/InBinaryExpressionsBeforeCloseParenthesis.after.inv.kt");
             }
 
             @TestMetadata("InExpressionsParenthesesBeforeOperand.after.inv.kt")
             public void testInExpressionsParenthesesBeforeOperand() throws Exception {
-                runTest("testData/indentationOnNewline/emptyParenthesisInBinaryExpression/InExpressionsParenthesesBeforeOperand.after.inv.kt");
+                runTest("testData/editor/enterHandler/emptyParenthesisInBinaryExpression/InExpressionsParenthesesBeforeOperand.after.inv.kt");
             }
 
             @TestMetadata("IsExpressionAfterIs.after.inv.kt")
             public void testIsExpressionAfterIs() throws Exception {
-                runTest("testData/indentationOnNewline/emptyParenthesisInBinaryExpression/IsExpressionAfterIs.after.inv.kt");
+                runTest("testData/editor/enterHandler/emptyParenthesisInBinaryExpression/IsExpressionAfterIs.after.inv.kt");
             }
         }
 
         @RunWith(JUnit3RunnerWithInners.class)
-        @TestMetadata("testData/indentationOnNewline/expressionBody")
+        @TestMetadata("testData/editor/enterHandler/expressionBody")
         public static class ExpressionBody extends AbstractTypingIndentationTestBase {
             private void runTest(String testDataFilePath) throws Exception {
                 KotlinTestUtils.runTest(this::doNewlineTestWithInvert, this, testDataFilePath);
@@ -2035,97 +2035,97 @@ public abstract class TypingIndentationTestBaseGenerated extends AbstractTypingI
 
             @TestMetadata("AfterFunctionWithExplicitType.after.inv.kt")
             public void testAfterFunctionWithExplicitType() throws Exception {
-                runTest("testData/indentationOnNewline/expressionBody/AfterFunctionWithExplicitType.after.inv.kt");
+                runTest("testData/editor/enterHandler/expressionBody/AfterFunctionWithExplicitType.after.inv.kt");
             }
 
             @TestMetadata("AfterFunctionWithInference.after.inv.kt")
             public void testAfterFunctionWithInference() throws Exception {
-                runTest("testData/indentationOnNewline/expressionBody/AfterFunctionWithInference.after.inv.kt");
+                runTest("testData/editor/enterHandler/expressionBody/AfterFunctionWithInference.after.inv.kt");
             }
 
             @TestMetadata("AfterFunctionWithTypeParameter.after.inv.kt")
             public void testAfterFunctionWithTypeParameter() throws Exception {
-                runTest("testData/indentationOnNewline/expressionBody/AfterFunctionWithTypeParameter.after.inv.kt");
+                runTest("testData/editor/enterHandler/expressionBody/AfterFunctionWithTypeParameter.after.inv.kt");
             }
 
             @TestMetadata("AfterMultideclaration.after.inv.kt")
             public void testAfterMultideclaration() throws Exception {
-                runTest("testData/indentationOnNewline/expressionBody/AfterMultideclaration.after.inv.kt");
+                runTest("testData/editor/enterHandler/expressionBody/AfterMultideclaration.after.inv.kt");
             }
 
             @TestMetadata("AfterMutableProperty.after.inv.kt")
             public void testAfterMutableProperty() throws Exception {
-                runTest("testData/indentationOnNewline/expressionBody/AfterMutableProperty.after.inv.kt");
+                runTest("testData/editor/enterHandler/expressionBody/AfterMutableProperty.after.inv.kt");
             }
 
             @TestMetadata("AfterPropertyWithExplicitType.after.inv.kt")
             public void testAfterPropertyWithExplicitType() throws Exception {
-                runTest("testData/indentationOnNewline/expressionBody/AfterPropertyWithExplicitType.after.inv.kt");
+                runTest("testData/editor/enterHandler/expressionBody/AfterPropertyWithExplicitType.after.inv.kt");
             }
 
             @TestMetadata("AfterPropertyWithInference.after.inv.kt")
             public void testAfterPropertyWithInference() throws Exception {
-                runTest("testData/indentationOnNewline/expressionBody/AfterPropertyWithInference.after.inv.kt");
+                runTest("testData/editor/enterHandler/expressionBody/AfterPropertyWithInference.after.inv.kt");
             }
 
             @TestMetadata("AfterPropertyWithReceiver.after.inv.kt")
             public void testAfterPropertyWithReceiver() throws Exception {
-                runTest("testData/indentationOnNewline/expressionBody/AfterPropertyWithReceiver.after.inv.kt");
+                runTest("testData/editor/enterHandler/expressionBody/AfterPropertyWithReceiver.after.inv.kt");
             }
 
             @TestMetadata("AfterPropertyWithTypeParameterReceiver.after.inv.kt")
             public void testAfterPropertyWithTypeParameterReceiver() throws Exception {
-                runTest("testData/indentationOnNewline/expressionBody/AfterPropertyWithTypeParameterReceiver.after.inv.kt");
+                runTest("testData/editor/enterHandler/expressionBody/AfterPropertyWithTypeParameterReceiver.after.inv.kt");
             }
 
             @TestMetadata("FunctionWithExplicitType.after.inv.kt")
             public void testFunctionWithExplicitType() throws Exception {
-                runTest("testData/indentationOnNewline/expressionBody/FunctionWithExplicitType.after.inv.kt");
+                runTest("testData/editor/enterHandler/expressionBody/FunctionWithExplicitType.after.inv.kt");
             }
 
             @TestMetadata("FunctionWithInference.after.inv.kt")
             public void testFunctionWithInference() throws Exception {
-                runTest("testData/indentationOnNewline/expressionBody/FunctionWithInference.after.inv.kt");
+                runTest("testData/editor/enterHandler/expressionBody/FunctionWithInference.after.inv.kt");
             }
 
             @TestMetadata("FunctionWithTypeParameter.after.inv.kt")
             public void testFunctionWithTypeParameter() throws Exception {
-                runTest("testData/indentationOnNewline/expressionBody/FunctionWithTypeParameter.after.inv.kt");
+                runTest("testData/editor/enterHandler/expressionBody/FunctionWithTypeParameter.after.inv.kt");
             }
 
             @TestMetadata("Multideclaration.after.inv.kt")
             public void testMultideclaration() throws Exception {
-                runTest("testData/indentationOnNewline/expressionBody/Multideclaration.after.inv.kt");
+                runTest("testData/editor/enterHandler/expressionBody/Multideclaration.after.inv.kt");
             }
 
             @TestMetadata("MutableProperty.after.inv.kt")
             public void testMutableProperty() throws Exception {
-                runTest("testData/indentationOnNewline/expressionBody/MutableProperty.after.inv.kt");
+                runTest("testData/editor/enterHandler/expressionBody/MutableProperty.after.inv.kt");
             }
 
             @TestMetadata("PropertyWithExplicitType.after.inv.kt")
             public void testPropertyWithExplicitType() throws Exception {
-                runTest("testData/indentationOnNewline/expressionBody/PropertyWithExplicitType.after.inv.kt");
+                runTest("testData/editor/enterHandler/expressionBody/PropertyWithExplicitType.after.inv.kt");
             }
 
             @TestMetadata("PropertyWithInference.after.inv.kt")
             public void testPropertyWithInference() throws Exception {
-                runTest("testData/indentationOnNewline/expressionBody/PropertyWithInference.after.inv.kt");
+                runTest("testData/editor/enterHandler/expressionBody/PropertyWithInference.after.inv.kt");
             }
 
             @TestMetadata("PropertyWithReceiver.after.inv.kt")
             public void testPropertyWithReceiver() throws Exception {
-                runTest("testData/indentationOnNewline/expressionBody/PropertyWithReceiver.after.inv.kt");
+                runTest("testData/editor/enterHandler/expressionBody/PropertyWithReceiver.after.inv.kt");
             }
 
             @TestMetadata("PropertyWithTypeParameterReceiver.after.inv.kt")
             public void testPropertyWithTypeParameterReceiver() throws Exception {
-                runTest("testData/indentationOnNewline/expressionBody/PropertyWithTypeParameterReceiver.after.inv.kt");
+                runTest("testData/editor/enterHandler/expressionBody/PropertyWithTypeParameterReceiver.after.inv.kt");
             }
         }
 
         @RunWith(JUnit3RunnerWithInners.class)
-        @TestMetadata("testData/indentationOnNewline")
+        @TestMetadata("testData/editor/enterHandler")
         public static class Uncategorized extends AbstractTypingIndentationTestBase {
             private void runTest(String testDataFilePath) throws Exception {
                 KotlinTestUtils.runTest(this::doNewlineTestWithInvert, this, testDataFilePath);
@@ -2133,47 +2133,47 @@ public abstract class TypingIndentationTestBaseGenerated extends AbstractTypingI
 
             @TestMetadata("ArgumentListNormalIndent.after.inv.kt")
             public void testArgumentListNormalIndent() throws Exception {
-                runTest("testData/indentationOnNewline/ArgumentListNormalIndent.after.inv.kt");
+                runTest("testData/editor/enterHandler/ArgumentListNormalIndent.after.inv.kt");
             }
 
             @TestMetadata("HigherOrderFunction2.after.inv.kt")
             public void testHigherOrderFunction2() throws Exception {
-                runTest("testData/indentationOnNewline/HigherOrderFunction2.after.inv.kt");
+                runTest("testData/editor/enterHandler/HigherOrderFunction2.after.inv.kt");
             }
 
             @TestMetadata("InDelegationListAfterColon.after.inv.kt")
             public void testInDelegationListAfterColon() throws Exception {
-                runTest("testData/indentationOnNewline/InDelegationListAfterColon.after.inv.kt");
+                runTest("testData/editor/enterHandler/InDelegationListAfterColon.after.inv.kt");
             }
 
             @TestMetadata("InDelegationListAfterComma.after.inv.kt")
             public void testInDelegationListAfterComma() throws Exception {
-                runTest("testData/indentationOnNewline/InDelegationListAfterComma.after.inv.kt");
+                runTest("testData/editor/enterHandler/InDelegationListAfterComma.after.inv.kt");
             }
 
             @TestMetadata("InDelegationListNotEmpty.after.inv.kt")
             public void testInDelegationListNotEmpty() throws Exception {
-                runTest("testData/indentationOnNewline/InDelegationListNotEmpty.after.inv.kt");
+                runTest("testData/editor/enterHandler/InDelegationListNotEmpty.after.inv.kt");
             }
 
             @TestMetadata("InEnumAfterSemicolon.after.inv.kt")
             public void testInEnumAfterSemicolon() throws Exception {
-                runTest("testData/indentationOnNewline/InEnumAfterSemicolon.after.inv.kt");
+                runTest("testData/editor/enterHandler/InEnumAfterSemicolon.after.inv.kt");
             }
 
             @TestMetadata("InEnumInitializerListAfterComma.after.inv.kt")
             public void testInEnumInitializerListAfterComma() throws Exception {
-                runTest("testData/indentationOnNewline/InEnumInitializerListAfterComma.after.inv.kt");
+                runTest("testData/editor/enterHandler/InEnumInitializerListAfterComma.after.inv.kt");
             }
 
             @TestMetadata("InEnumInitializerListNotEmpty.after.inv.kt")
             public void testInEnumInitializerListNotEmpty() throws Exception {
-                runTest("testData/indentationOnNewline/InEnumInitializerListNotEmpty.after.inv.kt");
+                runTest("testData/editor/enterHandler/InEnumInitializerListNotEmpty.after.inv.kt");
             }
 
             @TestMetadata("SettingAlignMultilineParametersInCalls.after.inv.kt")
             public void testSettingAlignMultilineParametersInCalls() throws Exception {
-                runTest("testData/indentationOnNewline/SettingAlignMultilineParametersInCalls.after.inv.kt");
+                runTest("testData/editor/enterHandler/SettingAlignMultilineParametersInCalls.after.inv.kt");
             }
         }
     }
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/AfterCatch.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/AfterCatch.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/AfterCatch.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/AfterCatch.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/AfterCatch.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/AfterCatch.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/AfterCatch.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/AfterCatch.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/AfterClassNameBeforeFun.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/AfterClassNameBeforeFun.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/AfterClassNameBeforeFun.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/AfterClassNameBeforeFun.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/AfterClassNameBeforeFun.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/AfterClassNameBeforeFun.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/AfterClassNameBeforeFun.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/AfterClassNameBeforeFun.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/AfterExtensionPropertyGetter.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/AfterExtensionPropertyGetter.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/AfterExtensionPropertyGetter.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/AfterExtensionPropertyGetter.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/AfterExtensionPropertyGetter.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/AfterExtensionPropertyGetter.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/AfterExtensionPropertyGetter.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/AfterExtensionPropertyGetter.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/AfterExtensionPropertySetter.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/AfterExtensionPropertySetter.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/AfterExtensionPropertySetter.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/AfterExtensionPropertySetter.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/AfterExtensionPropertySetter.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/AfterExtensionPropertySetter.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/AfterExtensionPropertySetter.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/AfterExtensionPropertySetter.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/AfterFinally.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/AfterFinally.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/AfterFinally.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/AfterFinally.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/AfterFinally.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/AfterFinally.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/AfterFinally.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/AfterFinally.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/AfterImport.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/AfterImport.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/AfterImport.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/AfterImport.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/AfterImport.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/AfterImport.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/AfterImport.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/AfterImport.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/AfterPropertyGetter.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/AfterPropertyGetter.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/AfterPropertyGetter.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/AfterPropertyGetter.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/AfterPropertyGetter.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/AfterPropertyGetter.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/AfterPropertyGetter.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/AfterPropertyGetter.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/AfterPropertySetter.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/AfterPropertySetter.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/AfterPropertySetter.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/AfterPropertySetter.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/AfterPropertySetter.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/AfterPropertySetter.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/AfterPropertySetter.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/AfterPropertySetter.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/AfterTry.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/AfterTry.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/AfterTry.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/AfterTry.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/AfterTry.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/AfterTry.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/AfterTry.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/AfterTry.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/Annotation.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/Annotation.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/Annotation.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/Annotation.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/Annotation.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/Annotation.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/Annotation.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/Annotation.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/AnnotationInDeclaration.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/AnnotationInDeclaration.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/AnnotationInDeclaration.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/AnnotationInDeclaration.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/AnnotationInDeclaration.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/AnnotationInDeclaration.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/AnnotationInDeclaration.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/AnnotationInDeclaration.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/ArgumentListNormalIndent.after.inv.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/ArgumentListNormalIndent.after.inv.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/ArgumentListNormalIndent.after.inv.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/ArgumentListNormalIndent.after.inv.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/ArgumentListNormalIndent.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/ArgumentListNormalIndent.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/ArgumentListNormalIndent.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/ArgumentListNormalIndent.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/ArgumentListNormalIndent.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/ArgumentListNormalIndent.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/ArgumentListNormalIndent.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/ArgumentListNormalIndent.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/AutoIndentInWhenClause.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/AutoIndentInWhenClause.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/AutoIndentInWhenClause.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/AutoIndentInWhenClause.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/AutoIndentInWhenClause.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/AutoIndentInWhenClause.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/AutoIndentInWhenClause.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/AutoIndentInWhenClause.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/BlockCommentAfterCatch.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/BlockCommentAfterCatch.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/BlockCommentAfterCatch.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/BlockCommentAfterCatch.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/BlockCommentAfterCatch.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/BlockCommentAfterCatch.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/BlockCommentAfterCatch.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/BlockCommentAfterCatch.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/ConsecutiveCallsAfterDot.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/ConsecutiveCallsAfterDot.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/ConsecutiveCallsAfterDot.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/ConsecutiveCallsAfterDot.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/ConsecutiveCallsAfterDot.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/ConsecutiveCallsAfterDot.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/ConsecutiveCallsAfterDot.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/ConsecutiveCallsAfterDot.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/ConsecutiveCallsInSaeCallsMiddle.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/ConsecutiveCallsInSaeCallsMiddle.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/ConsecutiveCallsInSaeCallsMiddle.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/ConsecutiveCallsInSaeCallsMiddle.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/ConsecutiveCallsInSaeCallsMiddle.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/ConsecutiveCallsInSaeCallsMiddle.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/ConsecutiveCallsInSaeCallsMiddle.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/ConsecutiveCallsInSaeCallsMiddle.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/ConsecutiveCallsInSafeCallsEnd.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/ConsecutiveCallsInSafeCallsEnd.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/ConsecutiveCallsInSafeCallsEnd.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/ConsecutiveCallsInSafeCallsEnd.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/ConsecutiveCallsInSafeCallsEnd.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/ConsecutiveCallsInSafeCallsEnd.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/ConsecutiveCallsInSafeCallsEnd.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/ConsecutiveCallsInSafeCallsEnd.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/EnterInFunctionWithExpressionBody.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/EnterInFunctionWithExpressionBody.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/EnterInFunctionWithExpressionBody.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/EnterInFunctionWithExpressionBody.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/EnterInFunctionWithExpressionBody.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/EnterInFunctionWithExpressionBody.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/EnterInFunctionWithExpressionBody.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/EnterInFunctionWithExpressionBody.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/EnterInMultiDeclaration.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/EnterInMultiDeclaration.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/EnterInMultiDeclaration.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/EnterInMultiDeclaration.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/EnterInMultiDeclaration.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/EnterInMultiDeclaration.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/EnterInMultiDeclaration.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/EnterInMultiDeclaration.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/EnterInVariableDeclaration.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/EnterInVariableDeclaration.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/EnterInVariableDeclaration.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/EnterInVariableDeclaration.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/EnterInVariableDeclaration.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/EnterInVariableDeclaration.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/EnterInVariableDeclaration.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/EnterInVariableDeclaration.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/EoLCommentAfterCatch.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/EoLCommentAfterCatch.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/EoLCommentAfterCatch.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/EoLCommentAfterCatch.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/EoLCommentAfterCatch.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/EoLCommentAfterCatch.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/EoLCommentAfterCatch.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/EoLCommentAfterCatch.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/EoLCommentAfterFor.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/EoLCommentAfterFor.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/EoLCommentAfterFor.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/EoLCommentAfterFor.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/EoLCommentAfterFor.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/EoLCommentAfterFor.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/EoLCommentAfterFor.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/EoLCommentAfterFor.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/EoLCommentAfterIf.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/EoLCommentAfterIf.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/EoLCommentAfterIf.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/EoLCommentAfterIf.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/EoLCommentAfterIf.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/EoLCommentAfterIf.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/EoLCommentAfterIf.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/EoLCommentAfterIf.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/FunctionBlock.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/FunctionBlock.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/FunctionBlock.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/FunctionBlock.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/FunctionBlock.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/FunctionBlock.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/FunctionBlock.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/FunctionBlock.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/HigherOrderFunction.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/HigherOrderFunction.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/HigherOrderFunction.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/HigherOrderFunction.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/HigherOrderFunction.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/HigherOrderFunction.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/HigherOrderFunction.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/HigherOrderFunction.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/HigherOrderFunction2.after.inv.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/HigherOrderFunction2.after.inv.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/HigherOrderFunction2.after.inv.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/HigherOrderFunction2.after.inv.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/HigherOrderFunction2.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/HigherOrderFunction2.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/HigherOrderFunction2.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/HigherOrderFunction2.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/HigherOrderFunction2.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/HigherOrderFunction2.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/HigherOrderFunction2.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/HigherOrderFunction2.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/HigherOrderFunction3.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/HigherOrderFunction3.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/HigherOrderFunction3.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/HigherOrderFunction3.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/HigherOrderFunction3.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/HigherOrderFunction3.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/HigherOrderFunction3.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/HigherOrderFunction3.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/InDelegationListAfterColon.after.inv.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/InDelegationListAfterColon.after.inv.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/InDelegationListAfterColon.after.inv.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/InDelegationListAfterColon.after.inv.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/InDelegationListAfterColon.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/InDelegationListAfterColon.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/InDelegationListAfterColon.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/InDelegationListAfterColon.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/InDelegationListAfterColon.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/InDelegationListAfterColon.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/InDelegationListAfterColon.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/InDelegationListAfterColon.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/InDelegationListAfterComma.after.inv.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/InDelegationListAfterComma.after.inv.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/InDelegationListAfterComma.after.inv.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/InDelegationListAfterComma.after.inv.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/InDelegationListAfterComma.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/InDelegationListAfterComma.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/InDelegationListAfterComma.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/InDelegationListAfterComma.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/InDelegationListAfterComma.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/InDelegationListAfterComma.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/InDelegationListAfterComma.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/InDelegationListAfterComma.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/InDelegationListNotEmpty.after.inv.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/InDelegationListNotEmpty.after.inv.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/InDelegationListNotEmpty.after.inv.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/InDelegationListNotEmpty.after.inv.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/InDelegationListNotEmpty.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/InDelegationListNotEmpty.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/InDelegationListNotEmpty.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/InDelegationListNotEmpty.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/InDelegationListNotEmpty.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/InDelegationListNotEmpty.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/InDelegationListNotEmpty.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/InDelegationListNotEmpty.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/InElseBlockBeforeParenthesis.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/InElseBlockBeforeParenthesis.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/InElseBlockBeforeParenthesis.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/InElseBlockBeforeParenthesis.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/InElseBlockBeforeParenthesis.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/InElseBlockBeforeParenthesis.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/InElseBlockBeforeParenthesis.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/InElseBlockBeforeParenthesis.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/InEnumAfterSemicolon.after.inv.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/InEnumAfterSemicolon.after.inv.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/InEnumAfterSemicolon.after.inv.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/InEnumAfterSemicolon.after.inv.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/InEnumAfterSemicolon.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/InEnumAfterSemicolon.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/InEnumAfterSemicolon.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/InEnumAfterSemicolon.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/InEnumAfterSemicolon.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/InEnumAfterSemicolon.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/InEnumAfterSemicolon.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/InEnumAfterSemicolon.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/InEnumInitializerListAfterComma.after.inv.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/InEnumInitializerListAfterComma.after.inv.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/InEnumInitializerListAfterComma.after.inv.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/InEnumInitializerListAfterComma.after.inv.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/InEnumInitializerListAfterComma.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/InEnumInitializerListAfterComma.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/InEnumInitializerListAfterComma.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/InEnumInitializerListAfterComma.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/InEnumInitializerListAfterComma.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/InEnumInitializerListAfterComma.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/InEnumInitializerListAfterComma.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/InEnumInitializerListAfterComma.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/InEnumInitializerListNotEmpty.after.inv.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/InEnumInitializerListNotEmpty.after.inv.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/InEnumInitializerListNotEmpty.after.inv.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/InEnumInitializerListNotEmpty.after.inv.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/InEnumInitializerListNotEmpty.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/InEnumInitializerListNotEmpty.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/InEnumInitializerListNotEmpty.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/InEnumInitializerListNotEmpty.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/InEnumInitializerListNotEmpty.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/InEnumInitializerListNotEmpty.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/InEnumInitializerListNotEmpty.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/InEnumInitializerListNotEmpty.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/InIfBlockBeforeParenthesis.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/InIfBlockBeforeParenthesis.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/InIfBlockBeforeParenthesis.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/InIfBlockBeforeParenthesis.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/InIfBlockBeforeParenthesis.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/InIfBlockBeforeParenthesis.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/InIfBlockBeforeParenthesis.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/InIfBlockBeforeParenthesis.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/InLabmdaAfterArrow.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/InLabmdaAfterArrow.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/InLabmdaAfterArrow.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/InLabmdaAfterArrow.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/InLabmdaAfterArrow.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/InLabmdaAfterArrow.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/InLabmdaAfterArrow.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/InLabmdaAfterArrow.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/InLambdaAfterArrowWithSpaces.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/InLambdaAfterArrowWithSpaces.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/InLambdaAfterArrowWithSpaces.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/InLambdaAfterArrowWithSpaces.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/InLambdaAfterArrowWithSpaces.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/InLambdaAfterArrowWithSpaces.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/InLambdaAfterArrowWithSpaces.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/InLambdaAfterArrowWithSpaces.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/InLambdaBeforeParams.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/InLambdaBeforeParams.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/InLambdaBeforeParams.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/InLambdaBeforeParams.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/InLambdaBeforeParams.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/InLambdaBeforeParams.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/InLambdaBeforeParams.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/InLambdaBeforeParams.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/InLambdaInsideChainCallSameLine.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/InLambdaInsideChainCallSameLine.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/InLambdaInsideChainCallSameLine.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/InLambdaInsideChainCallSameLine.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/InLambdaInsideChainCallSameLine.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/InLambdaInsideChainCallSameLine.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/InLambdaInsideChainCallSameLine.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/InLambdaInsideChainCallSameLine.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/InLambdaInsideChainCallSameLineWithSpaces.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/InLambdaInsideChainCallSameLineWithSpaces.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/InLambdaInsideChainCallSameLineWithSpaces.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/InLambdaInsideChainCallSameLineWithSpaces.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/InLambdaInsideChainCallSameLineWithSpaces.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/InLambdaInsideChainCallSameLineWithSpaces.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/InLambdaInsideChainCallSameLineWithSpaces.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/InLambdaInsideChainCallSameLineWithSpaces.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/InLambdaInsideChainCallWithNewLine.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/InLambdaInsideChainCallWithNewLine.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/InLambdaInsideChainCallWithNewLine.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/InLambdaInsideChainCallWithNewLine.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/InLambdaInsideChainCallWithNewLine.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/InLambdaInsideChainCallWithNewLine.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/InLambdaInsideChainCallWithNewLine.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/InLambdaInsideChainCallWithNewLine.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/InLambdaInsideChainCallWithNewLineWithSpaces.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/InLambdaInsideChainCallWithNewLineWithSpaces.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/InLambdaInsideChainCallWithNewLineWithSpaces.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/InLambdaInsideChainCallWithNewLineWithSpaces.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/InLambdaInsideChainCallWithNewLineWithSpaces.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/InLambdaInsideChainCallWithNewLineWithSpaces.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/InLambdaInsideChainCallWithNewLineWithSpaces.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/InLambdaInsideChainCallWithNewLineWithSpaces.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/InMultilineLambdaAfterArrow.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/InMultilineLambdaAfterArrow.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/InMultilineLambdaAfterArrow.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/InMultilineLambdaAfterArrow.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/InMultilineLambdaAfterArrow.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/InMultilineLambdaAfterArrow.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/InMultilineLambdaAfterArrow.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/InMultilineLambdaAfterArrow.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/IndentBeforeElseWithBlock.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/IndentBeforeElseWithBlock.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/IndentBeforeElseWithBlock.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/IndentBeforeElseWithBlock.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/IndentBeforeElseWithBlock.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/IndentBeforeElseWithBlock.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/IndentBeforeElseWithBlock.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/IndentBeforeElseWithBlock.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/IndentBeforeElseWithoutBlock.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/IndentBeforeElseWithoutBlock.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/IndentBeforeElseWithoutBlock.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/IndentBeforeElseWithoutBlock.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/IndentBeforeElseWithoutBlock.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/IndentBeforeElseWithoutBlock.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/IndentBeforeElseWithoutBlock.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/IndentBeforeElseWithoutBlock.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/IndentNotFinishedVariableEndAfterEquals.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/IndentNotFinishedVariableEndAfterEquals.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/IndentNotFinishedVariableEndAfterEquals.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/IndentNotFinishedVariableEndAfterEquals.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/IndentNotFinishedVariableEndAfterEquals.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/IndentNotFinishedVariableEndAfterEquals.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/IndentNotFinishedVariableEndAfterEquals.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/IndentNotFinishedVariableEndAfterEquals.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/IndentOnFinishedVariableEndAfterEquals.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/IndentOnFinishedVariableEndAfterEquals.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/IndentOnFinishedVariableEndAfterEquals.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/IndentOnFinishedVariableEndAfterEquals.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/IndentOnFinishedVariableEndAfterEquals.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/IndentOnFinishedVariableEndAfterEquals.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/IndentOnFinishedVariableEndAfterEquals.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/IndentOnFinishedVariableEndAfterEquals.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/KT20783.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/KT20783.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/KT20783.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/KT20783.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/KT20783.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/KT20783.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/KT20783.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/KT20783.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/LambdaInArguments.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/LambdaInArguments.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/LambdaInArguments.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/LambdaInArguments.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/LambdaInArguments.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/LambdaInArguments.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/LambdaInArguments.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/LambdaInArguments.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/LambdaInArguments2.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/LambdaInArguments2.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/LambdaInArguments2.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/LambdaInArguments2.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/LambdaInArguments2.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/LambdaInArguments2.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/LambdaInArguments2.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/LambdaInArguments2.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/LargeFile.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/LargeFile.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/LargeFile.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/LargeFile.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/LargeFile.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/LargeFile.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/LargeFile.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/LargeFile.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/LiteralExpression.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/LiteralExpression.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/LiteralExpression.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/LiteralExpression.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/LiteralExpression.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/LiteralExpression.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/LiteralExpression.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/LiteralExpression.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/LiteralExpression2.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/LiteralExpression2.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/LiteralExpression2.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/LiteralExpression2.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/LiteralExpression2.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/LiteralExpression2.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/LiteralExpression2.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/LiteralExpression2.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/LiteralExpression3.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/LiteralExpression3.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/LiteralExpression3.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/LiteralExpression3.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/LiteralExpression3.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/LiteralExpression3.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/LiteralExpression3.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/LiteralExpression3.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/ModifierListInUnfinishedDeclaration.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/ModifierListInUnfinishedDeclaration.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/ModifierListInUnfinishedDeclaration.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/ModifierListInUnfinishedDeclaration.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/ModifierListInUnfinishedDeclaration.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/ModifierListInUnfinishedDeclaration.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/ModifierListInUnfinishedDeclaration.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/ModifierListInUnfinishedDeclaration.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/NotFirstParameter.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/NotFirstParameter.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/NotFirstParameter.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/NotFirstParameter.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/NotFirstParameter.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/NotFirstParameter.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/NotFirstParameter.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/NotFirstParameter.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/ReindentOnUnmatchedBrace.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/ReindentOnUnmatchedBrace.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/ReindentOnUnmatchedBrace.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/ReindentOnUnmatchedBrace.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/ReindentOnUnmatchedBrace.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/ReindentOnUnmatchedBrace.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/ReindentOnUnmatchedBrace.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/ReindentOnUnmatchedBrace.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/ReturnContinue.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/ReturnContinue.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/ReturnContinue.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/ReturnContinue.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/ReturnContinue.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/ReturnContinue.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/ReturnContinue.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/ReturnContinue.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/Semicolon.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/Semicolon.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/Semicolon.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/Semicolon.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/Semicolon.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/Semicolon.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/Semicolon.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/Semicolon.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/Semicolon2.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/Semicolon2.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/Semicolon2.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/Semicolon2.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/Semicolon2.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/Semicolon2.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/Semicolon2.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/Semicolon2.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/SettingAlignMultilineParametersInCalls.after.inv.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/SettingAlignMultilineParametersInCalls.after.inv.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/SettingAlignMultilineParametersInCalls.after.inv.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/SettingAlignMultilineParametersInCalls.after.inv.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/SettingAlignMultilineParametersInCalls.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/SettingAlignMultilineParametersInCalls.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/SettingAlignMultilineParametersInCalls.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/SettingAlignMultilineParametersInCalls.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/SettingAlignMultilineParametersInCalls.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/SettingAlignMultilineParametersInCalls.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/SettingAlignMultilineParametersInCalls.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/SettingAlignMultilineParametersInCalls.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/SmartEnterBetweenOpeningAndClosingBrackets.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/SmartEnterBetweenOpeningAndClosingBrackets.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/SmartEnterBetweenOpeningAndClosingBrackets.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/SmartEnterBetweenOpeningAndClosingBrackets.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/SmartEnterBetweenOpeningAndClosingBrackets.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/SmartEnterBetweenOpeningAndClosingBrackets.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/SmartEnterBetweenOpeningAndClosingBrackets.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/SmartEnterBetweenOpeningAndClosingBrackets.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/SmartEnterBetweenOpeningAndClosingBracketsWithInvertedAlignWhenMultiline.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/SmartEnterBetweenOpeningAndClosingBracketsWithInvertedAlignWhenMultiline.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/SmartEnterBetweenOpeningAndClosingBracketsWithInvertedAlignWhenMultiline.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/SmartEnterBetweenOpeningAndClosingBracketsWithInvertedAlignWhenMultiline.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/SmartEnterBetweenOpeningAndClosingBracketsWithInvertedAlignWhenMultiline.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/SmartEnterBetweenOpeningAndClosingBracketsWithInvertedAlignWhenMultiline.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/SmartEnterBetweenOpeningAndClosingBracketsWithInvertedAlignWhenMultiline.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/SmartEnterBetweenOpeningAndClosingBracketsWithInvertedAlignWhenMultiline.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/SmartEnterWithTabsInMethodParameters.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/SmartEnterWithTabsInMethodParameters.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/SmartEnterWithTabsInMethodParameters.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/SmartEnterWithTabsInMethodParameters.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/SmartEnterWithTabsInMethodParameters.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/SmartEnterWithTabsInMethodParameters.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/SmartEnterWithTabsInMethodParameters.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/SmartEnterWithTabsInMethodParameters.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/SmartEnterWithTabsOnConstructorParameters.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/SmartEnterWithTabsOnConstructorParameters.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/SmartEnterWithTabsOnConstructorParameters.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/SmartEnterWithTabsOnConstructorParameters.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/SmartEnterWithTabsOnConstructorParameters.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/SmartEnterWithTabsOnConstructorParameters.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/SmartEnterWithTabsOnConstructorParameters.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/SmartEnterWithTabsOnConstructorParameters.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/SmartEnterWithTabsOnConstructorParametersWithInvertedAlignWhenMultiline.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/SmartEnterWithTabsOnConstructorParametersWithInvertedAlignWhenMultiline.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/SmartEnterWithTabsOnConstructorParametersWithInvertedAlignWhenMultiline.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/SmartEnterWithTabsOnConstructorParametersWithInvertedAlignWhenMultiline.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/SmartEnterWithTabsOnConstructorParametersWithInvertedAlignWhenMultiline.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/SmartEnterWithTabsOnConstructorParametersWithInvertedAlignWhenMultiline.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/SmartEnterWithTabsOnConstructorParametersWithInvertedAlignWhenMultiline.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/SmartEnterWithTabsOnConstructorParametersWithInvertedAlignWhenMultiline.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/SmartEnterWithTrailingCommaAndWhitespaceBeforeLineBreak.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/SmartEnterWithTrailingCommaAndWhitespaceBeforeLineBreak.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/SmartEnterWithTrailingCommaAndWhitespaceBeforeLineBreak.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/SmartEnterWithTrailingCommaAndWhitespaceBeforeLineBreak.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/SmartEnterWithTrailingCommaAndWhitespaceBeforeLineBreak.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/SmartEnterWithTrailingCommaAndWhitespaceBeforeLineBreak.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/SmartEnterWithTrailingCommaAndWhitespaceBeforeLineBreak.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/SmartEnterWithTrailingCommaAndWhitespaceBeforeLineBreak.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/SmartEnterWithoutLineBreakBeforeClosingBracketInMethodParameters.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/SmartEnterWithoutLineBreakBeforeClosingBracketInMethodParameters.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/SmartEnterWithoutLineBreakBeforeClosingBracketInMethodParameters.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/SmartEnterWithoutLineBreakBeforeClosingBracketInMethodParameters.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/SmartEnterWithoutLineBreakBeforeClosingBracketInMethodParameters.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/SmartEnterWithoutLineBreakBeforeClosingBracketInMethodParameters.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/SmartEnterWithoutLineBreakBeforeClosingBracketInMethodParameters.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/SmartEnterWithoutLineBreakBeforeClosingBracketInMethodParameters.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/SplitStringByEnter.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/SplitStringByEnter.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/SplitStringByEnter.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/SplitStringByEnter.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/SplitStringByEnter.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/SplitStringByEnter.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/SplitStringByEnter.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/SplitStringByEnter.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/SplitStringByEnterAddParentheses.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/SplitStringByEnterAddParentheses.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/SplitStringByEnterAddParentheses.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/SplitStringByEnterAddParentheses.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/SplitStringByEnterAddParentheses.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/SplitStringByEnterAddParentheses.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/SplitStringByEnterAddParentheses.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/SplitStringByEnterAddParentheses.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/SplitStringByEnterBeforeEscapeSequence.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/SplitStringByEnterBeforeEscapeSequence.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/SplitStringByEnterBeforeEscapeSequence.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/SplitStringByEnterBeforeEscapeSequence.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/SplitStringByEnterBeforeEscapeSequence.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/SplitStringByEnterBeforeEscapeSequence.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/SplitStringByEnterBeforeEscapeSequence.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/SplitStringByEnterBeforeEscapeSequence.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/SplitStringByEnterBeforeSubstitution.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/SplitStringByEnterBeforeSubstitution.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/SplitStringByEnterBeforeSubstitution.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/SplitStringByEnterBeforeSubstitution.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/SplitStringByEnterBeforeSubstitution.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/SplitStringByEnterBeforeSubstitution.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/SplitStringByEnterBeforeSubstitution.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/SplitStringByEnterBeforeSubstitution.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/SplitStringByEnterEmpty.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/SplitStringByEnterEmpty.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/SplitStringByEnterEmpty.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/SplitStringByEnterEmpty.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/SplitStringByEnterEmpty.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/SplitStringByEnterEmpty.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/SplitStringByEnterEmpty.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/SplitStringByEnterEmpty.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/SplitStringByEnterExistingParentheses.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/SplitStringByEnterExistingParentheses.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/SplitStringByEnterExistingParentheses.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/SplitStringByEnterExistingParentheses.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/SplitStringByEnterExistingParentheses.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/SplitStringByEnterExistingParentheses.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/SplitStringByEnterExistingParentheses.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/SplitStringByEnterExistingParentheses.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/afterUnmatchedBrace/AtEndOfFile.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/afterUnmatchedBrace/AtEndOfFile.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/afterUnmatchedBrace/AtEndOfFile.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/afterUnmatchedBrace/AtEndOfFile.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/afterUnmatchedBrace/AtEndOfFile.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/afterUnmatchedBrace/AtEndOfFile.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/afterUnmatchedBrace/AtEndOfFile.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/afterUnmatchedBrace/AtEndOfFile.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/afterUnmatchedBrace/LambdaArgumentBeforeFunctionInitializer.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/afterUnmatchedBrace/LambdaArgumentBeforeFunctionInitializer.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/afterUnmatchedBrace/LambdaArgumentBeforeFunctionInitializer.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/afterUnmatchedBrace/LambdaArgumentBeforeFunctionInitializer.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/afterUnmatchedBrace/LambdaArgumentBeforeFunctionInitializer.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/afterUnmatchedBrace/LambdaArgumentBeforeFunctionInitializer.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/afterUnmatchedBrace/LambdaArgumentBeforeFunctionInitializer.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/afterUnmatchedBrace/LambdaArgumentBeforeFunctionInitializer.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/afterUnmatchedBrace/LambdaArgumentBeforeLocalPropertyInitializer.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/afterUnmatchedBrace/LambdaArgumentBeforeLocalPropertyInitializer.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/afterUnmatchedBrace/LambdaArgumentBeforeLocalPropertyInitializer.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/afterUnmatchedBrace/LambdaArgumentBeforeLocalPropertyInitializer.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/afterUnmatchedBrace/LambdaArgumentBeforeLocalPropertyInitializer.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/afterUnmatchedBrace/LambdaArgumentBeforeLocalPropertyInitializer.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/afterUnmatchedBrace/LambdaArgumentBeforeLocalPropertyInitializer.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/afterUnmatchedBrace/LambdaArgumentBeforeLocalPropertyInitializer.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/afterUnmatchedBrace/LambdaArgumentBeforeMemberPropertyInitializer.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/afterUnmatchedBrace/LambdaArgumentBeforeMemberPropertyInitializer.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/afterUnmatchedBrace/LambdaArgumentBeforeMemberPropertyInitializer.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/afterUnmatchedBrace/LambdaArgumentBeforeMemberPropertyInitializer.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/afterUnmatchedBrace/LambdaArgumentBeforeMemberPropertyInitializer.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/afterUnmatchedBrace/LambdaArgumentBeforeMemberPropertyInitializer.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/afterUnmatchedBrace/LambdaArgumentBeforeMemberPropertyInitializer.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/afterUnmatchedBrace/LambdaArgumentBeforeMemberPropertyInitializer.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/afterUnmatchedBrace/LambdaArgumentBeforeTopLevelPropertyInitializer.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/afterUnmatchedBrace/LambdaArgumentBeforeTopLevelPropertyInitializer.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/afterUnmatchedBrace/LambdaArgumentBeforeTopLevelPropertyInitializer.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/afterUnmatchedBrace/LambdaArgumentBeforeTopLevelPropertyInitializer.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/afterUnmatchedBrace/LambdaArgumentBeforeTopLevelPropertyInitializer.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/afterUnmatchedBrace/LambdaArgumentBeforeTopLevelPropertyInitializer.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/afterUnmatchedBrace/LambdaArgumentBeforeTopLevelPropertyInitializer.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/afterUnmatchedBrace/LambdaArgumentBeforeTopLevelPropertyInitializer.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/afterUnmatchedBrace/NotApplicableOnInitializer.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/afterUnmatchedBrace/NotApplicableOnInitializer.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/afterUnmatchedBrace/NotApplicableOnInitializer.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/afterUnmatchedBrace/NotApplicableOnInitializer.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/afterUnmatchedBrace/NotApplicableOnInitializer.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/afterUnmatchedBrace/NotApplicableOnInitializer.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/afterUnmatchedBrace/NotApplicableOnInitializer.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/afterUnmatchedBrace/NotApplicableOnInitializer.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/afterUnmatchedBrace/NotApplicableOnInitializer2.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/afterUnmatchedBrace/NotApplicableOnInitializer2.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/afterUnmatchedBrace/NotApplicableOnInitializer2.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/afterUnmatchedBrace/NotApplicableOnInitializer2.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/afterUnmatchedBrace/NotApplicableOnInitializer2.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/afterUnmatchedBrace/NotApplicableOnInitializer2.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/afterUnmatchedBrace/NotApplicableOnInitializer2.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/afterUnmatchedBrace/NotApplicableOnInitializer2.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/afterUnmatchedBrace/UnfinishedLambdaInCode.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/afterUnmatchedBrace/UnfinishedLambdaInCode.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/afterUnmatchedBrace/UnfinishedLambdaInCode.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/afterUnmatchedBrace/UnfinishedLambdaInCode.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/afterUnmatchedBrace/UnfinishedLambdaInCode.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/afterUnmatchedBrace/UnfinishedLambdaInCode.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/afterUnmatchedBrace/UnfinishedLambdaInCode.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/afterUnmatchedBrace/UnfinishedLambdaInCode.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/afterUnmatchedBrace/UnfinishedLambdaInCodeAsVarInitiailzer.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/afterUnmatchedBrace/UnfinishedLambdaInCodeAsVarInitiailzer.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/afterUnmatchedBrace/UnfinishedLambdaInCodeAsVarInitiailzer.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/afterUnmatchedBrace/UnfinishedLambdaInCodeAsVarInitiailzer.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/afterUnmatchedBrace/UnfinishedLambdaInCodeAsVarInitiailzer.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/afterUnmatchedBrace/UnfinishedLambdaInCodeAsVarInitiailzer.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/afterUnmatchedBrace/UnfinishedLambdaInCodeAsVarInitiailzer.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/afterUnmatchedBrace/UnfinishedLambdaInCodeAsVarInitiailzer.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/afterUnmatchedBrace/UnfinishedLambdaWithCommentInCode.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/afterUnmatchedBrace/UnfinishedLambdaWithCommentInCode.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/afterUnmatchedBrace/UnfinishedLambdaWithCommentInCode.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/afterUnmatchedBrace/UnfinishedLambdaWithCommentInCode.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/afterUnmatchedBrace/UnfinishedLambdaWithCommentInCode.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/afterUnmatchedBrace/UnfinishedLambdaWithCommentInCode.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/afterUnmatchedBrace/UnfinishedLambdaWithCommentInCode.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/afterUnmatchedBrace/UnfinishedLambdaWithCommentInCode.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/afterUnmatchedBrace/WhenBeforeLocalPropertyInitializer.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/afterUnmatchedBrace/WhenBeforeLocalPropertyInitializer.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/afterUnmatchedBrace/WhenBeforeLocalPropertyInitializer.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/afterUnmatchedBrace/WhenBeforeLocalPropertyInitializer.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/afterUnmatchedBrace/WhenBeforeLocalPropertyInitializer.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/afterUnmatchedBrace/WhenBeforeLocalPropertyInitializer.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/afterUnmatchedBrace/WhenBeforeLocalPropertyInitializer.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/afterUnmatchedBrace/WhenBeforeLocalPropertyInitializer.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/afterUnmatchedBrace/WhenBeforeMemberPropertyInitializer.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/afterUnmatchedBrace/WhenBeforeMemberPropertyInitializer.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/afterUnmatchedBrace/WhenBeforeMemberPropertyInitializer.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/afterUnmatchedBrace/WhenBeforeMemberPropertyInitializer.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/afterUnmatchedBrace/WhenBeforeMemberPropertyInitializer.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/afterUnmatchedBrace/WhenBeforeMemberPropertyInitializer.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/afterUnmatchedBrace/WhenBeforeMemberPropertyInitializer.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/afterUnmatchedBrace/WhenBeforeMemberPropertyInitializer.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/afterUnmatchedBrace/WhenBeforeTopLevelPropertyInitializer.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/afterUnmatchedBrace/WhenBeforeTopLevelPropertyInitializer.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/afterUnmatchedBrace/WhenBeforeTopLevelPropertyInitializer.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/afterUnmatchedBrace/WhenBeforeTopLevelPropertyInitializer.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/afterUnmatchedBrace/WhenBeforeTopLevelPropertyInitializer.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/afterUnmatchedBrace/WhenBeforeTopLevelPropertyInitializer.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/afterUnmatchedBrace/WhenBeforeTopLevelPropertyInitializer.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/afterUnmatchedBrace/WhenBeforeTopLevelPropertyInitializer.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/arrayAccess/ListAccess.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/arrayAccess/ListAccess.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/arrayAccess/ListAccess.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/arrayAccess/ListAccess.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/arrayAccess/ListAccess.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/arrayAccess/ListAccess.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/arrayAccess/ListAccess.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/arrayAccess/ListAccess.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/BetweenOpenBraceAndParenthesis.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/BetweenOpenBraceAndParenthesis.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/BetweenOpenBraceAndParenthesis.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/BetweenOpenBraceAndParenthesis.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/BetweenOpenBraceAndParenthesis.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/BetweenOpenBraceAndParenthesis.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/BetweenOpenBraceAndParenthesis.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/BetweenOpenBraceAndParenthesis.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/Catch.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/Catch.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/Catch.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/Catch.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/Catch.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/Catch.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/Catch.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/Catch.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/Catch2.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/Catch2.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/Catch2.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/Catch2.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/Catch2.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/Catch2.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/Catch2.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/Catch2.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/Catch3.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/Catch3.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/Catch3.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/Catch3.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/Catch3.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/Catch3.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/Catch3.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/Catch3.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/Catch4.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/Catch4.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/Catch4.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/Catch4.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/Catch4.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/Catch4.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/Catch4.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/Catch4.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/Do2.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/Do2.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/Do2.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/Do2.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/Do2.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/Do2.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/Do2.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/Do2.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/DoInFun.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/DoInFun.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/DoInFun.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/DoInFun.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/DoInFun.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/DoInFun.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/DoInFun.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/DoInFun.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/DoWhile.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/DoWhile.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/DoWhile.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/DoWhile.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/DoWhile.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/DoWhile.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/DoWhile.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/DoWhile.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/DoWhile2.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/DoWhile2.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/DoWhile2.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/DoWhile2.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/DoWhile2.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/DoWhile2.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/DoWhile2.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/DoWhile2.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/DoWhile3.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/DoWhile3.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/DoWhile3.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/DoWhile3.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/DoWhile3.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/DoWhile3.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/DoWhile3.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/DoWhile3.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/DoWhile4.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/DoWhile4.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/DoWhile4.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/DoWhile4.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/DoWhile4.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/DoWhile4.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/DoWhile4.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/DoWhile4.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/DoWhile5.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/DoWhile5.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/DoWhile5.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/DoWhile5.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/DoWhile5.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/DoWhile5.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/DoWhile5.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/DoWhile5.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/DoWhile6.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/DoWhile6.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/DoWhile6.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/DoWhile6.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/DoWhile6.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/DoWhile6.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/DoWhile6.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/DoWhile6.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/DoWhile7.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/DoWhile7.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/DoWhile7.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/DoWhile7.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/DoWhile7.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/DoWhile7.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/DoWhile7.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/DoWhile7.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/DoWithBraces.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/DoWithBraces.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/DoWithBraces.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/DoWithBraces.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/DoWithBraces.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/DoWithBraces.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/DoWithBraces.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/DoWithBraces.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/DoWithBraces2.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/DoWithBraces2.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/DoWithBraces2.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/DoWithBraces2.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/DoWithBraces2.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/DoWithBraces2.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/DoWithBraces2.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/DoWithBraces2.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/ElseIf.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/ElseIf.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/ElseIf.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/ElseIf.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/ElseIf.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/ElseIf.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/ElseIf.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/ElseIf.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/ElseInWhenWithOption.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/ElseInWhenWithOption.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/ElseInWhenWithOption.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/ElseInWhenWithOption.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/ElseInWhenWithOption.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/ElseInWhenWithOption.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/ElseInWhenWithOption.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/ElseInWhenWithOption.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/ElseInWhenWithoutOption.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/ElseInWhenWithoutOption.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/ElseInWhenWithoutOption.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/ElseInWhenWithoutOption.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/ElseInWhenWithoutOption.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/ElseInWhenWithoutOption.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/ElseInWhenWithoutOption.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/ElseInWhenWithoutOption.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/ElseWithBrace.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/ElseWithBrace.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/ElseWithBrace.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/ElseWithBrace.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/ElseWithBrace.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/ElseWithBrace.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/ElseWithBrace.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/ElseWithBrace.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/ElseWithBraceAndComment.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/ElseWithBraceAndComment.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/ElseWithBraceAndComment.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/ElseWithBraceAndComment.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/ElseWithBraceAndComment.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/ElseWithBraceAndComment.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/ElseWithBraceAndComment.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/ElseWithBraceAndComment.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/ElseWithBraceAndComment2.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/ElseWithBraceAndComment2.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/ElseWithBraceAndComment2.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/ElseWithBraceAndComment2.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/ElseWithBraceAndComment2.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/ElseWithBraceAndComment2.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/ElseWithBraceAndComment2.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/ElseWithBraceAndComment2.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/ElseWithoutBrace.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/ElseWithoutBrace.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/ElseWithoutBrace.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/ElseWithoutBrace.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/ElseWithoutBrace.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/ElseWithoutBrace.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/ElseWithoutBrace.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/ElseWithoutBrace.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/ElseWithoutBrace2.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/ElseWithoutBrace2.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/ElseWithoutBrace2.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/ElseWithoutBrace2.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/ElseWithoutBrace2.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/ElseWithoutBrace2.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/ElseWithoutBrace2.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/ElseWithoutBrace2.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/Finally.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/Finally.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/Finally.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/Finally.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/Finally.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/Finally.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/Finally.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/Finally.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/Finally2.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/Finally2.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/Finally2.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/Finally2.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/Finally2.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/Finally2.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/Finally2.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/Finally2.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/Finally3.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/Finally3.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/Finally3.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/Finally3.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/Finally3.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/Finally3.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/Finally3.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/Finally3.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/Finally4.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/Finally4.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/Finally4.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/Finally4.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/Finally4.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/Finally4.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/Finally4.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/Finally4.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/For.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/For.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/For.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/For.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/For.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/For.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/For.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/For.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/ForWithBlock.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/ForWithBlock.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/ForWithBlock.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/ForWithBlock.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/ForWithBlock.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/ForWithBlock.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/ForWithBlock.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/ForWithBlock.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/ForWithCondition.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/ForWithCondition.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/ForWithCondition.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/ForWithCondition.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/ForWithCondition.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/ForWithCondition.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/ForWithCondition.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/ForWithCondition.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/ForWithoutCondition.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/ForWithoutCondition.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/ForWithoutCondition.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/ForWithoutCondition.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/ForWithoutCondition.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/ForWithoutCondition.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/ForWithoutCondition.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/ForWithoutCondition.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/If.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/If.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/If.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/If.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/If.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/If.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/If.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/If.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/IfBeforeCondition.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/IfBeforeCondition.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/IfBeforeCondition.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/IfBeforeCondition.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/IfBeforeCondition.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/IfBeforeCondition.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/IfBeforeCondition.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/IfBeforeCondition.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/IfBeforeCondition2.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/IfBeforeCondition2.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/IfBeforeCondition2.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/IfBeforeCondition2.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/IfBeforeCondition2.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/IfBeforeCondition2.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/IfBeforeCondition2.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/IfBeforeCondition2.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/IfBeforeCondition3.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/IfBeforeCondition3.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/IfBeforeCondition3.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/IfBeforeCondition3.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/IfBeforeCondition3.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/IfBeforeCondition3.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/IfBeforeCondition3.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/IfBeforeCondition3.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/IfBeforeCondition4.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/IfBeforeCondition4.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/IfBeforeCondition4.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/IfBeforeCondition4.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/IfBeforeCondition4.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/IfBeforeCondition4.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/IfBeforeCondition4.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/IfBeforeCondition4.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/IfWithBraces.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/IfWithBraces.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/IfWithBraces.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/IfWithBraces.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/IfWithBraces.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/IfWithBraces.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/IfWithBraces.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/IfWithBraces.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/IfWithBraces2.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/IfWithBraces2.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/IfWithBraces2.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/IfWithBraces2.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/IfWithBraces2.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/IfWithBraces2.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/IfWithBraces2.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/IfWithBraces2.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/Try.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/Try.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/Try.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/Try.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/Try.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/Try.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/Try.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/Try.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/Try2.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/Try2.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/Try2.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/Try2.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/Try2.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/Try2.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/Try2.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/Try2.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/WhenWithCondition.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/WhenWithCondition.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/WhenWithCondition.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/WhenWithCondition.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/WhenWithCondition.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/WhenWithCondition.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/WhenWithCondition.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/WhenWithCondition.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/WhenWithCondition2.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/WhenWithCondition2.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/WhenWithCondition2.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/WhenWithCondition2.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/WhenWithCondition2.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/WhenWithCondition2.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/WhenWithCondition2.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/WhenWithCondition2.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/WhenWithoutCondition.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/WhenWithoutCondition.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/WhenWithoutCondition.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/WhenWithoutCondition.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/WhenWithoutCondition.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/WhenWithoutCondition.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/WhenWithoutCondition.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/WhenWithoutCondition.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/While.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/While.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/While.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/While.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/While.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/While.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/While.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/While.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/While2.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/While2.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/While2.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/While2.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/While2.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/While2.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/While2.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/While2.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/While3.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/While3.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/While3.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/While3.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/While3.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/While3.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/While3.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/While3.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/WhileWithBlock.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/WhileWithBlock.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/WhileWithBlock.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/WhileWithBlock.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/WhileWithBlock.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/WhileWithBlock.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/WhileWithBlock.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/WhileWithBlock.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/WhileWithCondition.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/WhileWithCondition.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/WhileWithCondition.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/WhileWithCondition.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/WhileWithCondition.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/WhileWithCondition.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/WhileWithCondition.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/WhileWithCondition.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/WhileWithoutCondition.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/WhileWithoutCondition.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/WhileWithoutCondition.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/WhileWithoutCondition.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/WhileWithoutCondition.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/WhileWithoutCondition.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/controlFlowConstructions/WhileWithoutCondition.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/controlFlowConstructions/WhileWithoutCondition.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/elvis/AfterElvis.after.inv.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/elvis/AfterElvis.after.inv.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/elvis/AfterElvis.after.inv.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/elvis/AfterElvis.after.inv.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/elvis/AfterElvis.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/elvis/AfterElvis.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/elvis/AfterElvis.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/elvis/AfterElvis.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/elvis/AfterElvis.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/elvis/AfterElvis.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/elvis/AfterElvis.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/elvis/AfterElvis.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/elvis/AfterElvis2.after.inv.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/elvis/AfterElvis2.after.inv.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/elvis/AfterElvis2.after.inv.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/elvis/AfterElvis2.after.inv.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/elvis/AfterElvis2.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/elvis/AfterElvis2.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/elvis/AfterElvis2.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/elvis/AfterElvis2.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/elvis/AfterElvis2.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/elvis/AfterElvis2.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/elvis/AfterElvis2.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/elvis/AfterElvis2.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/elvis/AfterElvisInBinaryExpression.after.inv.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/elvis/AfterElvisInBinaryExpression.after.inv.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/elvis/AfterElvisInBinaryExpression.after.inv.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/elvis/AfterElvisInBinaryExpression.after.inv.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/elvis/AfterElvisInBinaryExpression.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/elvis/AfterElvisInBinaryExpression.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/elvis/AfterElvisInBinaryExpression.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/elvis/AfterElvisInBinaryExpression.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/elvis/AfterElvisInBinaryExpression.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/elvis/AfterElvisInBinaryExpression.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/elvis/AfterElvisInBinaryExpression.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/elvis/AfterElvisInBinaryExpression.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/elvis/BeforeElvis.after.inv.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/elvis/BeforeElvis.after.inv.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/elvis/BeforeElvis.after.inv.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/elvis/BeforeElvis.after.inv.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/elvis/BeforeElvis.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/elvis/BeforeElvis.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/elvis/BeforeElvis.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/elvis/BeforeElvis.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/elvis/BeforeElvis.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/elvis/BeforeElvis.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/elvis/BeforeElvis.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/elvis/BeforeElvis.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/elvis/BeforeElvisInBinaryExpression.after.inv.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/elvis/BeforeElvisInBinaryExpression.after.inv.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/elvis/BeforeElvisInBinaryExpression.after.inv.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/elvis/BeforeElvisInBinaryExpression.after.inv.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/elvis/BeforeElvisInBinaryExpression.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/elvis/BeforeElvisInBinaryExpression.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/elvis/BeforeElvisInBinaryExpression.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/elvis/BeforeElvisInBinaryExpression.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/elvis/BeforeElvisInBinaryExpression.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/elvis/BeforeElvisInBinaryExpression.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/elvis/BeforeElvisInBinaryExpression.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/elvis/BeforeElvisInBinaryExpression.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyBraces/ClassWithConstructor.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyBraces/ClassWithConstructor.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyBraces/ClassWithConstructor.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyBraces/ClassWithConstructor.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyBraces/ClassWithConstructor.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyBraces/ClassWithConstructor.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyBraces/ClassWithConstructor.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyBraces/ClassWithConstructor.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyBraces/ClassWithConstructor2.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyBraces/ClassWithConstructor2.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyBraces/ClassWithConstructor2.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyBraces/ClassWithConstructor2.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyBraces/ClassWithConstructor2.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyBraces/ClassWithConstructor2.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyBraces/ClassWithConstructor2.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyBraces/ClassWithConstructor2.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyBraces/ClassWithoutConstructor.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyBraces/ClassWithoutConstructor.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyBraces/ClassWithoutConstructor.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyBraces/ClassWithoutConstructor.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyBraces/ClassWithoutConstructor.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyBraces/ClassWithoutConstructor.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyBraces/ClassWithoutConstructor.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyBraces/ClassWithoutConstructor.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyBraces/FunctionBlock.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyBraces/FunctionBlock.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyBraces/FunctionBlock.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyBraces/FunctionBlock.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyBraces/FunctionBlock.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyBraces/FunctionBlock.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyBraces/FunctionBlock.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyBraces/FunctionBlock.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyBraces/FunctionBlock2.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyBraces/FunctionBlock2.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyBraces/FunctionBlock2.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyBraces/FunctionBlock2.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyBraces/FunctionBlock2.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyBraces/FunctionBlock2.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyBraces/FunctionBlock2.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyBraces/FunctionBlock2.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyBraces/FunctionBody3.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyBraces/FunctionBody3.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyBraces/FunctionBody3.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyBraces/FunctionBody3.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyBraces/FunctionBody3.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyBraces/FunctionBody3.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyBraces/FunctionBody3.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyBraces/FunctionBody3.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyBraces/FunctionBody4.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyBraces/FunctionBody4.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyBraces/FunctionBody4.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyBraces/FunctionBody4.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyBraces/FunctionBody4.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyBraces/FunctionBody4.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyBraces/FunctionBody4.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyBraces/FunctionBody4.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyBraces/FunctionBodyInsideClass.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyBraces/FunctionBodyInsideClass.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyBraces/FunctionBodyInsideClass.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyBraces/FunctionBodyInsideClass.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyBraces/FunctionBodyInsideClass.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyBraces/FunctionBodyInsideClass.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyBraces/FunctionBodyInsideClass.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyBraces/FunctionBodyInsideClass.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyBraces/FunctionBodyInsideClass2.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyBraces/FunctionBodyInsideClass2.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyBraces/FunctionBodyInsideClass2.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyBraces/FunctionBodyInsideClass2.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyBraces/FunctionBodyInsideClass2.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyBraces/FunctionBodyInsideClass2.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyBraces/FunctionBodyInsideClass2.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyBraces/FunctionBodyInsideClass2.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyArgumentInCallByArrayAccess.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyArgumentInCallByArrayAccess.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyArgumentInCallByArrayAccess.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyArgumentInCallByArrayAccess.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyArgumentInCallByArrayAccess.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyArgumentInCallByArrayAccess.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyArgumentInCallByArrayAccess.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyArgumentInCallByArrayAccess.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyArgumentInCallByArrayAccess2.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyArgumentInCallByArrayAccess2.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyArgumentInCallByArrayAccess2.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyArgumentInCallByArrayAccess2.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyArgumentInCallByArrayAccess2.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyArgumentInCallByArrayAccess2.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyArgumentInCallByArrayAccess2.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyArgumentInCallByArrayAccess2.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyArgumentInCallByDeclaration.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyArgumentInCallByDeclaration.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyArgumentInCallByDeclaration.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyArgumentInCallByDeclaration.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyArgumentInCallByDeclaration.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyArgumentInCallByDeclaration.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyArgumentInCallByDeclaration.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyArgumentInCallByDeclaration.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyArgumentInCallByDeclaration2.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyArgumentInCallByDeclaration2.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyArgumentInCallByDeclaration2.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyArgumentInCallByDeclaration2.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyArgumentInCallByDeclaration2.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyArgumentInCallByDeclaration2.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyArgumentInCallByDeclaration2.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyArgumentInCallByDeclaration2.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyArgumentInCallByReference.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyArgumentInCallByReference.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyArgumentInCallByReference.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyArgumentInCallByReference.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyArgumentInCallByReference.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyArgumentInCallByReference.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyArgumentInCallByReference.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyArgumentInCallByReference.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyArgumentInCallByReference2.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyArgumentInCallByReference2.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyArgumentInCallByReference2.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyArgumentInCallByReference2.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyArgumentInCallByReference2.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyArgumentInCallByReference2.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyArgumentInCallByReference2.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyArgumentInCallByReference2.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyArgumentInCallByReferenceInSuperType.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyArgumentInCallByReferenceInSuperType.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyArgumentInCallByReferenceInSuperType.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyArgumentInCallByReferenceInSuperType.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyArgumentInCallByReferenceInSuperType.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyArgumentInCallByReferenceInSuperType.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyArgumentInCallByReferenceInSuperType.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyArgumentInCallByReferenceInSuperType.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyArgumentInCallByReferenceInSuperType2.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyArgumentInCallByReferenceInSuperType2.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyArgumentInCallByReferenceInSuperType2.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyArgumentInCallByReferenceInSuperType2.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyArgumentInCallByReferenceInSuperType2.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyArgumentInCallByReferenceInSuperType2.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyArgumentInCallByReferenceInSuperType2.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyArgumentInCallByReferenceInSuperType2.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyArgumentInCallByReferenceInSuperTypeWithTypeArguments.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyArgumentInCallByReferenceInSuperTypeWithTypeArguments.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyArgumentInCallByReferenceInSuperTypeWithTypeArguments.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyArgumentInCallByReferenceInSuperTypeWithTypeArguments.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyArgumentInCallByReferenceInSuperTypeWithTypeArguments.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyArgumentInCallByReferenceInSuperTypeWithTypeArguments.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyArgumentInCallByReferenceInSuperTypeWithTypeArguments.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyArgumentInCallByReferenceInSuperTypeWithTypeArguments.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyArgumentInCallByReferenceInSuperTypeWithTypeArguments2.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyArgumentInCallByReferenceInSuperTypeWithTypeArguments2.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyArgumentInCallByReferenceInSuperTypeWithTypeArguments2.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyArgumentInCallByReferenceInSuperTypeWithTypeArguments2.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyArgumentInCallByReferenceInSuperTypeWithTypeArguments2.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyArgumentInCallByReferenceInSuperTypeWithTypeArguments2.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyArgumentInCallByReferenceInSuperTypeWithTypeArguments2.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyArgumentInCallByReferenceInSuperTypeWithTypeArguments2.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyArgumentInCallByReferenceWithTypeArguments.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyArgumentInCallByReferenceWithTypeArguments.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyArgumentInCallByReferenceWithTypeArguments.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyArgumentInCallByReferenceWithTypeArguments.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyArgumentInCallByReferenceWithTypeArguments.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyArgumentInCallByReferenceWithTypeArguments.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyArgumentInCallByReferenceWithTypeArguments.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyArgumentInCallByReferenceWithTypeArguments.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyArgumentInCallByReferenceWithTypeArguments2.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyArgumentInCallByReferenceWithTypeArguments2.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyArgumentInCallByReferenceWithTypeArguments2.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyArgumentInCallByReferenceWithTypeArguments2.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyArgumentInCallByReferenceWithTypeArguments2.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyArgumentInCallByReferenceWithTypeArguments2.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyArgumentInCallByReferenceWithTypeArguments2.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyArgumentInCallByReferenceWithTypeArguments2.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyArgumentInThisAsClassicFunction.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyArgumentInThisAsClassicFunction.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyArgumentInThisAsClassicFunction.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyArgumentInThisAsClassicFunction.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyArgumentInThisAsClassicFunction.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyArgumentInThisAsClassicFunction.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyArgumentInThisAsClassicFunction.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyArgumentInThisAsClassicFunction.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyArgumentInThisAsConstructor.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyArgumentInThisAsConstructor.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyArgumentInThisAsConstructor.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyArgumentInThisAsConstructor.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyArgumentInThisAsConstructor.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyArgumentInThisAsConstructor.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyArgumentInThisAsConstructor.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyArgumentInThisAsConstructor.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyArgumentInThisAsConstructor2.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyArgumentInThisAsConstructor2.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyArgumentInThisAsConstructor2.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyArgumentInThisAsConstructor2.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyArgumentInThisAsConstructor2.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyArgumentInThisAsConstructor2.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyArgumentInThisAsConstructor2.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyArgumentInThisAsConstructor2.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyConditionInCatch.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyConditionInCatch.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyConditionInCatch.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyConditionInCatch.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyConditionInCatch.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyConditionInCatch.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyConditionInCatch.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyConditionInCatch.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyConditionInCatch2.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyConditionInCatch2.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyConditionInCatch2.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyConditionInCatch2.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyConditionInCatch2.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyConditionInCatch2.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyConditionInCatch2.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyConditionInCatch2.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyConditionInDoWhile.after.inv.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyConditionInDoWhile.after.inv.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyConditionInDoWhile.after.inv.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyConditionInDoWhile.after.inv.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyConditionInDoWhile.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyConditionInDoWhile.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyConditionInDoWhile.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyConditionInDoWhile.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyConditionInDoWhile.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyConditionInDoWhile.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyConditionInDoWhile.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyConditionInDoWhile.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyConditionInFor.after.inv.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyConditionInFor.after.inv.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyConditionInFor.after.inv.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyConditionInFor.after.inv.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyConditionInFor.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyConditionInFor.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyConditionInFor.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyConditionInFor.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyConditionInFor.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyConditionInFor.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyConditionInFor.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyConditionInFor.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyConditionInIf.after.inv.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyConditionInIf.after.inv.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyConditionInIf.after.inv.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyConditionInIf.after.inv.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyConditionInIf.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyConditionInIf.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyConditionInIf.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyConditionInIf.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyConditionInIf.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyConditionInIf.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyConditionInIf.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyConditionInIf.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyConditionInWhen.after.inv.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyConditionInWhen.after.inv.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyConditionInWhen.after.inv.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyConditionInWhen.after.inv.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyConditionInWhen.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyConditionInWhen.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyConditionInWhen.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyConditionInWhen.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyConditionInWhen.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyConditionInWhen.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyConditionInWhen.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyConditionInWhen.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyConditionInWhile.after.inv.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyConditionInWhile.after.inv.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyConditionInWhile.after.inv.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyConditionInWhile.after.inv.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyConditionInWhile.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyConditionInWhile.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyConditionInWhile.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyConditionInWhile.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyConditionInWhile.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyConditionInWhile.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyConditionInWhile.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyConditionInWhile.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInAnnonymousFunction.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInAnnonymousFunction.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInAnnonymousFunction.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInAnnonymousFunction.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInAnnonymousFunction.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInAnnonymousFunction.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInAnnonymousFunction.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInAnnonymousFunction.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInAnnonymousFunction2.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInAnnonymousFunction2.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInAnnonymousFunction2.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInAnnonymousFunction2.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInAnnonymousFunction2.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInAnnonymousFunction2.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInAnnonymousFunction2.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInAnnonymousFunction2.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInAnnonymousFunctionWithNullableReceiver.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInAnnonymousFunctionWithNullableReceiver.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInAnnonymousFunctionWithNullableReceiver.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInAnnonymousFunctionWithNullableReceiver.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInAnnonymousFunctionWithNullableReceiver.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInAnnonymousFunctionWithNullableReceiver.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInAnnonymousFunctionWithNullableReceiver.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInAnnonymousFunctionWithNullableReceiver.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInAnnonymousFunctionWithNullableReceiver2.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInAnnonymousFunctionWithNullableReceiver2.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInAnnonymousFunctionWithNullableReceiver2.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInAnnonymousFunctionWithNullableReceiver2.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInAnnonymousFunctionWithNullableReceiver2.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInAnnonymousFunctionWithNullableReceiver2.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInAnnonymousFunctionWithNullableReceiver2.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInAnnonymousFunctionWithNullableReceiver2.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInAnnonymousFunctionWithReceiver.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInAnnonymousFunctionWithReceiver.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInAnnonymousFunctionWithReceiver.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInAnnonymousFunctionWithReceiver.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInAnnonymousFunctionWithReceiver.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInAnnonymousFunctionWithReceiver.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInAnnonymousFunctionWithReceiver.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInAnnonymousFunctionWithReceiver.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInAnnonymousFunctionWithReceiver2.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInAnnonymousFunctionWithReceiver2.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInAnnonymousFunctionWithReceiver2.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInAnnonymousFunctionWithReceiver2.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInAnnonymousFunctionWithReceiver2.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInAnnonymousFunctionWithReceiver2.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInAnnonymousFunctionWithReceiver2.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInAnnonymousFunctionWithReceiver2.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInDestructuringDeclaration.after.inv.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInDestructuringDeclaration.after.inv.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInDestructuringDeclaration.after.inv.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInDestructuringDeclaration.after.inv.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInDestructuringDeclaration.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInDestructuringDeclaration.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInDestructuringDeclaration.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInDestructuringDeclaration.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInDestructuringDeclaration.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInDestructuringDeclaration.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInDestructuringDeclaration.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInDestructuringDeclaration.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInDestructuringDeclaration2.after.inv.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInDestructuringDeclaration2.after.inv.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInDestructuringDeclaration2.after.inv.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInDestructuringDeclaration2.after.inv.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInDestructuringDeclaration2.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInDestructuringDeclaration2.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInDestructuringDeclaration2.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInDestructuringDeclaration2.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInDestructuringDeclaration2.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInDestructuringDeclaration2.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInDestructuringDeclaration2.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInDestructuringDeclaration2.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInDestructuringDeclaration3.after.inv.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInDestructuringDeclaration3.after.inv.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInDestructuringDeclaration3.after.inv.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInDestructuringDeclaration3.after.inv.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInDestructuringDeclaration3.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInDestructuringDeclaration3.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInDestructuringDeclaration3.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInDestructuringDeclaration3.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInDestructuringDeclaration3.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInDestructuringDeclaration3.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInDestructuringDeclaration3.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInDestructuringDeclaration3.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInExplicitPrimaryConstructor.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInExplicitPrimaryConstructor.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInExplicitPrimaryConstructor.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInExplicitPrimaryConstructor.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInExplicitPrimaryConstructor.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInExplicitPrimaryConstructor.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInExplicitPrimaryConstructor.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInExplicitPrimaryConstructor.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInExplicitPrimaryConstructor2.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInExplicitPrimaryConstructor2.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInExplicitPrimaryConstructor2.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInExplicitPrimaryConstructor2.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInExplicitPrimaryConstructor2.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInExplicitPrimaryConstructor2.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInExplicitPrimaryConstructor2.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInExplicitPrimaryConstructor2.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInFunction.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInFunction.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInFunction.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInFunction.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInFunction.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInFunction.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInFunction.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInFunction.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInFunction2.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInFunction2.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInFunction2.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInFunction2.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInFunction2.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInFunction2.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInFunction2.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInFunction2.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInFunctionWithReceiver.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInFunctionWithReceiver.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInFunctionWithReceiver.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInFunctionWithReceiver.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInFunctionWithReceiver.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInFunctionWithReceiver.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInFunctionWithReceiver.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInFunctionWithReceiver.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInFunctionWithReceiver2.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInFunctionWithReceiver2.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInFunctionWithReceiver2.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInFunctionWithReceiver2.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInFunctionWithReceiver2.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInFunctionWithReceiver2.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInFunctionWithReceiver2.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInFunctionWithReceiver2.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInFunctionWithTypeParameters.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInFunctionWithTypeParameters.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInFunctionWithTypeParameters.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInFunctionWithTypeParameters.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInFunctionWithTypeParameters.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInFunctionWithTypeParameters.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInFunctionWithTypeParameters.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInFunctionWithTypeParameters.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInFunctionWithTypeParameters2.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInFunctionWithTypeParameters2.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInFunctionWithTypeParameters2.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInFunctionWithTypeParameters2.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInFunctionWithTypeParameters2.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInFunctionWithTypeParameters2.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInFunctionWithTypeParameters2.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInFunctionWithTypeParameters2.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInFunctionWithTypeParametersAndReceiver.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInFunctionWithTypeParametersAndReceiver.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInFunctionWithTypeParametersAndReceiver.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInFunctionWithTypeParametersAndReceiver.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInFunctionWithTypeParametersAndReceiver.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInFunctionWithTypeParametersAndReceiver.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInFunctionWithTypeParametersAndReceiver.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInFunctionWithTypeParametersAndReceiver.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInFunctionWithTypeParametersAndReceiver2.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInFunctionWithTypeParametersAndReceiver2.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInFunctionWithTypeParametersAndReceiver2.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInFunctionWithTypeParametersAndReceiver2.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInFunctionWithTypeParametersAndReceiver2.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInFunctionWithTypeParametersAndReceiver2.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInFunctionWithTypeParametersAndReceiver2.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInFunctionWithTypeParametersAndReceiver2.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInFunctionWithTypeParametersAndReceiver3.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInFunctionWithTypeParametersAndReceiver3.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInFunctionWithTypeParametersAndReceiver3.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInFunctionWithTypeParametersAndReceiver3.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInFunctionWithTypeParametersAndReceiver3.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInFunctionWithTypeParametersAndReceiver3.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInFunctionWithTypeParametersAndReceiver3.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInFunctionWithTypeParametersAndReceiver3.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInFunctionWithTypeParametersAndReceiver4.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInFunctionWithTypeParametersAndReceiver4.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInFunctionWithTypeParametersAndReceiver4.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInFunctionWithTypeParametersAndReceiver4.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInFunctionWithTypeParametersAndReceiver4.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInFunctionWithTypeParametersAndReceiver4.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInFunctionWithTypeParametersAndReceiver4.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInFunctionWithTypeParametersAndReceiver4.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInGetter.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInGetter.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInGetter.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInGetter.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInGetter.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInGetter.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInGetter.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInGetter.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInGetter2.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInGetter2.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInGetter2.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInGetter2.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInGetter2.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInGetter2.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInGetter2.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInGetter2.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInImplicitPrimaryConstructor.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInImplicitPrimaryConstructor.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInImplicitPrimaryConstructor.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInImplicitPrimaryConstructor.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInImplicitPrimaryConstructor.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInImplicitPrimaryConstructor.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInImplicitPrimaryConstructor.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInImplicitPrimaryConstructor.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInImplicitPrimaryConstructor2.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInImplicitPrimaryConstructor2.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInImplicitPrimaryConstructor2.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInImplicitPrimaryConstructor2.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInImplicitPrimaryConstructor2.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInImplicitPrimaryConstructor2.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInImplicitPrimaryConstructor2.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInImplicitPrimaryConstructor2.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInImplicitPrimaryConstructorWithTypeParameters.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInImplicitPrimaryConstructorWithTypeParameters.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInImplicitPrimaryConstructorWithTypeParameters.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInImplicitPrimaryConstructorWithTypeParameters.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInImplicitPrimaryConstructorWithTypeParameters.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInImplicitPrimaryConstructorWithTypeParameters.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInImplicitPrimaryConstructorWithTypeParameters.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInImplicitPrimaryConstructorWithTypeParameters.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInImplicitPrimaryConstructorWithTypeParameters2.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInImplicitPrimaryConstructorWithTypeParameters2.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInImplicitPrimaryConstructorWithTypeParameters2.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInImplicitPrimaryConstructorWithTypeParameters2.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInImplicitPrimaryConstructorWithTypeParameters2.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInImplicitPrimaryConstructorWithTypeParameters2.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInImplicitPrimaryConstructorWithTypeParameters2.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInImplicitPrimaryConstructorWithTypeParameters2.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInInnerAnnonymousFunction.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInInnerAnnonymousFunction.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInInnerAnnonymousFunction.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInInnerAnnonymousFunction.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInInnerAnnonymousFunction.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInInnerAnnonymousFunction.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInInnerAnnonymousFunction.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInInnerAnnonymousFunction.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInInnerAnnonymousFunction2.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInInnerAnnonymousFunction2.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInInnerAnnonymousFunction2.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInInnerAnnonymousFunction2.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInInnerAnnonymousFunction2.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInInnerAnnonymousFunction2.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInInnerAnnonymousFunction2.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInInnerAnnonymousFunction2.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInSecondaryConstructor.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInSecondaryConstructor.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInSecondaryConstructor.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInSecondaryConstructor.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInSecondaryConstructor.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInSecondaryConstructor.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInSecondaryConstructor.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInSecondaryConstructor.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInSecondaryConstructor2.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInSecondaryConstructor2.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInSecondaryConstructor2.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInSecondaryConstructor2.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInSecondaryConstructor2.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInSecondaryConstructor2.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInSecondaryConstructor2.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInSecondaryConstructor2.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInSetter.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInSetter.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInSetter.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInSetter.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInSetter.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInSetter.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInSetter.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInSetter.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInSetter2.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInSetter2.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInSetter2.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInSetter2.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInSetter2.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInSetter2.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInSetter2.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInSetter2.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameters.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameters.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameters.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameters.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameters.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameters.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameters.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameters.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameters2.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameters2.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameters2.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameters2.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameters2.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameters2.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameters2.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameters2.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/AssignmentAfterEq.after.inv.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/AssignmentAfterEq.after.inv.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/AssignmentAfterEq.after.inv.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/AssignmentAfterEq.after.inv.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/AssignmentAfterEq.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/AssignmentAfterEq.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/AssignmentAfterEq.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/AssignmentAfterEq.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/AssignmentAfterEq.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/AssignmentAfterEq.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/AssignmentAfterEq.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/AssignmentAfterEq.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/BinaryWithTypeExpressions.after.inv.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/BinaryWithTypeExpressions.after.inv.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/BinaryWithTypeExpressions.after.inv.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/BinaryWithTypeExpressions.after.inv.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/BinaryWithTypeExpressions.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/BinaryWithTypeExpressions.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/BinaryWithTypeExpressions.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/BinaryWithTypeExpressions.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/BinaryWithTypeExpressions.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/BinaryWithTypeExpressions.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/BinaryWithTypeExpressions.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/BinaryWithTypeExpressions.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/EmptyArgumentInCallByArrayAccess.after.inv.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/EmptyArgumentInCallByArrayAccess.after.inv.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/EmptyArgumentInCallByArrayAccess.after.inv.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/EmptyArgumentInCallByArrayAccess.after.inv.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/EmptyArgumentInCallByArrayAccess.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/EmptyArgumentInCallByArrayAccess.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/EmptyArgumentInCallByArrayAccess.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/EmptyArgumentInCallByArrayAccess.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/EmptyArgumentInCallByArrayAccess.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/EmptyArgumentInCallByArrayAccess.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/EmptyArgumentInCallByArrayAccess.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/EmptyArgumentInCallByArrayAccess.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/EmptyArgumentInCallByDeclaration.after.inv.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/EmptyArgumentInCallByDeclaration.after.inv.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/EmptyArgumentInCallByDeclaration.after.inv.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/EmptyArgumentInCallByDeclaration.after.inv.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/EmptyArgumentInCallByDeclaration.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/EmptyArgumentInCallByDeclaration.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/EmptyArgumentInCallByDeclaration.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/EmptyArgumentInCallByDeclaration.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/EmptyArgumentInCallByDeclaration.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/EmptyArgumentInCallByDeclaration.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/EmptyArgumentInCallByDeclaration.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/EmptyArgumentInCallByDeclaration.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/InBinaryExpressionInMiddle.after.inv.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/InBinaryExpressionInMiddle.after.inv.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/InBinaryExpressionInMiddle.after.inv.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/InBinaryExpressionInMiddle.after.inv.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/InBinaryExpressionInMiddle.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/InBinaryExpressionInMiddle.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/InBinaryExpressionInMiddle.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/InBinaryExpressionInMiddle.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/InBinaryExpressionInMiddle.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/InBinaryExpressionInMiddle.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/InBinaryExpressionInMiddle.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/InBinaryExpressionInMiddle.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/InBinaryExpressionUnfinished.after.inv.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/InBinaryExpressionUnfinished.after.inv.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/InBinaryExpressionUnfinished.after.inv.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/InBinaryExpressionUnfinished.after.inv.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/InBinaryExpressionUnfinished.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/InBinaryExpressionUnfinished.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/InBinaryExpressionUnfinished.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/InBinaryExpressionUnfinished.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/InBinaryExpressionUnfinished.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/InBinaryExpressionUnfinished.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/InBinaryExpressionUnfinished.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/InBinaryExpressionUnfinished.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/InBinaryExpressionUnfinishedInIf.after.inv.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/InBinaryExpressionUnfinishedInIf.after.inv.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/InBinaryExpressionUnfinishedInIf.after.inv.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/InBinaryExpressionUnfinishedInIf.after.inv.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/InBinaryExpressionUnfinishedInIf.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/InBinaryExpressionUnfinishedInIf.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/InBinaryExpressionUnfinishedInIf.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/InBinaryExpressionUnfinishedInIf.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/InBinaryExpressionUnfinishedInIf.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/InBinaryExpressionUnfinishedInIf.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/InBinaryExpressionUnfinishedInIf.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/InBinaryExpressionUnfinishedInIf.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/InBinaryExpressionsBeforeCloseParenthesis.after.inv.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/InBinaryExpressionsBeforeCloseParenthesis.after.inv.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/InBinaryExpressionsBeforeCloseParenthesis.after.inv.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/InBinaryExpressionsBeforeCloseParenthesis.after.inv.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/InBinaryExpressionsBeforeCloseParenthesis.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/InBinaryExpressionsBeforeCloseParenthesis.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/InBinaryExpressionsBeforeCloseParenthesis.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/InBinaryExpressionsBeforeCloseParenthesis.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/InBinaryExpressionsBeforeCloseParenthesis.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/InBinaryExpressionsBeforeCloseParenthesis.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/InBinaryExpressionsBeforeCloseParenthesis.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/InBinaryExpressionsBeforeCloseParenthesis.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/InExpressionsParentheses.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/InExpressionsParentheses.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/InExpressionsParentheses.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/InExpressionsParentheses.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/InExpressionsParentheses.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/InExpressionsParentheses.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/InExpressionsParentheses.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/InExpressionsParentheses.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/InExpressionsParentheses2.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/InExpressionsParentheses2.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/InExpressionsParentheses2.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/InExpressionsParentheses2.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/InExpressionsParentheses2.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/InExpressionsParentheses2.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/InExpressionsParentheses2.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/InExpressionsParentheses2.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/InExpressionsParentheses3.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/InExpressionsParentheses3.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/InExpressionsParentheses3.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/InExpressionsParentheses3.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/InExpressionsParentheses3.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/InExpressionsParentheses3.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/InExpressionsParentheses3.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/InExpressionsParentheses3.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/InExpressionsParentheses4.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/InExpressionsParentheses4.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/InExpressionsParentheses4.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/InExpressionsParentheses4.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/InExpressionsParentheses4.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/InExpressionsParentheses4.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/InExpressionsParentheses4.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/InExpressionsParentheses4.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/InExpressionsParenthesesBeforeOperand.after.inv.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/InExpressionsParenthesesBeforeOperand.after.inv.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/InExpressionsParenthesesBeforeOperand.after.inv.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/InExpressionsParenthesesBeforeOperand.after.inv.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/InExpressionsParenthesesBeforeOperand.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/InExpressionsParenthesesBeforeOperand.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/InExpressionsParenthesesBeforeOperand.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/InExpressionsParenthesesBeforeOperand.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/InExpressionsParenthesesBeforeOperand.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/InExpressionsParenthesesBeforeOperand.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/InExpressionsParenthesesBeforeOperand.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/InExpressionsParenthesesBeforeOperand.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/IsExpressionAfterIs.after.inv.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/IsExpressionAfterIs.after.inv.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/IsExpressionAfterIs.after.inv.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/IsExpressionAfterIs.after.inv.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/IsExpressionAfterIs.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/IsExpressionAfterIs.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/IsExpressionAfterIs.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/IsExpressionAfterIs.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/IsExpressionAfterIs.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/IsExpressionAfterIs.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/IsExpressionAfterIs.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/IsExpressionAfterIs.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/AfterFunctionWithExplicitType.after.inv.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/AfterFunctionWithExplicitType.after.inv.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/AfterFunctionWithExplicitType.after.inv.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/AfterFunctionWithExplicitType.after.inv.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/AfterFunctionWithExplicitType.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/AfterFunctionWithExplicitType.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/AfterFunctionWithExplicitType.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/AfterFunctionWithExplicitType.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/AfterFunctionWithExplicitType.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/AfterFunctionWithExplicitType.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/AfterFunctionWithExplicitType.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/AfterFunctionWithExplicitType.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/AfterFunctionWithInference.after.inv.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/AfterFunctionWithInference.after.inv.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/AfterFunctionWithInference.after.inv.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/AfterFunctionWithInference.after.inv.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/AfterFunctionWithInference.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/AfterFunctionWithInference.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/AfterFunctionWithInference.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/AfterFunctionWithInference.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/AfterFunctionWithInference.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/AfterFunctionWithInference.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/AfterFunctionWithInference.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/AfterFunctionWithInference.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/AfterFunctionWithTypeParameter.after.inv.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/AfterFunctionWithTypeParameter.after.inv.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/AfterFunctionWithTypeParameter.after.inv.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/AfterFunctionWithTypeParameter.after.inv.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/AfterFunctionWithTypeParameter.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/AfterFunctionWithTypeParameter.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/AfterFunctionWithTypeParameter.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/AfterFunctionWithTypeParameter.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/AfterFunctionWithTypeParameter.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/AfterFunctionWithTypeParameter.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/AfterFunctionWithTypeParameter.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/AfterFunctionWithTypeParameter.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/AfterMultideclaration.after.inv.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/AfterMultideclaration.after.inv.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/AfterMultideclaration.after.inv.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/AfterMultideclaration.after.inv.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/AfterMultideclaration.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/AfterMultideclaration.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/AfterMultideclaration.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/AfterMultideclaration.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/AfterMultideclaration.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/AfterMultideclaration.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/AfterMultideclaration.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/AfterMultideclaration.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/AfterMutableProperty.after.inv.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/AfterMutableProperty.after.inv.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/AfterMutableProperty.after.inv.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/AfterMutableProperty.after.inv.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/AfterMutableProperty.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/AfterMutableProperty.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/AfterMutableProperty.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/AfterMutableProperty.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/AfterMutableProperty.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/AfterMutableProperty.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/AfterMutableProperty.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/AfterMutableProperty.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/AfterPropertyWithExplicitType.after.inv.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/AfterPropertyWithExplicitType.after.inv.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/AfterPropertyWithExplicitType.after.inv.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/AfterPropertyWithExplicitType.after.inv.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/AfterPropertyWithExplicitType.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/AfterPropertyWithExplicitType.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/AfterPropertyWithExplicitType.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/AfterPropertyWithExplicitType.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/AfterPropertyWithExplicitType.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/AfterPropertyWithExplicitType.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/AfterPropertyWithExplicitType.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/AfterPropertyWithExplicitType.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/AfterPropertyWithInference.after.inv.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/AfterPropertyWithInference.after.inv.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/AfterPropertyWithInference.after.inv.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/AfterPropertyWithInference.after.inv.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/AfterPropertyWithInference.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/AfterPropertyWithInference.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/AfterPropertyWithInference.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/AfterPropertyWithInference.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/AfterPropertyWithInference.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/AfterPropertyWithInference.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/AfterPropertyWithInference.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/AfterPropertyWithInference.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/AfterPropertyWithReceiver.after.inv.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/AfterPropertyWithReceiver.after.inv.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/AfterPropertyWithReceiver.after.inv.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/AfterPropertyWithReceiver.after.inv.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/AfterPropertyWithReceiver.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/AfterPropertyWithReceiver.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/AfterPropertyWithReceiver.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/AfterPropertyWithReceiver.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/AfterPropertyWithReceiver.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/AfterPropertyWithReceiver.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/AfterPropertyWithReceiver.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/AfterPropertyWithReceiver.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/AfterPropertyWithTypeParameterReceiver.after.inv.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/AfterPropertyWithTypeParameterReceiver.after.inv.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/AfterPropertyWithTypeParameterReceiver.after.inv.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/AfterPropertyWithTypeParameterReceiver.after.inv.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/AfterPropertyWithTypeParameterReceiver.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/AfterPropertyWithTypeParameterReceiver.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/AfterPropertyWithTypeParameterReceiver.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/AfterPropertyWithTypeParameterReceiver.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/AfterPropertyWithTypeParameterReceiver.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/AfterPropertyWithTypeParameterReceiver.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/AfterPropertyWithTypeParameterReceiver.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/AfterPropertyWithTypeParameterReceiver.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/FunctionWithExplicitType.after.inv.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/FunctionWithExplicitType.after.inv.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/FunctionWithExplicitType.after.inv.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/FunctionWithExplicitType.after.inv.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/FunctionWithExplicitType.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/FunctionWithExplicitType.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/FunctionWithExplicitType.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/FunctionWithExplicitType.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/FunctionWithExplicitType.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/FunctionWithExplicitType.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/FunctionWithExplicitType.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/FunctionWithExplicitType.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/FunctionWithInference.after.inv.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/FunctionWithInference.after.inv.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/FunctionWithInference.after.inv.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/FunctionWithInference.after.inv.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/FunctionWithInference.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/FunctionWithInference.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/FunctionWithInference.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/FunctionWithInference.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/FunctionWithInference.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/FunctionWithInference.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/FunctionWithInference.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/FunctionWithInference.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/FunctionWithTypeParameter.after.inv.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/FunctionWithTypeParameter.after.inv.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/FunctionWithTypeParameter.after.inv.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/FunctionWithTypeParameter.after.inv.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/FunctionWithTypeParameter.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/FunctionWithTypeParameter.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/FunctionWithTypeParameter.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/FunctionWithTypeParameter.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/FunctionWithTypeParameter.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/FunctionWithTypeParameter.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/FunctionWithTypeParameter.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/FunctionWithTypeParameter.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/Multideclaration.after.inv.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/Multideclaration.after.inv.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/Multideclaration.after.inv.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/Multideclaration.after.inv.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/Multideclaration.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/Multideclaration.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/Multideclaration.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/Multideclaration.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/Multideclaration.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/Multideclaration.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/Multideclaration.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/Multideclaration.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/MutableProperty.after.inv.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/MutableProperty.after.inv.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/MutableProperty.after.inv.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/MutableProperty.after.inv.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/MutableProperty.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/MutableProperty.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/MutableProperty.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/MutableProperty.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/MutableProperty.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/MutableProperty.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/MutableProperty.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/MutableProperty.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/PropertyWithExplicitType.after.inv.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/PropertyWithExplicitType.after.inv.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/PropertyWithExplicitType.after.inv.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/PropertyWithExplicitType.after.inv.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/PropertyWithExplicitType.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/PropertyWithExplicitType.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/PropertyWithExplicitType.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/PropertyWithExplicitType.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/PropertyWithExplicitType.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/PropertyWithExplicitType.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/PropertyWithExplicitType.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/PropertyWithExplicitType.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/PropertyWithInference.after.inv.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/PropertyWithInference.after.inv.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/PropertyWithInference.after.inv.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/PropertyWithInference.after.inv.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/PropertyWithInference.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/PropertyWithInference.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/PropertyWithInference.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/PropertyWithInference.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/PropertyWithInference.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/PropertyWithInference.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/PropertyWithInference.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/PropertyWithInference.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/PropertyWithReceiver.after.inv.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/PropertyWithReceiver.after.inv.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/PropertyWithReceiver.after.inv.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/PropertyWithReceiver.after.inv.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/PropertyWithReceiver.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/PropertyWithReceiver.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/PropertyWithReceiver.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/PropertyWithReceiver.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/PropertyWithReceiver.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/PropertyWithReceiver.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/PropertyWithReceiver.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/PropertyWithReceiver.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/PropertyWithTypeParameterReceiver.after.inv.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/PropertyWithTypeParameterReceiver.after.inv.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/PropertyWithTypeParameterReceiver.after.inv.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/PropertyWithTypeParameterReceiver.after.inv.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/PropertyWithTypeParameterReceiver.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/PropertyWithTypeParameterReceiver.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/PropertyWithTypeParameterReceiver.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/PropertyWithTypeParameterReceiver.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/PropertyWithTypeParameterReceiver.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/PropertyWithTypeParameterReceiver.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/expressionBody/PropertyWithTypeParameterReceiver.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/expressionBody/PropertyWithTypeParameterReceiver.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/DontAddMarginCharWhenMultilineWithoutMargins.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/DontAddMarginCharWhenMultilineWithoutMargins.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/DontAddMarginCharWhenMultilineWithoutMargins.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/DontAddMarginCharWhenMultilineWithoutMargins.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/DontAddMarginCharWhenMultilineWithoutMargins.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/DontAddMarginCharWhenMultilineWithoutMargins.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/DontAddMarginCharWhenMultilineWithoutMargins.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/DontAddMarginCharWhenMultilineWithoutMargins.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/DontAddMarginWhenItIsUnused.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/DontAddMarginWhenItIsUnused.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/DontAddMarginWhenItIsUnused.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/DontAddMarginWhenItIsUnused.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/DontAddMarginWhenItIsUnused.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/DontAddMarginWhenItIsUnused.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/DontAddMarginWhenItIsUnused.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/DontAddMarginWhenItIsUnused.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/DontAddMarginWhenItIsUnusedWithEmptyPrevious.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/DontAddMarginWhenItIsUnusedWithEmptyPrevious.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/DontAddMarginWhenItIsUnusedWithEmptyPrevious.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/DontAddMarginWhenItIsUnusedWithEmptyPrevious.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/DontAddMarginWhenItIsUnusedWithEmptyPrevious.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/DontAddMarginWhenItIsUnusedWithEmptyPrevious.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/DontAddMarginWhenItIsUnusedWithEmptyPrevious.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/DontAddMarginWhenItIsUnusedWithEmptyPrevious.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/DontAddTrimCallWhenAlreadyMultiline.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/DontAddTrimCallWhenAlreadyMultiline.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/DontAddTrimCallWhenAlreadyMultiline.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/DontAddTrimCallWhenAlreadyMultiline.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/DontAddTrimCallWhenAlreadyMultiline.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/DontAddTrimCallWhenAlreadyMultiline.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/DontAddTrimCallWhenAlreadyMultiline.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/DontAddTrimCallWhenAlreadyMultiline.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/DontAddTrimCallWhenAlreadyMultilineFirstLine.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/DontAddTrimCallWhenAlreadyMultilineFirstLine.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/DontAddTrimCallWhenAlreadyMultilineFirstLine.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/DontAddTrimCallWhenAlreadyMultilineFirstLine.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/DontAddTrimCallWhenAlreadyMultilineFirstLine.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/DontAddTrimCallWhenAlreadyMultilineFirstLine.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/DontAddTrimCallWhenAlreadyMultilineFirstLine.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/DontAddTrimCallWhenAlreadyMultilineFirstLine.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/DontInsertTrimMargin1.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/DontInsertTrimMargin1.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/DontInsertTrimMargin1.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/DontInsertTrimMargin1.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/DontInsertTrimMargin1.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/DontInsertTrimMargin1.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/DontInsertTrimMargin1.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/DontInsertTrimMargin1.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/DontInsertTrimMargin2.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/DontInsertTrimMargin2.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/DontInsertTrimMargin2.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/DontInsertTrimMargin2.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/DontInsertTrimMargin2.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/DontInsertTrimMargin2.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/DontInsertTrimMargin2.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/DontInsertTrimMargin2.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/DontInsertTrimMargin3.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/DontInsertTrimMargin3.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/DontInsertTrimMargin3.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/DontInsertTrimMargin3.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/DontInsertTrimMargin3.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/DontInsertTrimMargin3.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/DontInsertTrimMargin3.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/DontInsertTrimMargin3.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/DontInsertTrimMargin4.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/DontInsertTrimMargin4.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/DontInsertTrimMargin4.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/DontInsertTrimMargin4.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/DontInsertTrimMargin4.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/DontInsertTrimMargin4.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/DontInsertTrimMargin4.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/DontInsertTrimMargin4.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterAfterOpenningBrace.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterAfterOpenningBrace.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterAfterOpenningBrace.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterAfterOpenningBrace.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterAfterOpenningBrace.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterAfterOpenningBrace.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterAfterOpenningBrace.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterAfterOpenningBrace.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterBeforeLongEntryOneLine.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterBeforeLongEntryOneLine.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterBeforeLongEntryOneLine.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterBeforeLongEntryOneLine.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterBeforeLongEntryOneLine.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterBeforeLongEntryOneLine.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterBeforeLongEntryOneLine.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterBeforeLongEntryOneLine.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterBeforeMarginChar.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterBeforeMarginChar.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterBeforeMarginChar.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterBeforeMarginChar.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterBeforeMarginChar.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterBeforeMarginChar.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterBeforeMarginChar.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterBeforeMarginChar.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterBeforeShortEntryOneLine.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterBeforeShortEntryOneLine.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterBeforeShortEntryOneLine.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterBeforeShortEntryOneLine.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterBeforeShortEntryOneLine.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterBeforeShortEntryOneLine.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterBeforeShortEntryOneLine.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterBeforeShortEntryOneLine.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterInInfixMargin.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterInInfixMargin.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterInInfixMargin.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterInInfixMargin.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterInInfixMargin.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterInInfixMargin.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterInInfixMargin.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterInInfixMargin.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterInInjectedFragment.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterInInjectedFragment.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterInInjectedFragment.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterInInjectedFragment.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterInInjectedFragment.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterInInjectedFragment.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterInInjectedFragment.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterInInjectedFragment.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterInLineWithMarginOnNotMargedLine.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterInLineWithMarginOnNotMargedLine.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterInLineWithMarginOnNotMargedLine.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterInLineWithMarginOnNotMargedLine.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterInLineWithMarginOnNotMargedLine.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterInLineWithMarginOnNotMargedLine.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterInLineWithMarginOnNotMargedLine.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterInLineWithMarginOnNotMargedLine.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterInMethodCallMargin.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterInMethodCallMargin.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterInMethodCallMargin.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterInMethodCallMargin.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterInMethodCallMargin.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterInMethodCallMargin.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterInMethodCallMargin.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterInMethodCallMargin.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterInOneLineAfterSpaces.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterInOneLineAfterSpaces.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterInOneLineAfterSpaces.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterInOneLineAfterSpaces.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterInOneLineAfterSpaces.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterInOneLineAfterSpaces.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterInOneLineAfterSpaces.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterInOneLineAfterSpaces.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterInTwoLinesNoMarginCall.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterInTwoLinesNoMarginCall.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterInTwoLinesNoMarginCall.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterInTwoLinesNoMarginCall.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterInTwoLinesNoMarginCall.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterInTwoLinesNoMarginCall.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterInTwoLinesNoMarginCall.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterInTwoLinesNoMarginCall.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterInsideBraces.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterInsideBraces.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterInsideBraces.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterInsideBraces.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterInsideBraces.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterInsideBraces.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterInsideBraces.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterInsideBraces.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterInsideBraces1.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterInsideBraces1.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterInsideBraces1.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterInsideBraces1.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterInsideBraces1.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterInsideBraces1.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterInsideBraces1.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterInsideBraces1.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterInsideBraces2.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterInsideBraces2.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterInsideBraces2.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterInsideBraces2.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterInsideBraces2.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterInsideBraces2.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterInsideBraces2.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterInsideBraces2.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterInsideTextMargin.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterInsideTextMargin.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterInsideTextMargin.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterInsideTextMargin.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterInsideTextMargin.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterInsideTextMargin.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterInsideTextMargin.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterInsideTextMargin.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterMLSimpleMargin.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterMLSimpleMargin.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterMLSimpleMargin.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterMLSimpleMargin.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterMLSimpleMargin.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterMLSimpleMargin.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterMLSimpleMargin.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterMLSimpleMargin.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterMLStartOnSameLineMargin.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterMLStartOnSameLineMargin.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterMLStartOnSameLineMargin.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterMLStartOnSameLineMargin.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterMLStartOnSameLineMargin.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterMLStartOnSameLineMargin.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterMLStartOnSameLineMargin.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterMLStartOnSameLineMargin.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterOnFirstLineWithPresentTrimMargin.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterOnFirstLineWithPresentTrimMargin.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterOnFirstLineWithPresentTrimMargin.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterOnFirstLineWithPresentTrimMargin.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterOnFirstLineWithPresentTrimMargin.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterOnFirstLineWithPresentTrimMargin.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterOnFirstLineWithPresentTrimMargin.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterOnFirstLineWithPresentTrimMargin.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterOnFirstLineWithPresentTrimMarginAndLine.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterOnFirstLineWithPresentTrimMarginAndLine.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterOnFirstLineWithPresentTrimMarginAndLine.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterOnFirstLineWithPresentTrimMarginAndLine.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterOnFirstLineWithPresentTrimMarginAndLine.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterOnFirstLineWithPresentTrimMarginAndLine.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterOnFirstLineWithPresentTrimMarginAndLine.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterOnFirstLineWithPresentTrimMarginAndLine.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterOnFirstNonEmptyLineWithPresentTrimMargin.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterOnFirstNonEmptyLineWithPresentTrimMargin.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterOnFirstNonEmptyLineWithPresentTrimMargin.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterOnFirstNonEmptyLineWithPresentTrimMargin.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterOnFirstNonEmptyLineWithPresentTrimMargin.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterOnFirstNonEmptyLineWithPresentTrimMargin.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterOnFirstNonEmptyLineWithPresentTrimMargin.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterOnFirstNonEmptyLineWithPresentTrimMargin.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterOnNewLine.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterOnNewLine.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterOnNewLine.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterOnNewLine.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterOnNewLine.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterOnNewLine.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterOnNewLine.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterOnNewLine.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterSimple.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterSimple.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterSimple.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterSimple.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterSimple.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterSimple.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterSimple.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterSimple.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterWithTextMargin.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterWithTextMargin.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterWithTextMargin.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterWithTextMargin.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterWithTextMargin.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterWithTextMargin.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterWithTextMargin.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterWithTextMargin.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterWithTextOnNewLineMargin.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterWithTextOnNewLineMargin.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterWithTextOnNewLineMargin.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterWithTextOnNewLineMargin.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterWithTextOnNewLineMargin.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterWithTextOnNewLineMargin.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterWithTextOnNewLineMargin.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterWithTextOnNewLineMargin.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/InsertCustomMargin.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/InsertCustomMargin.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/InsertCustomMargin.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/InsertCustomMargin.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/InsertCustomMargin.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/InsertCustomMargin.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/InsertCustomMargin.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/InsertCustomMargin.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/InsertCustomMarginInLineStart.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/InsertCustomMarginInLineStart.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/InsertCustomMarginInLineStart.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/InsertCustomMarginInLineStart.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/InsertCustomMarginInLineStart.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/InsertCustomMarginInLineStart.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/InsertCustomMarginInLineStart.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/InsertCustomMarginInLineStart.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/InsertDefaultMargin.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/InsertDefaultMargin.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/InsertDefaultMargin.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/InsertDefaultMargin.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/InsertDefaultMargin.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/InsertDefaultMargin.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/InsertDefaultMargin.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/InsertDefaultMargin.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/NoTrimIndentInAnnotations.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/NoTrimIndentInAnnotations.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/NoTrimIndentInAnnotations.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/NoTrimIndentInAnnotations.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/NoTrimIndentInAnnotations.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/NoTrimIndentInAnnotations.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/NoTrimIndentInAnnotations.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/NoTrimIndentInAnnotations.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/NoTrimIndentInConst.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/NoTrimIndentInConst.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/NoTrimIndentInConst.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/NoTrimIndentInConst.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/NoTrimIndentInConst.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/NoTrimIndentInConst.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/NoTrimIndentInConst.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/NoTrimIndentInConst.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/RestoreIndentFromEmptyLine.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/RestoreIndentFromEmptyLine.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/RestoreIndentFromEmptyLine.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/RestoreIndentFromEmptyLine.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/RestoreIndentFromEmptyLine.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/RestoreIndentFromEmptyLine.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/spaces/RestoreIndentFromEmptyLine.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/spaces/RestoreIndentFromEmptyLine.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs2/DontInsertTrimMarginCall.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs2/DontInsertTrimMarginCall.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs2/DontInsertTrimMarginCall.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs2/DontInsertTrimMarginCall.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs2/DontInsertTrimMarginCall.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs2/DontInsertTrimMarginCall.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs2/DontInsertTrimMarginCall.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs2/DontInsertTrimMarginCall.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs2/EnterInMethodCallMargin.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs2/EnterInMethodCallMargin.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs2/EnterInMethodCallMargin.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs2/EnterInMethodCallMargin.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs2/EnterInMethodCallMargin.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs2/EnterInMethodCallMargin.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs2/EnterInMethodCallMargin.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs2/EnterInMethodCallMargin.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs2/EnterInTwoLinesNoMarginCall.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs2/EnterInTwoLinesNoMarginCall.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs2/EnterInTwoLinesNoMarginCall.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs2/EnterInTwoLinesNoMarginCall.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs2/EnterInTwoLinesNoMarginCall.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs2/EnterInTwoLinesNoMarginCall.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs2/EnterInTwoLinesNoMarginCall.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs2/EnterInTwoLinesNoMarginCall.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs2/EnterInsideBraces.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs2/EnterInsideBraces.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs2/EnterInsideBraces.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs2/EnterInsideBraces.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs2/EnterInsideBraces.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs2/EnterInsideBraces.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs2/EnterInsideBraces.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs2/EnterInsideBraces.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs2/EnterInsideText.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs2/EnterInsideText.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs2/EnterInsideText.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs2/EnterInsideText.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs2/EnterInsideText.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs2/EnterInsideText.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs2/EnterInsideText.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs2/EnterInsideText.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs2/EnterMLSimpleMargin.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs2/EnterMLSimpleMargin.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs2/EnterMLSimpleMargin.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs2/EnterMLSimpleMargin.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs2/EnterMLSimpleMargin.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs2/EnterMLSimpleMargin.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs2/EnterMLSimpleMargin.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs2/EnterMLSimpleMargin.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs2/EnterMLStartOnSameLineMargin.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs2/EnterMLStartOnSameLineMargin.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs2/EnterMLStartOnSameLineMargin.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs2/EnterMLStartOnSameLineMargin.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs2/EnterMLStartOnSameLineMargin.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs2/EnterMLStartOnSameLineMargin.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs2/EnterMLStartOnSameLineMargin.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs2/EnterMLStartOnSameLineMargin.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs2/EnterOnNewLineMargin.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs2/EnterOnNewLineMargin.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs2/EnterOnNewLineMargin.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs2/EnterOnNewLineMargin.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs2/EnterOnNewLineMargin.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs2/EnterOnNewLineMargin.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs2/EnterOnNewLineMargin.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs2/EnterOnNewLineMargin.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs2/EnterSimpleMargin.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs2/EnterSimpleMargin.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs2/EnterSimpleMargin.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs2/EnterSimpleMargin.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs2/EnterSimpleMargin.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs2/EnterSimpleMargin.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs2/EnterSimpleMargin.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs2/EnterSimpleMargin.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs2/EnterWithTextMargin.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs2/EnterWithTextMargin.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs2/EnterWithTextMargin.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs2/EnterWithTextMargin.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs2/EnterWithTextMargin.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs2/EnterWithTextMargin.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs2/EnterWithTextMargin.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs2/EnterWithTextMargin.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs2/EnterWithTextOnNewLineMargin.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs2/EnterWithTextOnNewLineMargin.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs2/EnterWithTextOnNewLineMargin.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs2/EnterWithTextOnNewLineMargin.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs2/EnterWithTextOnNewLineMargin.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs2/EnterWithTextOnNewLineMargin.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs2/EnterWithTextOnNewLineMargin.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs2/EnterWithTextOnNewLineMargin.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs4/DontInsertTrimMarginCall.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs4/DontInsertTrimMarginCall.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs4/DontInsertTrimMarginCall.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs4/DontInsertTrimMarginCall.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs4/DontInsertTrimMarginCall.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs4/DontInsertTrimMarginCall.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs4/DontInsertTrimMarginCall.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs4/DontInsertTrimMarginCall.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs4/EnterInMethodCallMargin.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs4/EnterInMethodCallMargin.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs4/EnterInMethodCallMargin.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs4/EnterInMethodCallMargin.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs4/EnterInMethodCallMargin.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs4/EnterInMethodCallMargin.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs4/EnterInMethodCallMargin.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs4/EnterInMethodCallMargin.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs4/EnterInsideBraces.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs4/EnterInsideBraces.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs4/EnterInsideBraces.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs4/EnterInsideBraces.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs4/EnterInsideBraces.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs4/EnterInsideBraces.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs4/EnterInsideBraces.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs4/EnterInsideBraces.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs4/EnterInsideText.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs4/EnterInsideText.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs4/EnterInsideText.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs4/EnterInsideText.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs4/EnterInsideText.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs4/EnterInsideText.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs4/EnterInsideText.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs4/EnterInsideText.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs4/EnterMLSimpleMargin.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs4/EnterMLSimpleMargin.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs4/EnterMLSimpleMargin.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs4/EnterMLSimpleMargin.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs4/EnterMLSimpleMargin.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs4/EnterMLSimpleMargin.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs4/EnterMLSimpleMargin.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs4/EnterMLSimpleMargin.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs4/EnterMLStartOnSameLineMargin.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs4/EnterMLStartOnSameLineMargin.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs4/EnterMLStartOnSameLineMargin.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs4/EnterMLStartOnSameLineMargin.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs4/EnterMLStartOnSameLineMargin.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs4/EnterMLStartOnSameLineMargin.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs4/EnterMLStartOnSameLineMargin.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs4/EnterMLStartOnSameLineMargin.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs4/EnterOnNewLineMargin.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs4/EnterOnNewLineMargin.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs4/EnterOnNewLineMargin.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs4/EnterOnNewLineMargin.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs4/EnterOnNewLineMargin.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs4/EnterOnNewLineMargin.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs4/EnterOnNewLineMargin.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs4/EnterOnNewLineMargin.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs4/EnterSimpleMargin.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs4/EnterSimpleMargin.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs4/EnterSimpleMargin.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs4/EnterSimpleMargin.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs4/EnterSimpleMargin.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs4/EnterSimpleMargin.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs4/EnterSimpleMargin.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs4/EnterSimpleMargin.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs4/EnterWithTabsAfterMarginChar.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs4/EnterWithTabsAfterMarginChar.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs4/EnterWithTabsAfterMarginChar.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs4/EnterWithTabsAfterMarginChar.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs4/EnterWithTabsAfterMarginChar.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs4/EnterWithTabsAfterMarginChar.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs4/EnterWithTabsAfterMarginChar.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs4/EnterWithTabsAfterMarginChar.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs4/EnterWithTextMargin.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs4/EnterWithTextMargin.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs4/EnterWithTextMargin.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs4/EnterWithTextMargin.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs4/EnterWithTextMargin.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs4/EnterWithTextMargin.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs4/EnterWithTextMargin.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs4/EnterWithTextMargin.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs4/EnterWithTextOnNewLineMargin.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs4/EnterWithTextOnNewLineMargin.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs4/EnterWithTextOnNewLineMargin.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs4/EnterWithTextOnNewLineMargin.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs4/EnterWithTextOnNewLineMargin.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs4/EnterWithTextOnNewLineMargin.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs4/EnterWithTextOnNewLineMargin.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs4/EnterWithTextOnNewLineMargin.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/script/ScriptAfterClosingBrace.after.kts b/plugins/kotlin/idea/tests/testData/editor/enterHandler/script/ScriptAfterClosingBrace.after.kts
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/script/ScriptAfterClosingBrace.after.kts
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/script/ScriptAfterClosingBrace.after.kts
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/script/ScriptAfterClosingBrace.kts b/plugins/kotlin/idea/tests/testData/editor/enterHandler/script/ScriptAfterClosingBrace.kts
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/script/ScriptAfterClosingBrace.kts
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/script/ScriptAfterClosingBrace.kts
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/script/ScriptAfterExpression.after.kts b/plugins/kotlin/idea/tests/testData/editor/enterHandler/script/ScriptAfterExpression.after.kts
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/script/ScriptAfterExpression.after.kts
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/script/ScriptAfterExpression.after.kts
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/script/ScriptAfterExpression.kts b/plugins/kotlin/idea/tests/testData/editor/enterHandler/script/ScriptAfterExpression.kts
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/script/ScriptAfterExpression.kts
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/script/ScriptAfterExpression.kts
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/script/ScriptAfterFun.after.kts b/plugins/kotlin/idea/tests/testData/editor/enterHandler/script/ScriptAfterFun.after.kts
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/script/ScriptAfterFun.after.kts
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/script/ScriptAfterFun.after.kts
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/script/ScriptAfterFun.kts b/plugins/kotlin/idea/tests/testData/editor/enterHandler/script/ScriptAfterFun.kts
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/script/ScriptAfterFun.kts
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/script/ScriptAfterFun.kts
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/script/ScriptAfterImport.after.kts b/plugins/kotlin/idea/tests/testData/editor/enterHandler/script/ScriptAfterImport.after.kts
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/script/ScriptAfterImport.after.kts
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/script/ScriptAfterImport.after.kts
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/script/ScriptAfterImport.kts b/plugins/kotlin/idea/tests/testData/editor/enterHandler/script/ScriptAfterImport.kts
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/script/ScriptAfterImport.kts
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/script/ScriptAfterImport.kts
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/script/ScriptBetweenFunctionCalls.after.kts b/plugins/kotlin/idea/tests/testData/editor/enterHandler/script/ScriptBetweenFunctionCalls.after.kts
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/script/ScriptBetweenFunctionCalls.after.kts
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/script/ScriptBetweenFunctionCalls.after.kts
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/script/ScriptBetweenFunctionCalls.kts b/plugins/kotlin/idea/tests/testData/editor/enterHandler/script/ScriptBetweenFunctionCalls.kts
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/script/ScriptBetweenFunctionCalls.kts
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/script/ScriptBetweenFunctionCalls.kts
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/script/ScriptInsideFun.after.kts b/plugins/kotlin/idea/tests/testData/editor/enterHandler/script/ScriptInsideFun.after.kts
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/script/ScriptInsideFun.after.kts
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/script/ScriptInsideFun.after.kts
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/script/ScriptInsideFun.kts b/plugins/kotlin/idea/tests/testData/editor/enterHandler/script/ScriptInsideFun.kts
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/script/ScriptInsideFun.kts
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/script/ScriptInsideFun.kts
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/LargeFileWithStringTemplate.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/LargeFileWithStringTemplate.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/LargeFileWithStringTemplate.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/LargeFileWithStringTemplate.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/LargeFileWithStringTemplate.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/LargeFileWithStringTemplate.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/LargeFileWithStringTemplate.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/LargeFileWithStringTemplate.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/TemplateEntryClose.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/TemplateEntryClose.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/TemplateEntryClose.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/TemplateEntryClose.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/TemplateEntryClose.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/TemplateEntryClose.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/TemplateEntryClose.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/TemplateEntryClose.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/TemplateEntryClose2.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/TemplateEntryClose2.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/TemplateEntryClose2.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/TemplateEntryClose2.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/TemplateEntryClose2.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/TemplateEntryClose2.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/TemplateEntryClose2.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/TemplateEntryClose2.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/TemplateEntryClose3.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/TemplateEntryClose3.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/TemplateEntryClose3.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/TemplateEntryClose3.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/TemplateEntryClose3.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/TemplateEntryClose3.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/TemplateEntryClose3.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/TemplateEntryClose3.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/TemplateEntryClose4.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/TemplateEntryClose4.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/TemplateEntryClose4.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/TemplateEntryClose4.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/TemplateEntryClose4.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/TemplateEntryClose4.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/TemplateEntryClose4.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/TemplateEntryClose4.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/TemplateEntryClose5.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/TemplateEntryClose5.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/TemplateEntryClose5.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/TemplateEntryClose5.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/TemplateEntryClose5.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/TemplateEntryClose5.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/TemplateEntryClose5.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/TemplateEntryClose5.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/TemplateEntryClose6.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/TemplateEntryClose6.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/TemplateEntryClose6.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/TemplateEntryClose6.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/TemplateEntryClose6.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/TemplateEntryClose6.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/TemplateEntryClose6.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/TemplateEntryClose6.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/TemplateEntryClose7.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/TemplateEntryClose7.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/TemplateEntryClose7.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/TemplateEntryClose7.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/TemplateEntryClose7.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/TemplateEntryClose7.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/TemplateEntryClose7.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/TemplateEntryClose7.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/TemplateEntryCloseInMultilineString.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/TemplateEntryCloseInMultilineString.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/TemplateEntryCloseInMultilineString.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/TemplateEntryCloseInMultilineString.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/TemplateEntryCloseInMultilineString.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/TemplateEntryCloseInMultilineString.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/TemplateEntryCloseInMultilineString.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/TemplateEntryCloseInMultilineString.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/TemplateEntryCloseInMultilineString2.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/TemplateEntryCloseInMultilineString2.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/TemplateEntryCloseInMultilineString2.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/TemplateEntryCloseInMultilineString2.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/TemplateEntryCloseInMultilineString2.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/TemplateEntryCloseInMultilineString2.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/TemplateEntryCloseInMultilineString2.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/TemplateEntryCloseInMultilineString2.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/TemplateEntryCloseInMultilineString3.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/TemplateEntryCloseInMultilineString3.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/TemplateEntryCloseInMultilineString3.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/TemplateEntryCloseInMultilineString3.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/TemplateEntryCloseInMultilineString3.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/TemplateEntryCloseInMultilineString3.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/TemplateEntryCloseInMultilineString3.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/TemplateEntryCloseInMultilineString3.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/TemplateEntryOpen.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/TemplateEntryOpen.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/TemplateEntryOpen.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/TemplateEntryOpen.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/TemplateEntryOpen.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/TemplateEntryOpen.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/TemplateEntryOpen.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/TemplateEntryOpen.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/TemplateEntryOpen2.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/TemplateEntryOpen2.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/TemplateEntryOpen2.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/TemplateEntryOpen2.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/TemplateEntryOpen2.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/TemplateEntryOpen2.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/TemplateEntryOpen2.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/TemplateEntryOpen2.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/TemplateEntryOpenInMultilineString.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/TemplateEntryOpenInMultilineString.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/TemplateEntryOpenInMultilineString.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/TemplateEntryOpenInMultilineString.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/TemplateEntryOpenInMultilineString.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/TemplateEntryOpenInMultilineString.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/TemplateEntryOpenInMultilineString.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/TemplateEntryOpenInMultilineString.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/TemplateEntryOpenInMultilineString2.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/TemplateEntryOpenInMultilineString2.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/TemplateEntryOpenInMultilineString2.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/TemplateEntryOpenInMultilineString2.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/TemplateEntryOpenInMultilineString2.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/TemplateEntryOpenInMultilineString2.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/TemplateEntryOpenInMultilineString2.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/TemplateEntryOpenInMultilineString2.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/TemplateEntryOpenInMultilineString3.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/TemplateEntryOpenInMultilineString3.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/TemplateEntryOpenInMultilineString3.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/TemplateEntryOpenInMultilineString3.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/TemplateEntryOpenInMultilineString3.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/TemplateEntryOpenInMultilineString3.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/TemplateEntryOpenInMultilineString3.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/TemplateEntryOpenInMultilineString3.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/TemplateEntryOpenWithComment.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/TemplateEntryOpenWithComment.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/TemplateEntryOpenWithComment.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/TemplateEntryOpenWithComment.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/TemplateEntryOpenWithComment.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/TemplateEntryOpenWithComment.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/TemplateEntryOpenWithComment.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/TemplateEntryOpenWithComment.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/TemplateEntryOpenWithComment2.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/TemplateEntryOpenWithComment2.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/TemplateEntryOpenWithComment2.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/TemplateEntryOpenWithComment2.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/TemplateEntryOpenWithComment2.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/TemplateEntryOpenWithComment2.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/TemplateEntryOpenWithComment2.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/TemplateEntryOpenWithComment2.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/TemplateEntryOpenWithoutContent.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/TemplateEntryOpenWithoutContent.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/TemplateEntryOpenWithoutContent.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/TemplateEntryOpenWithoutContent.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/TemplateEntryOpenWithoutContent.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/TemplateEntryOpenWithoutContent.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/TemplateEntryOpenWithoutContent.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/TemplateEntryOpenWithoutContent.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/TemplateEntryOpenWithoutContent2.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/TemplateEntryOpenWithoutContent2.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/TemplateEntryOpenWithoutContent2.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/TemplateEntryOpenWithoutContent2.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/TemplateEntryOpenWithoutContent2.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/TemplateEntryOpenWithoutContent2.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/TemplateEntryOpenWithoutContent2.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/TemplateEntryOpenWithoutContent2.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/TemplateEntryOpenWithoutContent3.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/TemplateEntryOpenWithoutContent3.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/TemplateEntryOpenWithoutContent3.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/TemplateEntryOpenWithoutContent3.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/TemplateEntryOpenWithoutContent3.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/TemplateEntryOpenWithoutContent3.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/TemplateEntryOpenWithoutContent3.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/TemplateEntryOpenWithoutContent3.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/TemplateEntryOpenWithoutContent4.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/TemplateEntryOpenWithoutContent4.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/TemplateEntryOpenWithoutContent4.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/TemplateEntryOpenWithoutContent4.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/TemplateEntryOpenWithoutContent4.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/TemplateEntryOpenWithoutContent4.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/TemplateEntryOpenWithoutContent4.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/TemplateEntryOpenWithoutContent4.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/TemplateEntryOpenWithoutContent5.after.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/TemplateEntryOpenWithoutContent5.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/TemplateEntryOpenWithoutContent5.after.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/TemplateEntryOpenWithoutContent5.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/TemplateEntryOpenWithoutContent5.kt b/plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/TemplateEntryOpenWithoutContent5.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/indentationOnNewline/templates/TemplateEntryOpenWithoutContent5.kt
rename to plugins/kotlin/idea/tests/testData/editor/enterHandler/templates/TemplateEntryOpenWithoutContent5.kt
diff --git a/plugins/kotlin/performance-tests/test/org/jetbrains/kotlin/idea/perf/synthetic/PerformanceTypingIndentationTestGenerated.java b/plugins/kotlin/performance-tests/test/org/jetbrains/kotlin/idea/perf/synthetic/PerformanceTypingIndentationTestGenerated.java
index cedb859cc6ea..2bd92637aaff 100644
--- a/plugins/kotlin/performance-tests/test/org/jetbrains/kotlin/idea/perf/synthetic/PerformanceTypingIndentationTestGenerated.java
+++ b/plugins/kotlin/performance-tests/test/org/jetbrains/kotlin/idea/perf/synthetic/PerformanceTypingIndentationTestGenerated.java
@@ -19,10 +19,10 @@ import org.junit.runner.RunWith;
 @RunWith(JUnit3RunnerWithInners.class)
 public abstract class PerformanceTypingIndentationTestGenerated extends AbstractPerformanceTypingIndentationTest {
     @RunWith(JUnit3RunnerWithInners.class)
-    @TestMetadata("../idea/tests/testData/indentationOnNewline")
+    @TestMetadata("../idea/tests/testData/editor/enterHandler")
     public abstract static class DirectSettings extends AbstractPerformanceTypingIndentationTest {
         @RunWith(JUnit3RunnerWithInners.class)
-        @TestMetadata("../idea/tests/testData/indentationOnNewline/afterUnmatchedBrace")
+        @TestMetadata("../idea/tests/testData/editor/enterHandler/afterUnmatchedBrace")
         public static class AfterUnmatchedBrace extends AbstractPerformanceTypingIndentationTest {
             private void runTest(String testDataFilePath) throws Exception {
                 KotlinTestUtils.runTest(this::doNewlineTest, this, testDataFilePath);
@@ -30,72 +30,72 @@ public abstract class PerformanceTypingIndentationTestGenerated extends Abstract
 
             @TestMetadata("AtEndOfFile.after.kt")
             public void testAtEndOfFile() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/afterUnmatchedBrace/AtEndOfFile.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/afterUnmatchedBrace/AtEndOfFile.after.kt");
             }
 
             @TestMetadata("LambdaArgumentBeforeFunctionInitializer.after.kt")
             public void testLambdaArgumentBeforeFunctionInitializer() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/afterUnmatchedBrace/LambdaArgumentBeforeFunctionInitializer.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/afterUnmatchedBrace/LambdaArgumentBeforeFunctionInitializer.after.kt");
             }
 
             @TestMetadata("LambdaArgumentBeforeLocalPropertyInitializer.after.kt")
             public void testLambdaArgumentBeforeLocalPropertyInitializer() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/afterUnmatchedBrace/LambdaArgumentBeforeLocalPropertyInitializer.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/afterUnmatchedBrace/LambdaArgumentBeforeLocalPropertyInitializer.after.kt");
             }
 
             @TestMetadata("LambdaArgumentBeforeMemberPropertyInitializer.after.kt")
             public void testLambdaArgumentBeforeMemberPropertyInitializer() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/afterUnmatchedBrace/LambdaArgumentBeforeMemberPropertyInitializer.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/afterUnmatchedBrace/LambdaArgumentBeforeMemberPropertyInitializer.after.kt");
             }
 
             @TestMetadata("LambdaArgumentBeforeTopLevelPropertyInitializer.after.kt")
             public void testLambdaArgumentBeforeTopLevelPropertyInitializer() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/afterUnmatchedBrace/LambdaArgumentBeforeTopLevelPropertyInitializer.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/afterUnmatchedBrace/LambdaArgumentBeforeTopLevelPropertyInitializer.after.kt");
             }
 
             @TestMetadata("NotApplicableOnInitializer.after.kt")
             public void testNotApplicableOnInitializer() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/afterUnmatchedBrace/NotApplicableOnInitializer.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/afterUnmatchedBrace/NotApplicableOnInitializer.after.kt");
             }
 
             @TestMetadata("NotApplicableOnInitializer2.after.kt")
             public void testNotApplicableOnInitializer2() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/afterUnmatchedBrace/NotApplicableOnInitializer2.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/afterUnmatchedBrace/NotApplicableOnInitializer2.after.kt");
             }
 
             @TestMetadata("UnfinishedLambdaInCode.after.kt")
             public void testUnfinishedLambdaInCode() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/afterUnmatchedBrace/UnfinishedLambdaInCode.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/afterUnmatchedBrace/UnfinishedLambdaInCode.after.kt");
             }
 
             @TestMetadata("UnfinishedLambdaInCodeAsVarInitiailzer.after.kt")
             public void testUnfinishedLambdaInCodeAsVarInitiailzer() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/afterUnmatchedBrace/UnfinishedLambdaInCodeAsVarInitiailzer.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/afterUnmatchedBrace/UnfinishedLambdaInCodeAsVarInitiailzer.after.kt");
             }
 
             @TestMetadata("UnfinishedLambdaWithCommentInCode.after.kt")
             public void testUnfinishedLambdaWithCommentInCode() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/afterUnmatchedBrace/UnfinishedLambdaWithCommentInCode.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/afterUnmatchedBrace/UnfinishedLambdaWithCommentInCode.after.kt");
             }
 
             @TestMetadata("WhenBeforeLocalPropertyInitializer.after.kt")
             public void testWhenBeforeLocalPropertyInitializer() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/afterUnmatchedBrace/WhenBeforeLocalPropertyInitializer.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/afterUnmatchedBrace/WhenBeforeLocalPropertyInitializer.after.kt");
             }
 
             @TestMetadata("WhenBeforeMemberPropertyInitializer.after.kt")
             public void testWhenBeforeMemberPropertyInitializer() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/afterUnmatchedBrace/WhenBeforeMemberPropertyInitializer.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/afterUnmatchedBrace/WhenBeforeMemberPropertyInitializer.after.kt");
             }
 
             @TestMetadata("WhenBeforeTopLevelPropertyInitializer.after.kt")
             public void testWhenBeforeTopLevelPropertyInitializer() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/afterUnmatchedBrace/WhenBeforeTopLevelPropertyInitializer.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/afterUnmatchedBrace/WhenBeforeTopLevelPropertyInitializer.after.kt");
             }
         }
 
         @RunWith(JUnit3RunnerWithInners.class)
-        @TestMetadata("../idea/tests/testData/indentationOnNewline/arrayAccess")
+        @TestMetadata("../idea/tests/testData/editor/enterHandler/arrayAccess")
         public static class ArrayAccess extends AbstractPerformanceTypingIndentationTest {
             private void runTest(String testDataFilePath) throws Exception {
                 KotlinTestUtils.runTest(this::doNewlineTest, this, testDataFilePath);
@@ -103,12 +103,12 @@ public abstract class PerformanceTypingIndentationTestGenerated extends Abstract
 
             @TestMetadata("ListAccess.after.kt")
             public void testListAccess() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/arrayAccess/ListAccess.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/arrayAccess/ListAccess.after.kt");
             }
         }
 
         @RunWith(JUnit3RunnerWithInners.class)
-        @TestMetadata("../idea/tests/testData/indentationOnNewline/controlFlowConstructions")
+        @TestMetadata("../idea/tests/testData/editor/enterHandler/controlFlowConstructions")
         public static class ControlFlowConstructions extends AbstractPerformanceTypingIndentationTest {
             private void runTest(String testDataFilePath) throws Exception {
                 KotlinTestUtils.runTest(this::doNewlineTest, this, testDataFilePath);
@@ -116,257 +116,257 @@ public abstract class PerformanceTypingIndentationTestGenerated extends Abstract
 
             @TestMetadata("BetweenOpenBraceAndParenthesis.after.kt")
             public void testBetweenOpenBraceAndParenthesis() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/controlFlowConstructions/BetweenOpenBraceAndParenthesis.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/controlFlowConstructions/BetweenOpenBraceAndParenthesis.after.kt");
             }
 
             @TestMetadata("Catch.after.kt")
             public void testCatch() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/controlFlowConstructions/Catch.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/controlFlowConstructions/Catch.after.kt");
             }
 
             @TestMetadata("Catch2.after.kt")
             public void testCatch2() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/controlFlowConstructions/Catch2.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/controlFlowConstructions/Catch2.after.kt");
             }
 
             @TestMetadata("Catch3.after.kt")
             public void testCatch3() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/controlFlowConstructions/Catch3.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/controlFlowConstructions/Catch3.after.kt");
             }
 
             @TestMetadata("Catch4.after.kt")
             public void testCatch4() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/controlFlowConstructions/Catch4.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/controlFlowConstructions/Catch4.after.kt");
             }
 
             @TestMetadata("Do2.after.kt")
             public void testDo2() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/controlFlowConstructions/Do2.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/controlFlowConstructions/Do2.after.kt");
             }
 
             @TestMetadata("DoInFun.after.kt")
             public void testDoInFun() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/controlFlowConstructions/DoInFun.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/controlFlowConstructions/DoInFun.after.kt");
             }
 
             @TestMetadata("DoWhile.after.kt")
             public void testDoWhile() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/controlFlowConstructions/DoWhile.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/controlFlowConstructions/DoWhile.after.kt");
             }
 
             @TestMetadata("DoWhile2.after.kt")
             public void testDoWhile2() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/controlFlowConstructions/DoWhile2.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/controlFlowConstructions/DoWhile2.after.kt");
             }
 
             @TestMetadata("DoWhile3.after.kt")
             public void testDoWhile3() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/controlFlowConstructions/DoWhile3.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/controlFlowConstructions/DoWhile3.after.kt");
             }
 
             @TestMetadata("DoWhile4.after.kt")
             public void testDoWhile4() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/controlFlowConstructions/DoWhile4.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/controlFlowConstructions/DoWhile4.after.kt");
             }
 
             @TestMetadata("DoWhile5.after.kt")
             public void testDoWhile5() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/controlFlowConstructions/DoWhile5.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/controlFlowConstructions/DoWhile5.after.kt");
             }
 
             @TestMetadata("DoWhile6.after.kt")
             public void testDoWhile6() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/controlFlowConstructions/DoWhile6.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/controlFlowConstructions/DoWhile6.after.kt");
             }
 
             @TestMetadata("DoWhile7.after.kt")
             public void testDoWhile7() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/controlFlowConstructions/DoWhile7.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/controlFlowConstructions/DoWhile7.after.kt");
             }
 
             @TestMetadata("DoWithBraces.after.kt")
             public void testDoWithBraces() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/controlFlowConstructions/DoWithBraces.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/controlFlowConstructions/DoWithBraces.after.kt");
             }
 
             @TestMetadata("DoWithBraces2.after.kt")
             public void testDoWithBraces2() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/controlFlowConstructions/DoWithBraces2.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/controlFlowConstructions/DoWithBraces2.after.kt");
             }
 
             @TestMetadata("ElseIf.after.kt")
             public void testElseIf() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/controlFlowConstructions/ElseIf.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/controlFlowConstructions/ElseIf.after.kt");
             }
 
             @TestMetadata("ElseInWhenWithOption.after.kt")
             public void testElseInWhenWithOption() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/controlFlowConstructions/ElseInWhenWithOption.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/controlFlowConstructions/ElseInWhenWithOption.after.kt");
             }
 
             @TestMetadata("ElseInWhenWithoutOption.after.kt")
             public void testElseInWhenWithoutOption() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/controlFlowConstructions/ElseInWhenWithoutOption.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/controlFlowConstructions/ElseInWhenWithoutOption.after.kt");
             }
 
             @TestMetadata("ElseWithBrace.after.kt")
             public void testElseWithBrace() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/controlFlowConstructions/ElseWithBrace.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/controlFlowConstructions/ElseWithBrace.after.kt");
             }
 
             @TestMetadata("ElseWithBraceAndComment.after.kt")
             public void testElseWithBraceAndComment() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/controlFlowConstructions/ElseWithBraceAndComment.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/controlFlowConstructions/ElseWithBraceAndComment.after.kt");
             }
 
             @TestMetadata("ElseWithBraceAndComment2.after.kt")
             public void testElseWithBraceAndComment2() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/controlFlowConstructions/ElseWithBraceAndComment2.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/controlFlowConstructions/ElseWithBraceAndComment2.after.kt");
             }
 
             @TestMetadata("ElseWithoutBrace.after.kt")
             public void testElseWithoutBrace() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/controlFlowConstructions/ElseWithoutBrace.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/controlFlowConstructions/ElseWithoutBrace.after.kt");
             }
 
             @TestMetadata("ElseWithoutBrace2.after.kt")
             public void testElseWithoutBrace2() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/controlFlowConstructions/ElseWithoutBrace2.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/controlFlowConstructions/ElseWithoutBrace2.after.kt");
             }
 
             @TestMetadata("Finally.after.kt")
             public void testFinally() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/controlFlowConstructions/Finally.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/controlFlowConstructions/Finally.after.kt");
             }
 
             @TestMetadata("Finally2.after.kt")
             public void testFinally2() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/controlFlowConstructions/Finally2.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/controlFlowConstructions/Finally2.after.kt");
             }
 
             @TestMetadata("Finally3.after.kt")
             public void testFinally3() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/controlFlowConstructions/Finally3.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/controlFlowConstructions/Finally3.after.kt");
             }
 
             @TestMetadata("Finally4.after.kt")
             public void testFinally4() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/controlFlowConstructions/Finally4.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/controlFlowConstructions/Finally4.after.kt");
             }
 
             @TestMetadata("For.after.kt")
             public void testFor() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/controlFlowConstructions/For.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/controlFlowConstructions/For.after.kt");
             }
 
             @TestMetadata("ForWithBlock.after.kt")
             public void testForWithBlock() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/controlFlowConstructions/ForWithBlock.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/controlFlowConstructions/ForWithBlock.after.kt");
             }
 
             @TestMetadata("ForWithCondition.after.kt")
             public void testForWithCondition() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/controlFlowConstructions/ForWithCondition.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/controlFlowConstructions/ForWithCondition.after.kt");
             }
 
             @TestMetadata("ForWithoutCondition.after.kt")
             public void testForWithoutCondition() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/controlFlowConstructions/ForWithoutCondition.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/controlFlowConstructions/ForWithoutCondition.after.kt");
             }
 
             @TestMetadata("If.after.kt")
             public void testIf() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/controlFlowConstructions/If.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/controlFlowConstructions/If.after.kt");
             }
 
             @TestMetadata("IfBeforeCondition.after.kt")
             public void testIfBeforeCondition() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/controlFlowConstructions/IfBeforeCondition.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/controlFlowConstructions/IfBeforeCondition.after.kt");
             }
 
             @TestMetadata("IfBeforeCondition2.after.kt")
             public void testIfBeforeCondition2() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/controlFlowConstructions/IfBeforeCondition2.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/controlFlowConstructions/IfBeforeCondition2.after.kt");
             }
 
             @TestMetadata("IfBeforeCondition3.after.kt")
             public void testIfBeforeCondition3() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/controlFlowConstructions/IfBeforeCondition3.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/controlFlowConstructions/IfBeforeCondition3.after.kt");
             }
 
             @TestMetadata("IfBeforeCondition4.after.kt")
             public void testIfBeforeCondition4() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/controlFlowConstructions/IfBeforeCondition4.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/controlFlowConstructions/IfBeforeCondition4.after.kt");
             }
 
             @TestMetadata("IfWithBraces.after.kt")
             public void testIfWithBraces() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/controlFlowConstructions/IfWithBraces.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/controlFlowConstructions/IfWithBraces.after.kt");
             }
 
             @TestMetadata("IfWithBraces2.after.kt")
             public void testIfWithBraces2() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/controlFlowConstructions/IfWithBraces2.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/controlFlowConstructions/IfWithBraces2.after.kt");
             }
 
             @TestMetadata("Try.after.kt")
             public void testTry() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/controlFlowConstructions/Try.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/controlFlowConstructions/Try.after.kt");
             }
 
             @TestMetadata("Try2.after.kt")
             public void testTry2() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/controlFlowConstructions/Try2.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/controlFlowConstructions/Try2.after.kt");
             }
 
             @TestMetadata("WhenWithCondition.after.kt")
             public void testWhenWithCondition() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/controlFlowConstructions/WhenWithCondition.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/controlFlowConstructions/WhenWithCondition.after.kt");
             }
 
             @TestMetadata("WhenWithCondition2.after.kt")
             public void testWhenWithCondition2() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/controlFlowConstructions/WhenWithCondition2.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/controlFlowConstructions/WhenWithCondition2.after.kt");
             }
 
             @TestMetadata("WhenWithoutCondition.after.kt")
             public void testWhenWithoutCondition() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/controlFlowConstructions/WhenWithoutCondition.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/controlFlowConstructions/WhenWithoutCondition.after.kt");
             }
 
             @TestMetadata("While.after.kt")
             public void testWhile() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/controlFlowConstructions/While.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/controlFlowConstructions/While.after.kt");
             }
 
             @TestMetadata("While2.after.kt")
             public void testWhile2() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/controlFlowConstructions/While2.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/controlFlowConstructions/While2.after.kt");
             }
 
             @TestMetadata("While3.after.kt")
             public void testWhile3() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/controlFlowConstructions/While3.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/controlFlowConstructions/While3.after.kt");
             }
 
             @TestMetadata("WhileWithBlock.after.kt")
             public void testWhileWithBlock() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/controlFlowConstructions/WhileWithBlock.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/controlFlowConstructions/WhileWithBlock.after.kt");
             }
 
             @TestMetadata("WhileWithCondition.after.kt")
             public void testWhileWithCondition() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/controlFlowConstructions/WhileWithCondition.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/controlFlowConstructions/WhileWithCondition.after.kt");
             }
 
             @TestMetadata("WhileWithoutCondition.after.kt")
             public void testWhileWithoutCondition() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/controlFlowConstructions/WhileWithoutCondition.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/controlFlowConstructions/WhileWithoutCondition.after.kt");
             }
         }
 
         @RunWith(JUnit3RunnerWithInners.class)
-        @TestMetadata("../idea/tests/testData/indentationOnNewline/elvis")
+        @TestMetadata("../idea/tests/testData/editor/enterHandler/elvis")
         public static class Elvis extends AbstractPerformanceTypingIndentationTest {
             private void runTest(String testDataFilePath) throws Exception {
                 KotlinTestUtils.runTest(this::doNewlineTest, this, testDataFilePath);
@@ -374,32 +374,32 @@ public abstract class PerformanceTypingIndentationTestGenerated extends Abstract
 
             @TestMetadata("AfterElvis.after.kt")
             public void testAfterElvis() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/elvis/AfterElvis.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/elvis/AfterElvis.after.kt");
             }
 
             @TestMetadata("AfterElvis2.after.kt")
             public void testAfterElvis2() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/elvis/AfterElvis2.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/elvis/AfterElvis2.after.kt");
             }
 
             @TestMetadata("AfterElvisInBinaryExpression.after.kt")
             public void testAfterElvisInBinaryExpression() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/elvis/AfterElvisInBinaryExpression.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/elvis/AfterElvisInBinaryExpression.after.kt");
             }
 
             @TestMetadata("BeforeElvis.after.kt")
             public void testBeforeElvis() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/elvis/BeforeElvis.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/elvis/BeforeElvis.after.kt");
             }
 
             @TestMetadata("BeforeElvisInBinaryExpression.after.kt")
             public void testBeforeElvisInBinaryExpression() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/elvis/BeforeElvisInBinaryExpression.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/elvis/BeforeElvisInBinaryExpression.after.kt");
             }
         }
 
         @RunWith(JUnit3RunnerWithInners.class)
-        @TestMetadata("../idea/tests/testData/indentationOnNewline/emptyBraces")
+        @TestMetadata("../idea/tests/testData/editor/enterHandler/emptyBraces")
         public static class EmptyBraces extends AbstractPerformanceTypingIndentationTest {
             private void runTest(String testDataFilePath) throws Exception {
                 KotlinTestUtils.runTest(this::doNewlineTest, this, testDataFilePath);
@@ -407,52 +407,52 @@ public abstract class PerformanceTypingIndentationTestGenerated extends Abstract
 
             @TestMetadata("ClassWithConstructor.after.kt")
             public void testClassWithConstructor() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyBraces/ClassWithConstructor.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyBraces/ClassWithConstructor.after.kt");
             }
 
             @TestMetadata("ClassWithConstructor2.after.kt")
             public void testClassWithConstructor2() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyBraces/ClassWithConstructor2.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyBraces/ClassWithConstructor2.after.kt");
             }
 
             @TestMetadata("ClassWithoutConstructor.after.kt")
             public void testClassWithoutConstructor() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyBraces/ClassWithoutConstructor.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyBraces/ClassWithoutConstructor.after.kt");
             }
 
             @TestMetadata("FunctionBlock.after.kt")
             public void testFunctionBlock() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyBraces/FunctionBlock.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyBraces/FunctionBlock.after.kt");
             }
 
             @TestMetadata("FunctionBlock2.after.kt")
             public void testFunctionBlock2() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyBraces/FunctionBlock2.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyBraces/FunctionBlock2.after.kt");
             }
 
             @TestMetadata("FunctionBody3.after.kt")
             public void testFunctionBody3() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyBraces/FunctionBody3.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyBraces/FunctionBody3.after.kt");
             }
 
             @TestMetadata("FunctionBody4.after.kt")
             public void testFunctionBody4() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyBraces/FunctionBody4.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyBraces/FunctionBody4.after.kt");
             }
 
             @TestMetadata("FunctionBodyInsideClass.after.kt")
             public void testFunctionBodyInsideClass() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyBraces/FunctionBodyInsideClass.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyBraces/FunctionBodyInsideClass.after.kt");
             }
 
             @TestMetadata("FunctionBodyInsideClass2.after.kt")
             public void testFunctionBodyInsideClass2() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyBraces/FunctionBodyInsideClass2.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyBraces/FunctionBodyInsideClass2.after.kt");
             }
         }
 
         @RunWith(JUnit3RunnerWithInners.class)
-        @TestMetadata("../idea/tests/testData/indentationOnNewline/emptyParameters")
+        @TestMetadata("../idea/tests/testData/editor/enterHandler/emptyParameters")
         public static class EmptyParameters extends AbstractPerformanceTypingIndentationTest {
             private void runTest(String testDataFilePath) throws Exception {
                 KotlinTestUtils.runTest(this::doNewlineTest, this, testDataFilePath);
@@ -460,292 +460,292 @@ public abstract class PerformanceTypingIndentationTestGenerated extends Abstract
 
             @TestMetadata("EmptyArgumentInCallByArrayAccess.after.kt")
             public void testEmptyArgumentInCallByArrayAccess() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyParameters/EmptyArgumentInCallByArrayAccess.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyParameters/EmptyArgumentInCallByArrayAccess.after.kt");
             }
 
             @TestMetadata("EmptyArgumentInCallByArrayAccess2.after.kt")
             public void testEmptyArgumentInCallByArrayAccess2() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyParameters/EmptyArgumentInCallByArrayAccess2.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyParameters/EmptyArgumentInCallByArrayAccess2.after.kt");
             }
 
             @TestMetadata("EmptyArgumentInCallByDeclaration.after.kt")
             public void testEmptyArgumentInCallByDeclaration() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyParameters/EmptyArgumentInCallByDeclaration.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyParameters/EmptyArgumentInCallByDeclaration.after.kt");
             }
 
             @TestMetadata("EmptyArgumentInCallByDeclaration2.after.kt")
             public void testEmptyArgumentInCallByDeclaration2() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyParameters/EmptyArgumentInCallByDeclaration2.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyParameters/EmptyArgumentInCallByDeclaration2.after.kt");
             }
 
             @TestMetadata("EmptyArgumentInCallByReference.after.kt")
             public void testEmptyArgumentInCallByReference() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyParameters/EmptyArgumentInCallByReference.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyParameters/EmptyArgumentInCallByReference.after.kt");
             }
 
             @TestMetadata("EmptyArgumentInCallByReference2.after.kt")
             public void testEmptyArgumentInCallByReference2() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyParameters/EmptyArgumentInCallByReference2.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyParameters/EmptyArgumentInCallByReference2.after.kt");
             }
 
             @TestMetadata("EmptyArgumentInCallByReferenceInSuperType.after.kt")
             public void testEmptyArgumentInCallByReferenceInSuperType() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyParameters/EmptyArgumentInCallByReferenceInSuperType.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyParameters/EmptyArgumentInCallByReferenceInSuperType.after.kt");
             }
 
             @TestMetadata("EmptyArgumentInCallByReferenceInSuperType2.after.kt")
             public void testEmptyArgumentInCallByReferenceInSuperType2() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyParameters/EmptyArgumentInCallByReferenceInSuperType2.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyParameters/EmptyArgumentInCallByReferenceInSuperType2.after.kt");
             }
 
             @TestMetadata("EmptyArgumentInCallByReferenceInSuperTypeWithTypeArguments.after.kt")
             public void testEmptyArgumentInCallByReferenceInSuperTypeWithTypeArguments() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyParameters/EmptyArgumentInCallByReferenceInSuperTypeWithTypeArguments.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyParameters/EmptyArgumentInCallByReferenceInSuperTypeWithTypeArguments.after.kt");
             }
 
             @TestMetadata("EmptyArgumentInCallByReferenceInSuperTypeWithTypeArguments2.after.kt")
             public void testEmptyArgumentInCallByReferenceInSuperTypeWithTypeArguments2() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyParameters/EmptyArgumentInCallByReferenceInSuperTypeWithTypeArguments2.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyParameters/EmptyArgumentInCallByReferenceInSuperTypeWithTypeArguments2.after.kt");
             }
 
             @TestMetadata("EmptyArgumentInCallByReferenceWithTypeArguments.after.kt")
             public void testEmptyArgumentInCallByReferenceWithTypeArguments() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyParameters/EmptyArgumentInCallByReferenceWithTypeArguments.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyParameters/EmptyArgumentInCallByReferenceWithTypeArguments.after.kt");
             }
 
             @TestMetadata("EmptyArgumentInCallByReferenceWithTypeArguments2.after.kt")
             public void testEmptyArgumentInCallByReferenceWithTypeArguments2() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyParameters/EmptyArgumentInCallByReferenceWithTypeArguments2.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyParameters/EmptyArgumentInCallByReferenceWithTypeArguments2.after.kt");
             }
 
             @TestMetadata("EmptyArgumentInThisAsClassicFunction.after.kt")
             public void testEmptyArgumentInThisAsClassicFunction() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyParameters/EmptyArgumentInThisAsClassicFunction.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyParameters/EmptyArgumentInThisAsClassicFunction.after.kt");
             }
 
             @TestMetadata("EmptyArgumentInThisAsConstructor.after.kt")
             public void testEmptyArgumentInThisAsConstructor() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyParameters/EmptyArgumentInThisAsConstructor.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyParameters/EmptyArgumentInThisAsConstructor.after.kt");
             }
 
             @TestMetadata("EmptyArgumentInThisAsConstructor2.after.kt")
             public void testEmptyArgumentInThisAsConstructor2() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyParameters/EmptyArgumentInThisAsConstructor2.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyParameters/EmptyArgumentInThisAsConstructor2.after.kt");
             }
 
             @TestMetadata("EmptyConditionInCatch.after.kt")
             public void testEmptyConditionInCatch() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyParameters/EmptyConditionInCatch.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyParameters/EmptyConditionInCatch.after.kt");
             }
 
             @TestMetadata("EmptyConditionInCatch2.after.kt")
             public void testEmptyConditionInCatch2() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyParameters/EmptyConditionInCatch2.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyParameters/EmptyConditionInCatch2.after.kt");
             }
 
             @TestMetadata("EmptyConditionInDoWhile.after.kt")
             public void testEmptyConditionInDoWhile() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyParameters/EmptyConditionInDoWhile.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyParameters/EmptyConditionInDoWhile.after.kt");
             }
 
             @TestMetadata("EmptyConditionInFor.after.kt")
             public void testEmptyConditionInFor() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyParameters/EmptyConditionInFor.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyParameters/EmptyConditionInFor.after.kt");
             }
 
             @TestMetadata("EmptyConditionInIf.after.kt")
             public void testEmptyConditionInIf() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyParameters/EmptyConditionInIf.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyParameters/EmptyConditionInIf.after.kt");
             }
 
             @TestMetadata("EmptyConditionInWhen.after.kt")
             public void testEmptyConditionInWhen() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyParameters/EmptyConditionInWhen.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyParameters/EmptyConditionInWhen.after.kt");
             }
 
             @TestMetadata("EmptyConditionInWhile.after.kt")
             public void testEmptyConditionInWhile() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyParameters/EmptyConditionInWhile.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyParameters/EmptyConditionInWhile.after.kt");
             }
 
             @TestMetadata("EmptyParameterInAnnonymousFunction.after.kt")
             public void testEmptyParameterInAnnonymousFunction() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInAnnonymousFunction.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInAnnonymousFunction.after.kt");
             }
 
             @TestMetadata("EmptyParameterInAnnonymousFunction2.after.kt")
             public void testEmptyParameterInAnnonymousFunction2() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInAnnonymousFunction2.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInAnnonymousFunction2.after.kt");
             }
 
             @TestMetadata("EmptyParameterInAnnonymousFunctionWithNullableReceiver.after.kt")
             public void testEmptyParameterInAnnonymousFunctionWithNullableReceiver() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInAnnonymousFunctionWithNullableReceiver.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInAnnonymousFunctionWithNullableReceiver.after.kt");
             }
 
             @TestMetadata("EmptyParameterInAnnonymousFunctionWithNullableReceiver2.after.kt")
             public void testEmptyParameterInAnnonymousFunctionWithNullableReceiver2() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInAnnonymousFunctionWithNullableReceiver2.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInAnnonymousFunctionWithNullableReceiver2.after.kt");
             }
 
             @TestMetadata("EmptyParameterInAnnonymousFunctionWithReceiver.after.kt")
             public void testEmptyParameterInAnnonymousFunctionWithReceiver() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInAnnonymousFunctionWithReceiver.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInAnnonymousFunctionWithReceiver.after.kt");
             }
 
             @TestMetadata("EmptyParameterInAnnonymousFunctionWithReceiver2.after.kt")
             public void testEmptyParameterInAnnonymousFunctionWithReceiver2() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInAnnonymousFunctionWithReceiver2.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInAnnonymousFunctionWithReceiver2.after.kt");
             }
 
             @TestMetadata("EmptyParameterInDestructuringDeclaration.after.kt")
             public void testEmptyParameterInDestructuringDeclaration() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInDestructuringDeclaration.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInDestructuringDeclaration.after.kt");
             }
 
             @TestMetadata("EmptyParameterInDestructuringDeclaration2.after.kt")
             public void testEmptyParameterInDestructuringDeclaration2() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInDestructuringDeclaration2.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInDestructuringDeclaration2.after.kt");
             }
 
             @TestMetadata("EmptyParameterInDestructuringDeclaration3.after.kt")
             public void testEmptyParameterInDestructuringDeclaration3() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInDestructuringDeclaration3.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInDestructuringDeclaration3.after.kt");
             }
 
             @TestMetadata("EmptyParameterInExplicitPrimaryConstructor.after.kt")
             public void testEmptyParameterInExplicitPrimaryConstructor() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInExplicitPrimaryConstructor.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInExplicitPrimaryConstructor.after.kt");
             }
 
             @TestMetadata("EmptyParameterInExplicitPrimaryConstructor2.after.kt")
             public void testEmptyParameterInExplicitPrimaryConstructor2() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInExplicitPrimaryConstructor2.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInExplicitPrimaryConstructor2.after.kt");
             }
 
             @TestMetadata("EmptyParameterInFunction.after.kt")
             public void testEmptyParameterInFunction() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInFunction.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInFunction.after.kt");
             }
 
             @TestMetadata("EmptyParameterInFunction2.after.kt")
             public void testEmptyParameterInFunction2() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInFunction2.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInFunction2.after.kt");
             }
 
             @TestMetadata("EmptyParameterInFunctionWithReceiver.after.kt")
             public void testEmptyParameterInFunctionWithReceiver() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInFunctionWithReceiver.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInFunctionWithReceiver.after.kt");
             }
 
             @TestMetadata("EmptyParameterInFunctionWithReceiver2.after.kt")
             public void testEmptyParameterInFunctionWithReceiver2() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInFunctionWithReceiver2.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInFunctionWithReceiver2.after.kt");
             }
 
             @TestMetadata("EmptyParameterInFunctionWithTypeParameters.after.kt")
             public void testEmptyParameterInFunctionWithTypeParameters() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInFunctionWithTypeParameters.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInFunctionWithTypeParameters.after.kt");
             }
 
             @TestMetadata("EmptyParameterInFunctionWithTypeParameters2.after.kt")
             public void testEmptyParameterInFunctionWithTypeParameters2() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInFunctionWithTypeParameters2.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInFunctionWithTypeParameters2.after.kt");
             }
 
             @TestMetadata("EmptyParameterInFunctionWithTypeParametersAndReceiver.after.kt")
             public void testEmptyParameterInFunctionWithTypeParametersAndReceiver() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInFunctionWithTypeParametersAndReceiver.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInFunctionWithTypeParametersAndReceiver.after.kt");
             }
 
             @TestMetadata("EmptyParameterInFunctionWithTypeParametersAndReceiver2.after.kt")
             public void testEmptyParameterInFunctionWithTypeParametersAndReceiver2() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInFunctionWithTypeParametersAndReceiver2.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInFunctionWithTypeParametersAndReceiver2.after.kt");
             }
 
             @TestMetadata("EmptyParameterInFunctionWithTypeParametersAndReceiver3.after.kt")
             public void testEmptyParameterInFunctionWithTypeParametersAndReceiver3() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInFunctionWithTypeParametersAndReceiver3.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInFunctionWithTypeParametersAndReceiver3.after.kt");
             }
 
             @TestMetadata("EmptyParameterInFunctionWithTypeParametersAndReceiver4.after.kt")
             public void testEmptyParameterInFunctionWithTypeParametersAndReceiver4() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInFunctionWithTypeParametersAndReceiver4.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInFunctionWithTypeParametersAndReceiver4.after.kt");
             }
 
             @TestMetadata("EmptyParameterInGetter.after.kt")
             public void testEmptyParameterInGetter() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInGetter.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInGetter.after.kt");
             }
 
             @TestMetadata("EmptyParameterInGetter2.after.kt")
             public void testEmptyParameterInGetter2() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInGetter2.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInGetter2.after.kt");
             }
 
             @TestMetadata("EmptyParameterInImplicitPrimaryConstructor.after.kt")
             public void testEmptyParameterInImplicitPrimaryConstructor() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInImplicitPrimaryConstructor.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInImplicitPrimaryConstructor.after.kt");
             }
 
             @TestMetadata("EmptyParameterInImplicitPrimaryConstructor2.after.kt")
             public void testEmptyParameterInImplicitPrimaryConstructor2() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInImplicitPrimaryConstructor2.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInImplicitPrimaryConstructor2.after.kt");
             }
 
             @TestMetadata("EmptyParameterInImplicitPrimaryConstructorWithTypeParameters.after.kt")
             public void testEmptyParameterInImplicitPrimaryConstructorWithTypeParameters() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInImplicitPrimaryConstructorWithTypeParameters.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInImplicitPrimaryConstructorWithTypeParameters.after.kt");
             }
 
             @TestMetadata("EmptyParameterInImplicitPrimaryConstructorWithTypeParameters2.after.kt")
             public void testEmptyParameterInImplicitPrimaryConstructorWithTypeParameters2() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInImplicitPrimaryConstructorWithTypeParameters2.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInImplicitPrimaryConstructorWithTypeParameters2.after.kt");
             }
 
             @TestMetadata("EmptyParameterInInnerAnnonymousFunction.after.kt")
             public void testEmptyParameterInInnerAnnonymousFunction() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInInnerAnnonymousFunction.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInInnerAnnonymousFunction.after.kt");
             }
 
             @TestMetadata("EmptyParameterInInnerAnnonymousFunction2.after.kt")
             public void testEmptyParameterInInnerAnnonymousFunction2() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInInnerAnnonymousFunction2.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInInnerAnnonymousFunction2.after.kt");
             }
 
             @TestMetadata("EmptyParameterInSecondaryConstructor.after.kt")
             public void testEmptyParameterInSecondaryConstructor() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInSecondaryConstructor.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInSecondaryConstructor.after.kt");
             }
 
             @TestMetadata("EmptyParameterInSecondaryConstructor2.after.kt")
             public void testEmptyParameterInSecondaryConstructor2() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInSecondaryConstructor2.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInSecondaryConstructor2.after.kt");
             }
 
             @TestMetadata("EmptyParameterInSetter.after.kt")
             public void testEmptyParameterInSetter() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInSetter.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInSetter.after.kt");
             }
 
             @TestMetadata("EmptyParameterInSetter2.after.kt")
             public void testEmptyParameterInSetter2() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInSetter2.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInSetter2.after.kt");
             }
 
             @TestMetadata("EmptyParameters.after.kt")
             public void testEmptyParameters() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameters.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameters.after.kt");
             }
 
             @TestMetadata("EmptyParameters2.after.kt")
             public void testEmptyParameters2() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameters2.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameters2.after.kt");
             }
         }
 
         @RunWith(JUnit3RunnerWithInners.class)
-        @TestMetadata("../idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression")
+        @TestMetadata("../idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression")
         public static class EmptyParenthesisInBinaryExpression extends AbstractPerformanceTypingIndentationTest {
             private void runTest(String testDataFilePath) throws Exception {
                 KotlinTestUtils.runTest(this::doNewlineTest, this, testDataFilePath);
@@ -753,77 +753,77 @@ public abstract class PerformanceTypingIndentationTestGenerated extends Abstract
 
             @TestMetadata("AssignmentAfterEq.after.kt")
             public void testAssignmentAfterEq() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/AssignmentAfterEq.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/AssignmentAfterEq.after.kt");
             }
 
             @TestMetadata("BinaryWithTypeExpressions.after.kt")
             public void testBinaryWithTypeExpressions() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/BinaryWithTypeExpressions.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/BinaryWithTypeExpressions.after.kt");
             }
 
             @TestMetadata("EmptyArgumentInCallByArrayAccess.after.kt")
             public void testEmptyArgumentInCallByArrayAccess() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/EmptyArgumentInCallByArrayAccess.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/EmptyArgumentInCallByArrayAccess.after.kt");
             }
 
             @TestMetadata("EmptyArgumentInCallByDeclaration.after.kt")
             public void testEmptyArgumentInCallByDeclaration() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/EmptyArgumentInCallByDeclaration.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/EmptyArgumentInCallByDeclaration.after.kt");
             }
 
             @TestMetadata("InBinaryExpressionInMiddle.after.kt")
             public void testInBinaryExpressionInMiddle() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/InBinaryExpressionInMiddle.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/InBinaryExpressionInMiddle.after.kt");
             }
 
             @TestMetadata("InBinaryExpressionUnfinished.after.kt")
             public void testInBinaryExpressionUnfinished() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/InBinaryExpressionUnfinished.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/InBinaryExpressionUnfinished.after.kt");
             }
 
             @TestMetadata("InBinaryExpressionUnfinishedInIf.after.kt")
             public void testInBinaryExpressionUnfinishedInIf() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/InBinaryExpressionUnfinishedInIf.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/InBinaryExpressionUnfinishedInIf.after.kt");
             }
 
             @TestMetadata("InBinaryExpressionsBeforeCloseParenthesis.after.kt")
             public void testInBinaryExpressionsBeforeCloseParenthesis() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/InBinaryExpressionsBeforeCloseParenthesis.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/InBinaryExpressionsBeforeCloseParenthesis.after.kt");
             }
 
             @TestMetadata("InExpressionsParentheses.after.kt")
             public void testInExpressionsParentheses() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/InExpressionsParentheses.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/InExpressionsParentheses.after.kt");
             }
 
             @TestMetadata("InExpressionsParentheses2.after.kt")
             public void testInExpressionsParentheses2() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/InExpressionsParentheses2.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/InExpressionsParentheses2.after.kt");
             }
 
             @TestMetadata("InExpressionsParentheses3.after.kt")
             public void testInExpressionsParentheses3() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/InExpressionsParentheses3.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/InExpressionsParentheses3.after.kt");
             }
 
             @TestMetadata("InExpressionsParentheses4.after.kt")
             public void testInExpressionsParentheses4() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/InExpressionsParentheses4.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/InExpressionsParentheses4.after.kt");
             }
 
             @TestMetadata("InExpressionsParenthesesBeforeOperand.after.kt")
             public void testInExpressionsParenthesesBeforeOperand() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/InExpressionsParenthesesBeforeOperand.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/InExpressionsParenthesesBeforeOperand.after.kt");
             }
 
             @TestMetadata("IsExpressionAfterIs.after.kt")
             public void testIsExpressionAfterIs() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/IsExpressionAfterIs.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/IsExpressionAfterIs.after.kt");
             }
         }
 
         @RunWith(JUnit3RunnerWithInners.class)
-        @TestMetadata("../idea/tests/testData/indentationOnNewline/expressionBody")
+        @TestMetadata("../idea/tests/testData/editor/enterHandler/expressionBody")
         public static class ExpressionBody extends AbstractPerformanceTypingIndentationTest {
             private void runTest(String testDataFilePath) throws Exception {
                 KotlinTestUtils.runTest(this::doNewlineTest, this, testDataFilePath);
@@ -831,100 +831,100 @@ public abstract class PerformanceTypingIndentationTestGenerated extends Abstract
 
             @TestMetadata("AfterFunctionWithExplicitType.after.kt")
             public void testAfterFunctionWithExplicitType() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/expressionBody/AfterFunctionWithExplicitType.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/expressionBody/AfterFunctionWithExplicitType.after.kt");
             }
 
             @TestMetadata("AfterFunctionWithInference.after.kt")
             public void testAfterFunctionWithInference() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/expressionBody/AfterFunctionWithInference.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/expressionBody/AfterFunctionWithInference.after.kt");
             }
 
             @TestMetadata("AfterFunctionWithTypeParameter.after.kt")
             public void testAfterFunctionWithTypeParameter() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/expressionBody/AfterFunctionWithTypeParameter.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/expressionBody/AfterFunctionWithTypeParameter.after.kt");
             }
 
             @TestMetadata("AfterMultideclaration.after.kt")
             public void testAfterMultideclaration() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/expressionBody/AfterMultideclaration.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/expressionBody/AfterMultideclaration.after.kt");
             }
 
             @TestMetadata("AfterMutableProperty.after.kt")
             public void testAfterMutableProperty() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/expressionBody/AfterMutableProperty.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/expressionBody/AfterMutableProperty.after.kt");
             }
 
             @TestMetadata("AfterPropertyWithExplicitType.after.kt")
             public void testAfterPropertyWithExplicitType() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/expressionBody/AfterPropertyWithExplicitType.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/expressionBody/AfterPropertyWithExplicitType.after.kt");
             }
 
             @TestMetadata("AfterPropertyWithInference.after.kt")
             public void testAfterPropertyWithInference() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/expressionBody/AfterPropertyWithInference.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/expressionBody/AfterPropertyWithInference.after.kt");
             }
 
             @TestMetadata("AfterPropertyWithReceiver.after.kt")
             public void testAfterPropertyWithReceiver() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/expressionBody/AfterPropertyWithReceiver.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/expressionBody/AfterPropertyWithReceiver.after.kt");
             }
 
             @TestMetadata("AfterPropertyWithTypeParameterReceiver.after.kt")
             public void testAfterPropertyWithTypeParameterReceiver() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/expressionBody/AfterPropertyWithTypeParameterReceiver.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/expressionBody/AfterPropertyWithTypeParameterReceiver.after.kt");
             }
 
             @TestMetadata("FunctionWithExplicitType.after.kt")
             public void testFunctionWithExplicitType() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/expressionBody/FunctionWithExplicitType.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/expressionBody/FunctionWithExplicitType.after.kt");
             }
 
             @TestMetadata("FunctionWithInference.after.kt")
             public void testFunctionWithInference() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/expressionBody/FunctionWithInference.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/expressionBody/FunctionWithInference.after.kt");
             }
 
             @TestMetadata("FunctionWithTypeParameter.after.kt")
             public void testFunctionWithTypeParameter() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/expressionBody/FunctionWithTypeParameter.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/expressionBody/FunctionWithTypeParameter.after.kt");
             }
 
             @TestMetadata("Multideclaration.after.kt")
             public void testMultideclaration() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/expressionBody/Multideclaration.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/expressionBody/Multideclaration.after.kt");
             }
 
             @TestMetadata("MutableProperty.after.kt")
             public void testMutableProperty() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/expressionBody/MutableProperty.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/expressionBody/MutableProperty.after.kt");
             }
 
             @TestMetadata("PropertyWithExplicitType.after.kt")
             public void testPropertyWithExplicitType() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/expressionBody/PropertyWithExplicitType.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/expressionBody/PropertyWithExplicitType.after.kt");
             }
 
             @TestMetadata("PropertyWithInference.after.kt")
             public void testPropertyWithInference() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/expressionBody/PropertyWithInference.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/expressionBody/PropertyWithInference.after.kt");
             }
 
             @TestMetadata("PropertyWithReceiver.after.kt")
             public void testPropertyWithReceiver() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/expressionBody/PropertyWithReceiver.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/expressionBody/PropertyWithReceiver.after.kt");
             }
 
             @TestMetadata("PropertyWithTypeParameterReceiver.after.kt")
             public void testPropertyWithTypeParameterReceiver() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/expressionBody/PropertyWithTypeParameterReceiver.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/expressionBody/PropertyWithTypeParameterReceiver.after.kt");
             }
         }
 
         @RunWith(JUnit3RunnerWithInners.class)
-        @TestMetadata("../idea/tests/testData/indentationOnNewline/multilineString")
+        @TestMetadata("../idea/tests/testData/editor/enterHandler/multilineString")
         public abstract static class MultilineString extends AbstractPerformanceTypingIndentationTest {
             @RunWith(JUnit3RunnerWithInners.class)
-            @TestMetadata("../idea/tests/testData/indentationOnNewline/multilineString/spaces")
+            @TestMetadata("../idea/tests/testData/editor/enterHandler/multilineString/spaces")
             public static class Spaces extends AbstractPerformanceTypingIndentationTest {
                 private void runTest(String testDataFilePath) throws Exception {
                     KotlinTestUtils.runTest(this::doNewlineTest, this, testDataFilePath);
@@ -932,200 +932,200 @@ public abstract class PerformanceTypingIndentationTestGenerated extends Abstract
 
                 @TestMetadata("DontAddMarginCharWhenMultilineWithoutMargins.after.kt")
                 public void testDontAddMarginCharWhenMultilineWithoutMargins() throws Exception {
-                    runTest("../idea/tests/testData/indentationOnNewline/multilineString/spaces/DontAddMarginCharWhenMultilineWithoutMargins.after.kt");
+                    runTest("../idea/tests/testData/editor/enterHandler/multilineString/spaces/DontAddMarginCharWhenMultilineWithoutMargins.after.kt");
                 }
 
                 @TestMetadata("DontAddMarginWhenItIsUnused.after.kt")
                 public void testDontAddMarginWhenItIsUnused() throws Exception {
-                    runTest("../idea/tests/testData/indentationOnNewline/multilineString/spaces/DontAddMarginWhenItIsUnused.after.kt");
+                    runTest("../idea/tests/testData/editor/enterHandler/multilineString/spaces/DontAddMarginWhenItIsUnused.after.kt");
                 }
 
                 @TestMetadata("DontAddMarginWhenItIsUnusedWithEmptyPrevious.after.kt")
                 public void testDontAddMarginWhenItIsUnusedWithEmptyPrevious() throws Exception {
-                    runTest("../idea/tests/testData/indentationOnNewline/multilineString/spaces/DontAddMarginWhenItIsUnusedWithEmptyPrevious.after.kt");
+                    runTest("../idea/tests/testData/editor/enterHandler/multilineString/spaces/DontAddMarginWhenItIsUnusedWithEmptyPrevious.after.kt");
                 }
 
                 @TestMetadata("DontAddTrimCallWhenAlreadyMultiline.after.kt")
                 public void testDontAddTrimCallWhenAlreadyMultiline() throws Exception {
-                    runTest("../idea/tests/testData/indentationOnNewline/multilineString/spaces/DontAddTrimCallWhenAlreadyMultiline.after.kt");
+                    runTest("../idea/tests/testData/editor/enterHandler/multilineString/spaces/DontAddTrimCallWhenAlreadyMultiline.after.kt");
                 }
 
                 @TestMetadata("DontAddTrimCallWhenAlreadyMultilineFirstLine.after.kt")
                 public void testDontAddTrimCallWhenAlreadyMultilineFirstLine() throws Exception {
-                    runTest("../idea/tests/testData/indentationOnNewline/multilineString/spaces/DontAddTrimCallWhenAlreadyMultilineFirstLine.after.kt");
+                    runTest("../idea/tests/testData/editor/enterHandler/multilineString/spaces/DontAddTrimCallWhenAlreadyMultilineFirstLine.after.kt");
                 }
 
                 @TestMetadata("DontInsertTrimMargin1.after.kt")
                 public void testDontInsertTrimMargin1() throws Exception {
-                    runTest("../idea/tests/testData/indentationOnNewline/multilineString/spaces/DontInsertTrimMargin1.after.kt");
+                    runTest("../idea/tests/testData/editor/enterHandler/multilineString/spaces/DontInsertTrimMargin1.after.kt");
                 }
 
                 @TestMetadata("DontInsertTrimMargin2.after.kt")
                 public void testDontInsertTrimMargin2() throws Exception {
-                    runTest("../idea/tests/testData/indentationOnNewline/multilineString/spaces/DontInsertTrimMargin2.after.kt");
+                    runTest("../idea/tests/testData/editor/enterHandler/multilineString/spaces/DontInsertTrimMargin2.after.kt");
                 }
 
                 @TestMetadata("DontInsertTrimMargin3.after.kt")
                 public void testDontInsertTrimMargin3() throws Exception {
-                    runTest("../idea/tests/testData/indentationOnNewline/multilineString/spaces/DontInsertTrimMargin3.after.kt");
+                    runTest("../idea/tests/testData/editor/enterHandler/multilineString/spaces/DontInsertTrimMargin3.after.kt");
                 }
 
                 @TestMetadata("DontInsertTrimMargin4.after.kt")
                 public void testDontInsertTrimMargin4() throws Exception {
-                    runTest("../idea/tests/testData/indentationOnNewline/multilineString/spaces/DontInsertTrimMargin4.after.kt");
+                    runTest("../idea/tests/testData/editor/enterHandler/multilineString/spaces/DontInsertTrimMargin4.after.kt");
                 }
 
                 @TestMetadata("EnterAfterOpenningBrace.after.kt")
                 public void testEnterAfterOpenningBrace() throws Exception {
-                    runTest("../idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterAfterOpenningBrace.after.kt");
+                    runTest("../idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterAfterOpenningBrace.after.kt");
                 }
 
                 @TestMetadata("EnterBeforeLongEntryOneLine.after.kt")
                 public void testEnterBeforeLongEntryOneLine() throws Exception {
-                    runTest("../idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterBeforeLongEntryOneLine.after.kt");
+                    runTest("../idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterBeforeLongEntryOneLine.after.kt");
                 }
 
                 @TestMetadata("EnterBeforeMarginChar.after.kt")
                 public void testEnterBeforeMarginChar() throws Exception {
-                    runTest("../idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterBeforeMarginChar.after.kt");
+                    runTest("../idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterBeforeMarginChar.after.kt");
                 }
 
                 @TestMetadata("EnterBeforeShortEntryOneLine.after.kt")
                 public void testEnterBeforeShortEntryOneLine() throws Exception {
-                    runTest("../idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterBeforeShortEntryOneLine.after.kt");
+                    runTest("../idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterBeforeShortEntryOneLine.after.kt");
                 }
 
                 @TestMetadata("EnterInInfixMargin.after.kt")
                 public void testEnterInInfixMargin() throws Exception {
-                    runTest("../idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterInInfixMargin.after.kt");
+                    runTest("../idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterInInfixMargin.after.kt");
                 }
 
                 @TestMetadata("EnterInInjectedFragment.after.kt")
                 public void testEnterInInjectedFragment() throws Exception {
-                    runTest("../idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterInInjectedFragment.after.kt");
+                    runTest("../idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterInInjectedFragment.after.kt");
                 }
 
                 @TestMetadata("EnterInLineWithMarginOnNotMargedLine.after.kt")
                 public void testEnterInLineWithMarginOnNotMargedLine() throws Exception {
-                    runTest("../idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterInLineWithMarginOnNotMargedLine.after.kt");
+                    runTest("../idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterInLineWithMarginOnNotMargedLine.after.kt");
                 }
 
                 @TestMetadata("EnterInMethodCallMargin.after.kt")
                 public void testEnterInMethodCallMargin() throws Exception {
-                    runTest("../idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterInMethodCallMargin.after.kt");
+                    runTest("../idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterInMethodCallMargin.after.kt");
                 }
 
                 @TestMetadata("EnterInOneLineAfterSpaces.after.kt")
                 public void testEnterInOneLineAfterSpaces() throws Exception {
-                    runTest("../idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterInOneLineAfterSpaces.after.kt");
+                    runTest("../idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterInOneLineAfterSpaces.after.kt");
                 }
 
                 @TestMetadata("EnterInTwoLinesNoMarginCall.after.kt")
                 public void testEnterInTwoLinesNoMarginCall() throws Exception {
-                    runTest("../idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterInTwoLinesNoMarginCall.after.kt");
+                    runTest("../idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterInTwoLinesNoMarginCall.after.kt");
                 }
 
                 @TestMetadata("EnterInsideBraces.after.kt")
                 public void testEnterInsideBraces() throws Exception {
-                    runTest("../idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterInsideBraces.after.kt");
+                    runTest("../idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterInsideBraces.after.kt");
                 }
 
                 @TestMetadata("EnterInsideBraces1.after.kt")
                 public void testEnterInsideBraces1() throws Exception {
-                    runTest("../idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterInsideBraces1.after.kt");
+                    runTest("../idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterInsideBraces1.after.kt");
                 }
 
                 @TestMetadata("EnterInsideBraces2.after.kt")
                 public void testEnterInsideBraces2() throws Exception {
-                    runTest("../idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterInsideBraces2.after.kt");
+                    runTest("../idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterInsideBraces2.after.kt");
                 }
 
                 @TestMetadata("EnterInsideTextMargin.after.kt")
                 public void testEnterInsideTextMargin() throws Exception {
-                    runTest("../idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterInsideTextMargin.after.kt");
+                    runTest("../idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterInsideTextMargin.after.kt");
                 }
 
                 @TestMetadata("EnterMLSimpleMargin.after.kt")
                 public void testEnterMLSimpleMargin() throws Exception {
-                    runTest("../idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterMLSimpleMargin.after.kt");
+                    runTest("../idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterMLSimpleMargin.after.kt");
                 }
 
                 @TestMetadata("EnterMLStartOnSameLineMargin.after.kt")
                 public void testEnterMLStartOnSameLineMargin() throws Exception {
-                    runTest("../idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterMLStartOnSameLineMargin.after.kt");
+                    runTest("../idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterMLStartOnSameLineMargin.after.kt");
                 }
 
                 @TestMetadata("EnterOnFirstLineWithPresentTrimMargin.after.kt")
                 public void testEnterOnFirstLineWithPresentTrimMargin() throws Exception {
-                    runTest("../idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterOnFirstLineWithPresentTrimMargin.after.kt");
+                    runTest("../idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterOnFirstLineWithPresentTrimMargin.after.kt");
                 }
 
                 @TestMetadata("EnterOnFirstLineWithPresentTrimMarginAndLine.after.kt")
                 public void testEnterOnFirstLineWithPresentTrimMarginAndLine() throws Exception {
-                    runTest("../idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterOnFirstLineWithPresentTrimMarginAndLine.after.kt");
+                    runTest("../idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterOnFirstLineWithPresentTrimMarginAndLine.after.kt");
                 }
 
                 @TestMetadata("EnterOnFirstNonEmptyLineWithPresentTrimMargin.after.kt")
                 public void testEnterOnFirstNonEmptyLineWithPresentTrimMargin() throws Exception {
-                    runTest("../idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterOnFirstNonEmptyLineWithPresentTrimMargin.after.kt");
+                    runTest("../idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterOnFirstNonEmptyLineWithPresentTrimMargin.after.kt");
                 }
 
                 @TestMetadata("EnterOnNewLine.after.kt")
                 public void testEnterOnNewLine() throws Exception {
-                    runTest("../idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterOnNewLine.after.kt");
+                    runTest("../idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterOnNewLine.after.kt");
                 }
 
                 @TestMetadata("EnterSimple.after.kt")
                 public void testEnterSimple() throws Exception {
-                    runTest("../idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterSimple.after.kt");
+                    runTest("../idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterSimple.after.kt");
                 }
 
                 @TestMetadata("EnterWithTextMargin.after.kt")
                 public void testEnterWithTextMargin() throws Exception {
-                    runTest("../idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterWithTextMargin.after.kt");
+                    runTest("../idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterWithTextMargin.after.kt");
                 }
 
                 @TestMetadata("EnterWithTextOnNewLineMargin.after.kt")
                 public void testEnterWithTextOnNewLineMargin() throws Exception {
-                    runTest("../idea/tests/testData/indentationOnNewline/multilineString/spaces/EnterWithTextOnNewLineMargin.after.kt");
+                    runTest("../idea/tests/testData/editor/enterHandler/multilineString/spaces/EnterWithTextOnNewLineMargin.after.kt");
                 }
 
                 @TestMetadata("InsertCustomMargin.after.kt")
                 public void testInsertCustomMargin() throws Exception {
-                    runTest("../idea/tests/testData/indentationOnNewline/multilineString/spaces/InsertCustomMargin.after.kt");
+                    runTest("../idea/tests/testData/editor/enterHandler/multilineString/spaces/InsertCustomMargin.after.kt");
                 }
 
                 @TestMetadata("InsertCustomMarginInLineStart.after.kt")
                 public void testInsertCustomMarginInLineStart() throws Exception {
-                    runTest("../idea/tests/testData/indentationOnNewline/multilineString/spaces/InsertCustomMarginInLineStart.after.kt");
+                    runTest("../idea/tests/testData/editor/enterHandler/multilineString/spaces/InsertCustomMarginInLineStart.after.kt");
                 }
 
                 @TestMetadata("InsertDefaultMargin.after.kt")
                 public void testInsertDefaultMargin() throws Exception {
-                    runTest("../idea/tests/testData/indentationOnNewline/multilineString/spaces/InsertDefaultMargin.after.kt");
+                    runTest("../idea/tests/testData/editor/enterHandler/multilineString/spaces/InsertDefaultMargin.after.kt");
                 }
 
                 @TestMetadata("NoTrimIndentInAnnotations.after.kt")
                 public void testNoTrimIndentInAnnotations() throws Exception {
-                    runTest("../idea/tests/testData/indentationOnNewline/multilineString/spaces/NoTrimIndentInAnnotations.after.kt");
+                    runTest("../idea/tests/testData/editor/enterHandler/multilineString/spaces/NoTrimIndentInAnnotations.after.kt");
                 }
 
                 @TestMetadata("NoTrimIndentInConst.after.kt")
                 public void testNoTrimIndentInConst() throws Exception {
-                    runTest("../idea/tests/testData/indentationOnNewline/multilineString/spaces/NoTrimIndentInConst.after.kt");
+                    runTest("../idea/tests/testData/editor/enterHandler/multilineString/spaces/NoTrimIndentInConst.after.kt");
                 }
 
                 @TestMetadata("RestoreIndentFromEmptyLine.after.kt")
                 public void testRestoreIndentFromEmptyLine() throws Exception {
-                    runTest("../idea/tests/testData/indentationOnNewline/multilineString/spaces/RestoreIndentFromEmptyLine.after.kt");
+                    runTest("../idea/tests/testData/editor/enterHandler/multilineString/spaces/RestoreIndentFromEmptyLine.after.kt");
                 }
             }
 
             @RunWith(JUnit3RunnerWithInners.class)
-            @TestMetadata("../idea/tests/testData/indentationOnNewline/multilineString/withTabs")
+            @TestMetadata("../idea/tests/testData/editor/enterHandler/multilineString/withTabs")
             public abstract static class WithTabs extends AbstractPerformanceTypingIndentationTest {
                 @RunWith(JUnit3RunnerWithInners.class)
-                @TestMetadata("../idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs2")
+                @TestMetadata("../idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs2")
                 public static class Tabs2 extends AbstractPerformanceTypingIndentationTest {
                     private void runTest(String testDataFilePath) throws Exception {
                         KotlinTestUtils.runTest(this::doNewlineTest, this, testDataFilePath);
@@ -1133,62 +1133,62 @@ public abstract class PerformanceTypingIndentationTestGenerated extends Abstract
 
                     @TestMetadata("DontInsertTrimMarginCall.after.kt")
                     public void testDontInsertTrimMarginCall() throws Exception {
-                        runTest("../idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs2/DontInsertTrimMarginCall.after.kt");
+                        runTest("../idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs2/DontInsertTrimMarginCall.after.kt");
                     }
 
                     @TestMetadata("EnterInMethodCallMargin.after.kt")
                     public void testEnterInMethodCallMargin() throws Exception {
-                        runTest("../idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs2/EnterInMethodCallMargin.after.kt");
+                        runTest("../idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs2/EnterInMethodCallMargin.after.kt");
                     }
 
                     @TestMetadata("EnterInTwoLinesNoMarginCall.after.kt")
                     public void testEnterInTwoLinesNoMarginCall() throws Exception {
-                        runTest("../idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs2/EnterInTwoLinesNoMarginCall.after.kt");
+                        runTest("../idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs2/EnterInTwoLinesNoMarginCall.after.kt");
                     }
 
                     @TestMetadata("EnterInsideBraces.after.kt")
                     public void testEnterInsideBraces() throws Exception {
-                        runTest("../idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs2/EnterInsideBraces.after.kt");
+                        runTest("../idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs2/EnterInsideBraces.after.kt");
                     }
 
                     @TestMetadata("EnterInsideText.after.kt")
                     public void testEnterInsideText() throws Exception {
-                        runTest("../idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs2/EnterInsideText.after.kt");
+                        runTest("../idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs2/EnterInsideText.after.kt");
                     }
 
                     @TestMetadata("EnterMLSimpleMargin.after.kt")
                     public void testEnterMLSimpleMargin() throws Exception {
-                        runTest("../idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs2/EnterMLSimpleMargin.after.kt");
+                        runTest("../idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs2/EnterMLSimpleMargin.after.kt");
                     }
 
                     @TestMetadata("EnterMLStartOnSameLineMargin.after.kt")
                     public void testEnterMLStartOnSameLineMargin() throws Exception {
-                        runTest("../idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs2/EnterMLStartOnSameLineMargin.after.kt");
+                        runTest("../idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs2/EnterMLStartOnSameLineMargin.after.kt");
                     }
 
                     @TestMetadata("EnterOnNewLineMargin.after.kt")
                     public void testEnterOnNewLineMargin() throws Exception {
-                        runTest("../idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs2/EnterOnNewLineMargin.after.kt");
+                        runTest("../idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs2/EnterOnNewLineMargin.after.kt");
                     }
 
                     @TestMetadata("EnterSimpleMargin.after.kt")
                     public void testEnterSimpleMargin() throws Exception {
-                        runTest("../idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs2/EnterSimpleMargin.after.kt");
+                        runTest("../idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs2/EnterSimpleMargin.after.kt");
                     }
 
                     @TestMetadata("EnterWithTextMargin.after.kt")
                     public void testEnterWithTextMargin() throws Exception {
-                        runTest("../idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs2/EnterWithTextMargin.after.kt");
+                        runTest("../idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs2/EnterWithTextMargin.after.kt");
                     }
 
                     @TestMetadata("EnterWithTextOnNewLineMargin.after.kt")
                     public void testEnterWithTextOnNewLineMargin() throws Exception {
-                        runTest("../idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs2/EnterWithTextOnNewLineMargin.after.kt");
+                        runTest("../idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs2/EnterWithTextOnNewLineMargin.after.kt");
                     }
                 }
 
                 @RunWith(JUnit3RunnerWithInners.class)
-                @TestMetadata("../idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs4")
+                @TestMetadata("../idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs4")
                 public static class Tabs4 extends AbstractPerformanceTypingIndentationTest {
                     private void runTest(String testDataFilePath) throws Exception {
                         KotlinTestUtils.runTest(this::doNewlineTest, this, testDataFilePath);
@@ -1196,64 +1196,64 @@ public abstract class PerformanceTypingIndentationTestGenerated extends Abstract
 
                     @TestMetadata("DontInsertTrimMarginCall.after.kt")
                     public void testDontInsertTrimMarginCall() throws Exception {
-                        runTest("../idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs4/DontInsertTrimMarginCall.after.kt");
+                        runTest("../idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs4/DontInsertTrimMarginCall.after.kt");
                     }
 
                     @TestMetadata("EnterInMethodCallMargin.after.kt")
                     public void testEnterInMethodCallMargin() throws Exception {
-                        runTest("../idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs4/EnterInMethodCallMargin.after.kt");
+                        runTest("../idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs4/EnterInMethodCallMargin.after.kt");
                     }
 
                     @TestMetadata("EnterInsideBraces.after.kt")
                     public void testEnterInsideBraces() throws Exception {
-                        runTest("../idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs4/EnterInsideBraces.after.kt");
+                        runTest("../idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs4/EnterInsideBraces.after.kt");
                     }
 
                     @TestMetadata("EnterInsideText.after.kt")
                     public void testEnterInsideText() throws Exception {
-                        runTest("../idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs4/EnterInsideText.after.kt");
+                        runTest("../idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs4/EnterInsideText.after.kt");
                     }
 
                     @TestMetadata("EnterMLSimpleMargin.after.kt")
                     public void testEnterMLSimpleMargin() throws Exception {
-                        runTest("../idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs4/EnterMLSimpleMargin.after.kt");
+                        runTest("../idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs4/EnterMLSimpleMargin.after.kt");
                     }
 
                     @TestMetadata("EnterMLStartOnSameLineMargin.after.kt")
                     public void testEnterMLStartOnSameLineMargin() throws Exception {
-                        runTest("../idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs4/EnterMLStartOnSameLineMargin.after.kt");
+                        runTest("../idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs4/EnterMLStartOnSameLineMargin.after.kt");
                     }
 
                     @TestMetadata("EnterOnNewLineMargin.after.kt")
                     public void testEnterOnNewLineMargin() throws Exception {
-                        runTest("../idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs4/EnterOnNewLineMargin.after.kt");
+                        runTest("../idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs4/EnterOnNewLineMargin.after.kt");
                     }
 
                     @TestMetadata("EnterSimpleMargin.after.kt")
                     public void testEnterSimpleMargin() throws Exception {
-                        runTest("../idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs4/EnterSimpleMargin.after.kt");
+                        runTest("../idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs4/EnterSimpleMargin.after.kt");
                     }
 
                     @TestMetadata("EnterWithTabsAfterMarginChar.after.kt")
                     public void testEnterWithTabsAfterMarginChar() throws Exception {
-                        runTest("../idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs4/EnterWithTabsAfterMarginChar.after.kt");
+                        runTest("../idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs4/EnterWithTabsAfterMarginChar.after.kt");
                     }
 
                     @TestMetadata("EnterWithTextMargin.after.kt")
                     public void testEnterWithTextMargin() throws Exception {
-                        runTest("../idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs4/EnterWithTextMargin.after.kt");
+                        runTest("../idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs4/EnterWithTextMargin.after.kt");
                     }
 
                     @TestMetadata("EnterWithTextOnNewLineMargin.after.kt")
                     public void testEnterWithTextOnNewLineMargin() throws Exception {
-                        runTest("../idea/tests/testData/indentationOnNewline/multilineString/withTabs/tabs4/EnterWithTextOnNewLineMargin.after.kt");
+                        runTest("../idea/tests/testData/editor/enterHandler/multilineString/withTabs/tabs4/EnterWithTextOnNewLineMargin.after.kt");
                     }
                 }
             }
         }
 
         @RunWith(JUnit3RunnerWithInners.class)
-        @TestMetadata("../idea/tests/testData/indentationOnNewline/script")
+        @TestMetadata("../idea/tests/testData/editor/enterHandler/script")
         public static class Script extends AbstractPerformanceTypingIndentationTest {
             private void runTest(String testDataFilePath) throws Exception {
                 KotlinTestUtils.runTest(this::doNewlineTest, this, testDataFilePath);
@@ -1261,37 +1261,37 @@ public abstract class PerformanceTypingIndentationTestGenerated extends Abstract
 
             @TestMetadata("ScriptAfterClosingBrace.after.kts")
             public void testScriptAfterClosingBrace() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/script/ScriptAfterClosingBrace.after.kts");
+                runTest("../idea/tests/testData/editor/enterHandler/script/ScriptAfterClosingBrace.after.kts");
             }
 
             @TestMetadata("ScriptAfterExpression.after.kts")
             public void testScriptAfterExpression() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/script/ScriptAfterExpression.after.kts");
+                runTest("../idea/tests/testData/editor/enterHandler/script/ScriptAfterExpression.after.kts");
             }
 
             @TestMetadata("ScriptAfterFun.after.kts")
             public void testScriptAfterFun() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/script/ScriptAfterFun.after.kts");
+                runTest("../idea/tests/testData/editor/enterHandler/script/ScriptAfterFun.after.kts");
             }
 
             @TestMetadata("ScriptAfterImport.after.kts")
             public void testScriptAfterImport() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/script/ScriptAfterImport.after.kts");
+                runTest("../idea/tests/testData/editor/enterHandler/script/ScriptAfterImport.after.kts");
             }
 
             @TestMetadata("ScriptBetweenFunctionCalls.after.kts")
             public void testScriptBetweenFunctionCalls() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/script/ScriptBetweenFunctionCalls.after.kts");
+                runTest("../idea/tests/testData/editor/enterHandler/script/ScriptBetweenFunctionCalls.after.kts");
             }
 
             @TestMetadata("ScriptInsideFun.after.kts")
             public void testScriptInsideFun() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/script/ScriptInsideFun.after.kts");
+                runTest("../idea/tests/testData/editor/enterHandler/script/ScriptInsideFun.after.kts");
             }
         }
 
         @RunWith(JUnit3RunnerWithInners.class)
-        @TestMetadata("../idea/tests/testData/indentationOnNewline/templates")
+        @TestMetadata("../idea/tests/testData/editor/enterHandler/templates")
         public static class Templates extends AbstractPerformanceTypingIndentationTest {
             private void runTest(String testDataFilePath) throws Exception {
                 KotlinTestUtils.runTest(this::doNewlineTest, this, testDataFilePath);
@@ -1299,122 +1299,122 @@ public abstract class PerformanceTypingIndentationTestGenerated extends Abstract
 
             @TestMetadata("LargeFileWithStringTemplate.after.kt")
             public void testLargeFileWithStringTemplate() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/templates/LargeFileWithStringTemplate.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/templates/LargeFileWithStringTemplate.after.kt");
             }
 
             @TestMetadata("TemplateEntryClose.after.kt")
             public void testTemplateEntryClose() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/templates/TemplateEntryClose.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/templates/TemplateEntryClose.after.kt");
             }
 
             @TestMetadata("TemplateEntryClose2.after.kt")
             public void testTemplateEntryClose2() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/templates/TemplateEntryClose2.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/templates/TemplateEntryClose2.after.kt");
             }
 
             @TestMetadata("TemplateEntryClose3.after.kt")
             public void testTemplateEntryClose3() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/templates/TemplateEntryClose3.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/templates/TemplateEntryClose3.after.kt");
             }
 
             @TestMetadata("TemplateEntryClose4.after.kt")
             public void testTemplateEntryClose4() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/templates/TemplateEntryClose4.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/templates/TemplateEntryClose4.after.kt");
             }
 
             @TestMetadata("TemplateEntryClose5.after.kt")
             public void testTemplateEntryClose5() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/templates/TemplateEntryClose5.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/templates/TemplateEntryClose5.after.kt");
             }
 
             @TestMetadata("TemplateEntryClose6.after.kt")
             public void testTemplateEntryClose6() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/templates/TemplateEntryClose6.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/templates/TemplateEntryClose6.after.kt");
             }
 
             @TestMetadata("TemplateEntryClose7.after.kt")
             public void testTemplateEntryClose7() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/templates/TemplateEntryClose7.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/templates/TemplateEntryClose7.after.kt");
             }
 
             @TestMetadata("TemplateEntryCloseInMultilineString.after.kt")
             public void testTemplateEntryCloseInMultilineString() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/templates/TemplateEntryCloseInMultilineString.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/templates/TemplateEntryCloseInMultilineString.after.kt");
             }
 
             @TestMetadata("TemplateEntryCloseInMultilineString2.after.kt")
             public void testTemplateEntryCloseInMultilineString2() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/templates/TemplateEntryCloseInMultilineString2.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/templates/TemplateEntryCloseInMultilineString2.after.kt");
             }
 
             @TestMetadata("TemplateEntryCloseInMultilineString3.after.kt")
             public void testTemplateEntryCloseInMultilineString3() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/templates/TemplateEntryCloseInMultilineString3.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/templates/TemplateEntryCloseInMultilineString3.after.kt");
             }
 
             @TestMetadata("TemplateEntryOpen.after.kt")
             public void testTemplateEntryOpen() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/templates/TemplateEntryOpen.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/templates/TemplateEntryOpen.after.kt");
             }
 
             @TestMetadata("TemplateEntryOpen2.after.kt")
             public void testTemplateEntryOpen2() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/templates/TemplateEntryOpen2.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/templates/TemplateEntryOpen2.after.kt");
             }
 
             @TestMetadata("TemplateEntryOpenInMultilineString.after.kt")
             public void testTemplateEntryOpenInMultilineString() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/templates/TemplateEntryOpenInMultilineString.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/templates/TemplateEntryOpenInMultilineString.after.kt");
             }
 
             @TestMetadata("TemplateEntryOpenInMultilineString2.after.kt")
             public void testTemplateEntryOpenInMultilineString2() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/templates/TemplateEntryOpenInMultilineString2.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/templates/TemplateEntryOpenInMultilineString2.after.kt");
             }
 
             @TestMetadata("TemplateEntryOpenInMultilineString3.after.kt")
             public void testTemplateEntryOpenInMultilineString3() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/templates/TemplateEntryOpenInMultilineString3.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/templates/TemplateEntryOpenInMultilineString3.after.kt");
             }
 
             @TestMetadata("TemplateEntryOpenWithComment.after.kt")
             public void testTemplateEntryOpenWithComment() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/templates/TemplateEntryOpenWithComment.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/templates/TemplateEntryOpenWithComment.after.kt");
             }
 
             @TestMetadata("TemplateEntryOpenWithComment2.after.kt")
             public void testTemplateEntryOpenWithComment2() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/templates/TemplateEntryOpenWithComment2.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/templates/TemplateEntryOpenWithComment2.after.kt");
             }
 
             @TestMetadata("TemplateEntryOpenWithoutContent.after.kt")
             public void testTemplateEntryOpenWithoutContent() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/templates/TemplateEntryOpenWithoutContent.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/templates/TemplateEntryOpenWithoutContent.after.kt");
             }
 
             @TestMetadata("TemplateEntryOpenWithoutContent2.after.kt")
             public void testTemplateEntryOpenWithoutContent2() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/templates/TemplateEntryOpenWithoutContent2.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/templates/TemplateEntryOpenWithoutContent2.after.kt");
             }
 
             @TestMetadata("TemplateEntryOpenWithoutContent3.after.kt")
             public void testTemplateEntryOpenWithoutContent3() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/templates/TemplateEntryOpenWithoutContent3.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/templates/TemplateEntryOpenWithoutContent3.after.kt");
             }
 
             @TestMetadata("TemplateEntryOpenWithoutContent4.after.kt")
             public void testTemplateEntryOpenWithoutContent4() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/templates/TemplateEntryOpenWithoutContent4.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/templates/TemplateEntryOpenWithoutContent4.after.kt");
             }
 
             @TestMetadata("TemplateEntryOpenWithoutContent5.after.kt")
             public void testTemplateEntryOpenWithoutContent5() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/templates/TemplateEntryOpenWithoutContent5.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/templates/TemplateEntryOpenWithoutContent5.after.kt");
             }
         }
 
         @RunWith(JUnit3RunnerWithInners.class)
-        @TestMetadata("../idea/tests/testData/indentationOnNewline")
+        @TestMetadata("../idea/tests/testData/editor/enterHandler")
         public static class Uncategorized extends AbstractPerformanceTypingIndentationTest {
             private void runTest(String testDataFilePath) throws Exception {
                 KotlinTestUtils.runTest(this::doNewlineTest, this, testDataFilePath);
@@ -1422,381 +1422,381 @@ public abstract class PerformanceTypingIndentationTestGenerated extends Abstract
 
             @TestMetadata("AfterCatch.after.kt")
             public void testAfterCatch() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/AfterCatch.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/AfterCatch.after.kt");
             }
 
             @TestMetadata("AfterClassNameBeforeFun.after.kt")
             public void testAfterClassNameBeforeFun() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/AfterClassNameBeforeFun.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/AfterClassNameBeforeFun.after.kt");
             }
 
             @TestMetadata("AfterExtensionPropertyGetter.after.kt")
             public void testAfterExtensionPropertyGetter() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/AfterExtensionPropertyGetter.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/AfterExtensionPropertyGetter.after.kt");
             }
 
             @TestMetadata("AfterExtensionPropertySetter.after.kt")
             public void testAfterExtensionPropertySetter() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/AfterExtensionPropertySetter.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/AfterExtensionPropertySetter.after.kt");
             }
 
             @TestMetadata("AfterFinally.after.kt")
             public void testAfterFinally() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/AfterFinally.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/AfterFinally.after.kt");
             }
 
             @TestMetadata("AfterImport.after.kt")
             public void testAfterImport() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/AfterImport.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/AfterImport.after.kt");
             }
 
             @TestMetadata("AfterPropertyGetter.after.kt")
             public void testAfterPropertyGetter() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/AfterPropertyGetter.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/AfterPropertyGetter.after.kt");
             }
 
             @TestMetadata("AfterPropertySetter.after.kt")
             public void testAfterPropertySetter() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/AfterPropertySetter.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/AfterPropertySetter.after.kt");
             }
 
             @TestMetadata("AfterTry.after.kt")
             public void testAfterTry() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/AfterTry.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/AfterTry.after.kt");
             }
 
             @TestMetadata("Annotation.after.kt")
             public void testAnnotation() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/Annotation.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/Annotation.after.kt");
             }
 
             @TestMetadata("AnnotationInDeclaration.after.kt")
             public void testAnnotationInDeclaration() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/AnnotationInDeclaration.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/AnnotationInDeclaration.after.kt");
             }
 
             @TestMetadata("ArgumentListNormalIndent.after.kt")
             public void testArgumentListNormalIndent() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/ArgumentListNormalIndent.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/ArgumentListNormalIndent.after.kt");
             }
 
             @TestMetadata("AutoIndentInWhenClause.after.kt")
             public void testAutoIndentInWhenClause() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/AutoIndentInWhenClause.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/AutoIndentInWhenClause.after.kt");
             }
 
             @TestMetadata("BlockCommentAfterCatch.after.kt")
             public void testBlockCommentAfterCatch() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/BlockCommentAfterCatch.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/BlockCommentAfterCatch.after.kt");
             }
 
             @TestMetadata("ConsecutiveCallsAfterDot.after.kt")
             public void testConsecutiveCallsAfterDot() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/ConsecutiveCallsAfterDot.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/ConsecutiveCallsAfterDot.after.kt");
             }
 
             @TestMetadata("ConsecutiveCallsInSaeCallsMiddle.after.kt")
             public void testConsecutiveCallsInSaeCallsMiddle() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/ConsecutiveCallsInSaeCallsMiddle.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/ConsecutiveCallsInSaeCallsMiddle.after.kt");
             }
 
             @TestMetadata("ConsecutiveCallsInSafeCallsEnd.after.kt")
             public void testConsecutiveCallsInSafeCallsEnd() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/ConsecutiveCallsInSafeCallsEnd.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/ConsecutiveCallsInSafeCallsEnd.after.kt");
             }
 
             @TestMetadata("EnterInFunctionWithExpressionBody.after.kt")
             public void testEnterInFunctionWithExpressionBody() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/EnterInFunctionWithExpressionBody.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/EnterInFunctionWithExpressionBody.after.kt");
             }
 
             @TestMetadata("EnterInMultiDeclaration.after.kt")
             public void testEnterInMultiDeclaration() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/EnterInMultiDeclaration.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/EnterInMultiDeclaration.after.kt");
             }
 
             @TestMetadata("EnterInVariableDeclaration.after.kt")
             public void testEnterInVariableDeclaration() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/EnterInVariableDeclaration.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/EnterInVariableDeclaration.after.kt");
             }
 
             @TestMetadata("EoLCommentAfterCatch.after.kt")
             public void testEoLCommentAfterCatch() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/EoLCommentAfterCatch.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/EoLCommentAfterCatch.after.kt");
             }
 
             @TestMetadata("EoLCommentAfterFor.after.kt")
             public void testEoLCommentAfterFor() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/EoLCommentAfterFor.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/EoLCommentAfterFor.after.kt");
             }
 
             @TestMetadata("EoLCommentAfterIf.after.kt")
             public void testEoLCommentAfterIf() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/EoLCommentAfterIf.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/EoLCommentAfterIf.after.kt");
             }
 
             @TestMetadata("FunctionBlock.after.kt")
             public void testFunctionBlock() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/FunctionBlock.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/FunctionBlock.after.kt");
             }
 
             @TestMetadata("HigherOrderFunction.after.kt")
             public void testHigherOrderFunction() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/HigherOrderFunction.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/HigherOrderFunction.after.kt");
             }
 
             @TestMetadata("HigherOrderFunction2.after.kt")
             public void testHigherOrderFunction2() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/HigherOrderFunction2.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/HigherOrderFunction2.after.kt");
             }
 
             @TestMetadata("HigherOrderFunction3.after.kt")
             public void testHigherOrderFunction3() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/HigherOrderFunction3.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/HigherOrderFunction3.after.kt");
             }
 
             @TestMetadata("InDelegationListAfterColon.after.kt")
             public void testInDelegationListAfterColon() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/InDelegationListAfterColon.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/InDelegationListAfterColon.after.kt");
             }
 
             @TestMetadata("InDelegationListAfterComma.after.kt")
             public void testInDelegationListAfterComma() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/InDelegationListAfterComma.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/InDelegationListAfterComma.after.kt");
             }
 
             @TestMetadata("InDelegationListNotEmpty.after.kt")
             public void testInDelegationListNotEmpty() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/InDelegationListNotEmpty.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/InDelegationListNotEmpty.after.kt");
             }
 
             @TestMetadata("InElseBlockBeforeParenthesis.after.kt")
             public void testInElseBlockBeforeParenthesis() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/InElseBlockBeforeParenthesis.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/InElseBlockBeforeParenthesis.after.kt");
             }
 
             @TestMetadata("InEnumAfterSemicolon.after.kt")
             public void testInEnumAfterSemicolon() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/InEnumAfterSemicolon.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/InEnumAfterSemicolon.after.kt");
             }
 
             @TestMetadata("InEnumInitializerListAfterComma.after.kt")
             public void testInEnumInitializerListAfterComma() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/InEnumInitializerListAfterComma.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/InEnumInitializerListAfterComma.after.kt");
             }
 
             @TestMetadata("InEnumInitializerListNotEmpty.after.kt")
             public void testInEnumInitializerListNotEmpty() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/InEnumInitializerListNotEmpty.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/InEnumInitializerListNotEmpty.after.kt");
             }
 
             @TestMetadata("InIfBlockBeforeParenthesis.after.kt")
             public void testInIfBlockBeforeParenthesis() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/InIfBlockBeforeParenthesis.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/InIfBlockBeforeParenthesis.after.kt");
             }
 
             @TestMetadata("InLabmdaAfterArrow.after.kt")
             public void testInLabmdaAfterArrow() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/InLabmdaAfterArrow.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/InLabmdaAfterArrow.after.kt");
             }
 
             @TestMetadata("InLambdaAfterArrowWithSpaces.after.kt")
             public void testInLambdaAfterArrowWithSpaces() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/InLambdaAfterArrowWithSpaces.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/InLambdaAfterArrowWithSpaces.after.kt");
             }
 
             @TestMetadata("InLambdaBeforeParams.after.kt")
             public void testInLambdaBeforeParams() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/InLambdaBeforeParams.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/InLambdaBeforeParams.after.kt");
             }
 
             @TestMetadata("InLambdaInsideChainCallSameLine.after.kt")
             public void testInLambdaInsideChainCallSameLine() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/InLambdaInsideChainCallSameLine.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/InLambdaInsideChainCallSameLine.after.kt");
             }
 
             @TestMetadata("InLambdaInsideChainCallSameLineWithSpaces.after.kt")
             public void testInLambdaInsideChainCallSameLineWithSpaces() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/InLambdaInsideChainCallSameLineWithSpaces.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/InLambdaInsideChainCallSameLineWithSpaces.after.kt");
             }
 
             @TestMetadata("InLambdaInsideChainCallWithNewLine.after.kt")
             public void testInLambdaInsideChainCallWithNewLine() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/InLambdaInsideChainCallWithNewLine.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/InLambdaInsideChainCallWithNewLine.after.kt");
             }
 
             @TestMetadata("InLambdaInsideChainCallWithNewLineWithSpaces.after.kt")
             public void testInLambdaInsideChainCallWithNewLineWithSpaces() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/InLambdaInsideChainCallWithNewLineWithSpaces.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/InLambdaInsideChainCallWithNewLineWithSpaces.after.kt");
             }
 
             @TestMetadata("InMultilineLambdaAfterArrow.after.kt")
             public void testInMultilineLambdaAfterArrow() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/InMultilineLambdaAfterArrow.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/InMultilineLambdaAfterArrow.after.kt");
             }
 
             @TestMetadata("IndentBeforeElseWithBlock.after.kt")
             public void testIndentBeforeElseWithBlock() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/IndentBeforeElseWithBlock.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/IndentBeforeElseWithBlock.after.kt");
             }
 
             @TestMetadata("IndentBeforeElseWithoutBlock.after.kt")
             public void testIndentBeforeElseWithoutBlock() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/IndentBeforeElseWithoutBlock.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/IndentBeforeElseWithoutBlock.after.kt");
             }
 
             @TestMetadata("IndentNotFinishedVariableEndAfterEquals.after.kt")
             public void testIndentNotFinishedVariableEndAfterEquals() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/IndentNotFinishedVariableEndAfterEquals.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/IndentNotFinishedVariableEndAfterEquals.after.kt");
             }
 
             @TestMetadata("IndentOnFinishedVariableEndAfterEquals.after.kt")
             public void testIndentOnFinishedVariableEndAfterEquals() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/IndentOnFinishedVariableEndAfterEquals.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/IndentOnFinishedVariableEndAfterEquals.after.kt");
             }
 
             @TestMetadata("KT20783.after.kt")
             public void testKT20783() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/KT20783.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/KT20783.after.kt");
             }
 
             @TestMetadata("LambdaInArguments.after.kt")
             public void testLambdaInArguments() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/LambdaInArguments.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/LambdaInArguments.after.kt");
             }
 
             @TestMetadata("LambdaInArguments2.after.kt")
             public void testLambdaInArguments2() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/LambdaInArguments2.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/LambdaInArguments2.after.kt");
             }
 
             @TestMetadata("LargeFile.after.kt")
             public void testLargeFile() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/LargeFile.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/LargeFile.after.kt");
             }
 
             @TestMetadata("LiteralExpression.after.kt")
             public void testLiteralExpression() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/LiteralExpression.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/LiteralExpression.after.kt");
             }
 
             @TestMetadata("LiteralExpression2.after.kt")
             public void testLiteralExpression2() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/LiteralExpression2.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/LiteralExpression2.after.kt");
             }
 
             @TestMetadata("LiteralExpression3.after.kt")
             public void testLiteralExpression3() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/LiteralExpression3.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/LiteralExpression3.after.kt");
             }
 
             @TestMetadata("ModifierListInUnfinishedDeclaration.after.kt")
             public void testModifierListInUnfinishedDeclaration() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/ModifierListInUnfinishedDeclaration.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/ModifierListInUnfinishedDeclaration.after.kt");
             }
 
             @TestMetadata("NotFirstParameter.after.kt")
             public void testNotFirstParameter() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/NotFirstParameter.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/NotFirstParameter.after.kt");
             }
 
             @TestMetadata("ReindentOnUnmatchedBrace.after.kt")
             public void testReindentOnUnmatchedBrace() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/ReindentOnUnmatchedBrace.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/ReindentOnUnmatchedBrace.after.kt");
             }
 
             @TestMetadata("ReturnContinue.after.kt")
             public void testReturnContinue() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/ReturnContinue.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/ReturnContinue.after.kt");
             }
 
             @TestMetadata("Semicolon.after.kt")
             public void testSemicolon() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/Semicolon.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/Semicolon.after.kt");
             }
 
             @TestMetadata("Semicolon2.after.kt")
             public void testSemicolon2() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/Semicolon2.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/Semicolon2.after.kt");
             }
 
             @TestMetadata("SettingAlignMultilineParametersInCalls.after.kt")
             public void testSettingAlignMultilineParametersInCalls() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/SettingAlignMultilineParametersInCalls.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/SettingAlignMultilineParametersInCalls.after.kt");
             }
 
             @TestMetadata("SmartEnterBetweenOpeningAndClosingBrackets.after.kt")
             public void testSmartEnterBetweenOpeningAndClosingBrackets() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/SmartEnterBetweenOpeningAndClosingBrackets.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/SmartEnterBetweenOpeningAndClosingBrackets.after.kt");
             }
 
             @TestMetadata("SmartEnterBetweenOpeningAndClosingBracketsWithInvertedAlignWhenMultiline.after.kt")
             public void testSmartEnterBetweenOpeningAndClosingBracketsWithInvertedAlignWhenMultiline() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/SmartEnterBetweenOpeningAndClosingBracketsWithInvertedAlignWhenMultiline.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/SmartEnterBetweenOpeningAndClosingBracketsWithInvertedAlignWhenMultiline.after.kt");
             }
 
             @TestMetadata("SmartEnterWithTabsInMethodParameters.after.kt")
             public void testSmartEnterWithTabsInMethodParameters() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/SmartEnterWithTabsInMethodParameters.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/SmartEnterWithTabsInMethodParameters.after.kt");
             }
 
             @TestMetadata("SmartEnterWithTabsOnConstructorParameters.after.kt")
             public void testSmartEnterWithTabsOnConstructorParameters() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/SmartEnterWithTabsOnConstructorParameters.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/SmartEnterWithTabsOnConstructorParameters.after.kt");
             }
 
             @TestMetadata("SmartEnterWithTabsOnConstructorParametersWithInvertedAlignWhenMultiline.after.kt")
             public void testSmartEnterWithTabsOnConstructorParametersWithInvertedAlignWhenMultiline() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/SmartEnterWithTabsOnConstructorParametersWithInvertedAlignWhenMultiline.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/SmartEnterWithTabsOnConstructorParametersWithInvertedAlignWhenMultiline.after.kt");
             }
 
             @TestMetadata("SmartEnterWithTrailingCommaAndWhitespaceBeforeLineBreak.after.kt")
             public void testSmartEnterWithTrailingCommaAndWhitespaceBeforeLineBreak() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/SmartEnterWithTrailingCommaAndWhitespaceBeforeLineBreak.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/SmartEnterWithTrailingCommaAndWhitespaceBeforeLineBreak.after.kt");
             }
 
             @TestMetadata("SmartEnterWithoutLineBreakBeforeClosingBracketInMethodParameters.after.kt")
             public void testSmartEnterWithoutLineBreakBeforeClosingBracketInMethodParameters() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/SmartEnterWithoutLineBreakBeforeClosingBracketInMethodParameters.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/SmartEnterWithoutLineBreakBeforeClosingBracketInMethodParameters.after.kt");
             }
 
             @TestMetadata("SplitStringByEnter.after.kt")
             public void testSplitStringByEnter() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/SplitStringByEnter.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/SplitStringByEnter.after.kt");
             }
 
             @TestMetadata("SplitStringByEnterAddParentheses.after.kt")
             public void testSplitStringByEnterAddParentheses() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/SplitStringByEnterAddParentheses.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/SplitStringByEnterAddParentheses.after.kt");
             }
 
             @TestMetadata("SplitStringByEnterBeforeEscapeSequence.after.kt")
             public void testSplitStringByEnterBeforeEscapeSequence() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/SplitStringByEnterBeforeEscapeSequence.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/SplitStringByEnterBeforeEscapeSequence.after.kt");
             }
 
             @TestMetadata("SplitStringByEnterBeforeSubstitution.after.kt")
             public void testSplitStringByEnterBeforeSubstitution() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/SplitStringByEnterBeforeSubstitution.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/SplitStringByEnterBeforeSubstitution.after.kt");
             }
 
             @TestMetadata("SplitStringByEnterEmpty.after.kt")
             public void testSplitStringByEnterEmpty() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/SplitStringByEnterEmpty.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/SplitStringByEnterEmpty.after.kt");
             }
 
             @TestMetadata("SplitStringByEnterExistingParentheses.after.kt")
             public void testSplitStringByEnterExistingParentheses() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/SplitStringByEnterExistingParentheses.after.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/SplitStringByEnterExistingParentheses.after.kt");
             }
         }
     }
 
     @RunWith(JUnit3RunnerWithInners.class)
-    @TestMetadata("../idea/tests/testData/indentationOnNewline")
+    @TestMetadata("../idea/tests/testData/editor/enterHandler")
     public abstract static class InvertedSettings extends AbstractPerformanceTypingIndentationTest {
         @RunWith(JUnit3RunnerWithInners.class)
-        @TestMetadata("../idea/tests/testData/indentationOnNewline/elvis")
+        @TestMetadata("../idea/tests/testData/editor/enterHandler/elvis")
         public static class Elvis extends AbstractPerformanceTypingIndentationTest {
             private void runTest(String testDataFilePath) throws Exception {
                 KotlinTestUtils.runTest(this::doNewlineTestWithInvert, this, testDataFilePath);
@@ -1804,32 +1804,32 @@ public abstract class PerformanceTypingIndentationTestGenerated extends Abstract
 
             @TestMetadata("AfterElvis.after.inv.kt")
             public void testAfterElvis() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/elvis/AfterElvis.after.inv.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/elvis/AfterElvis.after.inv.kt");
             }
 
             @TestMetadata("AfterElvis2.after.inv.kt")
             public void testAfterElvis2() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/elvis/AfterElvis2.after.inv.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/elvis/AfterElvis2.after.inv.kt");
             }
 
             @TestMetadata("AfterElvisInBinaryExpression.after.inv.kt")
             public void testAfterElvisInBinaryExpression() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/elvis/AfterElvisInBinaryExpression.after.inv.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/elvis/AfterElvisInBinaryExpression.after.inv.kt");
             }
 
             @TestMetadata("BeforeElvis.after.inv.kt")
             public void testBeforeElvis() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/elvis/BeforeElvis.after.inv.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/elvis/BeforeElvis.after.inv.kt");
             }
 
             @TestMetadata("BeforeElvisInBinaryExpression.after.inv.kt")
             public void testBeforeElvisInBinaryExpression() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/elvis/BeforeElvisInBinaryExpression.after.inv.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/elvis/BeforeElvisInBinaryExpression.after.inv.kt");
             }
         }
 
         @RunWith(JUnit3RunnerWithInners.class)
-        @TestMetadata("../idea/tests/testData/indentationOnNewline/emptyParameters")
+        @TestMetadata("../idea/tests/testData/editor/enterHandler/emptyParameters")
         public static class EmptyParameters extends AbstractPerformanceTypingIndentationTest {
             private void runTest(String testDataFilePath) throws Exception {
                 KotlinTestUtils.runTest(this::doNewlineTestWithInvert, this, testDataFilePath);
@@ -1837,47 +1837,47 @@ public abstract class PerformanceTypingIndentationTestGenerated extends Abstract
 
             @TestMetadata("EmptyConditionInDoWhile.after.inv.kt")
             public void testEmptyConditionInDoWhile() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyParameters/EmptyConditionInDoWhile.after.inv.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyParameters/EmptyConditionInDoWhile.after.inv.kt");
             }
 
             @TestMetadata("EmptyConditionInFor.after.inv.kt")
             public void testEmptyConditionInFor() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyParameters/EmptyConditionInFor.after.inv.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyParameters/EmptyConditionInFor.after.inv.kt");
             }
 
             @TestMetadata("EmptyConditionInIf.after.inv.kt")
             public void testEmptyConditionInIf() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyParameters/EmptyConditionInIf.after.inv.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyParameters/EmptyConditionInIf.after.inv.kt");
             }
 
             @TestMetadata("EmptyConditionInWhen.after.inv.kt")
             public void testEmptyConditionInWhen() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyParameters/EmptyConditionInWhen.after.inv.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyParameters/EmptyConditionInWhen.after.inv.kt");
             }
 
             @TestMetadata("EmptyConditionInWhile.after.inv.kt")
             public void testEmptyConditionInWhile() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyParameters/EmptyConditionInWhile.after.inv.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyParameters/EmptyConditionInWhile.after.inv.kt");
             }
 
             @TestMetadata("EmptyParameterInDestructuringDeclaration.after.inv.kt")
             public void testEmptyParameterInDestructuringDeclaration() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInDestructuringDeclaration.after.inv.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInDestructuringDeclaration.after.inv.kt");
             }
 
             @TestMetadata("EmptyParameterInDestructuringDeclaration2.after.inv.kt")
             public void testEmptyParameterInDestructuringDeclaration2() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInDestructuringDeclaration2.after.inv.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInDestructuringDeclaration2.after.inv.kt");
             }
 
             @TestMetadata("EmptyParameterInDestructuringDeclaration3.after.inv.kt")
             public void testEmptyParameterInDestructuringDeclaration3() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyParameters/EmptyParameterInDestructuringDeclaration3.after.inv.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyParameters/EmptyParameterInDestructuringDeclaration3.after.inv.kt");
             }
         }
 
         @RunWith(JUnit3RunnerWithInners.class)
-        @TestMetadata("../idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression")
+        @TestMetadata("../idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression")
         public static class EmptyParenthesisInBinaryExpression extends AbstractPerformanceTypingIndentationTest {
             private void runTest(String testDataFilePath) throws Exception {
                 KotlinTestUtils.runTest(this::doNewlineTestWithInvert, this, testDataFilePath);
@@ -1885,57 +1885,57 @@ public abstract class PerformanceTypingIndentationTestGenerated extends Abstract
 
             @TestMetadata("AssignmentAfterEq.after.inv.kt")
             public void testAssignmentAfterEq() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/AssignmentAfterEq.after.inv.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/AssignmentAfterEq.after.inv.kt");
             }
 
             @TestMetadata("BinaryWithTypeExpressions.after.inv.kt")
             public void testBinaryWithTypeExpressions() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/BinaryWithTypeExpressions.after.inv.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/BinaryWithTypeExpressions.after.inv.kt");
             }
 
             @TestMetadata("EmptyArgumentInCallByArrayAccess.after.inv.kt")
             public void testEmptyArgumentInCallByArrayAccess() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/EmptyArgumentInCallByArrayAccess.after.inv.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/EmptyArgumentInCallByArrayAccess.after.inv.kt");
             }
 
             @TestMetadata("EmptyArgumentInCallByDeclaration.after.inv.kt")
             public void testEmptyArgumentInCallByDeclaration() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/EmptyArgumentInCallByDeclaration.after.inv.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/EmptyArgumentInCallByDeclaration.after.inv.kt");
             }
 
             @TestMetadata("InBinaryExpressionInMiddle.after.inv.kt")
             public void testInBinaryExpressionInMiddle() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/InBinaryExpressionInMiddle.after.inv.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/InBinaryExpressionInMiddle.after.inv.kt");
             }
 
             @TestMetadata("InBinaryExpressionUnfinished.after.inv.kt")
             public void testInBinaryExpressionUnfinished() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/InBinaryExpressionUnfinished.after.inv.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/InBinaryExpressionUnfinished.after.inv.kt");
             }
 
             @TestMetadata("InBinaryExpressionUnfinishedInIf.after.inv.kt")
             public void testInBinaryExpressionUnfinishedInIf() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/InBinaryExpressionUnfinishedInIf.after.inv.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/InBinaryExpressionUnfinishedInIf.after.inv.kt");
             }
 
             @TestMetadata("InBinaryExpressionsBeforeCloseParenthesis.after.inv.kt")
             public void testInBinaryExpressionsBeforeCloseParenthesis() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/InBinaryExpressionsBeforeCloseParenthesis.after.inv.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/InBinaryExpressionsBeforeCloseParenthesis.after.inv.kt");
             }
 
             @TestMetadata("InExpressionsParenthesesBeforeOperand.after.inv.kt")
             public void testInExpressionsParenthesesBeforeOperand() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/InExpressionsParenthesesBeforeOperand.after.inv.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/InExpressionsParenthesesBeforeOperand.after.inv.kt");
             }
 
             @TestMetadata("IsExpressionAfterIs.after.inv.kt")
             public void testIsExpressionAfterIs() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/emptyParenthesisInBinaryExpression/IsExpressionAfterIs.after.inv.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/emptyParenthesisInBinaryExpression/IsExpressionAfterIs.after.inv.kt");
             }
         }
 
         @RunWith(JUnit3RunnerWithInners.class)
-        @TestMetadata("../idea/tests/testData/indentationOnNewline/expressionBody")
+        @TestMetadata("../idea/tests/testData/editor/enterHandler/expressionBody")
         public static class ExpressionBody extends AbstractPerformanceTypingIndentationTest {
             private void runTest(String testDataFilePath) throws Exception {
                 KotlinTestUtils.runTest(this::doNewlineTestWithInvert, this, testDataFilePath);
@@ -1943,97 +1943,97 @@ public abstract class PerformanceTypingIndentationTestGenerated extends Abstract
 
             @TestMetadata("AfterFunctionWithExplicitType.after.inv.kt")
             public void testAfterFunctionWithExplicitType() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/expressionBody/AfterFunctionWithExplicitType.after.inv.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/expressionBody/AfterFunctionWithExplicitType.after.inv.kt");
             }
 
             @TestMetadata("AfterFunctionWithInference.after.inv.kt")
             public void testAfterFunctionWithInference() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/expressionBody/AfterFunctionWithInference.after.inv.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/expressionBody/AfterFunctionWithInference.after.inv.kt");
             }
 
             @TestMetadata("AfterFunctionWithTypeParameter.after.inv.kt")
             public void testAfterFunctionWithTypeParameter() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/expressionBody/AfterFunctionWithTypeParameter.after.inv.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/expressionBody/AfterFunctionWithTypeParameter.after.inv.kt");
             }
 
             @TestMetadata("AfterMultideclaration.after.inv.kt")
             public void testAfterMultideclaration() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/expressionBody/AfterMultideclaration.after.inv.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/expressionBody/AfterMultideclaration.after.inv.kt");
             }
 
             @TestMetadata("AfterMutableProperty.after.inv.kt")
             public void testAfterMutableProperty() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/expressionBody/AfterMutableProperty.after.inv.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/expressionBody/AfterMutableProperty.after.inv.kt");
             }
 
             @TestMetadata("AfterPropertyWithExplicitType.after.inv.kt")
             public void testAfterPropertyWithExplicitType() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/expressionBody/AfterPropertyWithExplicitType.after.inv.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/expressionBody/AfterPropertyWithExplicitType.after.inv.kt");
             }
 
             @TestMetadata("AfterPropertyWithInference.after.inv.kt")
             public void testAfterPropertyWithInference() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/expressionBody/AfterPropertyWithInference.after.inv.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/expressionBody/AfterPropertyWithInference.after.inv.kt");
             }
 
             @TestMetadata("AfterPropertyWithReceiver.after.inv.kt")
             public void testAfterPropertyWithReceiver() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/expressionBody/AfterPropertyWithReceiver.after.inv.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/expressionBody/AfterPropertyWithReceiver.after.inv.kt");
             }
 
             @TestMetadata("AfterPropertyWithTypeParameterReceiver.after.inv.kt")
             public void testAfterPropertyWithTypeParameterReceiver() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/expressionBody/AfterPropertyWithTypeParameterReceiver.after.inv.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/expressionBody/AfterPropertyWithTypeParameterReceiver.after.inv.kt");
             }
 
             @TestMetadata("FunctionWithExplicitType.after.inv.kt")
             public void testFunctionWithExplicitType() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/expressionBody/FunctionWithExplicitType.after.inv.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/expressionBody/FunctionWithExplicitType.after.inv.kt");
             }
 
             @TestMetadata("FunctionWithInference.after.inv.kt")
             public void testFunctionWithInference() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/expressionBody/FunctionWithInference.after.inv.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/expressionBody/FunctionWithInference.after.inv.kt");
             }
 
             @TestMetadata("FunctionWithTypeParameter.after.inv.kt")
             public void testFunctionWithTypeParameter() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/expressionBody/FunctionWithTypeParameter.after.inv.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/expressionBody/FunctionWithTypeParameter.after.inv.kt");
             }
 
             @TestMetadata("Multideclaration.after.inv.kt")
             public void testMultideclaration() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/expressionBody/Multideclaration.after.inv.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/expressionBody/Multideclaration.after.inv.kt");
             }
 
             @TestMetadata("MutableProperty.after.inv.kt")
             public void testMutableProperty() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/expressionBody/MutableProperty.after.inv.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/expressionBody/MutableProperty.after.inv.kt");
             }
 
             @TestMetadata("PropertyWithExplicitType.after.inv.kt")
             public void testPropertyWithExplicitType() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/expressionBody/PropertyWithExplicitType.after.inv.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/expressionBody/PropertyWithExplicitType.after.inv.kt");
             }
 
             @TestMetadata("PropertyWithInference.after.inv.kt")
             public void testPropertyWithInference() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/expressionBody/PropertyWithInference.after.inv.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/expressionBody/PropertyWithInference.after.inv.kt");
             }
 
             @TestMetadata("PropertyWithReceiver.after.inv.kt")
             public void testPropertyWithReceiver() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/expressionBody/PropertyWithReceiver.after.inv.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/expressionBody/PropertyWithReceiver.after.inv.kt");
             }
 
             @TestMetadata("PropertyWithTypeParameterReceiver.after.inv.kt")
             public void testPropertyWithTypeParameterReceiver() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/expressionBody/PropertyWithTypeParameterReceiver.after.inv.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/expressionBody/PropertyWithTypeParameterReceiver.after.inv.kt");
             }
         }
 
         @RunWith(JUnit3RunnerWithInners.class)
-        @TestMetadata("../idea/tests/testData/indentationOnNewline")
+        @TestMetadata("../idea/tests/testData/editor/enterHandler")
         public static class Uncategorized extends AbstractPerformanceTypingIndentationTest {
             private void runTest(String testDataFilePath) throws Exception {
                 KotlinTestUtils.runTest(this::doNewlineTestWithInvert, this, testDataFilePath);
@@ -2041,47 +2041,47 @@ public abstract class PerformanceTypingIndentationTestGenerated extends Abstract
 
             @TestMetadata("ArgumentListNormalIndent.after.inv.kt")
             public void testArgumentListNormalIndent() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/ArgumentListNormalIndent.after.inv.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/ArgumentListNormalIndent.after.inv.kt");
             }
 
             @TestMetadata("HigherOrderFunction2.after.inv.kt")
             public void testHigherOrderFunction2() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/HigherOrderFunction2.after.inv.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/HigherOrderFunction2.after.inv.kt");
             }
 
             @TestMetadata("InDelegationListAfterColon.after.inv.kt")
             public void testInDelegationListAfterColon() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/InDelegationListAfterColon.after.inv.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/InDelegationListAfterColon.after.inv.kt");
             }
 
             @TestMetadata("InDelegationListAfterComma.after.inv.kt")
             public void testInDelegationListAfterComma() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/InDelegationListAfterComma.after.inv.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/InDelegationListAfterComma.after.inv.kt");
             }
 
             @TestMetadata("InDelegationListNotEmpty.after.inv.kt")
             public void testInDelegationListNotEmpty() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/InDelegationListNotEmpty.after.inv.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/InDelegationListNotEmpty.after.inv.kt");
             }
 
             @TestMetadata("InEnumAfterSemicolon.after.inv.kt")
             public void testInEnumAfterSemicolon() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/InEnumAfterSemicolon.after.inv.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/InEnumAfterSemicolon.after.inv.kt");
             }
 
             @TestMetadata("InEnumInitializerListAfterComma.after.inv.kt")
             public void testInEnumInitializerListAfterComma() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/InEnumInitializerListAfterComma.after.inv.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/InEnumInitializerListAfterComma.after.inv.kt");
             }
 
             @TestMetadata("InEnumInitializerListNotEmpty.after.inv.kt")
             public void testInEnumInitializerListNotEmpty() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/InEnumInitializerListNotEmpty.after.inv.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/InEnumInitializerListNotEmpty.after.inv.kt");
             }
 
             @TestMetadata("SettingAlignMultilineParametersInCalls.after.inv.kt")
             public void testSettingAlignMultilineParametersInCalls() throws Exception {
-                runTest("../idea/tests/testData/indentationOnNewline/SettingAlignMultilineParametersInCalls.after.inv.kt");
+                runTest("../idea/tests/testData/editor/enterHandler/SettingAlignMultilineParametersInCalls.after.inv.kt");
             }
         }
     }