From 7773a1c4e021b60c797e78b17183fc6e8f92a8ec Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Fri, 15 Jul 2016 13:11:20 +0300 Subject: [PATCH] Inline Variable/Property: Move test data --- .../{ => inlineVariableOrProperty}/Basic.kt | 0 .../Basic.kt.after | 0 .../BasicCaretOnDeclaration.kt | 0 .../BasicCaretOnDeclaration.kt.after | 0 .../InFunctionLiteral.kt | 0 .../InFunctionLiteral.kt.after | 0 .../MethodReference.kt | 0 .../MethodReference.kt.after | 0 .../MultipleInitializers.kt | 0 .../MultipleUsages.kt | 0 .../MultipleUsages.kt.after | 0 .../Parameter.kt | 0 .../SeparateInitializer.kt | 0 .../SeparateInitializer.kt.after | 0 .../SeparateInitializerInTry.kt | 0 .../SeparateInitializerInTry.kt.after | 0 .../UsedInAssignment.kt | 0 .../UsedInAssignment.kt.after | 0 .../ValWithoutInitializer.kt | 0 .../addParenthesis/ArrayAccess.kt | 0 .../addParenthesis/ArrayAccess.kt.after | 0 .../addParenthesis/ArrayAccessDontAdd.kt | 0 .../ArrayAccessDontAdd.kt.after | 0 .../addParenthesis/Binary.kt | 0 .../addParenthesis/Binary.kt.after | 0 .../addParenthesis/BinaryDontAdd.kt | 0 .../addParenthesis/BinaryDontAdd.kt.after | 0 .../addParenthesis/Call.kt | 0 .../addParenthesis/Call.kt.after | 0 .../addParenthesis/CallDontAdd.kt | 0 .../addParenthesis/CallDontAdd.kt.after | 0 .../addParenthesis/Callee.kt | 0 .../addParenthesis/Callee.kt.after | 0 .../addParenthesis/ColonDontAdd.kt | 0 .../addParenthesis/ColonDontAdd.kt.after | 0 .../addParenthesis/If.kt | 0 .../addParenthesis/If.kt.after | 0 .../addParenthesis/IfIntoArrayAccess.kt | 0 .../addParenthesis/IfIntoArrayAccess.kt.after | 0 .../IfIntoArrayAccessBrackets.kt | 0 .../IfIntoArrayAccessBrackets.kt.after | 0 .../addParenthesis/IfIntoBinaryLeft.kt | 0 .../addParenthesis/IfIntoBinaryLeft.kt.after | 0 .../addParenthesis/IfIntoBinaryRight.kt | 0 .../addParenthesis/IfIntoBinaryRight.kt.after | 0 .../addParenthesis/IfIntoBinaryRightLeft.kt | 0 .../IfIntoBinaryRightLeft.kt.after | 0 .../IfIntoBinaryRightLeftDontAdd.kt | 0 .../IfIntoBinaryRightLeftDontAdd.kt.after | 0 .../addParenthesis/IfIntoPostfix.kt | 0 .../addParenthesis/IfIntoPrefix.kt | 0 .../addParenthesis/IfIntoPrefix.kt.after | 0 .../addParenthesis/IsDontAdd.kt | 0 .../addParenthesis/IsDontAdd.kt.after | 0 .../addParenthesis/IsIntoCall.kt | 0 .../addParenthesis/IsIntoCall.kt.after | 0 .../addParenthesis/LeftAssociative.kt | 0 .../addParenthesis/LeftAssociative.kt.after | 0 .../addParenthesis/LeftAssociativeBoolean.kt | 0 .../LeftAssociativeBoolean.kt.after | 0 .../addParenthesis/LeftAssociativeDontAdd.kt | 0 .../LeftAssociativeDontAdd.kt.after | 0 .../addParenthesis/PostfixIntoPrefix.kt | 0 .../addParenthesis/PostfixIntoPrefix.kt.after | 0 .../addParenthesis/PrefixIntoPostfix.kt | 0 .../addParenthesis/PrefixIntoPostfix.kt.after | 0 .../addParenthesis/Qualified.kt | 0 .../addParenthesis/Qualified.kt.after | 0 .../addParenthesis/QualifiedDontAdd.kt | 0 .../addParenthesis/QualifiedDontAdd.kt.after | 0 .../addParenthesis/StringTemplate.kt | 0 .../addParenthesis/StringTemplate.kt.after | 0 .../StringTemplateAlreadyInBraces.kt | 0 .../StringTemplateAlreadyInBraces.kt.after | 0 .../addParenthesis/StringTemplateDontAdd.kt | 0 .../StringTemplateDontAdd.kt.after | 0 .../addParenthesis/UnaryIntoBinary.kt | 0 .../addParenthesis/UnaryIntoBinary.kt.after | 0 .../EnoughDontExplicate.kt | 0 .../EnoughDontExplicate.kt.after | 0 .../explicateParameterTypes/ErrorTypes.kt | 0 .../ErrorTypes.kt.after | 0 .../explicateParameterTypes/It.kt | 0 .../explicateParameterTypes/It.kt.after | 0 .../explicateParameterTypes/ItMultiLine.kt | 0 .../ItMultiLine.kt.after | 0 .../explicateParameterTypes/Parenthesized.kt | 0 .../Parenthesized.kt.after | 0 .../explicateParameterTypes/Simplest.kt | 0 .../explicateParameterTypes/Simplest.kt.after | 0 .../TrivialDontExplicate.kt | 0 .../TrivialDontExplicate.kt.after | 0 .../explicateTypeArgument/DeeperNestedCall.kt | 0 .../DeeperNestedCall.kt.after | 0 .../EnoughDontExplicate.kt | 0 .../EnoughDontExplicate.kt.after | 0 .../explicateTypeArgument/ExplicateForSome.kt | 0 .../ExplicateForSome.kt.after | 0 .../explicateTypeArgument/InStringTemplate.kt | 0 .../InStringTemplate.kt.after | 0 .../explicateTypeArgument/NestedCall.kt | 0 .../explicateTypeArgument/NestedCall.kt.after | 0 .../explicateTypeArgument/Parenthesized.kt | 0 .../Parenthesized.kt.after | 0 .../explicateTypeArgument/Qualified.kt | 0 .../explicateTypeArgument/Qualified.kt.after | 0 .../explicateTypeArgument/Simplest.kt | 0 .../explicateTypeArgument/Simplest.kt.after | 0 .../TrivialDontExplicate.kt | 0 .../TrivialDontExplicate.kt.after | 0 .../ifInQualifiedExpression.kt | 0 .../ifInQualifiedExpression.kt.after | 0 .../lessAndGreaterInCallArgs.kt | 0 .../lessAndGreaterInCallArgs.kt.after | 0 .../noUsages.kt | 0 .../property/Basic.kt | 0 .../property/Basic.kt.after | 0 .../property/ClassObjectProperty.kt | 0 .../property/ClassObjectProperty.kt.after | 0 .../property/ExtensionProperty.kt | 0 .../property/InstanceProperty.kt | 0 .../property/InstanceProperty.kt.after | 0 .../property/ObjectProperty.kt | 0 .../property/ObjectProperty.kt.after | 0 .../property/QualifiedUsage.kt | 0 .../property/QualifiedUsage.kt.after | 0 .../property/WithGetter.kt | 0 .../property/WithInitializerAndGetter.kt | 0 .../property/keepImport.1.kt | 0 .../property/keepImport.1.kt.after | 0 .../property/keepImport.kt | 0 .../property/keepImport.kt.after | 0 .../property/multiplePackages.1.kt | 0 .../property/multiplePackages.1.kt.after | 0 .../property/multiplePackages.2.kt | 0 .../property/multiplePackages.2.kt.after | 0 .../property/multiplePackages.3.kt | 0 .../property/multiplePackages.3.kt.after | 0 .../property/multiplePackages.4.kt | 0 .../property/multiplePackages.4.kt.after | 0 .../property/multiplePackages.5.kt | 0 .../property/multiplePackages.5.kt.after | 0 .../property/multiplePackages.kt | 0 .../property/multiplePackages.kt.after | 0 .../property/removeImport.1.kt | 0 .../property/removeImport.1.kt.after | 0 .../property/removeImport.kt | 0 .../property/removeImport.kt.after | 0 .../semicolon.kt | 0 .../semicolon.kt.after | 0 .../semicolonWithSpacesAndComments.kt | 0 .../semicolonWithSpacesAndComments.kt.after | 0 .../stringTemplates/addBraces.kt | 0 .../stringTemplates/addBraces.kt.after | 0 .../stringTemplates/blockEntry.kt | 0 .../stringTemplates/blockEntry.kt.after | 0 .../stringTemplates/empty.kt | 0 .../stringTemplates/empty.kt.after | 0 .../stringTemplates/nonEmpty.kt | 0 .../stringTemplates/nonEmpty.kt.after | 0 .../stringTemplates/nonRawToRaw.kt | 0 .../stringTemplates/nonRawToRaw.kt.after | 0 .../stringTemplates/rawString.kt | 0 .../stringTemplates/rawString.kt.after | 0 .../stringTemplates/rawToNonRaw.kt | 0 .../stringTemplates/rawToNonRaw.kt.after | 0 .../varNoWrite.kt | 0 .../varNoWrite.kt.after | 0 .../varWithAssignment.kt | 0 .../varWithInc.kt | 0 .../inline/InlineTestGenerated.java | 979 +++++++++--------- 171 files changed, 494 insertions(+), 485 deletions(-) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/Basic.kt (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/Basic.kt.after (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/BasicCaretOnDeclaration.kt (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/BasicCaretOnDeclaration.kt.after (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/InFunctionLiteral.kt (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/InFunctionLiteral.kt.after (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/MethodReference.kt (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/MethodReference.kt.after (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/MultipleInitializers.kt (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/MultipleUsages.kt (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/MultipleUsages.kt.after (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/Parameter.kt (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/SeparateInitializer.kt (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/SeparateInitializer.kt.after (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/SeparateInitializerInTry.kt (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/SeparateInitializerInTry.kt.after (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/UsedInAssignment.kt (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/UsedInAssignment.kt.after (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/ValWithoutInitializer.kt (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/addParenthesis/ArrayAccess.kt (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/addParenthesis/ArrayAccess.kt.after (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/addParenthesis/ArrayAccessDontAdd.kt (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/addParenthesis/ArrayAccessDontAdd.kt.after (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/addParenthesis/Binary.kt (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/addParenthesis/Binary.kt.after (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/addParenthesis/BinaryDontAdd.kt (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/addParenthesis/BinaryDontAdd.kt.after (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/addParenthesis/Call.kt (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/addParenthesis/Call.kt.after (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/addParenthesis/CallDontAdd.kt (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/addParenthesis/CallDontAdd.kt.after (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/addParenthesis/Callee.kt (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/addParenthesis/Callee.kt.after (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/addParenthesis/ColonDontAdd.kt (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/addParenthesis/ColonDontAdd.kt.after (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/addParenthesis/If.kt (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/addParenthesis/If.kt.after (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/addParenthesis/IfIntoArrayAccess.kt (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/addParenthesis/IfIntoArrayAccess.kt.after (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/addParenthesis/IfIntoArrayAccessBrackets.kt (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/addParenthesis/IfIntoArrayAccessBrackets.kt.after (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/addParenthesis/IfIntoBinaryLeft.kt (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/addParenthesis/IfIntoBinaryLeft.kt.after (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/addParenthesis/IfIntoBinaryRight.kt (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/addParenthesis/IfIntoBinaryRight.kt.after (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/addParenthesis/IfIntoBinaryRightLeft.kt (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/addParenthesis/IfIntoBinaryRightLeft.kt.after (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/addParenthesis/IfIntoBinaryRightLeftDontAdd.kt (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/addParenthesis/IfIntoBinaryRightLeftDontAdd.kt.after (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/addParenthesis/IfIntoPostfix.kt (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/addParenthesis/IfIntoPrefix.kt (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/addParenthesis/IfIntoPrefix.kt.after (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/addParenthesis/IsDontAdd.kt (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/addParenthesis/IsDontAdd.kt.after (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/addParenthesis/IsIntoCall.kt (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/addParenthesis/IsIntoCall.kt.after (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/addParenthesis/LeftAssociative.kt (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/addParenthesis/LeftAssociative.kt.after (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/addParenthesis/LeftAssociativeBoolean.kt (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/addParenthesis/LeftAssociativeBoolean.kt.after (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/addParenthesis/LeftAssociativeDontAdd.kt (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/addParenthesis/LeftAssociativeDontAdd.kt.after (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/addParenthesis/PostfixIntoPrefix.kt (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/addParenthesis/PostfixIntoPrefix.kt.after (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/addParenthesis/PrefixIntoPostfix.kt (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/addParenthesis/PrefixIntoPostfix.kt.after (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/addParenthesis/Qualified.kt (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/addParenthesis/Qualified.kt.after (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/addParenthesis/QualifiedDontAdd.kt (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/addParenthesis/QualifiedDontAdd.kt.after (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/addParenthesis/StringTemplate.kt (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/addParenthesis/StringTemplate.kt.after (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/addParenthesis/StringTemplateAlreadyInBraces.kt (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/addParenthesis/StringTemplateAlreadyInBraces.kt.after (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/addParenthesis/StringTemplateDontAdd.kt (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/addParenthesis/StringTemplateDontAdd.kt.after (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/addParenthesis/UnaryIntoBinary.kt (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/addParenthesis/UnaryIntoBinary.kt.after (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/explicateParameterTypes/EnoughDontExplicate.kt (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/explicateParameterTypes/EnoughDontExplicate.kt.after (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/explicateParameterTypes/ErrorTypes.kt (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/explicateParameterTypes/ErrorTypes.kt.after (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/explicateParameterTypes/It.kt (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/explicateParameterTypes/It.kt.after (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/explicateParameterTypes/ItMultiLine.kt (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/explicateParameterTypes/ItMultiLine.kt.after (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/explicateParameterTypes/Parenthesized.kt (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/explicateParameterTypes/Parenthesized.kt.after (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/explicateParameterTypes/Simplest.kt (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/explicateParameterTypes/Simplest.kt.after (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/explicateParameterTypes/TrivialDontExplicate.kt (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/explicateParameterTypes/TrivialDontExplicate.kt.after (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/explicateTypeArgument/DeeperNestedCall.kt (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/explicateTypeArgument/DeeperNestedCall.kt.after (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/explicateTypeArgument/EnoughDontExplicate.kt (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/explicateTypeArgument/EnoughDontExplicate.kt.after (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/explicateTypeArgument/ExplicateForSome.kt (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/explicateTypeArgument/ExplicateForSome.kt.after (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/explicateTypeArgument/InStringTemplate.kt (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/explicateTypeArgument/InStringTemplate.kt.after (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/explicateTypeArgument/NestedCall.kt (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/explicateTypeArgument/NestedCall.kt.after (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/explicateTypeArgument/Parenthesized.kt (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/explicateTypeArgument/Parenthesized.kt.after (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/explicateTypeArgument/Qualified.kt (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/explicateTypeArgument/Qualified.kt.after (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/explicateTypeArgument/Simplest.kt (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/explicateTypeArgument/Simplest.kt.after (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/explicateTypeArgument/TrivialDontExplicate.kt (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/explicateTypeArgument/TrivialDontExplicate.kt.after (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/ifInQualifiedExpression.kt (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/ifInQualifiedExpression.kt.after (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/lessAndGreaterInCallArgs.kt (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/lessAndGreaterInCallArgs.kt.after (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/noUsages.kt (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/property/Basic.kt (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/property/Basic.kt.after (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/property/ClassObjectProperty.kt (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/property/ClassObjectProperty.kt.after (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/property/ExtensionProperty.kt (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/property/InstanceProperty.kt (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/property/InstanceProperty.kt.after (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/property/ObjectProperty.kt (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/property/ObjectProperty.kt.after (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/property/QualifiedUsage.kt (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/property/QualifiedUsage.kt.after (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/property/WithGetter.kt (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/property/WithInitializerAndGetter.kt (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/property/keepImport.1.kt (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/property/keepImport.1.kt.after (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/property/keepImport.kt (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/property/keepImport.kt.after (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/property/multiplePackages.1.kt (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/property/multiplePackages.1.kt.after (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/property/multiplePackages.2.kt (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/property/multiplePackages.2.kt.after (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/property/multiplePackages.3.kt (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/property/multiplePackages.3.kt.after (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/property/multiplePackages.4.kt (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/property/multiplePackages.4.kt.after (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/property/multiplePackages.5.kt (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/property/multiplePackages.5.kt.after (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/property/multiplePackages.kt (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/property/multiplePackages.kt.after (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/property/removeImport.1.kt (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/property/removeImport.1.kt.after (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/property/removeImport.kt (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/property/removeImport.kt.after (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/semicolon.kt (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/semicolon.kt.after (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/semicolonWithSpacesAndComments.kt (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/semicolonWithSpacesAndComments.kt.after (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/stringTemplates/addBraces.kt (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/stringTemplates/addBraces.kt.after (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/stringTemplates/blockEntry.kt (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/stringTemplates/blockEntry.kt.after (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/stringTemplates/empty.kt (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/stringTemplates/empty.kt.after (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/stringTemplates/nonEmpty.kt (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/stringTemplates/nonEmpty.kt.after (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/stringTemplates/nonRawToRaw.kt (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/stringTemplates/nonRawToRaw.kt.after (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/stringTemplates/rawString.kt (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/stringTemplates/rawString.kt.after (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/stringTemplates/rawToNonRaw.kt (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/stringTemplates/rawToNonRaw.kt.after (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/varNoWrite.kt (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/varNoWrite.kt.after (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/varWithAssignment.kt (100%) rename idea/testData/refactoring/inline/{ => inlineVariableOrProperty}/varWithInc.kt (100%) diff --git a/idea/testData/refactoring/inline/Basic.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/Basic.kt similarity index 100% rename from idea/testData/refactoring/inline/Basic.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/Basic.kt diff --git a/idea/testData/refactoring/inline/Basic.kt.after b/idea/testData/refactoring/inline/inlineVariableOrProperty/Basic.kt.after similarity index 100% rename from idea/testData/refactoring/inline/Basic.kt.after rename to idea/testData/refactoring/inline/inlineVariableOrProperty/Basic.kt.after diff --git a/idea/testData/refactoring/inline/BasicCaretOnDeclaration.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/BasicCaretOnDeclaration.kt similarity index 100% rename from idea/testData/refactoring/inline/BasicCaretOnDeclaration.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/BasicCaretOnDeclaration.kt diff --git a/idea/testData/refactoring/inline/BasicCaretOnDeclaration.kt.after b/idea/testData/refactoring/inline/inlineVariableOrProperty/BasicCaretOnDeclaration.kt.after similarity index 100% rename from idea/testData/refactoring/inline/BasicCaretOnDeclaration.kt.after rename to idea/testData/refactoring/inline/inlineVariableOrProperty/BasicCaretOnDeclaration.kt.after diff --git a/idea/testData/refactoring/inline/InFunctionLiteral.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/InFunctionLiteral.kt similarity index 100% rename from idea/testData/refactoring/inline/InFunctionLiteral.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/InFunctionLiteral.kt diff --git a/idea/testData/refactoring/inline/InFunctionLiteral.kt.after b/idea/testData/refactoring/inline/inlineVariableOrProperty/InFunctionLiteral.kt.after similarity index 100% rename from idea/testData/refactoring/inline/InFunctionLiteral.kt.after rename to idea/testData/refactoring/inline/inlineVariableOrProperty/InFunctionLiteral.kt.after diff --git a/idea/testData/refactoring/inline/MethodReference.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/MethodReference.kt similarity index 100% rename from idea/testData/refactoring/inline/MethodReference.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/MethodReference.kt diff --git a/idea/testData/refactoring/inline/MethodReference.kt.after b/idea/testData/refactoring/inline/inlineVariableOrProperty/MethodReference.kt.after similarity index 100% rename from idea/testData/refactoring/inline/MethodReference.kt.after rename to idea/testData/refactoring/inline/inlineVariableOrProperty/MethodReference.kt.after diff --git a/idea/testData/refactoring/inline/MultipleInitializers.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/MultipleInitializers.kt similarity index 100% rename from idea/testData/refactoring/inline/MultipleInitializers.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/MultipleInitializers.kt diff --git a/idea/testData/refactoring/inline/MultipleUsages.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/MultipleUsages.kt similarity index 100% rename from idea/testData/refactoring/inline/MultipleUsages.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/MultipleUsages.kt diff --git a/idea/testData/refactoring/inline/MultipleUsages.kt.after b/idea/testData/refactoring/inline/inlineVariableOrProperty/MultipleUsages.kt.after similarity index 100% rename from idea/testData/refactoring/inline/MultipleUsages.kt.after rename to idea/testData/refactoring/inline/inlineVariableOrProperty/MultipleUsages.kt.after diff --git a/idea/testData/refactoring/inline/Parameter.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/Parameter.kt similarity index 100% rename from idea/testData/refactoring/inline/Parameter.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/Parameter.kt diff --git a/idea/testData/refactoring/inline/SeparateInitializer.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/SeparateInitializer.kt similarity index 100% rename from idea/testData/refactoring/inline/SeparateInitializer.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/SeparateInitializer.kt diff --git a/idea/testData/refactoring/inline/SeparateInitializer.kt.after b/idea/testData/refactoring/inline/inlineVariableOrProperty/SeparateInitializer.kt.after similarity index 100% rename from idea/testData/refactoring/inline/SeparateInitializer.kt.after rename to idea/testData/refactoring/inline/inlineVariableOrProperty/SeparateInitializer.kt.after diff --git a/idea/testData/refactoring/inline/SeparateInitializerInTry.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/SeparateInitializerInTry.kt similarity index 100% rename from idea/testData/refactoring/inline/SeparateInitializerInTry.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/SeparateInitializerInTry.kt diff --git a/idea/testData/refactoring/inline/SeparateInitializerInTry.kt.after b/idea/testData/refactoring/inline/inlineVariableOrProperty/SeparateInitializerInTry.kt.after similarity index 100% rename from idea/testData/refactoring/inline/SeparateInitializerInTry.kt.after rename to idea/testData/refactoring/inline/inlineVariableOrProperty/SeparateInitializerInTry.kt.after diff --git a/idea/testData/refactoring/inline/UsedInAssignment.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/UsedInAssignment.kt similarity index 100% rename from idea/testData/refactoring/inline/UsedInAssignment.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/UsedInAssignment.kt diff --git a/idea/testData/refactoring/inline/UsedInAssignment.kt.after b/idea/testData/refactoring/inline/inlineVariableOrProperty/UsedInAssignment.kt.after similarity index 100% rename from idea/testData/refactoring/inline/UsedInAssignment.kt.after rename to idea/testData/refactoring/inline/inlineVariableOrProperty/UsedInAssignment.kt.after diff --git a/idea/testData/refactoring/inline/ValWithoutInitializer.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/ValWithoutInitializer.kt similarity index 100% rename from idea/testData/refactoring/inline/ValWithoutInitializer.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/ValWithoutInitializer.kt diff --git a/idea/testData/refactoring/inline/addParenthesis/ArrayAccess.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/ArrayAccess.kt similarity index 100% rename from idea/testData/refactoring/inline/addParenthesis/ArrayAccess.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/ArrayAccess.kt diff --git a/idea/testData/refactoring/inline/addParenthesis/ArrayAccess.kt.after b/idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/ArrayAccess.kt.after similarity index 100% rename from idea/testData/refactoring/inline/addParenthesis/ArrayAccess.kt.after rename to idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/ArrayAccess.kt.after diff --git a/idea/testData/refactoring/inline/addParenthesis/ArrayAccessDontAdd.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/ArrayAccessDontAdd.kt similarity index 100% rename from idea/testData/refactoring/inline/addParenthesis/ArrayAccessDontAdd.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/ArrayAccessDontAdd.kt diff --git a/idea/testData/refactoring/inline/addParenthesis/ArrayAccessDontAdd.kt.after b/idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/ArrayAccessDontAdd.kt.after similarity index 100% rename from idea/testData/refactoring/inline/addParenthesis/ArrayAccessDontAdd.kt.after rename to idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/ArrayAccessDontAdd.kt.after diff --git a/idea/testData/refactoring/inline/addParenthesis/Binary.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/Binary.kt similarity index 100% rename from idea/testData/refactoring/inline/addParenthesis/Binary.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/Binary.kt diff --git a/idea/testData/refactoring/inline/addParenthesis/Binary.kt.after b/idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/Binary.kt.after similarity index 100% rename from idea/testData/refactoring/inline/addParenthesis/Binary.kt.after rename to idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/Binary.kt.after diff --git a/idea/testData/refactoring/inline/addParenthesis/BinaryDontAdd.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/BinaryDontAdd.kt similarity index 100% rename from idea/testData/refactoring/inline/addParenthesis/BinaryDontAdd.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/BinaryDontAdd.kt diff --git a/idea/testData/refactoring/inline/addParenthesis/BinaryDontAdd.kt.after b/idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/BinaryDontAdd.kt.after similarity index 100% rename from idea/testData/refactoring/inline/addParenthesis/BinaryDontAdd.kt.after rename to idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/BinaryDontAdd.kt.after diff --git a/idea/testData/refactoring/inline/addParenthesis/Call.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/Call.kt similarity index 100% rename from idea/testData/refactoring/inline/addParenthesis/Call.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/Call.kt diff --git a/idea/testData/refactoring/inline/addParenthesis/Call.kt.after b/idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/Call.kt.after similarity index 100% rename from idea/testData/refactoring/inline/addParenthesis/Call.kt.after rename to idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/Call.kt.after diff --git a/idea/testData/refactoring/inline/addParenthesis/CallDontAdd.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/CallDontAdd.kt similarity index 100% rename from idea/testData/refactoring/inline/addParenthesis/CallDontAdd.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/CallDontAdd.kt diff --git a/idea/testData/refactoring/inline/addParenthesis/CallDontAdd.kt.after b/idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/CallDontAdd.kt.after similarity index 100% rename from idea/testData/refactoring/inline/addParenthesis/CallDontAdd.kt.after rename to idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/CallDontAdd.kt.after diff --git a/idea/testData/refactoring/inline/addParenthesis/Callee.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/Callee.kt similarity index 100% rename from idea/testData/refactoring/inline/addParenthesis/Callee.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/Callee.kt diff --git a/idea/testData/refactoring/inline/addParenthesis/Callee.kt.after b/idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/Callee.kt.after similarity index 100% rename from idea/testData/refactoring/inline/addParenthesis/Callee.kt.after rename to idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/Callee.kt.after diff --git a/idea/testData/refactoring/inline/addParenthesis/ColonDontAdd.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/ColonDontAdd.kt similarity index 100% rename from idea/testData/refactoring/inline/addParenthesis/ColonDontAdd.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/ColonDontAdd.kt diff --git a/idea/testData/refactoring/inline/addParenthesis/ColonDontAdd.kt.after b/idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/ColonDontAdd.kt.after similarity index 100% rename from idea/testData/refactoring/inline/addParenthesis/ColonDontAdd.kt.after rename to idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/ColonDontAdd.kt.after diff --git a/idea/testData/refactoring/inline/addParenthesis/If.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/If.kt similarity index 100% rename from idea/testData/refactoring/inline/addParenthesis/If.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/If.kt diff --git a/idea/testData/refactoring/inline/addParenthesis/If.kt.after b/idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/If.kt.after similarity index 100% rename from idea/testData/refactoring/inline/addParenthesis/If.kt.after rename to idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/If.kt.after diff --git a/idea/testData/refactoring/inline/addParenthesis/IfIntoArrayAccess.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/IfIntoArrayAccess.kt similarity index 100% rename from idea/testData/refactoring/inline/addParenthesis/IfIntoArrayAccess.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/IfIntoArrayAccess.kt diff --git a/idea/testData/refactoring/inline/addParenthesis/IfIntoArrayAccess.kt.after b/idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/IfIntoArrayAccess.kt.after similarity index 100% rename from idea/testData/refactoring/inline/addParenthesis/IfIntoArrayAccess.kt.after rename to idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/IfIntoArrayAccess.kt.after diff --git a/idea/testData/refactoring/inline/addParenthesis/IfIntoArrayAccessBrackets.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/IfIntoArrayAccessBrackets.kt similarity index 100% rename from idea/testData/refactoring/inline/addParenthesis/IfIntoArrayAccessBrackets.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/IfIntoArrayAccessBrackets.kt diff --git a/idea/testData/refactoring/inline/addParenthesis/IfIntoArrayAccessBrackets.kt.after b/idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/IfIntoArrayAccessBrackets.kt.after similarity index 100% rename from idea/testData/refactoring/inline/addParenthesis/IfIntoArrayAccessBrackets.kt.after rename to idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/IfIntoArrayAccessBrackets.kt.after diff --git a/idea/testData/refactoring/inline/addParenthesis/IfIntoBinaryLeft.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/IfIntoBinaryLeft.kt similarity index 100% rename from idea/testData/refactoring/inline/addParenthesis/IfIntoBinaryLeft.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/IfIntoBinaryLeft.kt diff --git a/idea/testData/refactoring/inline/addParenthesis/IfIntoBinaryLeft.kt.after b/idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/IfIntoBinaryLeft.kt.after similarity index 100% rename from idea/testData/refactoring/inline/addParenthesis/IfIntoBinaryLeft.kt.after rename to idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/IfIntoBinaryLeft.kt.after diff --git a/idea/testData/refactoring/inline/addParenthesis/IfIntoBinaryRight.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/IfIntoBinaryRight.kt similarity index 100% rename from idea/testData/refactoring/inline/addParenthesis/IfIntoBinaryRight.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/IfIntoBinaryRight.kt diff --git a/idea/testData/refactoring/inline/addParenthesis/IfIntoBinaryRight.kt.after b/idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/IfIntoBinaryRight.kt.after similarity index 100% rename from idea/testData/refactoring/inline/addParenthesis/IfIntoBinaryRight.kt.after rename to idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/IfIntoBinaryRight.kt.after diff --git a/idea/testData/refactoring/inline/addParenthesis/IfIntoBinaryRightLeft.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/IfIntoBinaryRightLeft.kt similarity index 100% rename from idea/testData/refactoring/inline/addParenthesis/IfIntoBinaryRightLeft.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/IfIntoBinaryRightLeft.kt diff --git a/idea/testData/refactoring/inline/addParenthesis/IfIntoBinaryRightLeft.kt.after b/idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/IfIntoBinaryRightLeft.kt.after similarity index 100% rename from idea/testData/refactoring/inline/addParenthesis/IfIntoBinaryRightLeft.kt.after rename to idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/IfIntoBinaryRightLeft.kt.after diff --git a/idea/testData/refactoring/inline/addParenthesis/IfIntoBinaryRightLeftDontAdd.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/IfIntoBinaryRightLeftDontAdd.kt similarity index 100% rename from idea/testData/refactoring/inline/addParenthesis/IfIntoBinaryRightLeftDontAdd.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/IfIntoBinaryRightLeftDontAdd.kt diff --git a/idea/testData/refactoring/inline/addParenthesis/IfIntoBinaryRightLeftDontAdd.kt.after b/idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/IfIntoBinaryRightLeftDontAdd.kt.after similarity index 100% rename from idea/testData/refactoring/inline/addParenthesis/IfIntoBinaryRightLeftDontAdd.kt.after rename to idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/IfIntoBinaryRightLeftDontAdd.kt.after diff --git a/idea/testData/refactoring/inline/addParenthesis/IfIntoPostfix.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/IfIntoPostfix.kt similarity index 100% rename from idea/testData/refactoring/inline/addParenthesis/IfIntoPostfix.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/IfIntoPostfix.kt diff --git a/idea/testData/refactoring/inline/addParenthesis/IfIntoPrefix.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/IfIntoPrefix.kt similarity index 100% rename from idea/testData/refactoring/inline/addParenthesis/IfIntoPrefix.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/IfIntoPrefix.kt diff --git a/idea/testData/refactoring/inline/addParenthesis/IfIntoPrefix.kt.after b/idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/IfIntoPrefix.kt.after similarity index 100% rename from idea/testData/refactoring/inline/addParenthesis/IfIntoPrefix.kt.after rename to idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/IfIntoPrefix.kt.after diff --git a/idea/testData/refactoring/inline/addParenthesis/IsDontAdd.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/IsDontAdd.kt similarity index 100% rename from idea/testData/refactoring/inline/addParenthesis/IsDontAdd.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/IsDontAdd.kt diff --git a/idea/testData/refactoring/inline/addParenthesis/IsDontAdd.kt.after b/idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/IsDontAdd.kt.after similarity index 100% rename from idea/testData/refactoring/inline/addParenthesis/IsDontAdd.kt.after rename to idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/IsDontAdd.kt.after diff --git a/idea/testData/refactoring/inline/addParenthesis/IsIntoCall.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/IsIntoCall.kt similarity index 100% rename from idea/testData/refactoring/inline/addParenthesis/IsIntoCall.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/IsIntoCall.kt diff --git a/idea/testData/refactoring/inline/addParenthesis/IsIntoCall.kt.after b/idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/IsIntoCall.kt.after similarity index 100% rename from idea/testData/refactoring/inline/addParenthesis/IsIntoCall.kt.after rename to idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/IsIntoCall.kt.after diff --git a/idea/testData/refactoring/inline/addParenthesis/LeftAssociative.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/LeftAssociative.kt similarity index 100% rename from idea/testData/refactoring/inline/addParenthesis/LeftAssociative.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/LeftAssociative.kt diff --git a/idea/testData/refactoring/inline/addParenthesis/LeftAssociative.kt.after b/idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/LeftAssociative.kt.after similarity index 100% rename from idea/testData/refactoring/inline/addParenthesis/LeftAssociative.kt.after rename to idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/LeftAssociative.kt.after diff --git a/idea/testData/refactoring/inline/addParenthesis/LeftAssociativeBoolean.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/LeftAssociativeBoolean.kt similarity index 100% rename from idea/testData/refactoring/inline/addParenthesis/LeftAssociativeBoolean.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/LeftAssociativeBoolean.kt diff --git a/idea/testData/refactoring/inline/addParenthesis/LeftAssociativeBoolean.kt.after b/idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/LeftAssociativeBoolean.kt.after similarity index 100% rename from idea/testData/refactoring/inline/addParenthesis/LeftAssociativeBoolean.kt.after rename to idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/LeftAssociativeBoolean.kt.after diff --git a/idea/testData/refactoring/inline/addParenthesis/LeftAssociativeDontAdd.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/LeftAssociativeDontAdd.kt similarity index 100% rename from idea/testData/refactoring/inline/addParenthesis/LeftAssociativeDontAdd.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/LeftAssociativeDontAdd.kt diff --git a/idea/testData/refactoring/inline/addParenthesis/LeftAssociativeDontAdd.kt.after b/idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/LeftAssociativeDontAdd.kt.after similarity index 100% rename from idea/testData/refactoring/inline/addParenthesis/LeftAssociativeDontAdd.kt.after rename to idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/LeftAssociativeDontAdd.kt.after diff --git a/idea/testData/refactoring/inline/addParenthesis/PostfixIntoPrefix.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/PostfixIntoPrefix.kt similarity index 100% rename from idea/testData/refactoring/inline/addParenthesis/PostfixIntoPrefix.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/PostfixIntoPrefix.kt diff --git a/idea/testData/refactoring/inline/addParenthesis/PostfixIntoPrefix.kt.after b/idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/PostfixIntoPrefix.kt.after similarity index 100% rename from idea/testData/refactoring/inline/addParenthesis/PostfixIntoPrefix.kt.after rename to idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/PostfixIntoPrefix.kt.after diff --git a/idea/testData/refactoring/inline/addParenthesis/PrefixIntoPostfix.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/PrefixIntoPostfix.kt similarity index 100% rename from idea/testData/refactoring/inline/addParenthesis/PrefixIntoPostfix.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/PrefixIntoPostfix.kt diff --git a/idea/testData/refactoring/inline/addParenthesis/PrefixIntoPostfix.kt.after b/idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/PrefixIntoPostfix.kt.after similarity index 100% rename from idea/testData/refactoring/inline/addParenthesis/PrefixIntoPostfix.kt.after rename to idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/PrefixIntoPostfix.kt.after diff --git a/idea/testData/refactoring/inline/addParenthesis/Qualified.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/Qualified.kt similarity index 100% rename from idea/testData/refactoring/inline/addParenthesis/Qualified.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/Qualified.kt diff --git a/idea/testData/refactoring/inline/addParenthesis/Qualified.kt.after b/idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/Qualified.kt.after similarity index 100% rename from idea/testData/refactoring/inline/addParenthesis/Qualified.kt.after rename to idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/Qualified.kt.after diff --git a/idea/testData/refactoring/inline/addParenthesis/QualifiedDontAdd.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/QualifiedDontAdd.kt similarity index 100% rename from idea/testData/refactoring/inline/addParenthesis/QualifiedDontAdd.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/QualifiedDontAdd.kt diff --git a/idea/testData/refactoring/inline/addParenthesis/QualifiedDontAdd.kt.after b/idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/QualifiedDontAdd.kt.after similarity index 100% rename from idea/testData/refactoring/inline/addParenthesis/QualifiedDontAdd.kt.after rename to idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/QualifiedDontAdd.kt.after diff --git a/idea/testData/refactoring/inline/addParenthesis/StringTemplate.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/StringTemplate.kt similarity index 100% rename from idea/testData/refactoring/inline/addParenthesis/StringTemplate.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/StringTemplate.kt diff --git a/idea/testData/refactoring/inline/addParenthesis/StringTemplate.kt.after b/idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/StringTemplate.kt.after similarity index 100% rename from idea/testData/refactoring/inline/addParenthesis/StringTemplate.kt.after rename to idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/StringTemplate.kt.after diff --git a/idea/testData/refactoring/inline/addParenthesis/StringTemplateAlreadyInBraces.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/StringTemplateAlreadyInBraces.kt similarity index 100% rename from idea/testData/refactoring/inline/addParenthesis/StringTemplateAlreadyInBraces.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/StringTemplateAlreadyInBraces.kt diff --git a/idea/testData/refactoring/inline/addParenthesis/StringTemplateAlreadyInBraces.kt.after b/idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/StringTemplateAlreadyInBraces.kt.after similarity index 100% rename from idea/testData/refactoring/inline/addParenthesis/StringTemplateAlreadyInBraces.kt.after rename to idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/StringTemplateAlreadyInBraces.kt.after diff --git a/idea/testData/refactoring/inline/addParenthesis/StringTemplateDontAdd.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/StringTemplateDontAdd.kt similarity index 100% rename from idea/testData/refactoring/inline/addParenthesis/StringTemplateDontAdd.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/StringTemplateDontAdd.kt diff --git a/idea/testData/refactoring/inline/addParenthesis/StringTemplateDontAdd.kt.after b/idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/StringTemplateDontAdd.kt.after similarity index 100% rename from idea/testData/refactoring/inline/addParenthesis/StringTemplateDontAdd.kt.after rename to idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/StringTemplateDontAdd.kt.after diff --git a/idea/testData/refactoring/inline/addParenthesis/UnaryIntoBinary.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/UnaryIntoBinary.kt similarity index 100% rename from idea/testData/refactoring/inline/addParenthesis/UnaryIntoBinary.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/UnaryIntoBinary.kt diff --git a/idea/testData/refactoring/inline/addParenthesis/UnaryIntoBinary.kt.after b/idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/UnaryIntoBinary.kt.after similarity index 100% rename from idea/testData/refactoring/inline/addParenthesis/UnaryIntoBinary.kt.after rename to idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/UnaryIntoBinary.kt.after diff --git a/idea/testData/refactoring/inline/explicateParameterTypes/EnoughDontExplicate.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/explicateParameterTypes/EnoughDontExplicate.kt similarity index 100% rename from idea/testData/refactoring/inline/explicateParameterTypes/EnoughDontExplicate.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/explicateParameterTypes/EnoughDontExplicate.kt diff --git a/idea/testData/refactoring/inline/explicateParameterTypes/EnoughDontExplicate.kt.after b/idea/testData/refactoring/inline/inlineVariableOrProperty/explicateParameterTypes/EnoughDontExplicate.kt.after similarity index 100% rename from idea/testData/refactoring/inline/explicateParameterTypes/EnoughDontExplicate.kt.after rename to idea/testData/refactoring/inline/inlineVariableOrProperty/explicateParameterTypes/EnoughDontExplicate.kt.after diff --git a/idea/testData/refactoring/inline/explicateParameterTypes/ErrorTypes.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/explicateParameterTypes/ErrorTypes.kt similarity index 100% rename from idea/testData/refactoring/inline/explicateParameterTypes/ErrorTypes.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/explicateParameterTypes/ErrorTypes.kt diff --git a/idea/testData/refactoring/inline/explicateParameterTypes/ErrorTypes.kt.after b/idea/testData/refactoring/inline/inlineVariableOrProperty/explicateParameterTypes/ErrorTypes.kt.after similarity index 100% rename from idea/testData/refactoring/inline/explicateParameterTypes/ErrorTypes.kt.after rename to idea/testData/refactoring/inline/inlineVariableOrProperty/explicateParameterTypes/ErrorTypes.kt.after diff --git a/idea/testData/refactoring/inline/explicateParameterTypes/It.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/explicateParameterTypes/It.kt similarity index 100% rename from idea/testData/refactoring/inline/explicateParameterTypes/It.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/explicateParameterTypes/It.kt diff --git a/idea/testData/refactoring/inline/explicateParameterTypes/It.kt.after b/idea/testData/refactoring/inline/inlineVariableOrProperty/explicateParameterTypes/It.kt.after similarity index 100% rename from idea/testData/refactoring/inline/explicateParameterTypes/It.kt.after rename to idea/testData/refactoring/inline/inlineVariableOrProperty/explicateParameterTypes/It.kt.after diff --git a/idea/testData/refactoring/inline/explicateParameterTypes/ItMultiLine.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/explicateParameterTypes/ItMultiLine.kt similarity index 100% rename from idea/testData/refactoring/inline/explicateParameterTypes/ItMultiLine.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/explicateParameterTypes/ItMultiLine.kt diff --git a/idea/testData/refactoring/inline/explicateParameterTypes/ItMultiLine.kt.after b/idea/testData/refactoring/inline/inlineVariableOrProperty/explicateParameterTypes/ItMultiLine.kt.after similarity index 100% rename from idea/testData/refactoring/inline/explicateParameterTypes/ItMultiLine.kt.after rename to idea/testData/refactoring/inline/inlineVariableOrProperty/explicateParameterTypes/ItMultiLine.kt.after diff --git a/idea/testData/refactoring/inline/explicateParameterTypes/Parenthesized.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/explicateParameterTypes/Parenthesized.kt similarity index 100% rename from idea/testData/refactoring/inline/explicateParameterTypes/Parenthesized.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/explicateParameterTypes/Parenthesized.kt diff --git a/idea/testData/refactoring/inline/explicateParameterTypes/Parenthesized.kt.after b/idea/testData/refactoring/inline/inlineVariableOrProperty/explicateParameterTypes/Parenthesized.kt.after similarity index 100% rename from idea/testData/refactoring/inline/explicateParameterTypes/Parenthesized.kt.after rename to idea/testData/refactoring/inline/inlineVariableOrProperty/explicateParameterTypes/Parenthesized.kt.after diff --git a/idea/testData/refactoring/inline/explicateParameterTypes/Simplest.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/explicateParameterTypes/Simplest.kt similarity index 100% rename from idea/testData/refactoring/inline/explicateParameterTypes/Simplest.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/explicateParameterTypes/Simplest.kt diff --git a/idea/testData/refactoring/inline/explicateParameterTypes/Simplest.kt.after b/idea/testData/refactoring/inline/inlineVariableOrProperty/explicateParameterTypes/Simplest.kt.after similarity index 100% rename from idea/testData/refactoring/inline/explicateParameterTypes/Simplest.kt.after rename to idea/testData/refactoring/inline/inlineVariableOrProperty/explicateParameterTypes/Simplest.kt.after diff --git a/idea/testData/refactoring/inline/explicateParameterTypes/TrivialDontExplicate.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/explicateParameterTypes/TrivialDontExplicate.kt similarity index 100% rename from idea/testData/refactoring/inline/explicateParameterTypes/TrivialDontExplicate.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/explicateParameterTypes/TrivialDontExplicate.kt diff --git a/idea/testData/refactoring/inline/explicateParameterTypes/TrivialDontExplicate.kt.after b/idea/testData/refactoring/inline/inlineVariableOrProperty/explicateParameterTypes/TrivialDontExplicate.kt.after similarity index 100% rename from idea/testData/refactoring/inline/explicateParameterTypes/TrivialDontExplicate.kt.after rename to idea/testData/refactoring/inline/inlineVariableOrProperty/explicateParameterTypes/TrivialDontExplicate.kt.after diff --git a/idea/testData/refactoring/inline/explicateTypeArgument/DeeperNestedCall.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/explicateTypeArgument/DeeperNestedCall.kt similarity index 100% rename from idea/testData/refactoring/inline/explicateTypeArgument/DeeperNestedCall.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/explicateTypeArgument/DeeperNestedCall.kt diff --git a/idea/testData/refactoring/inline/explicateTypeArgument/DeeperNestedCall.kt.after b/idea/testData/refactoring/inline/inlineVariableOrProperty/explicateTypeArgument/DeeperNestedCall.kt.after similarity index 100% rename from idea/testData/refactoring/inline/explicateTypeArgument/DeeperNestedCall.kt.after rename to idea/testData/refactoring/inline/inlineVariableOrProperty/explicateTypeArgument/DeeperNestedCall.kt.after diff --git a/idea/testData/refactoring/inline/explicateTypeArgument/EnoughDontExplicate.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/explicateTypeArgument/EnoughDontExplicate.kt similarity index 100% rename from idea/testData/refactoring/inline/explicateTypeArgument/EnoughDontExplicate.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/explicateTypeArgument/EnoughDontExplicate.kt diff --git a/idea/testData/refactoring/inline/explicateTypeArgument/EnoughDontExplicate.kt.after b/idea/testData/refactoring/inline/inlineVariableOrProperty/explicateTypeArgument/EnoughDontExplicate.kt.after similarity index 100% rename from idea/testData/refactoring/inline/explicateTypeArgument/EnoughDontExplicate.kt.after rename to idea/testData/refactoring/inline/inlineVariableOrProperty/explicateTypeArgument/EnoughDontExplicate.kt.after diff --git a/idea/testData/refactoring/inline/explicateTypeArgument/ExplicateForSome.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/explicateTypeArgument/ExplicateForSome.kt similarity index 100% rename from idea/testData/refactoring/inline/explicateTypeArgument/ExplicateForSome.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/explicateTypeArgument/ExplicateForSome.kt diff --git a/idea/testData/refactoring/inline/explicateTypeArgument/ExplicateForSome.kt.after b/idea/testData/refactoring/inline/inlineVariableOrProperty/explicateTypeArgument/ExplicateForSome.kt.after similarity index 100% rename from idea/testData/refactoring/inline/explicateTypeArgument/ExplicateForSome.kt.after rename to idea/testData/refactoring/inline/inlineVariableOrProperty/explicateTypeArgument/ExplicateForSome.kt.after diff --git a/idea/testData/refactoring/inline/explicateTypeArgument/InStringTemplate.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/explicateTypeArgument/InStringTemplate.kt similarity index 100% rename from idea/testData/refactoring/inline/explicateTypeArgument/InStringTemplate.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/explicateTypeArgument/InStringTemplate.kt diff --git a/idea/testData/refactoring/inline/explicateTypeArgument/InStringTemplate.kt.after b/idea/testData/refactoring/inline/inlineVariableOrProperty/explicateTypeArgument/InStringTemplate.kt.after similarity index 100% rename from idea/testData/refactoring/inline/explicateTypeArgument/InStringTemplate.kt.after rename to idea/testData/refactoring/inline/inlineVariableOrProperty/explicateTypeArgument/InStringTemplate.kt.after diff --git a/idea/testData/refactoring/inline/explicateTypeArgument/NestedCall.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/explicateTypeArgument/NestedCall.kt similarity index 100% rename from idea/testData/refactoring/inline/explicateTypeArgument/NestedCall.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/explicateTypeArgument/NestedCall.kt diff --git a/idea/testData/refactoring/inline/explicateTypeArgument/NestedCall.kt.after b/idea/testData/refactoring/inline/inlineVariableOrProperty/explicateTypeArgument/NestedCall.kt.after similarity index 100% rename from idea/testData/refactoring/inline/explicateTypeArgument/NestedCall.kt.after rename to idea/testData/refactoring/inline/inlineVariableOrProperty/explicateTypeArgument/NestedCall.kt.after diff --git a/idea/testData/refactoring/inline/explicateTypeArgument/Parenthesized.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/explicateTypeArgument/Parenthesized.kt similarity index 100% rename from idea/testData/refactoring/inline/explicateTypeArgument/Parenthesized.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/explicateTypeArgument/Parenthesized.kt diff --git a/idea/testData/refactoring/inline/explicateTypeArgument/Parenthesized.kt.after b/idea/testData/refactoring/inline/inlineVariableOrProperty/explicateTypeArgument/Parenthesized.kt.after similarity index 100% rename from idea/testData/refactoring/inline/explicateTypeArgument/Parenthesized.kt.after rename to idea/testData/refactoring/inline/inlineVariableOrProperty/explicateTypeArgument/Parenthesized.kt.after diff --git a/idea/testData/refactoring/inline/explicateTypeArgument/Qualified.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/explicateTypeArgument/Qualified.kt similarity index 100% rename from idea/testData/refactoring/inline/explicateTypeArgument/Qualified.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/explicateTypeArgument/Qualified.kt diff --git a/idea/testData/refactoring/inline/explicateTypeArgument/Qualified.kt.after b/idea/testData/refactoring/inline/inlineVariableOrProperty/explicateTypeArgument/Qualified.kt.after similarity index 100% rename from idea/testData/refactoring/inline/explicateTypeArgument/Qualified.kt.after rename to idea/testData/refactoring/inline/inlineVariableOrProperty/explicateTypeArgument/Qualified.kt.after diff --git a/idea/testData/refactoring/inline/explicateTypeArgument/Simplest.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/explicateTypeArgument/Simplest.kt similarity index 100% rename from idea/testData/refactoring/inline/explicateTypeArgument/Simplest.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/explicateTypeArgument/Simplest.kt diff --git a/idea/testData/refactoring/inline/explicateTypeArgument/Simplest.kt.after b/idea/testData/refactoring/inline/inlineVariableOrProperty/explicateTypeArgument/Simplest.kt.after similarity index 100% rename from idea/testData/refactoring/inline/explicateTypeArgument/Simplest.kt.after rename to idea/testData/refactoring/inline/inlineVariableOrProperty/explicateTypeArgument/Simplest.kt.after diff --git a/idea/testData/refactoring/inline/explicateTypeArgument/TrivialDontExplicate.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/explicateTypeArgument/TrivialDontExplicate.kt similarity index 100% rename from idea/testData/refactoring/inline/explicateTypeArgument/TrivialDontExplicate.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/explicateTypeArgument/TrivialDontExplicate.kt diff --git a/idea/testData/refactoring/inline/explicateTypeArgument/TrivialDontExplicate.kt.after b/idea/testData/refactoring/inline/inlineVariableOrProperty/explicateTypeArgument/TrivialDontExplicate.kt.after similarity index 100% rename from idea/testData/refactoring/inline/explicateTypeArgument/TrivialDontExplicate.kt.after rename to idea/testData/refactoring/inline/inlineVariableOrProperty/explicateTypeArgument/TrivialDontExplicate.kt.after diff --git a/idea/testData/refactoring/inline/ifInQualifiedExpression.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/ifInQualifiedExpression.kt similarity index 100% rename from idea/testData/refactoring/inline/ifInQualifiedExpression.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/ifInQualifiedExpression.kt diff --git a/idea/testData/refactoring/inline/ifInQualifiedExpression.kt.after b/idea/testData/refactoring/inline/inlineVariableOrProperty/ifInQualifiedExpression.kt.after similarity index 100% rename from idea/testData/refactoring/inline/ifInQualifiedExpression.kt.after rename to idea/testData/refactoring/inline/inlineVariableOrProperty/ifInQualifiedExpression.kt.after diff --git a/idea/testData/refactoring/inline/lessAndGreaterInCallArgs.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/lessAndGreaterInCallArgs.kt similarity index 100% rename from idea/testData/refactoring/inline/lessAndGreaterInCallArgs.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/lessAndGreaterInCallArgs.kt diff --git a/idea/testData/refactoring/inline/lessAndGreaterInCallArgs.kt.after b/idea/testData/refactoring/inline/inlineVariableOrProperty/lessAndGreaterInCallArgs.kt.after similarity index 100% rename from idea/testData/refactoring/inline/lessAndGreaterInCallArgs.kt.after rename to idea/testData/refactoring/inline/inlineVariableOrProperty/lessAndGreaterInCallArgs.kt.after diff --git a/idea/testData/refactoring/inline/noUsages.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/noUsages.kt similarity index 100% rename from idea/testData/refactoring/inline/noUsages.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/noUsages.kt diff --git a/idea/testData/refactoring/inline/property/Basic.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/property/Basic.kt similarity index 100% rename from idea/testData/refactoring/inline/property/Basic.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/property/Basic.kt diff --git a/idea/testData/refactoring/inline/property/Basic.kt.after b/idea/testData/refactoring/inline/inlineVariableOrProperty/property/Basic.kt.after similarity index 100% rename from idea/testData/refactoring/inline/property/Basic.kt.after rename to idea/testData/refactoring/inline/inlineVariableOrProperty/property/Basic.kt.after diff --git a/idea/testData/refactoring/inline/property/ClassObjectProperty.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/property/ClassObjectProperty.kt similarity index 100% rename from idea/testData/refactoring/inline/property/ClassObjectProperty.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/property/ClassObjectProperty.kt diff --git a/idea/testData/refactoring/inline/property/ClassObjectProperty.kt.after b/idea/testData/refactoring/inline/inlineVariableOrProperty/property/ClassObjectProperty.kt.after similarity index 100% rename from idea/testData/refactoring/inline/property/ClassObjectProperty.kt.after rename to idea/testData/refactoring/inline/inlineVariableOrProperty/property/ClassObjectProperty.kt.after diff --git a/idea/testData/refactoring/inline/property/ExtensionProperty.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/property/ExtensionProperty.kt similarity index 100% rename from idea/testData/refactoring/inline/property/ExtensionProperty.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/property/ExtensionProperty.kt diff --git a/idea/testData/refactoring/inline/property/InstanceProperty.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/property/InstanceProperty.kt similarity index 100% rename from idea/testData/refactoring/inline/property/InstanceProperty.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/property/InstanceProperty.kt diff --git a/idea/testData/refactoring/inline/property/InstanceProperty.kt.after b/idea/testData/refactoring/inline/inlineVariableOrProperty/property/InstanceProperty.kt.after similarity index 100% rename from idea/testData/refactoring/inline/property/InstanceProperty.kt.after rename to idea/testData/refactoring/inline/inlineVariableOrProperty/property/InstanceProperty.kt.after diff --git a/idea/testData/refactoring/inline/property/ObjectProperty.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/property/ObjectProperty.kt similarity index 100% rename from idea/testData/refactoring/inline/property/ObjectProperty.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/property/ObjectProperty.kt diff --git a/idea/testData/refactoring/inline/property/ObjectProperty.kt.after b/idea/testData/refactoring/inline/inlineVariableOrProperty/property/ObjectProperty.kt.after similarity index 100% rename from idea/testData/refactoring/inline/property/ObjectProperty.kt.after rename to idea/testData/refactoring/inline/inlineVariableOrProperty/property/ObjectProperty.kt.after diff --git a/idea/testData/refactoring/inline/property/QualifiedUsage.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/property/QualifiedUsage.kt similarity index 100% rename from idea/testData/refactoring/inline/property/QualifiedUsage.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/property/QualifiedUsage.kt diff --git a/idea/testData/refactoring/inline/property/QualifiedUsage.kt.after b/idea/testData/refactoring/inline/inlineVariableOrProperty/property/QualifiedUsage.kt.after similarity index 100% rename from idea/testData/refactoring/inline/property/QualifiedUsage.kt.after rename to idea/testData/refactoring/inline/inlineVariableOrProperty/property/QualifiedUsage.kt.after diff --git a/idea/testData/refactoring/inline/property/WithGetter.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/property/WithGetter.kt similarity index 100% rename from idea/testData/refactoring/inline/property/WithGetter.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/property/WithGetter.kt diff --git a/idea/testData/refactoring/inline/property/WithInitializerAndGetter.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/property/WithInitializerAndGetter.kt similarity index 100% rename from idea/testData/refactoring/inline/property/WithInitializerAndGetter.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/property/WithInitializerAndGetter.kt diff --git a/idea/testData/refactoring/inline/property/keepImport.1.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/property/keepImport.1.kt similarity index 100% rename from idea/testData/refactoring/inline/property/keepImport.1.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/property/keepImport.1.kt diff --git a/idea/testData/refactoring/inline/property/keepImport.1.kt.after b/idea/testData/refactoring/inline/inlineVariableOrProperty/property/keepImport.1.kt.after similarity index 100% rename from idea/testData/refactoring/inline/property/keepImport.1.kt.after rename to idea/testData/refactoring/inline/inlineVariableOrProperty/property/keepImport.1.kt.after diff --git a/idea/testData/refactoring/inline/property/keepImport.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/property/keepImport.kt similarity index 100% rename from idea/testData/refactoring/inline/property/keepImport.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/property/keepImport.kt diff --git a/idea/testData/refactoring/inline/property/keepImport.kt.after b/idea/testData/refactoring/inline/inlineVariableOrProperty/property/keepImport.kt.after similarity index 100% rename from idea/testData/refactoring/inline/property/keepImport.kt.after rename to idea/testData/refactoring/inline/inlineVariableOrProperty/property/keepImport.kt.after diff --git a/idea/testData/refactoring/inline/property/multiplePackages.1.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/property/multiplePackages.1.kt similarity index 100% rename from idea/testData/refactoring/inline/property/multiplePackages.1.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/property/multiplePackages.1.kt diff --git a/idea/testData/refactoring/inline/property/multiplePackages.1.kt.after b/idea/testData/refactoring/inline/inlineVariableOrProperty/property/multiplePackages.1.kt.after similarity index 100% rename from idea/testData/refactoring/inline/property/multiplePackages.1.kt.after rename to idea/testData/refactoring/inline/inlineVariableOrProperty/property/multiplePackages.1.kt.after diff --git a/idea/testData/refactoring/inline/property/multiplePackages.2.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/property/multiplePackages.2.kt similarity index 100% rename from idea/testData/refactoring/inline/property/multiplePackages.2.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/property/multiplePackages.2.kt diff --git a/idea/testData/refactoring/inline/property/multiplePackages.2.kt.after b/idea/testData/refactoring/inline/inlineVariableOrProperty/property/multiplePackages.2.kt.after similarity index 100% rename from idea/testData/refactoring/inline/property/multiplePackages.2.kt.after rename to idea/testData/refactoring/inline/inlineVariableOrProperty/property/multiplePackages.2.kt.after diff --git a/idea/testData/refactoring/inline/property/multiplePackages.3.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/property/multiplePackages.3.kt similarity index 100% rename from idea/testData/refactoring/inline/property/multiplePackages.3.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/property/multiplePackages.3.kt diff --git a/idea/testData/refactoring/inline/property/multiplePackages.3.kt.after b/idea/testData/refactoring/inline/inlineVariableOrProperty/property/multiplePackages.3.kt.after similarity index 100% rename from idea/testData/refactoring/inline/property/multiplePackages.3.kt.after rename to idea/testData/refactoring/inline/inlineVariableOrProperty/property/multiplePackages.3.kt.after diff --git a/idea/testData/refactoring/inline/property/multiplePackages.4.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/property/multiplePackages.4.kt similarity index 100% rename from idea/testData/refactoring/inline/property/multiplePackages.4.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/property/multiplePackages.4.kt diff --git a/idea/testData/refactoring/inline/property/multiplePackages.4.kt.after b/idea/testData/refactoring/inline/inlineVariableOrProperty/property/multiplePackages.4.kt.after similarity index 100% rename from idea/testData/refactoring/inline/property/multiplePackages.4.kt.after rename to idea/testData/refactoring/inline/inlineVariableOrProperty/property/multiplePackages.4.kt.after diff --git a/idea/testData/refactoring/inline/property/multiplePackages.5.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/property/multiplePackages.5.kt similarity index 100% rename from idea/testData/refactoring/inline/property/multiplePackages.5.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/property/multiplePackages.5.kt diff --git a/idea/testData/refactoring/inline/property/multiplePackages.5.kt.after b/idea/testData/refactoring/inline/inlineVariableOrProperty/property/multiplePackages.5.kt.after similarity index 100% rename from idea/testData/refactoring/inline/property/multiplePackages.5.kt.after rename to idea/testData/refactoring/inline/inlineVariableOrProperty/property/multiplePackages.5.kt.after diff --git a/idea/testData/refactoring/inline/property/multiplePackages.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/property/multiplePackages.kt similarity index 100% rename from idea/testData/refactoring/inline/property/multiplePackages.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/property/multiplePackages.kt diff --git a/idea/testData/refactoring/inline/property/multiplePackages.kt.after b/idea/testData/refactoring/inline/inlineVariableOrProperty/property/multiplePackages.kt.after similarity index 100% rename from idea/testData/refactoring/inline/property/multiplePackages.kt.after rename to idea/testData/refactoring/inline/inlineVariableOrProperty/property/multiplePackages.kt.after diff --git a/idea/testData/refactoring/inline/property/removeImport.1.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/property/removeImport.1.kt similarity index 100% rename from idea/testData/refactoring/inline/property/removeImport.1.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/property/removeImport.1.kt diff --git a/idea/testData/refactoring/inline/property/removeImport.1.kt.after b/idea/testData/refactoring/inline/inlineVariableOrProperty/property/removeImport.1.kt.after similarity index 100% rename from idea/testData/refactoring/inline/property/removeImport.1.kt.after rename to idea/testData/refactoring/inline/inlineVariableOrProperty/property/removeImport.1.kt.after diff --git a/idea/testData/refactoring/inline/property/removeImport.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/property/removeImport.kt similarity index 100% rename from idea/testData/refactoring/inline/property/removeImport.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/property/removeImport.kt diff --git a/idea/testData/refactoring/inline/property/removeImport.kt.after b/idea/testData/refactoring/inline/inlineVariableOrProperty/property/removeImport.kt.after similarity index 100% rename from idea/testData/refactoring/inline/property/removeImport.kt.after rename to idea/testData/refactoring/inline/inlineVariableOrProperty/property/removeImport.kt.after diff --git a/idea/testData/refactoring/inline/semicolon.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/semicolon.kt similarity index 100% rename from idea/testData/refactoring/inline/semicolon.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/semicolon.kt diff --git a/idea/testData/refactoring/inline/semicolon.kt.after b/idea/testData/refactoring/inline/inlineVariableOrProperty/semicolon.kt.after similarity index 100% rename from idea/testData/refactoring/inline/semicolon.kt.after rename to idea/testData/refactoring/inline/inlineVariableOrProperty/semicolon.kt.after diff --git a/idea/testData/refactoring/inline/semicolonWithSpacesAndComments.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/semicolonWithSpacesAndComments.kt similarity index 100% rename from idea/testData/refactoring/inline/semicolonWithSpacesAndComments.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/semicolonWithSpacesAndComments.kt diff --git a/idea/testData/refactoring/inline/semicolonWithSpacesAndComments.kt.after b/idea/testData/refactoring/inline/inlineVariableOrProperty/semicolonWithSpacesAndComments.kt.after similarity index 100% rename from idea/testData/refactoring/inline/semicolonWithSpacesAndComments.kt.after rename to idea/testData/refactoring/inline/inlineVariableOrProperty/semicolonWithSpacesAndComments.kt.after diff --git a/idea/testData/refactoring/inline/stringTemplates/addBraces.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/stringTemplates/addBraces.kt similarity index 100% rename from idea/testData/refactoring/inline/stringTemplates/addBraces.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/stringTemplates/addBraces.kt diff --git a/idea/testData/refactoring/inline/stringTemplates/addBraces.kt.after b/idea/testData/refactoring/inline/inlineVariableOrProperty/stringTemplates/addBraces.kt.after similarity index 100% rename from idea/testData/refactoring/inline/stringTemplates/addBraces.kt.after rename to idea/testData/refactoring/inline/inlineVariableOrProperty/stringTemplates/addBraces.kt.after diff --git a/idea/testData/refactoring/inline/stringTemplates/blockEntry.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/stringTemplates/blockEntry.kt similarity index 100% rename from idea/testData/refactoring/inline/stringTemplates/blockEntry.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/stringTemplates/blockEntry.kt diff --git a/idea/testData/refactoring/inline/stringTemplates/blockEntry.kt.after b/idea/testData/refactoring/inline/inlineVariableOrProperty/stringTemplates/blockEntry.kt.after similarity index 100% rename from idea/testData/refactoring/inline/stringTemplates/blockEntry.kt.after rename to idea/testData/refactoring/inline/inlineVariableOrProperty/stringTemplates/blockEntry.kt.after diff --git a/idea/testData/refactoring/inline/stringTemplates/empty.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/stringTemplates/empty.kt similarity index 100% rename from idea/testData/refactoring/inline/stringTemplates/empty.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/stringTemplates/empty.kt diff --git a/idea/testData/refactoring/inline/stringTemplates/empty.kt.after b/idea/testData/refactoring/inline/inlineVariableOrProperty/stringTemplates/empty.kt.after similarity index 100% rename from idea/testData/refactoring/inline/stringTemplates/empty.kt.after rename to idea/testData/refactoring/inline/inlineVariableOrProperty/stringTemplates/empty.kt.after diff --git a/idea/testData/refactoring/inline/stringTemplates/nonEmpty.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/stringTemplates/nonEmpty.kt similarity index 100% rename from idea/testData/refactoring/inline/stringTemplates/nonEmpty.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/stringTemplates/nonEmpty.kt diff --git a/idea/testData/refactoring/inline/stringTemplates/nonEmpty.kt.after b/idea/testData/refactoring/inline/inlineVariableOrProperty/stringTemplates/nonEmpty.kt.after similarity index 100% rename from idea/testData/refactoring/inline/stringTemplates/nonEmpty.kt.after rename to idea/testData/refactoring/inline/inlineVariableOrProperty/stringTemplates/nonEmpty.kt.after diff --git a/idea/testData/refactoring/inline/stringTemplates/nonRawToRaw.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/stringTemplates/nonRawToRaw.kt similarity index 100% rename from idea/testData/refactoring/inline/stringTemplates/nonRawToRaw.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/stringTemplates/nonRawToRaw.kt diff --git a/idea/testData/refactoring/inline/stringTemplates/nonRawToRaw.kt.after b/idea/testData/refactoring/inline/inlineVariableOrProperty/stringTemplates/nonRawToRaw.kt.after similarity index 100% rename from idea/testData/refactoring/inline/stringTemplates/nonRawToRaw.kt.after rename to idea/testData/refactoring/inline/inlineVariableOrProperty/stringTemplates/nonRawToRaw.kt.after diff --git a/idea/testData/refactoring/inline/stringTemplates/rawString.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/stringTemplates/rawString.kt similarity index 100% rename from idea/testData/refactoring/inline/stringTemplates/rawString.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/stringTemplates/rawString.kt diff --git a/idea/testData/refactoring/inline/stringTemplates/rawString.kt.after b/idea/testData/refactoring/inline/inlineVariableOrProperty/stringTemplates/rawString.kt.after similarity index 100% rename from idea/testData/refactoring/inline/stringTemplates/rawString.kt.after rename to idea/testData/refactoring/inline/inlineVariableOrProperty/stringTemplates/rawString.kt.after diff --git a/idea/testData/refactoring/inline/stringTemplates/rawToNonRaw.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/stringTemplates/rawToNonRaw.kt similarity index 100% rename from idea/testData/refactoring/inline/stringTemplates/rawToNonRaw.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/stringTemplates/rawToNonRaw.kt diff --git a/idea/testData/refactoring/inline/stringTemplates/rawToNonRaw.kt.after b/idea/testData/refactoring/inline/inlineVariableOrProperty/stringTemplates/rawToNonRaw.kt.after similarity index 100% rename from idea/testData/refactoring/inline/stringTemplates/rawToNonRaw.kt.after rename to idea/testData/refactoring/inline/inlineVariableOrProperty/stringTemplates/rawToNonRaw.kt.after diff --git a/idea/testData/refactoring/inline/varNoWrite.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/varNoWrite.kt similarity index 100% rename from idea/testData/refactoring/inline/varNoWrite.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/varNoWrite.kt diff --git a/idea/testData/refactoring/inline/varNoWrite.kt.after b/idea/testData/refactoring/inline/inlineVariableOrProperty/varNoWrite.kt.after similarity index 100% rename from idea/testData/refactoring/inline/varNoWrite.kt.after rename to idea/testData/refactoring/inline/inlineVariableOrProperty/varNoWrite.kt.after diff --git a/idea/testData/refactoring/inline/varWithAssignment.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/varWithAssignment.kt similarity index 100% rename from idea/testData/refactoring/inline/varWithAssignment.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/varWithAssignment.kt diff --git a/idea/testData/refactoring/inline/varWithInc.kt b/idea/testData/refactoring/inline/inlineVariableOrProperty/varWithInc.kt similarity index 100% rename from idea/testData/refactoring/inline/varWithInc.kt rename to idea/testData/refactoring/inline/inlineVariableOrProperty/varWithInc.kt diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/inline/InlineTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/refactoring/inline/InlineTestGenerated.java index d07cb380f37..3f02c7b5765 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/inline/InlineTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/inline/InlineTestGenerated.java @@ -35,546 +35,555 @@ public class InlineTestGenerated extends AbstractInlineTest { KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/inline"), Pattern.compile("^(\\w+)\\.kt$"), true); } - @TestMetadata("Basic.kt") - public void testBasic() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/Basic.kt"); - doTest(fileName); - } - - @TestMetadata("BasicCaretOnDeclaration.kt") - public void testBasicCaretOnDeclaration() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/BasicCaretOnDeclaration.kt"); - doTest(fileName); - } - - @TestMetadata("ifInQualifiedExpression.kt") - public void testIfInQualifiedExpression() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/ifInQualifiedExpression.kt"); - doTest(fileName); - } - - @TestMetadata("InFunctionLiteral.kt") - public void testInFunctionLiteral() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/InFunctionLiteral.kt"); - doTest(fileName); - } - - @TestMetadata("lessAndGreaterInCallArgs.kt") - public void testLessAndGreaterInCallArgs() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/lessAndGreaterInCallArgs.kt"); - doTest(fileName); - } - - @TestMetadata("MethodReference.kt") - public void testMethodReference() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/MethodReference.kt"); - doTest(fileName); - } - - @TestMetadata("MultipleInitializers.kt") - public void testMultipleInitializers() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/MultipleInitializers.kt"); - doTest(fileName); - } - - @TestMetadata("MultipleUsages.kt") - public void testMultipleUsages() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/MultipleUsages.kt"); - doTest(fileName); - } - - @TestMetadata("noUsages.kt") - public void testNoUsages() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/noUsages.kt"); - doTest(fileName); - } - - @TestMetadata("Parameter.kt") - public void testParameter() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/Parameter.kt"); - doTest(fileName); - } - - @TestMetadata("semicolon.kt") - public void testSemicolon() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/semicolon.kt"); - doTest(fileName); - } - - @TestMetadata("semicolonWithSpacesAndComments.kt") - public void testSemicolonWithSpacesAndComments() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/semicolonWithSpacesAndComments.kt"); - doTest(fileName); - } - - @TestMetadata("SeparateInitializer.kt") - public void testSeparateInitializer() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/SeparateInitializer.kt"); - doTest(fileName); - } - - @TestMetadata("SeparateInitializerInTry.kt") - public void testSeparateInitializerInTry() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/SeparateInitializerInTry.kt"); - doTest(fileName); - } - - @TestMetadata("UsedInAssignment.kt") - public void testUsedInAssignment() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/UsedInAssignment.kt"); - doTest(fileName); - } - - @TestMetadata("ValWithoutInitializer.kt") - public void testValWithoutInitializer() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/ValWithoutInitializer.kt"); - doTest(fileName); - } - - @TestMetadata("varNoWrite.kt") - public void testVarNoWrite() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/varNoWrite.kt"); - doTest(fileName); - } - - @TestMetadata("varWithAssignment.kt") - public void testVarWithAssignment() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/varWithAssignment.kt"); - doTest(fileName); - } - - @TestMetadata("varWithInc.kt") - public void testVarWithInc() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/varWithInc.kt"); - doTest(fileName); - } - - @TestMetadata("idea/testData/refactoring/inline/addParenthesis") + @TestMetadata("idea/testData/refactoring/inline/inlineVariableOrProperty") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class AddParenthesis extends AbstractInlineTest { - public void testAllFilesPresentInAddParenthesis() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/inline/addParenthesis"), Pattern.compile("^(\\w+)\\.kt$"), true); - } - - @TestMetadata("ArrayAccess.kt") - public void testArrayAccess() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/ArrayAccess.kt"); - doTest(fileName); - } - - @TestMetadata("ArrayAccessDontAdd.kt") - public void testArrayAccessDontAdd() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/ArrayAccessDontAdd.kt"); - doTest(fileName); - } - - @TestMetadata("Binary.kt") - public void testBinary() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/Binary.kt"); - doTest(fileName); - } - - @TestMetadata("BinaryDontAdd.kt") - public void testBinaryDontAdd() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/BinaryDontAdd.kt"); - doTest(fileName); - } - - @TestMetadata("Call.kt") - public void testCall() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/Call.kt"); - doTest(fileName); - } - - @TestMetadata("CallDontAdd.kt") - public void testCallDontAdd() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/CallDontAdd.kt"); - doTest(fileName); - } - - @TestMetadata("Callee.kt") - public void testCallee() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/Callee.kt"); - doTest(fileName); - } - - @TestMetadata("ColonDontAdd.kt") - public void testColonDontAdd() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/ColonDontAdd.kt"); - doTest(fileName); - } - - @TestMetadata("If.kt") - public void testIf() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/If.kt"); - doTest(fileName); - } - - @TestMetadata("IfIntoArrayAccess.kt") - public void testIfIntoArrayAccess() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/IfIntoArrayAccess.kt"); - doTest(fileName); - } - - @TestMetadata("IfIntoArrayAccessBrackets.kt") - public void testIfIntoArrayAccessBrackets() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/IfIntoArrayAccessBrackets.kt"); - doTest(fileName); - } - - @TestMetadata("IfIntoBinaryLeft.kt") - public void testIfIntoBinaryLeft() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/IfIntoBinaryLeft.kt"); - doTest(fileName); - } - - @TestMetadata("IfIntoBinaryRight.kt") - public void testIfIntoBinaryRight() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/IfIntoBinaryRight.kt"); - doTest(fileName); - } - - @TestMetadata("IfIntoBinaryRightLeft.kt") - public void testIfIntoBinaryRightLeft() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/IfIntoBinaryRightLeft.kt"); - doTest(fileName); - } - - @TestMetadata("IfIntoBinaryRightLeftDontAdd.kt") - public void testIfIntoBinaryRightLeftDontAdd() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/IfIntoBinaryRightLeftDontAdd.kt"); - doTest(fileName); - } - - @TestMetadata("IfIntoPostfix.kt") - public void testIfIntoPostfix() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/IfIntoPostfix.kt"); - doTest(fileName); - } - - @TestMetadata("IfIntoPrefix.kt") - public void testIfIntoPrefix() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/IfIntoPrefix.kt"); - doTest(fileName); - } - - @TestMetadata("IsDontAdd.kt") - public void testIsDontAdd() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/IsDontAdd.kt"); - doTest(fileName); - } - - @TestMetadata("IsIntoCall.kt") - public void testIsIntoCall() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/IsIntoCall.kt"); - doTest(fileName); - } - - @TestMetadata("LeftAssociative.kt") - public void testLeftAssociative() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/LeftAssociative.kt"); - doTest(fileName); - } - - @TestMetadata("LeftAssociativeBoolean.kt") - public void testLeftAssociativeBoolean() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/LeftAssociativeBoolean.kt"); - doTest(fileName); - } - - @TestMetadata("LeftAssociativeDontAdd.kt") - public void testLeftAssociativeDontAdd() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/LeftAssociativeDontAdd.kt"); - doTest(fileName); - } - - @TestMetadata("PostfixIntoPrefix.kt") - public void testPostfixIntoPrefix() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/PostfixIntoPrefix.kt"); - doTest(fileName); - } - - @TestMetadata("PrefixIntoPostfix.kt") - public void testPrefixIntoPostfix() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/PrefixIntoPostfix.kt"); - doTest(fileName); - } - - @TestMetadata("Qualified.kt") - public void testQualified() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/Qualified.kt"); - doTest(fileName); - } - - @TestMetadata("QualifiedDontAdd.kt") - public void testQualifiedDontAdd() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/QualifiedDontAdd.kt"); - doTest(fileName); - } - - @TestMetadata("StringTemplate.kt") - public void testStringTemplate() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/StringTemplate.kt"); - doTest(fileName); - } - - @TestMetadata("StringTemplateAlreadyInBraces.kt") - public void testStringTemplateAlreadyInBraces() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/StringTemplateAlreadyInBraces.kt"); - doTest(fileName); - } - - @TestMetadata("StringTemplateDontAdd.kt") - public void testStringTemplateDontAdd() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/StringTemplateDontAdd.kt"); - doTest(fileName); - } - - @TestMetadata("UnaryIntoBinary.kt") - public void testUnaryIntoBinary() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/UnaryIntoBinary.kt"); - doTest(fileName); - } - } - - @TestMetadata("idea/testData/refactoring/inline/explicateParameterTypes") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class ExplicateParameterTypes extends AbstractInlineTest { - public void testAllFilesPresentInExplicateParameterTypes() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/inline/explicateParameterTypes"), Pattern.compile("^(\\w+)\\.kt$"), true); - } - - @TestMetadata("EnoughDontExplicate.kt") - public void testEnoughDontExplicate() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/explicateParameterTypes/EnoughDontExplicate.kt"); - doTest(fileName); - } - - @TestMetadata("ErrorTypes.kt") - public void testErrorTypes() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/explicateParameterTypes/ErrorTypes.kt"); - doTest(fileName); - } - - @TestMetadata("It.kt") - public void testIt() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/explicateParameterTypes/It.kt"); - doTest(fileName); - } - - @TestMetadata("ItMultiLine.kt") - public void testItMultiLine() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/explicateParameterTypes/ItMultiLine.kt"); - doTest(fileName); - } - - @TestMetadata("Parenthesized.kt") - public void testParenthesized() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/explicateParameterTypes/Parenthesized.kt"); - doTest(fileName); - } - - @TestMetadata("Simplest.kt") - public void testSimplest() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/explicateParameterTypes/Simplest.kt"); - doTest(fileName); - } - - @TestMetadata("TrivialDontExplicate.kt") - public void testTrivialDontExplicate() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/explicateParameterTypes/TrivialDontExplicate.kt"); - doTest(fileName); - } - } - - @TestMetadata("idea/testData/refactoring/inline/explicateTypeArgument") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class ExplicateTypeArgument extends AbstractInlineTest { - public void testAllFilesPresentInExplicateTypeArgument() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/inline/explicateTypeArgument"), Pattern.compile("^(\\w+)\\.kt$"), true); - } - - @TestMetadata("DeeperNestedCall.kt") - public void testDeeperNestedCall() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/explicateTypeArgument/DeeperNestedCall.kt"); - doTest(fileName); - } - - @TestMetadata("EnoughDontExplicate.kt") - public void testEnoughDontExplicate() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/explicateTypeArgument/EnoughDontExplicate.kt"); - doTest(fileName); - } - - @TestMetadata("ExplicateForSome.kt") - public void testExplicateForSome() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/explicateTypeArgument/ExplicateForSome.kt"); - doTest(fileName); - } - - @TestMetadata("InStringTemplate.kt") - public void testInStringTemplate() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/explicateTypeArgument/InStringTemplate.kt"); - doTest(fileName); - } - - @TestMetadata("NestedCall.kt") - public void testNestedCall() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/explicateTypeArgument/NestedCall.kt"); - doTest(fileName); - } - - @TestMetadata("Parenthesized.kt") - public void testParenthesized() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/explicateTypeArgument/Parenthesized.kt"); - doTest(fileName); - } - - @TestMetadata("Qualified.kt") - public void testQualified() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/explicateTypeArgument/Qualified.kt"); - doTest(fileName); - } - - @TestMetadata("Simplest.kt") - public void testSimplest() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/explicateTypeArgument/Simplest.kt"); - doTest(fileName); - } - - @TestMetadata("TrivialDontExplicate.kt") - public void testTrivialDontExplicate() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/explicateTypeArgument/TrivialDontExplicate.kt"); - doTest(fileName); - } - } - - @TestMetadata("idea/testData/refactoring/inline/property") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Property extends AbstractInlineTest { - public void testAllFilesPresentInProperty() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/inline/property"), Pattern.compile("^(\\w+)\\.kt$"), true); + public static class InlineVariableOrProperty extends AbstractInlineTest { + public void testAllFilesPresentInInlineVariableOrProperty() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/inline/inlineVariableOrProperty"), Pattern.compile("^(\\w+)\\.kt$"), true); } @TestMetadata("Basic.kt") public void testBasic() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/property/Basic.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/inlineVariableOrProperty/Basic.kt"); doTest(fileName); } - @TestMetadata("ClassObjectProperty.kt") - public void testClassObjectProperty() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/property/ClassObjectProperty.kt"); + @TestMetadata("BasicCaretOnDeclaration.kt") + public void testBasicCaretOnDeclaration() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/inlineVariableOrProperty/BasicCaretOnDeclaration.kt"); doTest(fileName); } - @TestMetadata("ExtensionProperty.kt") - public void testExtensionProperty() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/property/ExtensionProperty.kt"); + @TestMetadata("ifInQualifiedExpression.kt") + public void testIfInQualifiedExpression() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/inlineVariableOrProperty/ifInQualifiedExpression.kt"); doTest(fileName); } - @TestMetadata("InstanceProperty.kt") - public void testInstanceProperty() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/property/InstanceProperty.kt"); + @TestMetadata("InFunctionLiteral.kt") + public void testInFunctionLiteral() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/inlineVariableOrProperty/InFunctionLiteral.kt"); doTest(fileName); } - @TestMetadata("keepImport.kt") - public void testKeepImport() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/property/keepImport.kt"); + @TestMetadata("lessAndGreaterInCallArgs.kt") + public void testLessAndGreaterInCallArgs() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/inlineVariableOrProperty/lessAndGreaterInCallArgs.kt"); doTest(fileName); } - @TestMetadata("multiplePackages.kt") - public void testMultiplePackages() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/property/multiplePackages.kt"); + @TestMetadata("MethodReference.kt") + public void testMethodReference() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/inlineVariableOrProperty/MethodReference.kt"); doTest(fileName); } - @TestMetadata("ObjectProperty.kt") - public void testObjectProperty() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/property/ObjectProperty.kt"); + @TestMetadata("MultipleInitializers.kt") + public void testMultipleInitializers() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/inlineVariableOrProperty/MultipleInitializers.kt"); doTest(fileName); } - @TestMetadata("QualifiedUsage.kt") - public void testQualifiedUsage() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/property/QualifiedUsage.kt"); + @TestMetadata("MultipleUsages.kt") + public void testMultipleUsages() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/inlineVariableOrProperty/MultipleUsages.kt"); doTest(fileName); } - @TestMetadata("removeImport.kt") - public void testRemoveImport() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/property/removeImport.kt"); + @TestMetadata("noUsages.kt") + public void testNoUsages() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/inlineVariableOrProperty/noUsages.kt"); doTest(fileName); } - @TestMetadata("WithGetter.kt") - public void testWithGetter() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/property/WithGetter.kt"); + @TestMetadata("Parameter.kt") + public void testParameter() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/inlineVariableOrProperty/Parameter.kt"); doTest(fileName); } - @TestMetadata("WithInitializerAndGetter.kt") - public void testWithInitializerAndGetter() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/property/WithInitializerAndGetter.kt"); - doTest(fileName); - } - } - - @TestMetadata("idea/testData/refactoring/inline/stringTemplates") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class StringTemplates extends AbstractInlineTest { - @TestMetadata("addBraces.kt") - public void testAddBraces() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/stringTemplates/addBraces.kt"); + @TestMetadata("semicolon.kt") + public void testSemicolon() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/inlineVariableOrProperty/semicolon.kt"); doTest(fileName); } - public void testAllFilesPresentInStringTemplates() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/inline/stringTemplates"), Pattern.compile("^(\\w+)\\.kt$"), true); - } - - @TestMetadata("blockEntry.kt") - public void testBlockEntry() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/stringTemplates/blockEntry.kt"); + @TestMetadata("semicolonWithSpacesAndComments.kt") + public void testSemicolonWithSpacesAndComments() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/inlineVariableOrProperty/semicolonWithSpacesAndComments.kt"); doTest(fileName); } - @TestMetadata("empty.kt") - public void testEmpty() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/stringTemplates/empty.kt"); + @TestMetadata("SeparateInitializer.kt") + public void testSeparateInitializer() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/inlineVariableOrProperty/SeparateInitializer.kt"); doTest(fileName); } - @TestMetadata("nonEmpty.kt") - public void testNonEmpty() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/stringTemplates/nonEmpty.kt"); + @TestMetadata("SeparateInitializerInTry.kt") + public void testSeparateInitializerInTry() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/inlineVariableOrProperty/SeparateInitializerInTry.kt"); doTest(fileName); } - @TestMetadata("nonRawToRaw.kt") - public void testNonRawToRaw() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/stringTemplates/nonRawToRaw.kt"); + @TestMetadata("UsedInAssignment.kt") + public void testUsedInAssignment() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/inlineVariableOrProperty/UsedInAssignment.kt"); doTest(fileName); } - @TestMetadata("rawString.kt") - public void testRawString() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/stringTemplates/rawString.kt"); + @TestMetadata("ValWithoutInitializer.kt") + public void testValWithoutInitializer() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/inlineVariableOrProperty/ValWithoutInitializer.kt"); doTest(fileName); } - @TestMetadata("rawToNonRaw.kt") - public void testRawToNonRaw() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/stringTemplates/rawToNonRaw.kt"); + @TestMetadata("varNoWrite.kt") + public void testVarNoWrite() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/inlineVariableOrProperty/varNoWrite.kt"); doTest(fileName); } + + @TestMetadata("varWithAssignment.kt") + public void testVarWithAssignment() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/inlineVariableOrProperty/varWithAssignment.kt"); + doTest(fileName); + } + + @TestMetadata("varWithInc.kt") + public void testVarWithInc() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/inlineVariableOrProperty/varWithInc.kt"); + doTest(fileName); + } + + @TestMetadata("idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class AddParenthesis extends AbstractInlineTest { + public void testAllFilesPresentInAddParenthesis() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis"), Pattern.compile("^(\\w+)\\.kt$"), true); + } + + @TestMetadata("ArrayAccess.kt") + public void testArrayAccess() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/ArrayAccess.kt"); + doTest(fileName); + } + + @TestMetadata("ArrayAccessDontAdd.kt") + public void testArrayAccessDontAdd() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/ArrayAccessDontAdd.kt"); + doTest(fileName); + } + + @TestMetadata("Binary.kt") + public void testBinary() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/Binary.kt"); + doTest(fileName); + } + + @TestMetadata("BinaryDontAdd.kt") + public void testBinaryDontAdd() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/BinaryDontAdd.kt"); + doTest(fileName); + } + + @TestMetadata("Call.kt") + public void testCall() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/Call.kt"); + doTest(fileName); + } + + @TestMetadata("CallDontAdd.kt") + public void testCallDontAdd() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/CallDontAdd.kt"); + doTest(fileName); + } + + @TestMetadata("Callee.kt") + public void testCallee() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/Callee.kt"); + doTest(fileName); + } + + @TestMetadata("ColonDontAdd.kt") + public void testColonDontAdd() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/ColonDontAdd.kt"); + doTest(fileName); + } + + @TestMetadata("If.kt") + public void testIf() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/If.kt"); + doTest(fileName); + } + + @TestMetadata("IfIntoArrayAccess.kt") + public void testIfIntoArrayAccess() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/IfIntoArrayAccess.kt"); + doTest(fileName); + } + + @TestMetadata("IfIntoArrayAccessBrackets.kt") + public void testIfIntoArrayAccessBrackets() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/IfIntoArrayAccessBrackets.kt"); + doTest(fileName); + } + + @TestMetadata("IfIntoBinaryLeft.kt") + public void testIfIntoBinaryLeft() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/IfIntoBinaryLeft.kt"); + doTest(fileName); + } + + @TestMetadata("IfIntoBinaryRight.kt") + public void testIfIntoBinaryRight() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/IfIntoBinaryRight.kt"); + doTest(fileName); + } + + @TestMetadata("IfIntoBinaryRightLeft.kt") + public void testIfIntoBinaryRightLeft() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/IfIntoBinaryRightLeft.kt"); + doTest(fileName); + } + + @TestMetadata("IfIntoBinaryRightLeftDontAdd.kt") + public void testIfIntoBinaryRightLeftDontAdd() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/IfIntoBinaryRightLeftDontAdd.kt"); + doTest(fileName); + } + + @TestMetadata("IfIntoPostfix.kt") + public void testIfIntoPostfix() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/IfIntoPostfix.kt"); + doTest(fileName); + } + + @TestMetadata("IfIntoPrefix.kt") + public void testIfIntoPrefix() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/IfIntoPrefix.kt"); + doTest(fileName); + } + + @TestMetadata("IsDontAdd.kt") + public void testIsDontAdd() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/IsDontAdd.kt"); + doTest(fileName); + } + + @TestMetadata("IsIntoCall.kt") + public void testIsIntoCall() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/IsIntoCall.kt"); + doTest(fileName); + } + + @TestMetadata("LeftAssociative.kt") + public void testLeftAssociative() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/LeftAssociative.kt"); + doTest(fileName); + } + + @TestMetadata("LeftAssociativeBoolean.kt") + public void testLeftAssociativeBoolean() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/LeftAssociativeBoolean.kt"); + doTest(fileName); + } + + @TestMetadata("LeftAssociativeDontAdd.kt") + public void testLeftAssociativeDontAdd() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/LeftAssociativeDontAdd.kt"); + doTest(fileName); + } + + @TestMetadata("PostfixIntoPrefix.kt") + public void testPostfixIntoPrefix() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/PostfixIntoPrefix.kt"); + doTest(fileName); + } + + @TestMetadata("PrefixIntoPostfix.kt") + public void testPrefixIntoPostfix() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/PrefixIntoPostfix.kt"); + doTest(fileName); + } + + @TestMetadata("Qualified.kt") + public void testQualified() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/Qualified.kt"); + doTest(fileName); + } + + @TestMetadata("QualifiedDontAdd.kt") + public void testQualifiedDontAdd() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/QualifiedDontAdd.kt"); + doTest(fileName); + } + + @TestMetadata("StringTemplate.kt") + public void testStringTemplate() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/StringTemplate.kt"); + doTest(fileName); + } + + @TestMetadata("StringTemplateAlreadyInBraces.kt") + public void testStringTemplateAlreadyInBraces() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/StringTemplateAlreadyInBraces.kt"); + doTest(fileName); + } + + @TestMetadata("StringTemplateDontAdd.kt") + public void testStringTemplateDontAdd() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/StringTemplateDontAdd.kt"); + doTest(fileName); + } + + @TestMetadata("UnaryIntoBinary.kt") + public void testUnaryIntoBinary() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/inlineVariableOrProperty/addParenthesis/UnaryIntoBinary.kt"); + doTest(fileName); + } + } + + @TestMetadata("idea/testData/refactoring/inline/inlineVariableOrProperty/explicateParameterTypes") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class ExplicateParameterTypes extends AbstractInlineTest { + public void testAllFilesPresentInExplicateParameterTypes() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/inline/inlineVariableOrProperty/explicateParameterTypes"), Pattern.compile("^(\\w+)\\.kt$"), true); + } + + @TestMetadata("EnoughDontExplicate.kt") + public void testEnoughDontExplicate() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/inlineVariableOrProperty/explicateParameterTypes/EnoughDontExplicate.kt"); + doTest(fileName); + } + + @TestMetadata("ErrorTypes.kt") + public void testErrorTypes() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/inlineVariableOrProperty/explicateParameterTypes/ErrorTypes.kt"); + doTest(fileName); + } + + @TestMetadata("It.kt") + public void testIt() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/inlineVariableOrProperty/explicateParameterTypes/It.kt"); + doTest(fileName); + } + + @TestMetadata("ItMultiLine.kt") + public void testItMultiLine() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/inlineVariableOrProperty/explicateParameterTypes/ItMultiLine.kt"); + doTest(fileName); + } + + @TestMetadata("Parenthesized.kt") + public void testParenthesized() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/inlineVariableOrProperty/explicateParameterTypes/Parenthesized.kt"); + doTest(fileName); + } + + @TestMetadata("Simplest.kt") + public void testSimplest() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/inlineVariableOrProperty/explicateParameterTypes/Simplest.kt"); + doTest(fileName); + } + + @TestMetadata("TrivialDontExplicate.kt") + public void testTrivialDontExplicate() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/inlineVariableOrProperty/explicateParameterTypes/TrivialDontExplicate.kt"); + doTest(fileName); + } + } + + @TestMetadata("idea/testData/refactoring/inline/inlineVariableOrProperty/explicateTypeArgument") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class ExplicateTypeArgument extends AbstractInlineTest { + public void testAllFilesPresentInExplicateTypeArgument() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/inline/inlineVariableOrProperty/explicateTypeArgument"), Pattern.compile("^(\\w+)\\.kt$"), true); + } + + @TestMetadata("DeeperNestedCall.kt") + public void testDeeperNestedCall() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/inlineVariableOrProperty/explicateTypeArgument/DeeperNestedCall.kt"); + doTest(fileName); + } + + @TestMetadata("EnoughDontExplicate.kt") + public void testEnoughDontExplicate() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/inlineVariableOrProperty/explicateTypeArgument/EnoughDontExplicate.kt"); + doTest(fileName); + } + + @TestMetadata("ExplicateForSome.kt") + public void testExplicateForSome() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/inlineVariableOrProperty/explicateTypeArgument/ExplicateForSome.kt"); + doTest(fileName); + } + + @TestMetadata("InStringTemplate.kt") + public void testInStringTemplate() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/inlineVariableOrProperty/explicateTypeArgument/InStringTemplate.kt"); + doTest(fileName); + } + + @TestMetadata("NestedCall.kt") + public void testNestedCall() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/inlineVariableOrProperty/explicateTypeArgument/NestedCall.kt"); + doTest(fileName); + } + + @TestMetadata("Parenthesized.kt") + public void testParenthesized() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/inlineVariableOrProperty/explicateTypeArgument/Parenthesized.kt"); + doTest(fileName); + } + + @TestMetadata("Qualified.kt") + public void testQualified() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/inlineVariableOrProperty/explicateTypeArgument/Qualified.kt"); + doTest(fileName); + } + + @TestMetadata("Simplest.kt") + public void testSimplest() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/inlineVariableOrProperty/explicateTypeArgument/Simplest.kt"); + doTest(fileName); + } + + @TestMetadata("TrivialDontExplicate.kt") + public void testTrivialDontExplicate() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/inlineVariableOrProperty/explicateTypeArgument/TrivialDontExplicate.kt"); + doTest(fileName); + } + } + + @TestMetadata("idea/testData/refactoring/inline/inlineVariableOrProperty/property") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class Property extends AbstractInlineTest { + public void testAllFilesPresentInProperty() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/inline/inlineVariableOrProperty/property"), Pattern.compile("^(\\w+)\\.kt$"), true); + } + + @TestMetadata("Basic.kt") + public void testBasic() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/inlineVariableOrProperty/property/Basic.kt"); + doTest(fileName); + } + + @TestMetadata("ClassObjectProperty.kt") + public void testClassObjectProperty() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/inlineVariableOrProperty/property/ClassObjectProperty.kt"); + doTest(fileName); + } + + @TestMetadata("ExtensionProperty.kt") + public void testExtensionProperty() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/inlineVariableOrProperty/property/ExtensionProperty.kt"); + doTest(fileName); + } + + @TestMetadata("InstanceProperty.kt") + public void testInstanceProperty() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/inlineVariableOrProperty/property/InstanceProperty.kt"); + doTest(fileName); + } + + @TestMetadata("keepImport.kt") + public void testKeepImport() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/inlineVariableOrProperty/property/keepImport.kt"); + doTest(fileName); + } + + @TestMetadata("multiplePackages.kt") + public void testMultiplePackages() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/inlineVariableOrProperty/property/multiplePackages.kt"); + doTest(fileName); + } + + @TestMetadata("ObjectProperty.kt") + public void testObjectProperty() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/inlineVariableOrProperty/property/ObjectProperty.kt"); + doTest(fileName); + } + + @TestMetadata("QualifiedUsage.kt") + public void testQualifiedUsage() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/inlineVariableOrProperty/property/QualifiedUsage.kt"); + doTest(fileName); + } + + @TestMetadata("removeImport.kt") + public void testRemoveImport() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/inlineVariableOrProperty/property/removeImport.kt"); + doTest(fileName); + } + + @TestMetadata("WithGetter.kt") + public void testWithGetter() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/inlineVariableOrProperty/property/WithGetter.kt"); + doTest(fileName); + } + + @TestMetadata("WithInitializerAndGetter.kt") + public void testWithInitializerAndGetter() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/inlineVariableOrProperty/property/WithInitializerAndGetter.kt"); + doTest(fileName); + } + } + + @TestMetadata("idea/testData/refactoring/inline/inlineVariableOrProperty/stringTemplates") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class StringTemplates extends AbstractInlineTest { + @TestMetadata("addBraces.kt") + public void testAddBraces() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/inlineVariableOrProperty/stringTemplates/addBraces.kt"); + doTest(fileName); + } + + public void testAllFilesPresentInStringTemplates() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/inline/inlineVariableOrProperty/stringTemplates"), Pattern.compile("^(\\w+)\\.kt$"), true); + } + + @TestMetadata("blockEntry.kt") + public void testBlockEntry() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/inlineVariableOrProperty/stringTemplates/blockEntry.kt"); + doTest(fileName); + } + + @TestMetadata("empty.kt") + public void testEmpty() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/inlineVariableOrProperty/stringTemplates/empty.kt"); + doTest(fileName); + } + + @TestMetadata("nonEmpty.kt") + public void testNonEmpty() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/inlineVariableOrProperty/stringTemplates/nonEmpty.kt"); + doTest(fileName); + } + + @TestMetadata("nonRawToRaw.kt") + public void testNonRawToRaw() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/inlineVariableOrProperty/stringTemplates/nonRawToRaw.kt"); + doTest(fileName); + } + + @TestMetadata("rawString.kt") + public void testRawString() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/inlineVariableOrProperty/stringTemplates/rawString.kt"); + doTest(fileName); + } + + @TestMetadata("rawToNonRaw.kt") + public void testRawToNonRaw() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/inlineVariableOrProperty/stringTemplates/rawToNonRaw.kt"); + doTest(fileName); + } + } } }