diff --git a/generators/org/jetbrains/jet/generators/tests/GenerateTests.java b/generators/org/jetbrains/jet/generators/tests/GenerateTests.java index fb53e2a6a2b..62a775547c2 100644 --- a/generators/org/jetbrains/jet/generators/tests/GenerateTests.java +++ b/generators/org/jetbrains/jet/generators/tests/GenerateTests.java @@ -38,7 +38,7 @@ import org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveDescriptorRenderer import org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest; import org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveTest; import org.jetbrains.jet.modules.xml.AbstractModuleXmlParserTest; -import org.jetbrains.jet.plugin.codeInsight.codeTransformations.AbstractCodeTransformationTest; +import org.jetbrains.jet.plugin.intentions.AbstractCodeTransformationTest; import org.jetbrains.jet.plugin.codeInsight.surroundWith.AbstractSurroundWithTest; import org.jetbrains.jet.plugin.folding.AbstractKotlinFoldingTest; import org.jetbrains.jet.plugin.hierarchy.AbstractHierarchyTest; @@ -330,25 +330,25 @@ public class GenerateTests { "idea/tests/", "CodeTransformationsTestGenerated", AbstractCodeTransformationTest.class, - testModel("idea/testData/codeInsight/codeTransformations/branched/folding/ifToAssignment", "doTestFoldIfToAssignment"), - testModel("idea/testData/codeInsight/codeTransformations/branched/folding/ifToReturn", "doTestFoldIfToReturn"), - testModel("idea/testData/codeInsight/codeTransformations/branched/folding/ifToReturnAsymmetrically", "doTestFoldIfToReturnAsymmetrically"), - testModel("idea/testData/codeInsight/codeTransformations/branched/folding/whenToAssignment", "doTestFoldWhenToAssignment"), - testModel("idea/testData/codeInsight/codeTransformations/branched/folding/whenToReturn", "doTestFoldWhenToReturn"), - testModel("idea/testData/codeInsight/codeTransformations/branched/unfolding/assignmentToIf", "doTestUnfoldAssignmentToIf"), - testModel("idea/testData/codeInsight/codeTransformations/branched/unfolding/assignmentToWhen", "doTestUnfoldAssignmentToWhen"), - testModel("idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToIf", "doTestUnfoldPropertyToIf"), - testModel("idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToWhen", "doTestUnfoldPropertyToWhen"), - testModel("idea/testData/codeInsight/codeTransformations/branched/unfolding/returnToIf", "doTestUnfoldReturnToIf"), - testModel("idea/testData/codeInsight/codeTransformations/branched/unfolding/returnToWhen", "doTestUnfoldReturnToWhen"), - testModel("idea/testData/codeInsight/codeTransformations/branched/ifWhen/ifToWhen", "doTestIfToWhen"), - testModel("idea/testData/codeInsight/codeTransformations/branched/ifWhen/whenToIf", "doTestWhenToIf"), - testModel("idea/testData/codeInsight/codeTransformations/branched/when/flatten", "doTestFlattenWhen"), - testModel("idea/testData/codeInsight/codeTransformations/branched/when/introduceSubject", "doTestIntroduceWhenSubject"), - testModel("idea/testData/codeInsight/codeTransformations/branched/when/eliminateSubject", "doTestEliminateWhenSubject"), - testModel("idea/testData/codeInsight/codeTransformations/declarations/split", "doTestSplitProperty"), - testModel("idea/testData/codeInsight/codeTransformations/declarations/join", "doTestJoinProperty"), - testModel("idea/testData/codeInsight/codeTransformations/removeUnnecessaryParentheses", "doTestRemoveUnnecessaryParentheses") + testModel("idea/testData/intentions/branched/folding/ifToAssignment", "doTestFoldIfToAssignment"), + testModel("idea/testData/intentions/branched/folding/ifToReturn", "doTestFoldIfToReturn"), + testModel("idea/testData/intentions/branched/folding/ifToReturnAsymmetrically", "doTestFoldIfToReturnAsymmetrically"), + testModel("idea/testData/intentions/branched/folding/whenToAssignment", "doTestFoldWhenToAssignment"), + testModel("idea/testData/intentions/branched/folding/whenToReturn", "doTestFoldWhenToReturn"), + testModel("idea/testData/intentions/branched/unfolding/assignmentToIf", "doTestUnfoldAssignmentToIf"), + testModel("idea/testData/intentions/branched/unfolding/assignmentToWhen", "doTestUnfoldAssignmentToWhen"), + testModel("idea/testData/intentions/branched/unfolding/propertyToIf", "doTestUnfoldPropertyToIf"), + testModel("idea/testData/intentions/branched/unfolding/propertyToWhen", "doTestUnfoldPropertyToWhen"), + testModel("idea/testData/intentions/branched/unfolding/returnToIf", "doTestUnfoldReturnToIf"), + testModel("idea/testData/intentions/branched/unfolding/returnToWhen", "doTestUnfoldReturnToWhen"), + testModel("idea/testData/intentions/branched/ifWhen/ifToWhen", "doTestIfToWhen"), + testModel("idea/testData/intentions/branched/ifWhen/whenToIf", "doTestWhenToIf"), + testModel("idea/testData/intentions/branched/when/flatten", "doTestFlattenWhen"), + testModel("idea/testData/intentions/branched/when/introduceSubject", "doTestIntroduceWhenSubject"), + testModel("idea/testData/intentions/branched/when/eliminateSubject", "doTestEliminateWhenSubject"), + testModel("idea/testData/intentions/declarations/split", "doTestSplitProperty"), + testModel("idea/testData/intentions/declarations/join", "doTestJoinProperty"), + testModel("idea/testData/intentions/removeUnnecessaryParentheses", "doTestRemoveUnnecessaryParentheses") ); generateTest( diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml index e9d773c8e00..fcf0e0c2ae7 100644 --- a/idea/src/META-INF/plugin.xml +++ b/idea/src/META-INF/plugin.xml @@ -28,7 +28,7 @@ org.jetbrains.jet.plugin.versions.OutdatedKotlinRuntimeNotification - org.jetbrains.jet.plugin.codeInsight.ktSignature.KotlinSignatureInJavaMarkerUpdater + org.jetbrains.jet.plugin.ktSignature.KotlinSignatureInJavaMarkerUpdater @@ -71,7 +71,7 @@ - + @@ -211,7 +211,7 @@ + implementationClass="org.jetbrains.jet.plugin.ktSignature.KotlinSignatureInJavaMarkerProvider"/> @@ -291,7 +291,7 @@ implementation="org.jetbrains.jet.plugin.codeInsight.upDownMover.JetDeclarationMover" order="before jetExpression" /> - + org.jetbrains.jet.plugin.intentions.SpecifyTypeExplicitlyAction @@ -299,97 +299,97 @@ - org.jetbrains.jet.plugin.codeInsight.ktSignature.KotlinSignatureAnnotationIntention + org.jetbrains.jet.plugin.ktSignature.KotlinSignatureAnnotationIntention Kotlin - org.jetbrains.jet.plugin.codeInsight.codeTransformations.branchedTransformations.intentions.FoldBranchedExpressionIntention$FoldIfToAssignmentIntention + org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions.FoldBranchedExpressionIntention$FoldIfToAssignmentIntention Kotlin - org.jetbrains.jet.plugin.codeInsight.codeTransformations.branchedTransformations.intentions.FoldBranchedExpressionIntention$FoldIfToReturnAsymmetricallyIntention + org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions.FoldBranchedExpressionIntention$FoldIfToReturnAsymmetricallyIntention Kotlin - org.jetbrains.jet.plugin.codeInsight.codeTransformations.branchedTransformations.intentions.FoldBranchedExpressionIntention$FoldIfToReturnIntention + org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions.FoldBranchedExpressionIntention$FoldIfToReturnIntention Kotlin - org.jetbrains.jet.plugin.codeInsight.codeTransformations.branchedTransformations.intentions.FoldBranchedExpressionIntention$FoldWhenToAssignmentIntention + org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions.FoldBranchedExpressionIntention$FoldWhenToAssignmentIntention Kotlin - org.jetbrains.jet.plugin.codeInsight.codeTransformations.branchedTransformations.intentions.FoldBranchedExpressionIntention$FoldWhenToReturnIntention + org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions.FoldBranchedExpressionIntention$FoldWhenToReturnIntention Kotlin - org.jetbrains.jet.plugin.codeInsight.codeTransformations.branchedTransformations.intentions.UnfoldBranchedExpressionIntention$UnfoldAssignmentToIfIntention + org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions.UnfoldBranchedExpressionIntention$UnfoldAssignmentToIfIntention Kotlin - org.jetbrains.jet.plugin.codeInsight.codeTransformations.branchedTransformations.intentions.UnfoldBranchedExpressionIntention$UnfoldPropertyToIfIntention + org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions.UnfoldBranchedExpressionIntention$UnfoldPropertyToIfIntention Kotlin - org.jetbrains.jet.plugin.codeInsight.codeTransformations.branchedTransformations.intentions.UnfoldBranchedExpressionIntention$UnfoldAssignmentToWhenIntention + org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions.UnfoldBranchedExpressionIntention$UnfoldAssignmentToWhenIntention Kotlin - org.jetbrains.jet.plugin.codeInsight.codeTransformations.branchedTransformations.intentions.UnfoldBranchedExpressionIntention$UnfoldPropertyToWhenIntention + org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions.UnfoldBranchedExpressionIntention$UnfoldPropertyToWhenIntention Kotlin - org.jetbrains.jet.plugin.codeInsight.codeTransformations.branchedTransformations.intentions.UnfoldBranchedExpressionIntention$UnfoldReturnToIfIntention + org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions.UnfoldBranchedExpressionIntention$UnfoldReturnToIfIntention Kotlin - org.jetbrains.jet.plugin.codeInsight.codeTransformations.branchedTransformations.intentions.UnfoldBranchedExpressionIntention$UnfoldReturnToWhenIntention + org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions.UnfoldBranchedExpressionIntention$UnfoldReturnToWhenIntention Kotlin - org.jetbrains.jet.plugin.codeInsight.codeTransformations.branchedTransformations.intentions.IfToWhenIntention + org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions.IfToWhenIntention Kotlin - org.jetbrains.jet.plugin.codeInsight.codeTransformations.branchedTransformations.intentions.WhenToIfIntention + org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions.WhenToIfIntention Kotlin - org.jetbrains.jet.plugin.codeInsight.codeTransformations.branchedTransformations.intentions.FlattenWhenIntention + org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions.FlattenWhenIntention Kotlin - org.jetbrains.jet.plugin.codeInsight.codeTransformations.branchedTransformations.intentions.IntroduceWhenSubjectIntention + org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions.IntroduceWhenSubjectIntention Kotlin - org.jetbrains.jet.plugin.codeInsight.codeTransformations.branchedTransformations.intentions.EliminateWhenSubjectIntention + org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions.EliminateWhenSubjectIntention Kotlin - org.jetbrains.jet.plugin.codeInsight.codeTransformations.RemoveUnnecessaryParenthesesIntention + org.jetbrains.jet.plugin.intentions.RemoveUnnecessaryParenthesesIntention Kotlin - org.jetbrains.jet.plugin.codeInsight.codeTransformations.declarations.SplitPropertyDeclarationIntention + org.jetbrains.jet.plugin.intentions.declarations.SplitPropertyDeclarationIntention Kotlin diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/AbstractCodeTransformationIntention.java b/idea/src/org/jetbrains/jet/plugin/intentions/AbstractCodeTransformationIntention.java similarity index 94% rename from idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/AbstractCodeTransformationIntention.java rename to idea/src/org/jetbrains/jet/plugin/intentions/AbstractCodeTransformationIntention.java index d965e443028..5990e926e7f 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/AbstractCodeTransformationIntention.java +++ b/idea/src/org/jetbrains/jet/plugin/intentions/AbstractCodeTransformationIntention.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.codeInsight.codeTransformations; +package org.jetbrains.jet.plugin.intentions; import com.google.common.base.Predicate; import com.intellij.codeInsight.intention.impl.BaseIntentionAction; @@ -29,7 +29,6 @@ import org.jetbrains.jet.lang.psi.JetElement; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.psi.JetPsiUtil; import org.jetbrains.jet.plugin.JetBundle; -import org.jetbrains.jet.plugin.codeInsight.codeTransformations.Transformer; public abstract class AbstractCodeTransformationIntention extends BaseIntentionAction { private final T transformer; diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/RemoveUnnecessaryParenthesesIntention.java b/idea/src/org/jetbrains/jet/plugin/intentions/RemoveUnnecessaryParenthesesIntention.java similarity index 97% rename from idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/RemoveUnnecessaryParenthesesIntention.java rename to idea/src/org/jetbrains/jet/plugin/intentions/RemoveUnnecessaryParenthesesIntention.java index 6ccb7e3ac7d..fec605186b1 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/RemoveUnnecessaryParenthesesIntention.java +++ b/idea/src/org/jetbrains/jet/plugin/intentions/RemoveUnnecessaryParenthesesIntention.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.codeInsight.codeTransformations; +package org.jetbrains.jet.plugin.intentions; import com.intellij.codeInsight.intention.impl.BaseIntentionAction; import com.intellij.openapi.editor.Editor; diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/Transformer.java b/idea/src/org/jetbrains/jet/plugin/intentions/Transformer.java similarity index 93% rename from idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/Transformer.java rename to idea/src/org/jetbrains/jet/plugin/intentions/Transformer.java index 6fa2790ac05..e975e842b3d 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/Transformer.java +++ b/idea/src/org/jetbrains/jet/plugin/intentions/Transformer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.codeInsight.codeTransformations; +package org.jetbrains.jet.plugin.intentions; import com.intellij.openapi.editor.Editor; import com.intellij.psi.PsiElement; diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/BranchedFoldingUtils.java b/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/BranchedFoldingUtils.java similarity index 99% rename from idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/BranchedFoldingUtils.java rename to idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/BranchedFoldingUtils.java index ca8dc54d57f..f071b96d725 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/BranchedFoldingUtils.java +++ b/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/BranchedFoldingUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.codeInsight.codeTransformations.branchedTransformations; +package org.jetbrains.jet.plugin.intentions.branchedTransformations; import com.google.common.base.Predicate; import com.intellij.openapi.project.Project; diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/BranchedUnfoldingUtils.java b/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/BranchedUnfoldingUtils.java similarity index 97% rename from idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/BranchedUnfoldingUtils.java rename to idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/BranchedUnfoldingUtils.java index a3fccc42a96..b456b4876c4 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/BranchedUnfoldingUtils.java +++ b/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/BranchedUnfoldingUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.codeInsight.codeTransformations.branchedTransformations; +package org.jetbrains.jet.plugin.intentions.branchedTransformations; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; @@ -22,7 +22,7 @@ import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.psi.*; -import org.jetbrains.jet.plugin.codeInsight.codeTransformations.declarations.DeclarationUtils; +import org.jetbrains.jet.plugin.intentions.declarations.DeclarationUtils; public class BranchedUnfoldingUtils { private BranchedUnfoldingUtils() { diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/FoldableKind.java b/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/FoldableKind.java similarity index 93% rename from idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/FoldableKind.java rename to idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/FoldableKind.java index 4207d42ea51..7f3d8531209 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/FoldableKind.java +++ b/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/FoldableKind.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.codeInsight.codeTransformations.branchedTransformations; +package org.jetbrains.jet.plugin.intentions.branchedTransformations; import com.intellij.openapi.editor.Editor; import com.intellij.psi.PsiElement; @@ -22,7 +22,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.psi.JetIfExpression; import org.jetbrains.jet.lang.psi.JetWhenExpression; -import org.jetbrains.jet.plugin.codeInsight.codeTransformations.Transformer; +import org.jetbrains.jet.plugin.intentions.Transformer; public enum FoldableKind implements Transformer { IF_TO_ASSIGNMENT("fold.if.to.assignment") { diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/IfWhenUtils.java b/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/IfWhenUtils.java similarity index 98% rename from idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/IfWhenUtils.java rename to idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/IfWhenUtils.java index b0a9ec4aa07..d13b1727371 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/IfWhenUtils.java +++ b/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/IfWhenUtils.java @@ -1,4 +1,4 @@ -package org.jetbrains.jet.plugin.codeInsight.codeTransformations.branchedTransformations; +package org.jetbrains.jet.plugin.intentions.branchedTransformations; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/UnfoldableKind.java b/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/UnfoldableKind.java similarity index 94% rename from idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/UnfoldableKind.java rename to idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/UnfoldableKind.java index bb14756bafb..9c99d7eb807 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/UnfoldableKind.java +++ b/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/UnfoldableKind.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.codeInsight.codeTransformations.branchedTransformations; +package org.jetbrains.jet.plugin.intentions.branchedTransformations; import com.intellij.openapi.editor.Editor; import com.intellij.psi.PsiElement; @@ -23,7 +23,7 @@ import org.jetbrains.jet.lang.psi.JetBinaryExpression; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.psi.JetProperty; import org.jetbrains.jet.lang.psi.JetReturnExpression; -import org.jetbrains.jet.plugin.codeInsight.codeTransformations.Transformer; +import org.jetbrains.jet.plugin.intentions.Transformer; public enum UnfoldableKind implements Transformer { ASSIGNMENT_TO_IF("unfold.assignment.to.if") { diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/WhenUtils.java b/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/WhenUtils.java similarity index 99% rename from idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/WhenUtils.java rename to idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/WhenUtils.java index 53bea0419bc..08ddc198924 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/WhenUtils.java +++ b/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/WhenUtils.java @@ -1,4 +1,4 @@ -package org.jetbrains.jet.plugin.codeInsight.codeTransformations.branchedTransformations; +package org.jetbrains.jet.plugin.intentions.branchedTransformations; import com.intellij.psi.tree.IElementType; import org.jetbrains.annotations.NotNull; diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/intentions/EliminateWhenSubjectIntention.java b/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/EliminateWhenSubjectIntention.java similarity index 76% rename from idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/intentions/EliminateWhenSubjectIntention.java rename to idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/EliminateWhenSubjectIntention.java index 06113ada000..84b31f0a872 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/intentions/EliminateWhenSubjectIntention.java +++ b/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/EliminateWhenSubjectIntention.java @@ -1,4 +1,4 @@ -package org.jetbrains.jet.plugin.codeInsight.codeTransformations.branchedTransformations.intentions; +package org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions; import com.google.common.base.Predicate; import com.intellij.openapi.editor.Editor; @@ -7,9 +7,9 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.psi.JetWhenExpression; -import org.jetbrains.jet.plugin.codeInsight.codeTransformations.AbstractCodeTransformationIntention; -import org.jetbrains.jet.plugin.codeInsight.codeTransformations.branchedTransformations.WhenUtils; -import org.jetbrains.jet.plugin.codeInsight.codeTransformations.Transformer; +import org.jetbrains.jet.plugin.intentions.AbstractCodeTransformationIntention; +import org.jetbrains.jet.plugin.intentions.branchedTransformations.WhenUtils; +import org.jetbrains.jet.plugin.intentions.Transformer; public class EliminateWhenSubjectIntention extends AbstractCodeTransformationIntention { private static final Transformer TRANSFORMER = new Transformer() { diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/intentions/FlattenWhenIntention.java b/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/FlattenWhenIntention.java similarity index 75% rename from idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/intentions/FlattenWhenIntention.java rename to idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/FlattenWhenIntention.java index f687d649bfd..4dc17519b5b 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/intentions/FlattenWhenIntention.java +++ b/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/FlattenWhenIntention.java @@ -1,4 +1,4 @@ -package org.jetbrains.jet.plugin.codeInsight.codeTransformations.branchedTransformations.intentions; +package org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions; import com.google.common.base.Predicate; import com.intellij.openapi.editor.Editor; @@ -7,9 +7,9 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.psi.JetWhenExpression; -import org.jetbrains.jet.plugin.codeInsight.codeTransformations.AbstractCodeTransformationIntention; -import org.jetbrains.jet.plugin.codeInsight.codeTransformations.branchedTransformations.WhenUtils; -import org.jetbrains.jet.plugin.codeInsight.codeTransformations.Transformer; +import org.jetbrains.jet.plugin.intentions.AbstractCodeTransformationIntention; +import org.jetbrains.jet.plugin.intentions.branchedTransformations.WhenUtils; +import org.jetbrains.jet.plugin.intentions.Transformer; public class FlattenWhenIntention extends AbstractCodeTransformationIntention { private static final Transformer TRANSFORMER = new Transformer() { diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/intentions/FoldBranchedExpressionIntention.java b/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/FoldBranchedExpressionIntention.java similarity index 85% rename from idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/intentions/FoldBranchedExpressionIntention.java rename to idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/FoldBranchedExpressionIntention.java index c0328548790..152ae94e32b 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/intentions/FoldBranchedExpressionIntention.java +++ b/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/FoldBranchedExpressionIntention.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.codeInsight.codeTransformations.branchedTransformations.intentions; +package org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions; import com.google.common.base.Predicate; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.psi.JetExpression; -import org.jetbrains.jet.plugin.codeInsight.codeTransformations.AbstractCodeTransformationIntention; -import org.jetbrains.jet.plugin.codeInsight.codeTransformations.branchedTransformations.BranchedFoldingUtils; -import org.jetbrains.jet.plugin.codeInsight.codeTransformations.branchedTransformations.FoldableKind; +import org.jetbrains.jet.plugin.intentions.AbstractCodeTransformationIntention; +import org.jetbrains.jet.plugin.intentions.branchedTransformations.BranchedFoldingUtils; +import org.jetbrains.jet.plugin.intentions.branchedTransformations.FoldableKind; public abstract class FoldBranchedExpressionIntention extends AbstractCodeTransformationIntention { protected FoldBranchedExpressionIntention(@NotNull final FoldableKind foldableKind) { diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/intentions/IfToWhenIntention.java b/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/IfToWhenIntention.java similarity index 75% rename from idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/intentions/IfToWhenIntention.java rename to idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/IfToWhenIntention.java index df3b9cb712f..25ebc93c548 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/intentions/IfToWhenIntention.java +++ b/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/IfToWhenIntention.java @@ -1,4 +1,4 @@ -package org.jetbrains.jet.plugin.codeInsight.codeTransformations.branchedTransformations.intentions; +package org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions; import com.google.common.base.Predicate; import com.intellij.openapi.editor.Editor; @@ -7,9 +7,9 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.psi.JetIfExpression; -import org.jetbrains.jet.plugin.codeInsight.codeTransformations.AbstractCodeTransformationIntention; -import org.jetbrains.jet.plugin.codeInsight.codeTransformations.branchedTransformations.IfWhenUtils; -import org.jetbrains.jet.plugin.codeInsight.codeTransformations.Transformer; +import org.jetbrains.jet.plugin.intentions.AbstractCodeTransformationIntention; +import org.jetbrains.jet.plugin.intentions.branchedTransformations.IfWhenUtils; +import org.jetbrains.jet.plugin.intentions.Transformer; public class IfToWhenIntention extends AbstractCodeTransformationIntention { private static final Transformer TRANSFORMER = new Transformer() { diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/intentions/IntroduceWhenSubjectIntention.java b/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/IntroduceWhenSubjectIntention.java similarity index 76% rename from idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/intentions/IntroduceWhenSubjectIntention.java rename to idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/IntroduceWhenSubjectIntention.java index 8ddadc2364e..96989b42600 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/intentions/IntroduceWhenSubjectIntention.java +++ b/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/IntroduceWhenSubjectIntention.java @@ -1,4 +1,4 @@ -package org.jetbrains.jet.plugin.codeInsight.codeTransformations.branchedTransformations.intentions; +package org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions; import com.google.common.base.Predicate; import com.intellij.openapi.editor.Editor; @@ -7,9 +7,9 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.psi.JetWhenExpression; -import org.jetbrains.jet.plugin.codeInsight.codeTransformations.AbstractCodeTransformationIntention; -import org.jetbrains.jet.plugin.codeInsight.codeTransformations.branchedTransformations.WhenUtils; -import org.jetbrains.jet.plugin.codeInsight.codeTransformations.Transformer; +import org.jetbrains.jet.plugin.intentions.AbstractCodeTransformationIntention; +import org.jetbrains.jet.plugin.intentions.branchedTransformations.WhenUtils; +import org.jetbrains.jet.plugin.intentions.Transformer; public class IntroduceWhenSubjectIntention extends AbstractCodeTransformationIntention { private static final Transformer TRANSFORMER = new Transformer() { diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/intentions/UnfoldBranchedExpressionIntention.java b/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/UnfoldBranchedExpressionIntention.java similarity index 90% rename from idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/intentions/UnfoldBranchedExpressionIntention.java rename to idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/UnfoldBranchedExpressionIntention.java index 45caf8e5583..d90c5f90378 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/intentions/UnfoldBranchedExpressionIntention.java +++ b/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/UnfoldBranchedExpressionIntention.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.codeInsight.codeTransformations.branchedTransformations.intentions; +package org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions; import com.google.common.base.Predicate; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.psi.JetExpression; -import org.jetbrains.jet.plugin.codeInsight.codeTransformations.branchedTransformations.*; -import org.jetbrains.jet.plugin.codeInsight.codeTransformations.AbstractCodeTransformationIntention; +import org.jetbrains.jet.plugin.intentions.branchedTransformations.*; +import org.jetbrains.jet.plugin.intentions.AbstractCodeTransformationIntention; public abstract class UnfoldBranchedExpressionIntention extends AbstractCodeTransformationIntention { protected UnfoldBranchedExpressionIntention(@NotNull final UnfoldableKind unfoldableKind) { diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/intentions/WhenToIfIntention.java b/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/WhenToIfIntention.java similarity index 82% rename from idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/intentions/WhenToIfIntention.java rename to idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/WhenToIfIntention.java index c503d03f031..081b0588c92 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/intentions/WhenToIfIntention.java +++ b/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/WhenToIfIntention.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.codeInsight.codeTransformations.branchedTransformations.intentions; +package org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions; import com.google.common.base.Predicate; import com.intellij.openapi.editor.Editor; @@ -23,9 +23,9 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.psi.JetWhenExpression; -import org.jetbrains.jet.plugin.codeInsight.codeTransformations.AbstractCodeTransformationIntention; -import org.jetbrains.jet.plugin.codeInsight.codeTransformations.branchedTransformations.IfWhenUtils; -import org.jetbrains.jet.plugin.codeInsight.codeTransformations.Transformer; +import org.jetbrains.jet.plugin.intentions.AbstractCodeTransformationIntention; +import org.jetbrains.jet.plugin.intentions.branchedTransformations.IfWhenUtils; +import org.jetbrains.jet.plugin.intentions.Transformer; public class WhenToIfIntention extends AbstractCodeTransformationIntention { private static final Transformer TRANSFORMER = new Transformer() { diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/declarations/DeclarationUtils.java b/idea/src/org/jetbrains/jet/plugin/intentions/declarations/DeclarationUtils.java similarity index 98% rename from idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/declarations/DeclarationUtils.java rename to idea/src/org/jetbrains/jet/plugin/intentions/declarations/DeclarationUtils.java index c802625201b..f5356ab0649 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/declarations/DeclarationUtils.java +++ b/idea/src/org/jetbrains/jet/plugin/intentions/declarations/DeclarationUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.codeInsight.codeTransformations.declarations; +package org.jetbrains.jet.plugin.intentions.declarations; import com.google.common.base.Predicate; import com.intellij.openapi.project.Project; diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/declarations/JetDeclarationJoinLinesHandler.java b/idea/src/org/jetbrains/jet/plugin/intentions/declarations/JetDeclarationJoinLinesHandler.java similarity index 94% rename from idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/declarations/JetDeclarationJoinLinesHandler.java rename to idea/src/org/jetbrains/jet/plugin/intentions/declarations/JetDeclarationJoinLinesHandler.java index b5717a8d868..9513626474f 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/declarations/JetDeclarationJoinLinesHandler.java +++ b/idea/src/org/jetbrains/jet/plugin/intentions/declarations/JetDeclarationJoinLinesHandler.java @@ -1,4 +1,4 @@ -package org.jetbrains.jet.plugin.codeInsight.codeTransformations.declarations; +package org.jetbrains.jet.plugin.intentions.declarations; import com.google.common.base.Predicate; import com.intellij.codeInsight.editorActions.JoinRawLinesHandlerDelegate; diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/declarations/SplitPropertyDeclarationIntention.java b/idea/src/org/jetbrains/jet/plugin/intentions/declarations/SplitPropertyDeclarationIntention.java similarity index 87% rename from idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/declarations/SplitPropertyDeclarationIntention.java rename to idea/src/org/jetbrains/jet/plugin/intentions/declarations/SplitPropertyDeclarationIntention.java index 8d72546f57b..b582f6c9cd0 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/declarations/SplitPropertyDeclarationIntention.java +++ b/idea/src/org/jetbrains/jet/plugin/intentions/declarations/SplitPropertyDeclarationIntention.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.codeInsight.codeTransformations.declarations; +package org.jetbrains.jet.plugin.intentions.declarations; import com.google.common.base.Predicate; import com.intellij.openapi.editor.Editor; @@ -23,8 +23,8 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.psi.JetProperty; -import org.jetbrains.jet.plugin.codeInsight.codeTransformations.AbstractCodeTransformationIntention; -import org.jetbrains.jet.plugin.codeInsight.codeTransformations.Transformer; +import org.jetbrains.jet.plugin.intentions.AbstractCodeTransformationIntention; +import org.jetbrains.jet.plugin.intentions.Transformer; public class SplitPropertyDeclarationIntention extends AbstractCodeTransformationIntention { private static final Transformer TRANSFORMER = new Transformer() { diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/ktSignature/DeleteSignatureAction.java b/idea/src/org/jetbrains/jet/plugin/ktSignature/DeleteSignatureAction.java similarity index 81% rename from idea/src/org/jetbrains/jet/plugin/codeInsight/ktSignature/DeleteSignatureAction.java rename to idea/src/org/jetbrains/jet/plugin/ktSignature/DeleteSignatureAction.java index 1c9390c255d..dc9df7b0b70 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/ktSignature/DeleteSignatureAction.java +++ b/idea/src/org/jetbrains/jet/plugin/ktSignature/DeleteSignatureAction.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.codeInsight.ktSignature; +package org.jetbrains.jet.plugin.ktSignature; import com.intellij.codeInsight.ExternalAnnotationsManager; import com.intellij.openapi.actionSystem.AnAction; @@ -26,15 +26,13 @@ import com.intellij.psi.PsiAnnotation; import com.intellij.psi.PsiModifierListOwner; import org.jetbrains.annotations.NotNull; -import static org.jetbrains.jet.plugin.codeInsight.ktSignature.KotlinSignatureUtil.*; - public class DeleteSignatureAction extends AnAction { private final PsiModifierListOwner annotationOwner; public DeleteSignatureAction(@NotNull PsiModifierListOwner elementInEditor) { super("Delete"); - this.annotationOwner = getAnnotationOwner(elementInEditor); - getTemplatePresentation().setVisible(isAnnotationEditable(elementInEditor)); + this.annotationOwner = KotlinSignatureUtil.getAnnotationOwner(elementInEditor); + getTemplatePresentation().setVisible(KotlinSignatureUtil.isAnnotationEditable(elementInEditor)); } @Override @@ -42,7 +40,7 @@ public class DeleteSignatureAction extends AnAction { final Project project = e.getProject(); assert project != null; - final PsiAnnotation annotation = findKotlinSignatureAnnotation(annotationOwner); + final PsiAnnotation annotation = KotlinSignatureUtil.findKotlinSignatureAnnotation(annotationOwner); assert annotation != null; if (annotation.getContainingFile() != annotationOwner.getContainingFile()) { @@ -50,7 +48,7 @@ public class DeleteSignatureAction extends AnAction { new WriteCommandAction(project) { @Override protected void run(Result result) throws Throwable { - ExternalAnnotationsManager.getInstance(project).deannotate(annotationOwner, KOTLIN_SIGNATURE_ANNOTATION); + ExternalAnnotationsManager.getInstance(project).deannotate(annotationOwner, KotlinSignatureUtil.KOTLIN_SIGNATURE_ANNOTATION); } }.execute(); } @@ -64,6 +62,6 @@ public class DeleteSignatureAction extends AnAction { } - refreshMarkers(project); + KotlinSignatureUtil.refreshMarkers(project); } } diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/ktSignature/EditSignatureAction.java b/idea/src/org/jetbrains/jet/plugin/ktSignature/EditSignatureAction.java similarity index 85% rename from idea/src/org/jetbrains/jet/plugin/codeInsight/ktSignature/EditSignatureAction.java rename to idea/src/org/jetbrains/jet/plugin/ktSignature/EditSignatureAction.java index 578b7374ef6..e48c5627a56 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/ktSignature/EditSignatureAction.java +++ b/idea/src/org/jetbrains/jet/plugin/ktSignature/EditSignatureAction.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.codeInsight.ktSignature; +package org.jetbrains.jet.plugin.ktSignature; import com.intellij.codeInsight.navigation.NavigationUtil; import com.intellij.openapi.actionSystem.AnAction; @@ -30,13 +30,11 @@ import org.jetbrains.annotations.Nullable; import java.awt.*; -import static org.jetbrains.jet.plugin.codeInsight.ktSignature.KotlinSignatureUtil.*; - public class EditSignatureAction extends AnAction { private final PsiModifierListOwner elementInEditor; public EditSignatureAction(@NotNull PsiModifierListOwner elementInEditor) { - super(isAnnotationEditable(elementInEditor) ? "Edit" : "View"); + super(KotlinSignatureUtil.isAnnotationEditable(elementInEditor) ? "Edit" : "View"); this.elementInEditor = elementInEditor; } @@ -52,7 +50,7 @@ public class EditSignatureAction extends AnAction { } static void invokeEditSignature(@NotNull PsiElement elementInEditor, @NotNull Editor editor, @Nullable Point point) { - PsiAnnotation annotation = findKotlinSignatureAnnotation(elementInEditor); + PsiAnnotation annotation = KotlinSignatureUtil.findKotlinSignatureAnnotation(elementInEditor); assert annotation != null; if (annotation.getContainingFile() == elementInEditor.getContainingFile()) { // not external, go to @@ -75,9 +73,9 @@ public class EditSignatureAction extends AnAction { } } else { - PsiModifierListOwner annotationOwner = getAnnotationOwner(elementInEditor); - boolean editable = isAnnotationEditable(elementInEditor); - EditSignatureBalloon balloon = new EditSignatureBalloon(annotationOwner, getKotlinSignature(annotation), editable); + PsiModifierListOwner annotationOwner = KotlinSignatureUtil.getAnnotationOwner(elementInEditor); + boolean editable = KotlinSignatureUtil.isAnnotationEditable(elementInEditor); + EditSignatureBalloon balloon = new EditSignatureBalloon(annotationOwner, KotlinSignatureUtil.getKotlinSignature(annotation), editable); balloon.show(point, editor, elementInEditor); } } diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/ktSignature/EditSignatureBalloon.java b/idea/src/org/jetbrains/jet/plugin/ktSignature/EditSignatureBalloon.java similarity index 95% rename from idea/src/org/jetbrains/jet/plugin/codeInsight/ktSignature/EditSignatureBalloon.java rename to idea/src/org/jetbrains/jet/plugin/ktSignature/EditSignatureBalloon.java index 52e3ed00f2b..1366643086c 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/ktSignature/EditSignatureBalloon.java +++ b/idea/src/org/jetbrains/jet/plugin/ktSignature/EditSignatureBalloon.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.codeInsight.ktSignature; +package org.jetbrains.jet.plugin.ktSignature; import com.intellij.codeInsight.ExternalAnnotationsManager; import com.intellij.openapi.Disposable; @@ -54,9 +54,6 @@ import java.awt.event.ActionListener; import java.awt.event.InputEvent; import java.awt.event.KeyEvent; -import static org.jetbrains.jet.plugin.codeInsight.ktSignature.KotlinSignatureUtil.KOTLIN_SIGNATURE_ANNOTATION; -import static org.jetbrains.jet.plugin.codeInsight.ktSignature.KotlinSignatureUtil.signatureToNameValuePairs; - class EditSignatureBalloon implements Disposable { private final Editor editor; private final PsiModifierListOwner annotatedElement; @@ -179,7 +176,8 @@ class EditSignatureBalloon implements Disposable { @Override protected void run(Result result) throws Throwable { ExternalAnnotationsManager.getInstance(project).editExternalAnnotation( - annotatedElement, KOTLIN_SIGNATURE_ANNOTATION, signatureToNameValuePairs(project, newSignature)); + annotatedElement, KotlinSignatureUtil.KOTLIN_SIGNATURE_ANNOTATION, KotlinSignatureUtil + .signatureToNameValuePairs(project, newSignature)); } }.execute(); } diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/ktSignature/KotlinSignatureAnnotationIntention.java b/idea/src/org/jetbrains/jet/plugin/ktSignature/KotlinSignatureAnnotationIntention.java similarity index 93% rename from idea/src/org/jetbrains/jet/plugin/codeInsight/ktSignature/KotlinSignatureAnnotationIntention.java rename to idea/src/org/jetbrains/jet/plugin/ktSignature/KotlinSignatureAnnotationIntention.java index 05789d76979..7de28e34a82 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/ktSignature/KotlinSignatureAnnotationIntention.java +++ b/idea/src/org/jetbrains/jet/plugin/ktSignature/KotlinSignatureAnnotationIntention.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.codeInsight.ktSignature; +package org.jetbrains.jet.plugin.ktSignature; import com.intellij.codeInsight.ExternalAnnotationsListener; import com.intellij.codeInsight.ExternalAnnotationsManager; @@ -47,8 +47,6 @@ import org.jetbrains.jet.renderer.DescriptorRendererBuilder; import javax.swing.*; -import static org.jetbrains.jet.plugin.codeInsight.ktSignature.KotlinSignatureUtil.*; - public class KotlinSignatureAnnotationIntention extends BaseIntentionAction implements Iconable { private static final DescriptorRenderer RENDERER = new DescriptorRendererBuilder() .setShortNames(true) @@ -80,8 +78,8 @@ public class KotlinSignatureAnnotationIntention extends BaseIntentionAction impl if (!PsiUtil.isLanguageLevel5OrHigher(annotationOwner)) return false; - if (findKotlinSignatureAnnotation(annotationOwner) != null) { - if (isAnnotationEditable(annotationOwner)) { + if (KotlinSignatureUtil.findKotlinSignatureAnnotation(annotationOwner) != null) { + if (KotlinSignatureUtil.isAnnotationEditable(annotationOwner)) { setText(JetBundle.message("edit.kotlin.signature.action.text")); } else { @@ -100,7 +98,7 @@ public class KotlinSignatureAnnotationIntention extends BaseIntentionAction impl assert annotatedElement != null; - if (findKotlinSignatureAnnotation(annotatedElement) != null) { + if (KotlinSignatureUtil.findKotlinSignatureAnnotation(annotatedElement) != null) { EditSignatureAction.invokeEditSignature(annotatedElement, editor, null); return; } @@ -113,11 +111,11 @@ public class KotlinSignatureAnnotationIntention extends BaseIntentionAction impl public void afterExternalAnnotationChanging(@NotNull PsiModifierListOwner owner, @NotNull String annotationFQName, boolean successful) { busConnection.disconnect(); - if (successful && owner == annotatedElement && KOTLIN_SIGNATURE_ANNOTATION.equals(annotationFQName)) { + if (successful && owner == annotatedElement && KotlinSignatureUtil.KOTLIN_SIGNATURE_ANNOTATION.equals(annotationFQName)) { ApplicationManager.getApplication().invokeLater(new Runnable() { @Override public void run() { - refreshMarkers(project); + KotlinSignatureUtil.refreshMarkers(project); EditSignatureAction.invokeEditSignature(annotatedElement, editor, null); } }, ModalityState.NON_MODAL); @@ -126,7 +124,8 @@ public class KotlinSignatureAnnotationIntention extends BaseIntentionAction impl }); AddAnnotationFix addAnnotationFix = new AddAnnotationFix( - KOTLIN_SIGNATURE_ANNOTATION, annotatedElement, signatureToNameValuePairs(annotatedElement.getProject(), signature)); + KotlinSignatureUtil.KOTLIN_SIGNATURE_ANNOTATION, annotatedElement, KotlinSignatureUtil + .signatureToNameValuePairs(annotatedElement.getProject(), signature)); addAnnotationFix.invoke(project, editor, file); } diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/ktSignature/KotlinSignatureInJavaMarkerProvider.java b/idea/src/org/jetbrains/jet/plugin/ktSignature/KotlinSignatureInJavaMarkerProvider.java similarity index 95% rename from idea/src/org/jetbrains/jet/plugin/codeInsight/ktSignature/KotlinSignatureInJavaMarkerProvider.java rename to idea/src/org/jetbrains/jet/plugin/ktSignature/KotlinSignatureInJavaMarkerProvider.java index bc1851e5744..7209e3a414d 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/ktSignature/KotlinSignatureInJavaMarkerProvider.java +++ b/idea/src/org/jetbrains/jet/plugin/ktSignature/KotlinSignatureInJavaMarkerProvider.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.codeInsight.ktSignature; +package org.jetbrains.jet.plugin.ktSignature; import com.intellij.codeHighlighting.Pass; import com.intellij.codeInsight.daemon.GutterIconNavigationHandler; @@ -53,8 +53,6 @@ import java.awt.event.MouseEvent; import java.util.Collection; import java.util.List; -import static org.jetbrains.jet.plugin.codeInsight.ktSignature.KotlinSignatureUtil.*; - public class KotlinSignatureInJavaMarkerProvider implements LineMarkerProvider { private static final String SHOW_MARKERS_PROPERTY = "kotlin.signature.markers.enabled"; @@ -104,7 +102,7 @@ public class KotlinSignatureInJavaMarkerProvider implements LineMarkerProvider { if (memberDescriptor == null) continue; List errors = trace.get(BindingContext.LOAD_FROM_JAVA_SIGNATURE_ERRORS, memberDescriptor); - boolean hasSignatureAnnotation = findKotlinSignatureAnnotation(element) != null; + boolean hasSignatureAnnotation = KotlinSignatureUtil.findKotlinSignatureAnnotation(element) != null; if (errors != null || hasSignatureAnnotation) { result.add(new MyLineMarkerInfo((PsiModifierListOwner) element, errors, hasSignatureAnnotation)); @@ -200,7 +198,7 @@ public class KotlinSignatureInJavaMarkerProvider implements LineMarkerProvider { memberScope.getProperties(name); } - PsiModifierListOwner annotationOwner = getAnnotationOwner(member); + PsiModifierListOwner annotationOwner = KotlinSignatureUtil.getAnnotationOwner(member); return trace.get(BindingContext.DECLARATION_TO_DESCRIPTOR, annotationOwner); } @@ -210,7 +208,7 @@ public class KotlinSignatureInJavaMarkerProvider implements LineMarkerProvider { public static void setMarkersEnabled(@NotNull Project project, boolean value) { PropertiesComponent.getInstance(project).setValue(SHOW_MARKERS_PROPERTY, Boolean.toString(value)); - refreshMarkers(project); + KotlinSignatureUtil.refreshMarkers(project); } private static class MyLineMarkerInfo extends LineMarkerInfo { @@ -245,11 +243,11 @@ public class KotlinSignatureInJavaMarkerProvider implements LineMarkerProvider { @Nullable @Override public String fun(PsiElement element) { - PsiAnnotation annotation = findKotlinSignatureAnnotation(element); + PsiAnnotation annotation = KotlinSignatureUtil.findKotlinSignatureAnnotation(element); if (annotation == null) return errorsString(); - String signature = getKotlinSignature(annotation); + String signature = KotlinSignatureUtil.getKotlinSignature(annotation); String text = "Alternative Kotlin signature is available for this method:\n" + StringUtil.escapeXml(signature); if (errors == null) { diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/ktSignature/KotlinSignatureInJavaMarkerUpdater.java b/idea/src/org/jetbrains/jet/plugin/ktSignature/KotlinSignatureInJavaMarkerUpdater.java similarity index 95% rename from idea/src/org/jetbrains/jet/plugin/codeInsight/ktSignature/KotlinSignatureInJavaMarkerUpdater.java rename to idea/src/org/jetbrains/jet/plugin/ktSignature/KotlinSignatureInJavaMarkerUpdater.java index 2baee5fdde3..5365c21d448 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/ktSignature/KotlinSignatureInJavaMarkerUpdater.java +++ b/idea/src/org/jetbrains/jet/plugin/ktSignature/KotlinSignatureInJavaMarkerUpdater.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.codeInsight.ktSignature; +package org.jetbrains.jet.plugin.ktSignature; import com.intellij.codeInsight.ExternalAnnotationsListener; import com.intellij.codeInsight.ExternalAnnotationsManager; diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/ktSignature/KotlinSignatureUtil.java b/idea/src/org/jetbrains/jet/plugin/ktSignature/KotlinSignatureUtil.java similarity index 98% rename from idea/src/org/jetbrains/jet/plugin/codeInsight/ktSignature/KotlinSignatureUtil.java rename to idea/src/org/jetbrains/jet/plugin/ktSignature/KotlinSignatureUtil.java index 65af5942ce2..2b1070fe8ac 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/ktSignature/KotlinSignatureUtil.java +++ b/idea/src/org/jetbrains/jet/plugin/ktSignature/KotlinSignatureUtil.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.codeInsight.ktSignature; +package org.jetbrains.jet.plugin.ktSignature; import com.intellij.codeInsight.ExternalAnnotationsManager; import com.intellij.codeInsight.daemon.DaemonCodeAnalyzer; diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/ktSignature/ShowKotlinSignaturesAction.java b/idea/src/org/jetbrains/jet/plugin/ktSignature/ShowKotlinSignaturesAction.java similarity index 96% rename from idea/src/org/jetbrains/jet/plugin/codeInsight/ktSignature/ShowKotlinSignaturesAction.java rename to idea/src/org/jetbrains/jet/plugin/ktSignature/ShowKotlinSignaturesAction.java index 82d3f37b61a..acb3644f446 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/ktSignature/ShowKotlinSignaturesAction.java +++ b/idea/src/org/jetbrains/jet/plugin/ktSignature/ShowKotlinSignaturesAction.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.codeInsight.ktSignature; +package org.jetbrains.jet.plugin.ktSignature; import com.intellij.lang.java.JavaLanguage; import com.intellij.openapi.actionSystem.AnActionEvent; diff --git a/idea/testData/codeInsight/codeTransformations/branched/folding/ifToAssignment/innerIfTransformed.kt b/idea/testData/intentions/branched/folding/ifToAssignment/innerIfTransformed.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/folding/ifToAssignment/innerIfTransformed.kt rename to idea/testData/intentions/branched/folding/ifToAssignment/innerIfTransformed.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/folding/ifToAssignment/innerIfTransformed.kt.after b/idea/testData/intentions/branched/folding/ifToAssignment/innerIfTransformed.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/folding/ifToAssignment/innerIfTransformed.kt.after rename to idea/testData/intentions/branched/folding/ifToAssignment/innerIfTransformed.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/branched/folding/ifToAssignment/simpleIf.kt b/idea/testData/intentions/branched/folding/ifToAssignment/simpleIf.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/folding/ifToAssignment/simpleIf.kt rename to idea/testData/intentions/branched/folding/ifToAssignment/simpleIf.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/folding/ifToAssignment/simpleIf.kt.after b/idea/testData/intentions/branched/folding/ifToAssignment/simpleIf.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/folding/ifToAssignment/simpleIf.kt.after rename to idea/testData/intentions/branched/folding/ifToAssignment/simpleIf.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/branched/folding/ifToAssignment/simpleIfWithAugmentedAssignment.kt b/idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithAugmentedAssignment.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/folding/ifToAssignment/simpleIfWithAugmentedAssignment.kt rename to idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithAugmentedAssignment.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/folding/ifToAssignment/simpleIfWithAugmentedAssignment.kt.after b/idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithAugmentedAssignment.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/folding/ifToAssignment/simpleIfWithAugmentedAssignment.kt.after rename to idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithAugmentedAssignment.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/branched/folding/ifToAssignment/simpleIfWithBlocks.kt b/idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithBlocks.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/folding/ifToAssignment/simpleIfWithBlocks.kt rename to idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithBlocks.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/folding/ifToAssignment/simpleIfWithBlocks.kt.after b/idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithBlocks.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/folding/ifToAssignment/simpleIfWithBlocks.kt.after rename to idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithBlocks.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/branched/folding/ifToAssignment/simpleIfWithShadowedVar.kt b/idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithShadowedVar.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/folding/ifToAssignment/simpleIfWithShadowedVar.kt rename to idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithShadowedVar.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/folding/ifToAssignment/simpleIfWithUnmatchedAssignmentOps.kt b/idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithUnmatchedAssignmentOps.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/folding/ifToAssignment/simpleIfWithUnmatchedAssignmentOps.kt rename to idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithUnmatchedAssignmentOps.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/folding/ifToAssignment/simpleIfWithUnmatchedAssignments.kt b/idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithUnmatchedAssignments.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/folding/ifToAssignment/simpleIfWithUnmatchedAssignments.kt rename to idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithUnmatchedAssignments.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/folding/ifToAssignment/simpleIfWithoutElse.kt b/idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithoutElse.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/folding/ifToAssignment/simpleIfWithoutElse.kt rename to idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithoutElse.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/folding/ifToAssignment/simpleIfWithoutTerminatingAssignment.kt b/idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithoutTerminatingAssignment.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/folding/ifToAssignment/simpleIfWithoutTerminatingAssignment.kt rename to idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithoutTerminatingAssignment.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/folding/ifToReturn/innerIfTransformed.kt b/idea/testData/intentions/branched/folding/ifToReturn/innerIfTransformed.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/folding/ifToReturn/innerIfTransformed.kt rename to idea/testData/intentions/branched/folding/ifToReturn/innerIfTransformed.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/folding/ifToReturn/innerIfTransformed.kt.after b/idea/testData/intentions/branched/folding/ifToReturn/innerIfTransformed.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/folding/ifToReturn/innerIfTransformed.kt.after rename to idea/testData/intentions/branched/folding/ifToReturn/innerIfTransformed.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/branched/folding/ifToReturn/simpleIf.kt b/idea/testData/intentions/branched/folding/ifToReturn/simpleIf.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/folding/ifToReturn/simpleIf.kt rename to idea/testData/intentions/branched/folding/ifToReturn/simpleIf.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/folding/ifToReturn/simpleIf.kt.after b/idea/testData/intentions/branched/folding/ifToReturn/simpleIf.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/folding/ifToReturn/simpleIf.kt.after rename to idea/testData/intentions/branched/folding/ifToReturn/simpleIf.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/branched/folding/ifToReturn/simpleIfWithBlocks.kt b/idea/testData/intentions/branched/folding/ifToReturn/simpleIfWithBlocks.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/folding/ifToReturn/simpleIfWithBlocks.kt rename to idea/testData/intentions/branched/folding/ifToReturn/simpleIfWithBlocks.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/folding/ifToReturn/simpleIfWithBlocks.kt.after b/idea/testData/intentions/branched/folding/ifToReturn/simpleIfWithBlocks.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/folding/ifToReturn/simpleIfWithBlocks.kt.after rename to idea/testData/intentions/branched/folding/ifToReturn/simpleIfWithBlocks.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/branched/folding/ifToReturnAsymmetrically/simpleIf.kt b/idea/testData/intentions/branched/folding/ifToReturnAsymmetrically/simpleIf.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/folding/ifToReturnAsymmetrically/simpleIf.kt rename to idea/testData/intentions/branched/folding/ifToReturnAsymmetrically/simpleIf.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/folding/ifToReturnAsymmetrically/simpleIf.kt.after b/idea/testData/intentions/branched/folding/ifToReturnAsymmetrically/simpleIf.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/folding/ifToReturnAsymmetrically/simpleIf.kt.after rename to idea/testData/intentions/branched/folding/ifToReturnAsymmetrically/simpleIf.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/branched/folding/ifToReturnAsymmetrically/simpleIfWithBlocks.kt b/idea/testData/intentions/branched/folding/ifToReturnAsymmetrically/simpleIfWithBlocks.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/folding/ifToReturnAsymmetrically/simpleIfWithBlocks.kt rename to idea/testData/intentions/branched/folding/ifToReturnAsymmetrically/simpleIfWithBlocks.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/folding/ifToReturnAsymmetrically/simpleIfWithBlocks.kt.after b/idea/testData/intentions/branched/folding/ifToReturnAsymmetrically/simpleIfWithBlocks.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/folding/ifToReturnAsymmetrically/simpleIfWithBlocks.kt.after rename to idea/testData/intentions/branched/folding/ifToReturnAsymmetrically/simpleIfWithBlocks.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/branched/folding/ifToReturnAsymmetrically/simpleIfWithComments.kt b/idea/testData/intentions/branched/folding/ifToReturnAsymmetrically/simpleIfWithComments.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/folding/ifToReturnAsymmetrically/simpleIfWithComments.kt rename to idea/testData/intentions/branched/folding/ifToReturnAsymmetrically/simpleIfWithComments.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/folding/ifToReturnAsymmetrically/simpleIfWithComments.kt.after b/idea/testData/intentions/branched/folding/ifToReturnAsymmetrically/simpleIfWithComments.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/folding/ifToReturnAsymmetrically/simpleIfWithComments.kt.after rename to idea/testData/intentions/branched/folding/ifToReturnAsymmetrically/simpleIfWithComments.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/branched/folding/whenToAssignment/innerWhenTransformed.kt b/idea/testData/intentions/branched/folding/whenToAssignment/innerWhenTransformed.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/folding/whenToAssignment/innerWhenTransformed.kt rename to idea/testData/intentions/branched/folding/whenToAssignment/innerWhenTransformed.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/folding/whenToAssignment/innerWhenTransformed.kt.after b/idea/testData/intentions/branched/folding/whenToAssignment/innerWhenTransformed.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/folding/whenToAssignment/innerWhenTransformed.kt.after rename to idea/testData/intentions/branched/folding/whenToAssignment/innerWhenTransformed.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/branched/folding/whenToAssignment/simpleWhen.kt b/idea/testData/intentions/branched/folding/whenToAssignment/simpleWhen.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/folding/whenToAssignment/simpleWhen.kt rename to idea/testData/intentions/branched/folding/whenToAssignment/simpleWhen.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/folding/whenToAssignment/simpleWhen.kt.after b/idea/testData/intentions/branched/folding/whenToAssignment/simpleWhen.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/folding/whenToAssignment/simpleWhen.kt.after rename to idea/testData/intentions/branched/folding/whenToAssignment/simpleWhen.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/branched/folding/whenToAssignment/simpleWhenWithBlocks.kt b/idea/testData/intentions/branched/folding/whenToAssignment/simpleWhenWithBlocks.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/folding/whenToAssignment/simpleWhenWithBlocks.kt rename to idea/testData/intentions/branched/folding/whenToAssignment/simpleWhenWithBlocks.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/folding/whenToAssignment/simpleWhenWithBlocks.kt.after b/idea/testData/intentions/branched/folding/whenToAssignment/simpleWhenWithBlocks.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/folding/whenToAssignment/simpleWhenWithBlocks.kt.after rename to idea/testData/intentions/branched/folding/whenToAssignment/simpleWhenWithBlocks.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/branched/folding/whenToAssignment/simpleWhenWithShadowedVar.kt b/idea/testData/intentions/branched/folding/whenToAssignment/simpleWhenWithShadowedVar.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/folding/whenToAssignment/simpleWhenWithShadowedVar.kt rename to idea/testData/intentions/branched/folding/whenToAssignment/simpleWhenWithShadowedVar.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/folding/whenToAssignment/simpleWhenWithUnmatchedAssignments.kt b/idea/testData/intentions/branched/folding/whenToAssignment/simpleWhenWithUnmatchedAssignments.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/folding/whenToAssignment/simpleWhenWithUnmatchedAssignments.kt rename to idea/testData/intentions/branched/folding/whenToAssignment/simpleWhenWithUnmatchedAssignments.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/folding/whenToAssignment/simpleWhenWithoutTerminatingAssignment.kt b/idea/testData/intentions/branched/folding/whenToAssignment/simpleWhenWithoutTerminatingAssignment.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/folding/whenToAssignment/simpleWhenWithoutTerminatingAssignment.kt rename to idea/testData/intentions/branched/folding/whenToAssignment/simpleWhenWithoutTerminatingAssignment.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/folding/whenToReturn/innerWhenTransformed.kt b/idea/testData/intentions/branched/folding/whenToReturn/innerWhenTransformed.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/folding/whenToReturn/innerWhenTransformed.kt rename to idea/testData/intentions/branched/folding/whenToReturn/innerWhenTransformed.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/folding/whenToReturn/innerWhenTransformed.kt.after b/idea/testData/intentions/branched/folding/whenToReturn/innerWhenTransformed.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/folding/whenToReturn/innerWhenTransformed.kt.after rename to idea/testData/intentions/branched/folding/whenToReturn/innerWhenTransformed.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/branched/folding/whenToReturn/simpleWhen.kt b/idea/testData/intentions/branched/folding/whenToReturn/simpleWhen.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/folding/whenToReturn/simpleWhen.kt rename to idea/testData/intentions/branched/folding/whenToReturn/simpleWhen.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/folding/whenToReturn/simpleWhen.kt.after b/idea/testData/intentions/branched/folding/whenToReturn/simpleWhen.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/folding/whenToReturn/simpleWhen.kt.after rename to idea/testData/intentions/branched/folding/whenToReturn/simpleWhen.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/branched/folding/whenToReturn/simpleWhenWithBlocks.kt b/idea/testData/intentions/branched/folding/whenToReturn/simpleWhenWithBlocks.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/folding/whenToReturn/simpleWhenWithBlocks.kt rename to idea/testData/intentions/branched/folding/whenToReturn/simpleWhenWithBlocks.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/folding/whenToReturn/simpleWhenWithBlocks.kt.after b/idea/testData/intentions/branched/folding/whenToReturn/simpleWhenWithBlocks.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/folding/whenToReturn/simpleWhenWithBlocks.kt.after rename to idea/testData/intentions/branched/folding/whenToReturn/simpleWhenWithBlocks.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/branched/ifWhen/ifToWhen/ifWithEqualityTests.kt b/idea/testData/intentions/branched/ifWhen/ifToWhen/ifWithEqualityTests.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/ifWhen/ifToWhen/ifWithEqualityTests.kt rename to idea/testData/intentions/branched/ifWhen/ifToWhen/ifWithEqualityTests.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/ifWhen/ifToWhen/ifWithEqualityTests.kt.after b/idea/testData/intentions/branched/ifWhen/ifToWhen/ifWithEqualityTests.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/ifWhen/ifToWhen/ifWithEqualityTests.kt.after rename to idea/testData/intentions/branched/ifWhen/ifToWhen/ifWithEqualityTests.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/branched/ifWhen/ifToWhen/ifWithIs.kt b/idea/testData/intentions/branched/ifWhen/ifToWhen/ifWithIs.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/ifWhen/ifToWhen/ifWithIs.kt rename to idea/testData/intentions/branched/ifWhen/ifToWhen/ifWithIs.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/ifWhen/ifToWhen/ifWithIs.kt.after b/idea/testData/intentions/branched/ifWhen/ifToWhen/ifWithIs.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/ifWhen/ifToWhen/ifWithIs.kt.after rename to idea/testData/intentions/branched/ifWhen/ifToWhen/ifWithIs.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/branched/ifWhen/ifToWhen/ifWithMultiConditions.kt b/idea/testData/intentions/branched/ifWhen/ifToWhen/ifWithMultiConditions.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/ifWhen/ifToWhen/ifWithMultiConditions.kt rename to idea/testData/intentions/branched/ifWhen/ifToWhen/ifWithMultiConditions.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/ifWhen/ifToWhen/ifWithMultiConditions.kt.after b/idea/testData/intentions/branched/ifWhen/ifToWhen/ifWithMultiConditions.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/ifWhen/ifToWhen/ifWithMultiConditions.kt.after rename to idea/testData/intentions/branched/ifWhen/ifToWhen/ifWithMultiConditions.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/branched/ifWhen/ifToWhen/ifWithNegativeIs.kt b/idea/testData/intentions/branched/ifWhen/ifToWhen/ifWithNegativeIs.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/ifWhen/ifToWhen/ifWithNegativeIs.kt rename to idea/testData/intentions/branched/ifWhen/ifToWhen/ifWithNegativeIs.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/ifWhen/ifToWhen/ifWithNegativeIs.kt.after b/idea/testData/intentions/branched/ifWhen/ifToWhen/ifWithNegativeIs.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/ifWhen/ifToWhen/ifWithNegativeIs.kt.after rename to idea/testData/intentions/branched/ifWhen/ifToWhen/ifWithNegativeIs.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/branched/ifWhen/ifToWhen/ifWithNegativeRangeTests.kt b/idea/testData/intentions/branched/ifWhen/ifToWhen/ifWithNegativeRangeTests.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/ifWhen/ifToWhen/ifWithNegativeRangeTests.kt rename to idea/testData/intentions/branched/ifWhen/ifToWhen/ifWithNegativeRangeTests.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/ifWhen/ifToWhen/ifWithNegativeRangeTests.kt.after b/idea/testData/intentions/branched/ifWhen/ifToWhen/ifWithNegativeRangeTests.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/ifWhen/ifToWhen/ifWithNegativeRangeTests.kt.after rename to idea/testData/intentions/branched/ifWhen/ifToWhen/ifWithNegativeRangeTests.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/branched/ifWhen/ifToWhen/ifWithRangeTests.kt b/idea/testData/intentions/branched/ifWhen/ifToWhen/ifWithRangeTests.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/ifWhen/ifToWhen/ifWithRangeTests.kt rename to idea/testData/intentions/branched/ifWhen/ifToWhen/ifWithRangeTests.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/ifWhen/ifToWhen/ifWithRangeTests.kt.after b/idea/testData/intentions/branched/ifWhen/ifToWhen/ifWithRangeTests.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/ifWhen/ifToWhen/ifWithRangeTests.kt.after rename to idea/testData/intentions/branched/ifWhen/ifToWhen/ifWithRangeTests.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/branched/ifWhen/ifToWhen/ifWithRangeTestsAndMultiConditions.kt b/idea/testData/intentions/branched/ifWhen/ifToWhen/ifWithRangeTestsAndMultiConditions.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/ifWhen/ifToWhen/ifWithRangeTestsAndMultiConditions.kt rename to idea/testData/intentions/branched/ifWhen/ifToWhen/ifWithRangeTestsAndMultiConditions.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/ifWhen/ifToWhen/ifWithRangeTestsAndMultiConditions.kt.after b/idea/testData/intentions/branched/ifWhen/ifToWhen/ifWithRangeTestsAndMultiConditions.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/ifWhen/ifToWhen/ifWithRangeTestsAndMultiConditions.kt.after rename to idea/testData/intentions/branched/ifWhen/ifToWhen/ifWithRangeTestsAndMultiConditions.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/branched/ifWhen/ifToWhen/ifWithRangeTestsAndUnparenthesizedMultiConditions.kt b/idea/testData/intentions/branched/ifWhen/ifToWhen/ifWithRangeTestsAndUnparenthesizedMultiConditions.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/ifWhen/ifToWhen/ifWithRangeTestsAndUnparenthesizedMultiConditions.kt rename to idea/testData/intentions/branched/ifWhen/ifToWhen/ifWithRangeTestsAndUnparenthesizedMultiConditions.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/ifWhen/ifToWhen/ifWithRangeTestsAndUnparenthesizedMultiConditions.kt.after b/idea/testData/intentions/branched/ifWhen/ifToWhen/ifWithRangeTestsAndUnparenthesizedMultiConditions.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/ifWhen/ifToWhen/ifWithRangeTestsAndUnparenthesizedMultiConditions.kt.after rename to idea/testData/intentions/branched/ifWhen/ifToWhen/ifWithRangeTestsAndUnparenthesizedMultiConditions.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/branched/ifWhen/ifToWhen/whenWithMultipleConditionTypes.kt b/idea/testData/intentions/branched/ifWhen/ifToWhen/whenWithMultipleConditionTypes.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/ifWhen/ifToWhen/whenWithMultipleConditionTypes.kt rename to idea/testData/intentions/branched/ifWhen/ifToWhen/whenWithMultipleConditionTypes.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/ifWhen/ifToWhen/whenWithMultipleConditionTypes.kt.after b/idea/testData/intentions/branched/ifWhen/ifToWhen/whenWithMultipleConditionTypes.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/ifWhen/ifToWhen/whenWithMultipleConditionTypes.kt.after rename to idea/testData/intentions/branched/ifWhen/ifToWhen/whenWithMultipleConditionTypes.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/branched/ifWhen/whenToIf/whenWithEqualityTests.kt b/idea/testData/intentions/branched/ifWhen/whenToIf/whenWithEqualityTests.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/ifWhen/whenToIf/whenWithEqualityTests.kt rename to idea/testData/intentions/branched/ifWhen/whenToIf/whenWithEqualityTests.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/ifWhen/whenToIf/whenWithEqualityTests.kt.after b/idea/testData/intentions/branched/ifWhen/whenToIf/whenWithEqualityTests.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/ifWhen/whenToIf/whenWithEqualityTests.kt.after rename to idea/testData/intentions/branched/ifWhen/whenToIf/whenWithEqualityTests.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/branched/ifWhen/whenToIf/whenWithMultiConditions.kt b/idea/testData/intentions/branched/ifWhen/whenToIf/whenWithMultiConditions.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/ifWhen/whenToIf/whenWithMultiConditions.kt rename to idea/testData/intentions/branched/ifWhen/whenToIf/whenWithMultiConditions.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/ifWhen/whenToIf/whenWithMultiConditions.kt.after b/idea/testData/intentions/branched/ifWhen/whenToIf/whenWithMultiConditions.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/ifWhen/whenToIf/whenWithMultiConditions.kt.after rename to idea/testData/intentions/branched/ifWhen/whenToIf/whenWithMultiConditions.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/branched/ifWhen/whenToIf/whenWithMultipleConditionTypes.kt b/idea/testData/intentions/branched/ifWhen/whenToIf/whenWithMultipleConditionTypes.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/ifWhen/whenToIf/whenWithMultipleConditionTypes.kt rename to idea/testData/intentions/branched/ifWhen/whenToIf/whenWithMultipleConditionTypes.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/ifWhen/whenToIf/whenWithMultipleConditionTypes.kt.after b/idea/testData/intentions/branched/ifWhen/whenToIf/whenWithMultipleConditionTypes.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/ifWhen/whenToIf/whenWithMultipleConditionTypes.kt.after rename to idea/testData/intentions/branched/ifWhen/whenToIf/whenWithMultipleConditionTypes.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/branched/ifWhen/whenToIf/whenWithNegativePatterns.kt b/idea/testData/intentions/branched/ifWhen/whenToIf/whenWithNegativePatterns.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/ifWhen/whenToIf/whenWithNegativePatterns.kt rename to idea/testData/intentions/branched/ifWhen/whenToIf/whenWithNegativePatterns.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/ifWhen/whenToIf/whenWithNegativePatterns.kt.after b/idea/testData/intentions/branched/ifWhen/whenToIf/whenWithNegativePatterns.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/ifWhen/whenToIf/whenWithNegativePatterns.kt.after rename to idea/testData/intentions/branched/ifWhen/whenToIf/whenWithNegativePatterns.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/branched/ifWhen/whenToIf/whenWithNegativeRangeTests.kt b/idea/testData/intentions/branched/ifWhen/whenToIf/whenWithNegativeRangeTests.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/ifWhen/whenToIf/whenWithNegativeRangeTests.kt rename to idea/testData/intentions/branched/ifWhen/whenToIf/whenWithNegativeRangeTests.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/ifWhen/whenToIf/whenWithNegativeRangeTests.kt.after b/idea/testData/intentions/branched/ifWhen/whenToIf/whenWithNegativeRangeTests.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/ifWhen/whenToIf/whenWithNegativeRangeTests.kt.after rename to idea/testData/intentions/branched/ifWhen/whenToIf/whenWithNegativeRangeTests.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/branched/ifWhen/whenToIf/whenWithPatterns.kt b/idea/testData/intentions/branched/ifWhen/whenToIf/whenWithPatterns.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/ifWhen/whenToIf/whenWithPatterns.kt rename to idea/testData/intentions/branched/ifWhen/whenToIf/whenWithPatterns.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/ifWhen/whenToIf/whenWithPatterns.kt.after b/idea/testData/intentions/branched/ifWhen/whenToIf/whenWithPatterns.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/ifWhen/whenToIf/whenWithPatterns.kt.after rename to idea/testData/intentions/branched/ifWhen/whenToIf/whenWithPatterns.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/branched/ifWhen/whenToIf/whenWithRangeTests.kt b/idea/testData/intentions/branched/ifWhen/whenToIf/whenWithRangeTests.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/ifWhen/whenToIf/whenWithRangeTests.kt rename to idea/testData/intentions/branched/ifWhen/whenToIf/whenWithRangeTests.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/ifWhen/whenToIf/whenWithRangeTests.kt.after b/idea/testData/intentions/branched/ifWhen/whenToIf/whenWithRangeTests.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/ifWhen/whenToIf/whenWithRangeTests.kt.after rename to idea/testData/intentions/branched/ifWhen/whenToIf/whenWithRangeTests.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/branched/ifWhen/whenToIf/whenWithRangeTestsAndMultiConditions.kt b/idea/testData/intentions/branched/ifWhen/whenToIf/whenWithRangeTestsAndMultiConditions.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/ifWhen/whenToIf/whenWithRangeTestsAndMultiConditions.kt rename to idea/testData/intentions/branched/ifWhen/whenToIf/whenWithRangeTestsAndMultiConditions.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/ifWhen/whenToIf/whenWithRangeTestsAndMultiConditions.kt.after b/idea/testData/intentions/branched/ifWhen/whenToIf/whenWithRangeTestsAndMultiConditions.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/ifWhen/whenToIf/whenWithRangeTestsAndMultiConditions.kt.after rename to idea/testData/intentions/branched/ifWhen/whenToIf/whenWithRangeTestsAndMultiConditions.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/branched/ifWhen/whenToIf/whenWithoutSubject.kt b/idea/testData/intentions/branched/ifWhen/whenToIf/whenWithoutSubject.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/ifWhen/whenToIf/whenWithoutSubject.kt rename to idea/testData/intentions/branched/ifWhen/whenToIf/whenWithoutSubject.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/ifWhen/whenToIf/whenWithoutSubject.kt.after b/idea/testData/intentions/branched/ifWhen/whenToIf/whenWithoutSubject.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/ifWhen/whenToIf/whenWithoutSubject.kt.after rename to idea/testData/intentions/branched/ifWhen/whenToIf/whenWithoutSubject.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/branched/unfolding/assignmentToIf/innerIfTransformed.kt b/idea/testData/intentions/branched/unfolding/assignmentToIf/innerIfTransformed.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/unfolding/assignmentToIf/innerIfTransformed.kt rename to idea/testData/intentions/branched/unfolding/assignmentToIf/innerIfTransformed.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/unfolding/assignmentToIf/innerIfTransformed.kt.after b/idea/testData/intentions/branched/unfolding/assignmentToIf/innerIfTransformed.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/unfolding/assignmentToIf/innerIfTransformed.kt.after rename to idea/testData/intentions/branched/unfolding/assignmentToIf/innerIfTransformed.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/branched/unfolding/assignmentToIf/nestedIfs.kt b/idea/testData/intentions/branched/unfolding/assignmentToIf/nestedIfs.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/unfolding/assignmentToIf/nestedIfs.kt rename to idea/testData/intentions/branched/unfolding/assignmentToIf/nestedIfs.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/unfolding/assignmentToIf/nestedIfs.kt.after b/idea/testData/intentions/branched/unfolding/assignmentToIf/nestedIfs.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/unfolding/assignmentToIf/nestedIfs.kt.after rename to idea/testData/intentions/branched/unfolding/assignmentToIf/nestedIfs.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/branched/unfolding/assignmentToIf/simpleIf.kt b/idea/testData/intentions/branched/unfolding/assignmentToIf/simpleIf.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/unfolding/assignmentToIf/simpleIf.kt rename to idea/testData/intentions/branched/unfolding/assignmentToIf/simpleIf.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/unfolding/assignmentToIf/simpleIf.kt.after b/idea/testData/intentions/branched/unfolding/assignmentToIf/simpleIf.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/unfolding/assignmentToIf/simpleIf.kt.after rename to idea/testData/intentions/branched/unfolding/assignmentToIf/simpleIf.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/branched/unfolding/assignmentToIf/simpleIfWithAugmentedAssignment.kt b/idea/testData/intentions/branched/unfolding/assignmentToIf/simpleIfWithAugmentedAssignment.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/unfolding/assignmentToIf/simpleIfWithAugmentedAssignment.kt rename to idea/testData/intentions/branched/unfolding/assignmentToIf/simpleIfWithAugmentedAssignment.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/unfolding/assignmentToIf/simpleIfWithAugmentedAssignment.kt.after b/idea/testData/intentions/branched/unfolding/assignmentToIf/simpleIfWithAugmentedAssignment.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/unfolding/assignmentToIf/simpleIfWithAugmentedAssignment.kt.after rename to idea/testData/intentions/branched/unfolding/assignmentToIf/simpleIfWithAugmentedAssignment.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/branched/unfolding/assignmentToIf/simpleIfWithBlocks.kt b/idea/testData/intentions/branched/unfolding/assignmentToIf/simpleIfWithBlocks.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/unfolding/assignmentToIf/simpleIfWithBlocks.kt rename to idea/testData/intentions/branched/unfolding/assignmentToIf/simpleIfWithBlocks.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/unfolding/assignmentToIf/simpleIfWithBlocks.kt.after b/idea/testData/intentions/branched/unfolding/assignmentToIf/simpleIfWithBlocks.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/unfolding/assignmentToIf/simpleIfWithBlocks.kt.after rename to idea/testData/intentions/branched/unfolding/assignmentToIf/simpleIfWithBlocks.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/branched/unfolding/assignmentToIf/simpleIfWithComplexAssignmentLHS.kt b/idea/testData/intentions/branched/unfolding/assignmentToIf/simpleIfWithComplexAssignmentLHS.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/unfolding/assignmentToIf/simpleIfWithComplexAssignmentLHS.kt rename to idea/testData/intentions/branched/unfolding/assignmentToIf/simpleIfWithComplexAssignmentLHS.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/unfolding/assignmentToIf/simpleIfWithComplexAssignmentLHS.kt.after b/idea/testData/intentions/branched/unfolding/assignmentToIf/simpleIfWithComplexAssignmentLHS.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/unfolding/assignmentToIf/simpleIfWithComplexAssignmentLHS.kt.after rename to idea/testData/intentions/branched/unfolding/assignmentToIf/simpleIfWithComplexAssignmentLHS.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/branched/unfolding/assignmentToIf/simpleIfWithoutAssignment.kt b/idea/testData/intentions/branched/unfolding/assignmentToIf/simpleIfWithoutAssignment.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/unfolding/assignmentToIf/simpleIfWithoutAssignment.kt rename to idea/testData/intentions/branched/unfolding/assignmentToIf/simpleIfWithoutAssignment.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/unfolding/assignmentToWhen/innerWhenTransformed.kt b/idea/testData/intentions/branched/unfolding/assignmentToWhen/innerWhenTransformed.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/unfolding/assignmentToWhen/innerWhenTransformed.kt rename to idea/testData/intentions/branched/unfolding/assignmentToWhen/innerWhenTransformed.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/unfolding/assignmentToWhen/innerWhenTransformed.kt.after b/idea/testData/intentions/branched/unfolding/assignmentToWhen/innerWhenTransformed.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/unfolding/assignmentToWhen/innerWhenTransformed.kt.after rename to idea/testData/intentions/branched/unfolding/assignmentToWhen/innerWhenTransformed.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/branched/unfolding/assignmentToWhen/simpleWhen.kt b/idea/testData/intentions/branched/unfolding/assignmentToWhen/simpleWhen.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/unfolding/assignmentToWhen/simpleWhen.kt rename to idea/testData/intentions/branched/unfolding/assignmentToWhen/simpleWhen.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/unfolding/assignmentToWhen/simpleWhen.kt.after b/idea/testData/intentions/branched/unfolding/assignmentToWhen/simpleWhen.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/unfolding/assignmentToWhen/simpleWhen.kt.after rename to idea/testData/intentions/branched/unfolding/assignmentToWhen/simpleWhen.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/branched/unfolding/assignmentToWhen/simpleWhenWithBlocks.kt b/idea/testData/intentions/branched/unfolding/assignmentToWhen/simpleWhenWithBlocks.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/unfolding/assignmentToWhen/simpleWhenWithBlocks.kt rename to idea/testData/intentions/branched/unfolding/assignmentToWhen/simpleWhenWithBlocks.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/unfolding/assignmentToWhen/simpleWhenWithBlocks.kt.after b/idea/testData/intentions/branched/unfolding/assignmentToWhen/simpleWhenWithBlocks.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/unfolding/assignmentToWhen/simpleWhenWithBlocks.kt.after rename to idea/testData/intentions/branched/unfolding/assignmentToWhen/simpleWhenWithBlocks.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/branched/unfolding/assignmentToWhen/simpleWhenWithComplexAssignmentLHS.kt b/idea/testData/intentions/branched/unfolding/assignmentToWhen/simpleWhenWithComplexAssignmentLHS.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/unfolding/assignmentToWhen/simpleWhenWithComplexAssignmentLHS.kt rename to idea/testData/intentions/branched/unfolding/assignmentToWhen/simpleWhenWithComplexAssignmentLHS.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/unfolding/assignmentToWhen/simpleWhenWithComplexAssignmentLHS.kt.after b/idea/testData/intentions/branched/unfolding/assignmentToWhen/simpleWhenWithComplexAssignmentLHS.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/unfolding/assignmentToWhen/simpleWhenWithComplexAssignmentLHS.kt.after rename to idea/testData/intentions/branched/unfolding/assignmentToWhen/simpleWhenWithComplexAssignmentLHS.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToIf/nestedIfs.kt b/idea/testData/intentions/branched/unfolding/propertyToIf/nestedIfs.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToIf/nestedIfs.kt rename to idea/testData/intentions/branched/unfolding/propertyToIf/nestedIfs.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToIf/nestedIfs.kt.after b/idea/testData/intentions/branched/unfolding/propertyToIf/nestedIfs.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToIf/nestedIfs.kt.after rename to idea/testData/intentions/branched/unfolding/propertyToIf/nestedIfs.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToIf/nestedIfs2.kt b/idea/testData/intentions/branched/unfolding/propertyToIf/nestedIfs2.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToIf/nestedIfs2.kt rename to idea/testData/intentions/branched/unfolding/propertyToIf/nestedIfs2.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToIf/nestedIfs2.kt.after b/idea/testData/intentions/branched/unfolding/propertyToIf/nestedIfs2.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToIf/nestedIfs2.kt.after rename to idea/testData/intentions/branched/unfolding/propertyToIf/nestedIfs2.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToIf/nonLocalProperty.kt b/idea/testData/intentions/branched/unfolding/propertyToIf/nonLocalProperty.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToIf/nonLocalProperty.kt rename to idea/testData/intentions/branched/unfolding/propertyToIf/nonLocalProperty.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToIf/nonLocalProperty2.kt b/idea/testData/intentions/branched/unfolding/propertyToIf/nonLocalProperty2.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToIf/nonLocalProperty2.kt rename to idea/testData/intentions/branched/unfolding/propertyToIf/nonLocalProperty2.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToIf/simpleIf.kt b/idea/testData/intentions/branched/unfolding/propertyToIf/simpleIf.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToIf/simpleIf.kt rename to idea/testData/intentions/branched/unfolding/propertyToIf/simpleIf.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToIf/simpleIf.kt.after b/idea/testData/intentions/branched/unfolding/propertyToIf/simpleIf.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToIf/simpleIf.kt.after rename to idea/testData/intentions/branched/unfolding/propertyToIf/simpleIf.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToIf/simpleIf2.kt b/idea/testData/intentions/branched/unfolding/propertyToIf/simpleIf2.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToIf/simpleIf2.kt rename to idea/testData/intentions/branched/unfolding/propertyToIf/simpleIf2.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToIf/simpleIf2.kt.after b/idea/testData/intentions/branched/unfolding/propertyToIf/simpleIf2.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToIf/simpleIf2.kt.after rename to idea/testData/intentions/branched/unfolding/propertyToIf/simpleIf2.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToIf/simpleIfWithBlocks.kt b/idea/testData/intentions/branched/unfolding/propertyToIf/simpleIfWithBlocks.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToIf/simpleIfWithBlocks.kt rename to idea/testData/intentions/branched/unfolding/propertyToIf/simpleIfWithBlocks.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToIf/simpleIfWithBlocks.kt.after b/idea/testData/intentions/branched/unfolding/propertyToIf/simpleIfWithBlocks.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToIf/simpleIfWithBlocks.kt.after rename to idea/testData/intentions/branched/unfolding/propertyToIf/simpleIfWithBlocks.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToIf/simpleIfWithBlocks2.kt b/idea/testData/intentions/branched/unfolding/propertyToIf/simpleIfWithBlocks2.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToIf/simpleIfWithBlocks2.kt rename to idea/testData/intentions/branched/unfolding/propertyToIf/simpleIfWithBlocks2.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToIf/simpleIfWithBlocks2.kt.after b/idea/testData/intentions/branched/unfolding/propertyToIf/simpleIfWithBlocks2.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToIf/simpleIfWithBlocks2.kt.after rename to idea/testData/intentions/branched/unfolding/propertyToIf/simpleIfWithBlocks2.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToIf/simpleIfWithType.kt b/idea/testData/intentions/branched/unfolding/propertyToIf/simpleIfWithType.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToIf/simpleIfWithType.kt rename to idea/testData/intentions/branched/unfolding/propertyToIf/simpleIfWithType.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToIf/simpleIfWithType.kt.after b/idea/testData/intentions/branched/unfolding/propertyToIf/simpleIfWithType.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToIf/simpleIfWithType.kt.after rename to idea/testData/intentions/branched/unfolding/propertyToIf/simpleIfWithType.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToWhen/nonLocalProperty.kt b/idea/testData/intentions/branched/unfolding/propertyToWhen/nonLocalProperty.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToWhen/nonLocalProperty.kt rename to idea/testData/intentions/branched/unfolding/propertyToWhen/nonLocalProperty.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToWhen/nonLocalProperty2.kt b/idea/testData/intentions/branched/unfolding/propertyToWhen/nonLocalProperty2.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToWhen/nonLocalProperty2.kt rename to idea/testData/intentions/branched/unfolding/propertyToWhen/nonLocalProperty2.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToWhen/simpleWhen.kt b/idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhen.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToWhen/simpleWhen.kt rename to idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhen.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToWhen/simpleWhen.kt.after b/idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhen.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToWhen/simpleWhen.kt.after rename to idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhen.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToWhen/simpleWhen2.kt b/idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhen2.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToWhen/simpleWhen2.kt rename to idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhen2.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToWhen/simpleWhen2.kt.after b/idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhen2.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToWhen/simpleWhen2.kt.after rename to idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhen2.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToWhen/simpleWhenWithBlocks.kt b/idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhenWithBlocks.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToWhen/simpleWhenWithBlocks.kt rename to idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhenWithBlocks.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToWhen/simpleWhenWithBlocks.kt.after b/idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhenWithBlocks.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToWhen/simpleWhenWithBlocks.kt.after rename to idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhenWithBlocks.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToWhen/simpleWhenWithBlocks2.kt b/idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhenWithBlocks2.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToWhen/simpleWhenWithBlocks2.kt rename to idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhenWithBlocks2.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToWhen/simpleWhenWithBlocks2.kt.after b/idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhenWithBlocks2.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToWhen/simpleWhenWithBlocks2.kt.after rename to idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhenWithBlocks2.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToWhen/simpleWhenWithType.kt b/idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhenWithType.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToWhen/simpleWhenWithType.kt rename to idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhenWithType.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToWhen/simpleWhenWithType.kt.after b/idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhenWithType.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToWhen/simpleWhenWithType.kt.after rename to idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhenWithType.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/branched/unfolding/returnToIf/innerIfTransformed.kt b/idea/testData/intentions/branched/unfolding/returnToIf/innerIfTransformed.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/unfolding/returnToIf/innerIfTransformed.kt rename to idea/testData/intentions/branched/unfolding/returnToIf/innerIfTransformed.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/unfolding/returnToIf/innerIfTransformed.kt.after b/idea/testData/intentions/branched/unfolding/returnToIf/innerIfTransformed.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/unfolding/returnToIf/innerIfTransformed.kt.after rename to idea/testData/intentions/branched/unfolding/returnToIf/innerIfTransformed.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/branched/unfolding/returnToIf/simpleIf.kt b/idea/testData/intentions/branched/unfolding/returnToIf/simpleIf.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/unfolding/returnToIf/simpleIf.kt rename to idea/testData/intentions/branched/unfolding/returnToIf/simpleIf.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/unfolding/returnToIf/simpleIf.kt.after b/idea/testData/intentions/branched/unfolding/returnToIf/simpleIf.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/unfolding/returnToIf/simpleIf.kt.after rename to idea/testData/intentions/branched/unfolding/returnToIf/simpleIf.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/branched/unfolding/returnToIf/simpleIfWithBlocks.kt b/idea/testData/intentions/branched/unfolding/returnToIf/simpleIfWithBlocks.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/unfolding/returnToIf/simpleIfWithBlocks.kt rename to idea/testData/intentions/branched/unfolding/returnToIf/simpleIfWithBlocks.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/unfolding/returnToIf/simpleIfWithBlocks.kt.after b/idea/testData/intentions/branched/unfolding/returnToIf/simpleIfWithBlocks.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/unfolding/returnToIf/simpleIfWithBlocks.kt.after rename to idea/testData/intentions/branched/unfolding/returnToIf/simpleIfWithBlocks.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/branched/unfolding/returnToWhen/innerWhenTransformed.kt b/idea/testData/intentions/branched/unfolding/returnToWhen/innerWhenTransformed.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/unfolding/returnToWhen/innerWhenTransformed.kt rename to idea/testData/intentions/branched/unfolding/returnToWhen/innerWhenTransformed.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/unfolding/returnToWhen/innerWhenTransformed.kt.after b/idea/testData/intentions/branched/unfolding/returnToWhen/innerWhenTransformed.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/unfolding/returnToWhen/innerWhenTransformed.kt.after rename to idea/testData/intentions/branched/unfolding/returnToWhen/innerWhenTransformed.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/branched/unfolding/returnToWhen/simpleWhen.kt b/idea/testData/intentions/branched/unfolding/returnToWhen/simpleWhen.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/unfolding/returnToWhen/simpleWhen.kt rename to idea/testData/intentions/branched/unfolding/returnToWhen/simpleWhen.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/unfolding/returnToWhen/simpleWhen.kt.after b/idea/testData/intentions/branched/unfolding/returnToWhen/simpleWhen.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/unfolding/returnToWhen/simpleWhen.kt.after rename to idea/testData/intentions/branched/unfolding/returnToWhen/simpleWhen.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/branched/unfolding/returnToWhen/simpleWhenWithBlocks.kt b/idea/testData/intentions/branched/unfolding/returnToWhen/simpleWhenWithBlocks.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/unfolding/returnToWhen/simpleWhenWithBlocks.kt rename to idea/testData/intentions/branched/unfolding/returnToWhen/simpleWhenWithBlocks.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/unfolding/returnToWhen/simpleWhenWithBlocks.kt.after b/idea/testData/intentions/branched/unfolding/returnToWhen/simpleWhenWithBlocks.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/unfolding/returnToWhen/simpleWhenWithBlocks.kt.after rename to idea/testData/intentions/branched/unfolding/returnToWhen/simpleWhenWithBlocks.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/branched/when/eliminateSubject/whenWithEqualityTests.kt b/idea/testData/intentions/branched/when/eliminateSubject/whenWithEqualityTests.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/when/eliminateSubject/whenWithEqualityTests.kt rename to idea/testData/intentions/branched/when/eliminateSubject/whenWithEqualityTests.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/when/eliminateSubject/whenWithEqualityTests.kt.after b/idea/testData/intentions/branched/when/eliminateSubject/whenWithEqualityTests.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/when/eliminateSubject/whenWithEqualityTests.kt.after rename to idea/testData/intentions/branched/when/eliminateSubject/whenWithEqualityTests.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/branched/when/eliminateSubject/whenWithMultipleConditionTypes.kt b/idea/testData/intentions/branched/when/eliminateSubject/whenWithMultipleConditionTypes.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/when/eliminateSubject/whenWithMultipleConditionTypes.kt rename to idea/testData/intentions/branched/when/eliminateSubject/whenWithMultipleConditionTypes.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/when/eliminateSubject/whenWithMultipleConditionTypes.kt.after b/idea/testData/intentions/branched/when/eliminateSubject/whenWithMultipleConditionTypes.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/when/eliminateSubject/whenWithMultipleConditionTypes.kt.after rename to idea/testData/intentions/branched/when/eliminateSubject/whenWithMultipleConditionTypes.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/branched/when/eliminateSubject/whenWithNegativePatterns.kt b/idea/testData/intentions/branched/when/eliminateSubject/whenWithNegativePatterns.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/when/eliminateSubject/whenWithNegativePatterns.kt rename to idea/testData/intentions/branched/when/eliminateSubject/whenWithNegativePatterns.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/when/eliminateSubject/whenWithNegativePatterns.kt.after b/idea/testData/intentions/branched/when/eliminateSubject/whenWithNegativePatterns.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/when/eliminateSubject/whenWithNegativePatterns.kt.after rename to idea/testData/intentions/branched/when/eliminateSubject/whenWithNegativePatterns.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/branched/when/eliminateSubject/whenWithNegativeRangeTests.kt b/idea/testData/intentions/branched/when/eliminateSubject/whenWithNegativeRangeTests.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/when/eliminateSubject/whenWithNegativeRangeTests.kt rename to idea/testData/intentions/branched/when/eliminateSubject/whenWithNegativeRangeTests.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/when/eliminateSubject/whenWithNegativeRangeTests.kt.after b/idea/testData/intentions/branched/when/eliminateSubject/whenWithNegativeRangeTests.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/when/eliminateSubject/whenWithNegativeRangeTests.kt.after rename to idea/testData/intentions/branched/when/eliminateSubject/whenWithNegativeRangeTests.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/branched/when/eliminateSubject/whenWithPatterns.kt b/idea/testData/intentions/branched/when/eliminateSubject/whenWithPatterns.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/when/eliminateSubject/whenWithPatterns.kt rename to idea/testData/intentions/branched/when/eliminateSubject/whenWithPatterns.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/when/eliminateSubject/whenWithPatterns.kt.after b/idea/testData/intentions/branched/when/eliminateSubject/whenWithPatterns.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/when/eliminateSubject/whenWithPatterns.kt.after rename to idea/testData/intentions/branched/when/eliminateSubject/whenWithPatterns.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/branched/when/eliminateSubject/whenWithRangeTests.kt b/idea/testData/intentions/branched/when/eliminateSubject/whenWithRangeTests.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/when/eliminateSubject/whenWithRangeTests.kt rename to idea/testData/intentions/branched/when/eliminateSubject/whenWithRangeTests.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/when/eliminateSubject/whenWithRangeTests.kt.after b/idea/testData/intentions/branched/when/eliminateSubject/whenWithRangeTests.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/when/eliminateSubject/whenWithRangeTests.kt.after rename to idea/testData/intentions/branched/when/eliminateSubject/whenWithRangeTests.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/branched/when/eliminateSubject/whenWithRangeTestsAndMultiConditions.kt b/idea/testData/intentions/branched/when/eliminateSubject/whenWithRangeTestsAndMultiConditions.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/when/eliminateSubject/whenWithRangeTestsAndMultiConditions.kt rename to idea/testData/intentions/branched/when/eliminateSubject/whenWithRangeTestsAndMultiConditions.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/when/eliminateSubject/whenWithRangeTestsAndMultiConditions.kt.after b/idea/testData/intentions/branched/when/eliminateSubject/whenWithRangeTestsAndMultiConditions.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/when/eliminateSubject/whenWithRangeTestsAndMultiConditions.kt.after rename to idea/testData/intentions/branched/when/eliminateSubject/whenWithRangeTestsAndMultiConditions.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/branched/when/eliminateSubject/whenWithoutSubject.kt b/idea/testData/intentions/branched/when/eliminateSubject/whenWithoutSubject.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/when/eliminateSubject/whenWithoutSubject.kt rename to idea/testData/intentions/branched/when/eliminateSubject/whenWithoutSubject.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/when/flatten/flattenWithSubject.kt b/idea/testData/intentions/branched/when/flatten/flattenWithSubject.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/when/flatten/flattenWithSubject.kt rename to idea/testData/intentions/branched/when/flatten/flattenWithSubject.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/when/flatten/flattenWithSubject.kt.after b/idea/testData/intentions/branched/when/flatten/flattenWithSubject.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/when/flatten/flattenWithSubject.kt.after rename to idea/testData/intentions/branched/when/flatten/flattenWithSubject.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/branched/when/flatten/flattenWithUnmatchedSubjects.kt b/idea/testData/intentions/branched/when/flatten/flattenWithUnmatchedSubjects.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/when/flatten/flattenWithUnmatchedSubjects.kt rename to idea/testData/intentions/branched/when/flatten/flattenWithUnmatchedSubjects.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/when/flatten/flattenWithoutSubject.kt b/idea/testData/intentions/branched/when/flatten/flattenWithoutSubject.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/when/flatten/flattenWithoutSubject.kt rename to idea/testData/intentions/branched/when/flatten/flattenWithoutSubject.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/when/flatten/flattenWithoutSubject.kt.after b/idea/testData/intentions/branched/when/flatten/flattenWithoutSubject.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/when/flatten/flattenWithoutSubject.kt.after rename to idea/testData/intentions/branched/when/flatten/flattenWithoutSubject.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/branched/when/introduceSubject/whenWithEqualityTests.kt b/idea/testData/intentions/branched/when/introduceSubject/whenWithEqualityTests.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/when/introduceSubject/whenWithEqualityTests.kt rename to idea/testData/intentions/branched/when/introduceSubject/whenWithEqualityTests.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/when/introduceSubject/whenWithEqualityTests.kt.after b/idea/testData/intentions/branched/when/introduceSubject/whenWithEqualityTests.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/when/introduceSubject/whenWithEqualityTests.kt.after rename to idea/testData/intentions/branched/when/introduceSubject/whenWithEqualityTests.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/branched/when/introduceSubject/whenWithMultipleConditionTypes.kt b/idea/testData/intentions/branched/when/introduceSubject/whenWithMultipleConditionTypes.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/when/introduceSubject/whenWithMultipleConditionTypes.kt rename to idea/testData/intentions/branched/when/introduceSubject/whenWithMultipleConditionTypes.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/when/introduceSubject/whenWithMultipleConditionTypes.kt.after b/idea/testData/intentions/branched/when/introduceSubject/whenWithMultipleConditionTypes.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/when/introduceSubject/whenWithMultipleConditionTypes.kt.after rename to idea/testData/intentions/branched/when/introduceSubject/whenWithMultipleConditionTypes.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/branched/when/introduceSubject/whenWithNegativePatterns.kt b/idea/testData/intentions/branched/when/introduceSubject/whenWithNegativePatterns.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/when/introduceSubject/whenWithNegativePatterns.kt rename to idea/testData/intentions/branched/when/introduceSubject/whenWithNegativePatterns.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/when/introduceSubject/whenWithNegativePatterns.kt.after b/idea/testData/intentions/branched/when/introduceSubject/whenWithNegativePatterns.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/when/introduceSubject/whenWithNegativePatterns.kt.after rename to idea/testData/intentions/branched/when/introduceSubject/whenWithNegativePatterns.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/branched/when/introduceSubject/whenWithNegativeRangeTests.kt b/idea/testData/intentions/branched/when/introduceSubject/whenWithNegativeRangeTests.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/when/introduceSubject/whenWithNegativeRangeTests.kt rename to idea/testData/intentions/branched/when/introduceSubject/whenWithNegativeRangeTests.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/when/introduceSubject/whenWithNegativeRangeTests.kt.after b/idea/testData/intentions/branched/when/introduceSubject/whenWithNegativeRangeTests.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/when/introduceSubject/whenWithNegativeRangeTests.kt.after rename to idea/testData/intentions/branched/when/introduceSubject/whenWithNegativeRangeTests.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/branched/when/introduceSubject/whenWithNondivisibleConditions.kt b/idea/testData/intentions/branched/when/introduceSubject/whenWithNondivisibleConditions.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/when/introduceSubject/whenWithNondivisibleConditions.kt rename to idea/testData/intentions/branched/when/introduceSubject/whenWithNondivisibleConditions.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/when/introduceSubject/whenWithPatterns.kt b/idea/testData/intentions/branched/when/introduceSubject/whenWithPatterns.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/when/introduceSubject/whenWithPatterns.kt rename to idea/testData/intentions/branched/when/introduceSubject/whenWithPatterns.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/when/introduceSubject/whenWithPatterns.kt.after b/idea/testData/intentions/branched/when/introduceSubject/whenWithPatterns.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/when/introduceSubject/whenWithPatterns.kt.after rename to idea/testData/intentions/branched/when/introduceSubject/whenWithPatterns.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/branched/when/introduceSubject/whenWithRangeTests.kt b/idea/testData/intentions/branched/when/introduceSubject/whenWithRangeTests.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/when/introduceSubject/whenWithRangeTests.kt rename to idea/testData/intentions/branched/when/introduceSubject/whenWithRangeTests.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/when/introduceSubject/whenWithRangeTests.kt.after b/idea/testData/intentions/branched/when/introduceSubject/whenWithRangeTests.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/when/introduceSubject/whenWithRangeTests.kt.after rename to idea/testData/intentions/branched/when/introduceSubject/whenWithRangeTests.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/branched/when/introduceSubject/whenWithRangeTestsAndMultiConditions.kt b/idea/testData/intentions/branched/when/introduceSubject/whenWithRangeTestsAndMultiConditions.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/when/introduceSubject/whenWithRangeTestsAndMultiConditions.kt rename to idea/testData/intentions/branched/when/introduceSubject/whenWithRangeTestsAndMultiConditions.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/when/introduceSubject/whenWithRangeTestsAndMultiConditions.kt.after b/idea/testData/intentions/branched/when/introduceSubject/whenWithRangeTestsAndMultiConditions.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/when/introduceSubject/whenWithRangeTestsAndMultiConditions.kt.after rename to idea/testData/intentions/branched/when/introduceSubject/whenWithRangeTestsAndMultiConditions.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/branched/when/introduceSubject/whenWithSubject.kt b/idea/testData/intentions/branched/when/introduceSubject/whenWithSubject.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/when/introduceSubject/whenWithSubject.kt rename to idea/testData/intentions/branched/when/introduceSubject/whenWithSubject.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/when/introduceSubject/whenWithSwappedEqualityTests.kt b/idea/testData/intentions/branched/when/introduceSubject/whenWithSwappedEqualityTests.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/when/introduceSubject/whenWithSwappedEqualityTests.kt rename to idea/testData/intentions/branched/when/introduceSubject/whenWithSwappedEqualityTests.kt diff --git a/idea/testData/codeInsight/codeTransformations/branched/when/introduceSubject/whenWithSwappedEqualityTests.kt.after b/idea/testData/intentions/branched/when/introduceSubject/whenWithSwappedEqualityTests.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/when/introduceSubject/whenWithSwappedEqualityTests.kt.after rename to idea/testData/intentions/branched/when/introduceSubject/whenWithSwappedEqualityTests.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/branched/when/introduceSubject/whenWithUnmatchedCandidateSubjects.kt b/idea/testData/intentions/branched/when/introduceSubject/whenWithUnmatchedCandidateSubjects.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/branched/when/introduceSubject/whenWithUnmatchedCandidateSubjects.kt rename to idea/testData/intentions/branched/when/introduceSubject/whenWithUnmatchedCandidateSubjects.kt diff --git a/idea/testData/codeInsight/codeTransformations/declarations/join/longInit.kt b/idea/testData/intentions/declarations/join/longInit.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/declarations/join/longInit.kt rename to idea/testData/intentions/declarations/join/longInit.kt diff --git a/idea/testData/codeInsight/codeTransformations/declarations/join/longInit.kt.after b/idea/testData/intentions/declarations/join/longInit.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/declarations/join/longInit.kt.after rename to idea/testData/intentions/declarations/join/longInit.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/declarations/join/longInit2.kt b/idea/testData/intentions/declarations/join/longInit2.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/declarations/join/longInit2.kt rename to idea/testData/intentions/declarations/join/longInit2.kt diff --git a/idea/testData/codeInsight/codeTransformations/declarations/join/longInit2.kt.after b/idea/testData/intentions/declarations/join/longInit2.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/declarations/join/longInit2.kt.after rename to idea/testData/intentions/declarations/join/longInit2.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/declarations/join/simpleInit.kt b/idea/testData/intentions/declarations/join/simpleInit.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/declarations/join/simpleInit.kt rename to idea/testData/intentions/declarations/join/simpleInit.kt diff --git a/idea/testData/codeInsight/codeTransformations/declarations/join/simpleInit.kt.after b/idea/testData/intentions/declarations/join/simpleInit.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/declarations/join/simpleInit.kt.after rename to idea/testData/intentions/declarations/join/simpleInit.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/declarations/join/simpleInit2.kt b/idea/testData/intentions/declarations/join/simpleInit2.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/declarations/join/simpleInit2.kt rename to idea/testData/intentions/declarations/join/simpleInit2.kt diff --git a/idea/testData/codeInsight/codeTransformations/declarations/join/simpleInit2.kt.after b/idea/testData/intentions/declarations/join/simpleInit2.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/declarations/join/simpleInit2.kt.after rename to idea/testData/intentions/declarations/join/simpleInit2.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/declarations/join/simpleInitWithBackticks.kt b/idea/testData/intentions/declarations/join/simpleInitWithBackticks.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/declarations/join/simpleInitWithBackticks.kt rename to idea/testData/intentions/declarations/join/simpleInitWithBackticks.kt diff --git a/idea/testData/codeInsight/codeTransformations/declarations/join/simpleInitWithBackticks.kt.after b/idea/testData/intentions/declarations/join/simpleInitWithBackticks.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/declarations/join/simpleInitWithBackticks.kt.after rename to idea/testData/intentions/declarations/join/simpleInitWithBackticks.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/declarations/join/simpleInitWithBackticks2.kt b/idea/testData/intentions/declarations/join/simpleInitWithBackticks2.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/declarations/join/simpleInitWithBackticks2.kt rename to idea/testData/intentions/declarations/join/simpleInitWithBackticks2.kt diff --git a/idea/testData/codeInsight/codeTransformations/declarations/join/simpleInitWithBackticks2.kt.after b/idea/testData/intentions/declarations/join/simpleInitWithBackticks2.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/declarations/join/simpleInitWithBackticks2.kt.after rename to idea/testData/intentions/declarations/join/simpleInitWithBackticks2.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/declarations/join/simpleInitWithBackticks3.kt b/idea/testData/intentions/declarations/join/simpleInitWithBackticks3.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/declarations/join/simpleInitWithBackticks3.kt rename to idea/testData/intentions/declarations/join/simpleInitWithBackticks3.kt diff --git a/idea/testData/codeInsight/codeTransformations/declarations/join/simpleInitWithBackticks3.kt.after b/idea/testData/intentions/declarations/join/simpleInitWithBackticks3.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/declarations/join/simpleInitWithBackticks3.kt.after rename to idea/testData/intentions/declarations/join/simpleInitWithBackticks3.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/declarations/join/simpleInitWithComments.kt b/idea/testData/intentions/declarations/join/simpleInitWithComments.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/declarations/join/simpleInitWithComments.kt rename to idea/testData/intentions/declarations/join/simpleInitWithComments.kt diff --git a/idea/testData/codeInsight/codeTransformations/declarations/join/simpleInitWithComments.kt.after b/idea/testData/intentions/declarations/join/simpleInitWithComments.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/declarations/join/simpleInitWithComments.kt.after rename to idea/testData/intentions/declarations/join/simpleInitWithComments.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/declarations/join/simpleInitWithComments2.kt b/idea/testData/intentions/declarations/join/simpleInitWithComments2.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/declarations/join/simpleInitWithComments2.kt rename to idea/testData/intentions/declarations/join/simpleInitWithComments2.kt diff --git a/idea/testData/codeInsight/codeTransformations/declarations/join/simpleInitWithComments2.kt.after b/idea/testData/intentions/declarations/join/simpleInitWithComments2.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/declarations/join/simpleInitWithComments2.kt.after rename to idea/testData/intentions/declarations/join/simpleInitWithComments2.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/declarations/join/simpleInitWithSemicolons.kt b/idea/testData/intentions/declarations/join/simpleInitWithSemicolons.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/declarations/join/simpleInitWithSemicolons.kt rename to idea/testData/intentions/declarations/join/simpleInitWithSemicolons.kt diff --git a/idea/testData/codeInsight/codeTransformations/declarations/join/simpleInitWithSemicolons.kt.after b/idea/testData/intentions/declarations/join/simpleInitWithSemicolons.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/declarations/join/simpleInitWithSemicolons.kt.after rename to idea/testData/intentions/declarations/join/simpleInitWithSemicolons.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/declarations/join/simpleInitWithSemicolons2.kt b/idea/testData/intentions/declarations/join/simpleInitWithSemicolons2.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/declarations/join/simpleInitWithSemicolons2.kt rename to idea/testData/intentions/declarations/join/simpleInitWithSemicolons2.kt diff --git a/idea/testData/codeInsight/codeTransformations/declarations/join/simpleInitWithSemicolons2.kt.after b/idea/testData/intentions/declarations/join/simpleInitWithSemicolons2.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/declarations/join/simpleInitWithSemicolons2.kt.after rename to idea/testData/intentions/declarations/join/simpleInitWithSemicolons2.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/declarations/join/simpleInitWithSemicolons3.kt b/idea/testData/intentions/declarations/join/simpleInitWithSemicolons3.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/declarations/join/simpleInitWithSemicolons3.kt rename to idea/testData/intentions/declarations/join/simpleInitWithSemicolons3.kt diff --git a/idea/testData/codeInsight/codeTransformations/declarations/join/simpleInitWithSemicolons3.kt.after b/idea/testData/intentions/declarations/join/simpleInitWithSemicolons3.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/declarations/join/simpleInitWithSemicolons3.kt.after rename to idea/testData/intentions/declarations/join/simpleInitWithSemicolons3.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/declarations/join/simpleInitWithType.kt b/idea/testData/intentions/declarations/join/simpleInitWithType.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/declarations/join/simpleInitWithType.kt rename to idea/testData/intentions/declarations/join/simpleInitWithType.kt diff --git a/idea/testData/codeInsight/codeTransformations/declarations/join/simpleInitWithType.kt.after b/idea/testData/intentions/declarations/join/simpleInitWithType.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/declarations/join/simpleInitWithType.kt.after rename to idea/testData/intentions/declarations/join/simpleInitWithType.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/declarations/join/simpleInitWithType2.kt b/idea/testData/intentions/declarations/join/simpleInitWithType2.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/declarations/join/simpleInitWithType2.kt rename to idea/testData/intentions/declarations/join/simpleInitWithType2.kt diff --git a/idea/testData/codeInsight/codeTransformations/declarations/join/simpleInitWithType2.kt.after b/idea/testData/intentions/declarations/join/simpleInitWithType2.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/declarations/join/simpleInitWithType2.kt.after rename to idea/testData/intentions/declarations/join/simpleInitWithType2.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/declarations/split/longInit.kt b/idea/testData/intentions/declarations/split/longInit.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/declarations/split/longInit.kt rename to idea/testData/intentions/declarations/split/longInit.kt diff --git a/idea/testData/codeInsight/codeTransformations/declarations/split/longInit.kt.after b/idea/testData/intentions/declarations/split/longInit.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/declarations/split/longInit.kt.after rename to idea/testData/intentions/declarations/split/longInit.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/declarations/split/longInit2.kt b/idea/testData/intentions/declarations/split/longInit2.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/declarations/split/longInit2.kt rename to idea/testData/intentions/declarations/split/longInit2.kt diff --git a/idea/testData/codeInsight/codeTransformations/declarations/split/longInit2.kt.after b/idea/testData/intentions/declarations/split/longInit2.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/declarations/split/longInit2.kt.after rename to idea/testData/intentions/declarations/split/longInit2.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/declarations/split/noInitializer.kt b/idea/testData/intentions/declarations/split/noInitializer.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/declarations/split/noInitializer.kt rename to idea/testData/intentions/declarations/split/noInitializer.kt diff --git a/idea/testData/codeInsight/codeTransformations/declarations/split/noInitializer2.kt b/idea/testData/intentions/declarations/split/noInitializer2.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/declarations/split/noInitializer2.kt rename to idea/testData/intentions/declarations/split/noInitializer2.kt diff --git a/idea/testData/codeInsight/codeTransformations/declarations/split/nonLocalProperty.kt b/idea/testData/intentions/declarations/split/nonLocalProperty.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/declarations/split/nonLocalProperty.kt rename to idea/testData/intentions/declarations/split/nonLocalProperty.kt diff --git a/idea/testData/codeInsight/codeTransformations/declarations/split/nonLocalProperty2.kt b/idea/testData/intentions/declarations/split/nonLocalProperty2.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/declarations/split/nonLocalProperty2.kt rename to idea/testData/intentions/declarations/split/nonLocalProperty2.kt diff --git a/idea/testData/codeInsight/codeTransformations/declarations/split/simpleInit.kt b/idea/testData/intentions/declarations/split/simpleInit.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/declarations/split/simpleInit.kt rename to idea/testData/intentions/declarations/split/simpleInit.kt diff --git a/idea/testData/codeInsight/codeTransformations/declarations/split/simpleInit.kt.after b/idea/testData/intentions/declarations/split/simpleInit.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/declarations/split/simpleInit.kt.after rename to idea/testData/intentions/declarations/split/simpleInit.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/declarations/split/simpleInit2.kt b/idea/testData/intentions/declarations/split/simpleInit2.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/declarations/split/simpleInit2.kt rename to idea/testData/intentions/declarations/split/simpleInit2.kt diff --git a/idea/testData/codeInsight/codeTransformations/declarations/split/simpleInit2.kt.after b/idea/testData/intentions/declarations/split/simpleInit2.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/declarations/split/simpleInit2.kt.after rename to idea/testData/intentions/declarations/split/simpleInit2.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/declarations/split/simpleInitWithErrorType.kt b/idea/testData/intentions/declarations/split/simpleInitWithErrorType.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/declarations/split/simpleInitWithErrorType.kt rename to idea/testData/intentions/declarations/split/simpleInitWithErrorType.kt diff --git a/idea/testData/codeInsight/codeTransformations/declarations/split/simpleInitWithErrorType.kt.after b/idea/testData/intentions/declarations/split/simpleInitWithErrorType.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/declarations/split/simpleInitWithErrorType.kt.after rename to idea/testData/intentions/declarations/split/simpleInitWithErrorType.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/declarations/split/simpleInitWithErrorType2.kt b/idea/testData/intentions/declarations/split/simpleInitWithErrorType2.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/declarations/split/simpleInitWithErrorType2.kt rename to idea/testData/intentions/declarations/split/simpleInitWithErrorType2.kt diff --git a/idea/testData/codeInsight/codeTransformations/declarations/split/simpleInitWithErrorType2.kt.after b/idea/testData/intentions/declarations/split/simpleInitWithErrorType2.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/declarations/split/simpleInitWithErrorType2.kt.after rename to idea/testData/intentions/declarations/split/simpleInitWithErrorType2.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/declarations/split/simpleInitWithType.kt b/idea/testData/intentions/declarations/split/simpleInitWithType.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/declarations/split/simpleInitWithType.kt rename to idea/testData/intentions/declarations/split/simpleInitWithType.kt diff --git a/idea/testData/codeInsight/codeTransformations/declarations/split/simpleInitWithType.kt.after b/idea/testData/intentions/declarations/split/simpleInitWithType.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/declarations/split/simpleInitWithType.kt.after rename to idea/testData/intentions/declarations/split/simpleInitWithType.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/declarations/split/simpleInitWithType2.kt b/idea/testData/intentions/declarations/split/simpleInitWithType2.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/declarations/split/simpleInitWithType2.kt rename to idea/testData/intentions/declarations/split/simpleInitWithType2.kt diff --git a/idea/testData/codeInsight/codeTransformations/declarations/split/simpleInitWithType2.kt.after b/idea/testData/intentions/declarations/split/simpleInitWithType2.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/declarations/split/simpleInitWithType2.kt.after rename to idea/testData/intentions/declarations/split/simpleInitWithType2.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/removeUnnecessaryParentheses/necessaryParentheses1.kt b/idea/testData/intentions/removeUnnecessaryParentheses/necessaryParentheses1.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/removeUnnecessaryParentheses/necessaryParentheses1.kt rename to idea/testData/intentions/removeUnnecessaryParentheses/necessaryParentheses1.kt diff --git a/idea/testData/codeInsight/codeTransformations/removeUnnecessaryParentheses/necessaryParentheses2.kt b/idea/testData/intentions/removeUnnecessaryParentheses/necessaryParentheses2.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/removeUnnecessaryParentheses/necessaryParentheses2.kt rename to idea/testData/intentions/removeUnnecessaryParentheses/necessaryParentheses2.kt diff --git a/idea/testData/codeInsight/codeTransformations/removeUnnecessaryParentheses/necessaryParentheses3.kt b/idea/testData/intentions/removeUnnecessaryParentheses/necessaryParentheses3.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/removeUnnecessaryParentheses/necessaryParentheses3.kt rename to idea/testData/intentions/removeUnnecessaryParentheses/necessaryParentheses3.kt diff --git a/idea/testData/codeInsight/codeTransformations/removeUnnecessaryParentheses/necessaryParentheses4.kt b/idea/testData/intentions/removeUnnecessaryParentheses/necessaryParentheses4.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/removeUnnecessaryParentheses/necessaryParentheses4.kt rename to idea/testData/intentions/removeUnnecessaryParentheses/necessaryParentheses4.kt diff --git a/idea/testData/codeInsight/codeTransformations/removeUnnecessaryParentheses/necessaryParentheses5.kt b/idea/testData/intentions/removeUnnecessaryParentheses/necessaryParentheses5.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/removeUnnecessaryParentheses/necessaryParentheses5.kt rename to idea/testData/intentions/removeUnnecessaryParentheses/necessaryParentheses5.kt diff --git a/idea/testData/codeInsight/codeTransformations/removeUnnecessaryParentheses/unnecessaryParentheses1.kt b/idea/testData/intentions/removeUnnecessaryParentheses/unnecessaryParentheses1.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/removeUnnecessaryParentheses/unnecessaryParentheses1.kt rename to idea/testData/intentions/removeUnnecessaryParentheses/unnecessaryParentheses1.kt diff --git a/idea/testData/codeInsight/codeTransformations/removeUnnecessaryParentheses/unnecessaryParentheses1.kt.after b/idea/testData/intentions/removeUnnecessaryParentheses/unnecessaryParentheses1.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/removeUnnecessaryParentheses/unnecessaryParentheses1.kt.after rename to idea/testData/intentions/removeUnnecessaryParentheses/unnecessaryParentheses1.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/removeUnnecessaryParentheses/unnecessaryParentheses2.kt b/idea/testData/intentions/removeUnnecessaryParentheses/unnecessaryParentheses2.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/removeUnnecessaryParentheses/unnecessaryParentheses2.kt rename to idea/testData/intentions/removeUnnecessaryParentheses/unnecessaryParentheses2.kt diff --git a/idea/testData/codeInsight/codeTransformations/removeUnnecessaryParentheses/unnecessaryParentheses2.kt.after b/idea/testData/intentions/removeUnnecessaryParentheses/unnecessaryParentheses2.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/removeUnnecessaryParentheses/unnecessaryParentheses2.kt.after rename to idea/testData/intentions/removeUnnecessaryParentheses/unnecessaryParentheses2.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/removeUnnecessaryParentheses/unnecessaryParentheses3.kt b/idea/testData/intentions/removeUnnecessaryParentheses/unnecessaryParentheses3.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/removeUnnecessaryParentheses/unnecessaryParentheses3.kt rename to idea/testData/intentions/removeUnnecessaryParentheses/unnecessaryParentheses3.kt diff --git a/idea/testData/codeInsight/codeTransformations/removeUnnecessaryParentheses/unnecessaryParentheses3.kt.after b/idea/testData/intentions/removeUnnecessaryParentheses/unnecessaryParentheses3.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/removeUnnecessaryParentheses/unnecessaryParentheses3.kt.after rename to idea/testData/intentions/removeUnnecessaryParentheses/unnecessaryParentheses3.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/removeUnnecessaryParentheses/unnecessaryParentheses4.kt b/idea/testData/intentions/removeUnnecessaryParentheses/unnecessaryParentheses4.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/removeUnnecessaryParentheses/unnecessaryParentheses4.kt rename to idea/testData/intentions/removeUnnecessaryParentheses/unnecessaryParentheses4.kt diff --git a/idea/testData/codeInsight/codeTransformations/removeUnnecessaryParentheses/unnecessaryParentheses4.kt.after b/idea/testData/intentions/removeUnnecessaryParentheses/unnecessaryParentheses4.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/removeUnnecessaryParentheses/unnecessaryParentheses4.kt.after rename to idea/testData/intentions/removeUnnecessaryParentheses/unnecessaryParentheses4.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/removeUnnecessaryParentheses/unnecessaryParentheses5.kt b/idea/testData/intentions/removeUnnecessaryParentheses/unnecessaryParentheses5.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/removeUnnecessaryParentheses/unnecessaryParentheses5.kt rename to idea/testData/intentions/removeUnnecessaryParentheses/unnecessaryParentheses5.kt diff --git a/idea/testData/codeInsight/codeTransformations/removeUnnecessaryParentheses/unnecessaryParentheses5.kt.after b/idea/testData/intentions/removeUnnecessaryParentheses/unnecessaryParentheses5.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/removeUnnecessaryParentheses/unnecessaryParentheses5.kt.after rename to idea/testData/intentions/removeUnnecessaryParentheses/unnecessaryParentheses5.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/removeUnnecessaryParentheses/unnecessaryParentheses6.kt b/idea/testData/intentions/removeUnnecessaryParentheses/unnecessaryParentheses6.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/removeUnnecessaryParentheses/unnecessaryParentheses6.kt rename to idea/testData/intentions/removeUnnecessaryParentheses/unnecessaryParentheses6.kt diff --git a/idea/testData/codeInsight/codeTransformations/removeUnnecessaryParentheses/unnecessaryParentheses6.kt.after b/idea/testData/intentions/removeUnnecessaryParentheses/unnecessaryParentheses6.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/removeUnnecessaryParentheses/unnecessaryParentheses6.kt.after rename to idea/testData/intentions/removeUnnecessaryParentheses/unnecessaryParentheses6.kt.after diff --git a/idea/testData/codeInsight/codeTransformations/removeUnnecessaryParentheses/unnecessaryParentheses7.kt b/idea/testData/intentions/removeUnnecessaryParentheses/unnecessaryParentheses7.kt similarity index 100% rename from idea/testData/codeInsight/codeTransformations/removeUnnecessaryParentheses/unnecessaryParentheses7.kt rename to idea/testData/intentions/removeUnnecessaryParentheses/unnecessaryParentheses7.kt diff --git a/idea/testData/codeInsight/codeTransformations/removeUnnecessaryParentheses/unnecessaryParentheses7.kt.after b/idea/testData/intentions/removeUnnecessaryParentheses/unnecessaryParentheses7.kt.after similarity index 100% rename from idea/testData/codeInsight/codeTransformations/removeUnnecessaryParentheses/unnecessaryParentheses7.kt.after rename to idea/testData/intentions/removeUnnecessaryParentheses/unnecessaryParentheses7.kt.after diff --git a/idea/tests/org/jetbrains/jet/plugin/codeInsight/codeTransformations/AbstractCodeTransformationTest.java b/idea/tests/org/jetbrains/jet/plugin/intentions/AbstractCodeTransformationTest.java similarity index 94% rename from idea/tests/org/jetbrains/jet/plugin/codeInsight/codeTransformations/AbstractCodeTransformationTest.java rename to idea/tests/org/jetbrains/jet/plugin/intentions/AbstractCodeTransformationTest.java index b5407f37d2b..80382dcdef5 100644 --- a/idea/tests/org/jetbrains/jet/plugin/codeInsight/codeTransformations/AbstractCodeTransformationTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/intentions/AbstractCodeTransformationTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.codeInsight.codeTransformations; +package org.jetbrains.jet.plugin.intentions; import com.intellij.codeInsight.editorActions.JoinLinesHandler; import com.intellij.codeInsight.intention.IntentionAction; @@ -23,8 +23,9 @@ import com.intellij.openapi.util.io.FileUtil; import com.intellij.testFramework.LightCodeInsightTestCase; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.InTextDirectivesUtils; -import org.jetbrains.jet.plugin.codeInsight.codeTransformations.branchedTransformations.intentions.*; -import org.jetbrains.jet.plugin.codeInsight.codeTransformations.declarations.SplitPropertyDeclarationIntention; +import org.jetbrains.jet.plugin.intentions.RemoveUnnecessaryParenthesesIntention; +import org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions.*; +import org.jetbrains.jet.plugin.intentions.declarations.SplitPropertyDeclarationIntention; import java.io.File; diff --git a/idea/tests/org/jetbrains/jet/plugin/codeInsight/codeTransformations/CodeTransformationsTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/intentions/CodeTransformationsTestGenerated.java similarity index 54% rename from idea/tests/org/jetbrains/jet/plugin/codeInsight/codeTransformations/CodeTransformationsTestGenerated.java rename to idea/tests/org/jetbrains/jet/plugin/intentions/CodeTransformationsTestGenerated.java index abc0b628fe8..586744b7b3f 100644 --- a/idea/tests/org/jetbrains/jet/plugin/codeInsight/codeTransformations/CodeTransformationsTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/intentions/CodeTransformationsTestGenerated.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.codeInsight.codeTransformations; +package org.jetbrains.jet.plugin.intentions; import junit.framework.Assert; import junit.framework.Test; @@ -26,835 +26,835 @@ import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; -import org.jetbrains.jet.plugin.codeInsight.codeTransformations.AbstractCodeTransformationTest; +import org.jetbrains.jet.plugin.intentions.AbstractCodeTransformationTest; /** This class is generated by {@link org.jetbrains.jet.generators.tests.GenerateTests}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") @InnerTestClasses({CodeTransformationsTestGenerated.IfToAssignment.class, CodeTransformationsTestGenerated.IfToReturn.class, CodeTransformationsTestGenerated.IfToReturnAsymmetrically.class, CodeTransformationsTestGenerated.WhenToAssignment.class, CodeTransformationsTestGenerated.WhenToReturn.class, CodeTransformationsTestGenerated.AssignmentToIf.class, CodeTransformationsTestGenerated.AssignmentToWhen.class, CodeTransformationsTestGenerated.PropertyToIf.class, CodeTransformationsTestGenerated.PropertyToWhen.class, CodeTransformationsTestGenerated.ReturnToIf.class, CodeTransformationsTestGenerated.ReturnToWhen.class, CodeTransformationsTestGenerated.IfToWhen.class, CodeTransformationsTestGenerated.WhenToIf.class, CodeTransformationsTestGenerated.Flatten.class, CodeTransformationsTestGenerated.IntroduceSubject.class, CodeTransformationsTestGenerated.EliminateSubject.class, CodeTransformationsTestGenerated.Split.class, CodeTransformationsTestGenerated.Join.class, CodeTransformationsTestGenerated.RemoveUnnecessaryParentheses.class}) public class CodeTransformationsTestGenerated extends AbstractCodeTransformationTest { - @TestMetadata("idea/testData/codeInsight/codeTransformations/branched/folding/ifToAssignment") + @TestMetadata("idea/testData/intentions/branched/folding/ifToAssignment") public static class IfToAssignment extends AbstractCodeTransformationTest { public void testAllFilesPresentInIfToAssignment() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/codeInsight/codeTransformations/branched/folding/ifToAssignment"), Pattern.compile("^(.+)\\.kt$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/intentions/branched/folding/ifToAssignment"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("innerIfTransformed.kt") public void testInnerIfTransformed() throws Exception { - doTestFoldIfToAssignment("idea/testData/codeInsight/codeTransformations/branched/folding/ifToAssignment/innerIfTransformed.kt"); + doTestFoldIfToAssignment("idea/testData/intentions/branched/folding/ifToAssignment/innerIfTransformed.kt"); } @TestMetadata("simpleIf.kt") public void testSimpleIf() throws Exception { - doTestFoldIfToAssignment("idea/testData/codeInsight/codeTransformations/branched/folding/ifToAssignment/simpleIf.kt"); + doTestFoldIfToAssignment("idea/testData/intentions/branched/folding/ifToAssignment/simpleIf.kt"); } @TestMetadata("simpleIfWithAugmentedAssignment.kt") public void testSimpleIfWithAugmentedAssignment() throws Exception { - doTestFoldIfToAssignment("idea/testData/codeInsight/codeTransformations/branched/folding/ifToAssignment/simpleIfWithAugmentedAssignment.kt"); + doTestFoldIfToAssignment("idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithAugmentedAssignment.kt"); } @TestMetadata("simpleIfWithBlocks.kt") public void testSimpleIfWithBlocks() throws Exception { - doTestFoldIfToAssignment("idea/testData/codeInsight/codeTransformations/branched/folding/ifToAssignment/simpleIfWithBlocks.kt"); + doTestFoldIfToAssignment("idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithBlocks.kt"); } @TestMetadata("simpleIfWithShadowedVar.kt") public void testSimpleIfWithShadowedVar() throws Exception { - doTestFoldIfToAssignment("idea/testData/codeInsight/codeTransformations/branched/folding/ifToAssignment/simpleIfWithShadowedVar.kt"); + doTestFoldIfToAssignment("idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithShadowedVar.kt"); } @TestMetadata("simpleIfWithUnmatchedAssignmentOps.kt") public void testSimpleIfWithUnmatchedAssignmentOps() throws Exception { - doTestFoldIfToAssignment("idea/testData/codeInsight/codeTransformations/branched/folding/ifToAssignment/simpleIfWithUnmatchedAssignmentOps.kt"); + doTestFoldIfToAssignment("idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithUnmatchedAssignmentOps.kt"); } @TestMetadata("simpleIfWithUnmatchedAssignments.kt") public void testSimpleIfWithUnmatchedAssignments() throws Exception { - doTestFoldIfToAssignment("idea/testData/codeInsight/codeTransformations/branched/folding/ifToAssignment/simpleIfWithUnmatchedAssignments.kt"); + doTestFoldIfToAssignment("idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithUnmatchedAssignments.kt"); } @TestMetadata("simpleIfWithoutElse.kt") public void testSimpleIfWithoutElse() throws Exception { - doTestFoldIfToAssignment("idea/testData/codeInsight/codeTransformations/branched/folding/ifToAssignment/simpleIfWithoutElse.kt"); + doTestFoldIfToAssignment("idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithoutElse.kt"); } @TestMetadata("simpleIfWithoutTerminatingAssignment.kt") public void testSimpleIfWithoutTerminatingAssignment() throws Exception { - doTestFoldIfToAssignment("idea/testData/codeInsight/codeTransformations/branched/folding/ifToAssignment/simpleIfWithoutTerminatingAssignment.kt"); + doTestFoldIfToAssignment("idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithoutTerminatingAssignment.kt"); } } - @TestMetadata("idea/testData/codeInsight/codeTransformations/branched/folding/ifToReturn") + @TestMetadata("idea/testData/intentions/branched/folding/ifToReturn") public static class IfToReturn extends AbstractCodeTransformationTest { public void testAllFilesPresentInIfToReturn() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/codeInsight/codeTransformations/branched/folding/ifToReturn"), Pattern.compile("^(.+)\\.kt$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/intentions/branched/folding/ifToReturn"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("innerIfTransformed.kt") public void testInnerIfTransformed() throws Exception { - doTestFoldIfToReturn("idea/testData/codeInsight/codeTransformations/branched/folding/ifToReturn/innerIfTransformed.kt"); + doTestFoldIfToReturn("idea/testData/intentions/branched/folding/ifToReturn/innerIfTransformed.kt"); } @TestMetadata("simpleIf.kt") public void testSimpleIf() throws Exception { - doTestFoldIfToReturn("idea/testData/codeInsight/codeTransformations/branched/folding/ifToReturn/simpleIf.kt"); + doTestFoldIfToReturn("idea/testData/intentions/branched/folding/ifToReturn/simpleIf.kt"); } @TestMetadata("simpleIfWithBlocks.kt") public void testSimpleIfWithBlocks() throws Exception { - doTestFoldIfToReturn("idea/testData/codeInsight/codeTransformations/branched/folding/ifToReturn/simpleIfWithBlocks.kt"); + doTestFoldIfToReturn("idea/testData/intentions/branched/folding/ifToReturn/simpleIfWithBlocks.kt"); } } - @TestMetadata("idea/testData/codeInsight/codeTransformations/branched/folding/ifToReturnAsymmetrically") + @TestMetadata("idea/testData/intentions/branched/folding/ifToReturnAsymmetrically") public static class IfToReturnAsymmetrically extends AbstractCodeTransformationTest { public void testAllFilesPresentInIfToReturnAsymmetrically() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/codeInsight/codeTransformations/branched/folding/ifToReturnAsymmetrically"), Pattern.compile("^(.+)\\.kt$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/intentions/branched/folding/ifToReturnAsymmetrically"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("simpleIf.kt") public void testSimpleIf() throws Exception { - doTestFoldIfToReturnAsymmetrically("idea/testData/codeInsight/codeTransformations/branched/folding/ifToReturnAsymmetrically/simpleIf.kt"); + doTestFoldIfToReturnAsymmetrically("idea/testData/intentions/branched/folding/ifToReturnAsymmetrically/simpleIf.kt"); } @TestMetadata("simpleIfWithBlocks.kt") public void testSimpleIfWithBlocks() throws Exception { - doTestFoldIfToReturnAsymmetrically("idea/testData/codeInsight/codeTransformations/branched/folding/ifToReturnAsymmetrically/simpleIfWithBlocks.kt"); + doTestFoldIfToReturnAsymmetrically("idea/testData/intentions/branched/folding/ifToReturnAsymmetrically/simpleIfWithBlocks.kt"); } @TestMetadata("simpleIfWithComments.kt") public void testSimpleIfWithComments() throws Exception { - doTestFoldIfToReturnAsymmetrically("idea/testData/codeInsight/codeTransformations/branched/folding/ifToReturnAsymmetrically/simpleIfWithComments.kt"); + doTestFoldIfToReturnAsymmetrically("idea/testData/intentions/branched/folding/ifToReturnAsymmetrically/simpleIfWithComments.kt"); } } - @TestMetadata("idea/testData/codeInsight/codeTransformations/branched/folding/whenToAssignment") + @TestMetadata("idea/testData/intentions/branched/folding/whenToAssignment") public static class WhenToAssignment extends AbstractCodeTransformationTest { public void testAllFilesPresentInWhenToAssignment() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/codeInsight/codeTransformations/branched/folding/whenToAssignment"), Pattern.compile("^(.+)\\.kt$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/intentions/branched/folding/whenToAssignment"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("innerWhenTransformed.kt") public void testInnerWhenTransformed() throws Exception { - doTestFoldWhenToAssignment("idea/testData/codeInsight/codeTransformations/branched/folding/whenToAssignment/innerWhenTransformed.kt"); + doTestFoldWhenToAssignment("idea/testData/intentions/branched/folding/whenToAssignment/innerWhenTransformed.kt"); } @TestMetadata("simpleWhen.kt") public void testSimpleWhen() throws Exception { - doTestFoldWhenToAssignment("idea/testData/codeInsight/codeTransformations/branched/folding/whenToAssignment/simpleWhen.kt"); + doTestFoldWhenToAssignment("idea/testData/intentions/branched/folding/whenToAssignment/simpleWhen.kt"); } @TestMetadata("simpleWhenWithBlocks.kt") public void testSimpleWhenWithBlocks() throws Exception { - doTestFoldWhenToAssignment("idea/testData/codeInsight/codeTransformations/branched/folding/whenToAssignment/simpleWhenWithBlocks.kt"); + doTestFoldWhenToAssignment("idea/testData/intentions/branched/folding/whenToAssignment/simpleWhenWithBlocks.kt"); } @TestMetadata("simpleWhenWithShadowedVar.kt") public void testSimpleWhenWithShadowedVar() throws Exception { - doTestFoldWhenToAssignment("idea/testData/codeInsight/codeTransformations/branched/folding/whenToAssignment/simpleWhenWithShadowedVar.kt"); + doTestFoldWhenToAssignment("idea/testData/intentions/branched/folding/whenToAssignment/simpleWhenWithShadowedVar.kt"); } @TestMetadata("simpleWhenWithUnmatchedAssignments.kt") public void testSimpleWhenWithUnmatchedAssignments() throws Exception { - doTestFoldWhenToAssignment("idea/testData/codeInsight/codeTransformations/branched/folding/whenToAssignment/simpleWhenWithUnmatchedAssignments.kt"); + doTestFoldWhenToAssignment("idea/testData/intentions/branched/folding/whenToAssignment/simpleWhenWithUnmatchedAssignments.kt"); } @TestMetadata("simpleWhenWithoutTerminatingAssignment.kt") public void testSimpleWhenWithoutTerminatingAssignment() throws Exception { - doTestFoldWhenToAssignment("idea/testData/codeInsight/codeTransformations/branched/folding/whenToAssignment/simpleWhenWithoutTerminatingAssignment.kt"); + doTestFoldWhenToAssignment("idea/testData/intentions/branched/folding/whenToAssignment/simpleWhenWithoutTerminatingAssignment.kt"); } } - @TestMetadata("idea/testData/codeInsight/codeTransformations/branched/folding/whenToReturn") + @TestMetadata("idea/testData/intentions/branched/folding/whenToReturn") public static class WhenToReturn extends AbstractCodeTransformationTest { public void testAllFilesPresentInWhenToReturn() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/codeInsight/codeTransformations/branched/folding/whenToReturn"), Pattern.compile("^(.+)\\.kt$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/intentions/branched/folding/whenToReturn"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("innerWhenTransformed.kt") public void testInnerWhenTransformed() throws Exception { - doTestFoldWhenToReturn("idea/testData/codeInsight/codeTransformations/branched/folding/whenToReturn/innerWhenTransformed.kt"); + doTestFoldWhenToReturn("idea/testData/intentions/branched/folding/whenToReturn/innerWhenTransformed.kt"); } @TestMetadata("simpleWhen.kt") public void testSimpleWhen() throws Exception { - doTestFoldWhenToReturn("idea/testData/codeInsight/codeTransformations/branched/folding/whenToReturn/simpleWhen.kt"); + doTestFoldWhenToReturn("idea/testData/intentions/branched/folding/whenToReturn/simpleWhen.kt"); } @TestMetadata("simpleWhenWithBlocks.kt") public void testSimpleWhenWithBlocks() throws Exception { - doTestFoldWhenToReturn("idea/testData/codeInsight/codeTransformations/branched/folding/whenToReturn/simpleWhenWithBlocks.kt"); + doTestFoldWhenToReturn("idea/testData/intentions/branched/folding/whenToReturn/simpleWhenWithBlocks.kt"); } } - @TestMetadata("idea/testData/codeInsight/codeTransformations/branched/unfolding/assignmentToIf") + @TestMetadata("idea/testData/intentions/branched/unfolding/assignmentToIf") public static class AssignmentToIf extends AbstractCodeTransformationTest { public void testAllFilesPresentInAssignmentToIf() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/codeInsight/codeTransformations/branched/unfolding/assignmentToIf"), Pattern.compile("^(.+)\\.kt$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/intentions/branched/unfolding/assignmentToIf"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("innerIfTransformed.kt") public void testInnerIfTransformed() throws Exception { - doTestUnfoldAssignmentToIf("idea/testData/codeInsight/codeTransformations/branched/unfolding/assignmentToIf/innerIfTransformed.kt"); + doTestUnfoldAssignmentToIf("idea/testData/intentions/branched/unfolding/assignmentToIf/innerIfTransformed.kt"); } @TestMetadata("nestedIfs.kt") public void testNestedIfs() throws Exception { - doTestUnfoldAssignmentToIf("idea/testData/codeInsight/codeTransformations/branched/unfolding/assignmentToIf/nestedIfs.kt"); + doTestUnfoldAssignmentToIf("idea/testData/intentions/branched/unfolding/assignmentToIf/nestedIfs.kt"); } @TestMetadata("simpleIf.kt") public void testSimpleIf() throws Exception { - doTestUnfoldAssignmentToIf("idea/testData/codeInsight/codeTransformations/branched/unfolding/assignmentToIf/simpleIf.kt"); + doTestUnfoldAssignmentToIf("idea/testData/intentions/branched/unfolding/assignmentToIf/simpleIf.kt"); } @TestMetadata("simpleIfWithAugmentedAssignment.kt") public void testSimpleIfWithAugmentedAssignment() throws Exception { - doTestUnfoldAssignmentToIf("idea/testData/codeInsight/codeTransformations/branched/unfolding/assignmentToIf/simpleIfWithAugmentedAssignment.kt"); + doTestUnfoldAssignmentToIf("idea/testData/intentions/branched/unfolding/assignmentToIf/simpleIfWithAugmentedAssignment.kt"); } @TestMetadata("simpleIfWithBlocks.kt") public void testSimpleIfWithBlocks() throws Exception { - doTestUnfoldAssignmentToIf("idea/testData/codeInsight/codeTransformations/branched/unfolding/assignmentToIf/simpleIfWithBlocks.kt"); + doTestUnfoldAssignmentToIf("idea/testData/intentions/branched/unfolding/assignmentToIf/simpleIfWithBlocks.kt"); } @TestMetadata("simpleIfWithComplexAssignmentLHS.kt") public void testSimpleIfWithComplexAssignmentLHS() throws Exception { - doTestUnfoldAssignmentToIf("idea/testData/codeInsight/codeTransformations/branched/unfolding/assignmentToIf/simpleIfWithComplexAssignmentLHS.kt"); + doTestUnfoldAssignmentToIf("idea/testData/intentions/branched/unfolding/assignmentToIf/simpleIfWithComplexAssignmentLHS.kt"); } @TestMetadata("simpleIfWithoutAssignment.kt") public void testSimpleIfWithoutAssignment() throws Exception { - doTestUnfoldAssignmentToIf("idea/testData/codeInsight/codeTransformations/branched/unfolding/assignmentToIf/simpleIfWithoutAssignment.kt"); + doTestUnfoldAssignmentToIf("idea/testData/intentions/branched/unfolding/assignmentToIf/simpleIfWithoutAssignment.kt"); } } - @TestMetadata("idea/testData/codeInsight/codeTransformations/branched/unfolding/assignmentToWhen") + @TestMetadata("idea/testData/intentions/branched/unfolding/assignmentToWhen") public static class AssignmentToWhen extends AbstractCodeTransformationTest { public void testAllFilesPresentInAssignmentToWhen() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/codeInsight/codeTransformations/branched/unfolding/assignmentToWhen"), Pattern.compile("^(.+)\\.kt$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/intentions/branched/unfolding/assignmentToWhen"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("innerWhenTransformed.kt") public void testInnerWhenTransformed() throws Exception { - doTestUnfoldAssignmentToWhen("idea/testData/codeInsight/codeTransformations/branched/unfolding/assignmentToWhen/innerWhenTransformed.kt"); + doTestUnfoldAssignmentToWhen("idea/testData/intentions/branched/unfolding/assignmentToWhen/innerWhenTransformed.kt"); } @TestMetadata("simpleWhen.kt") public void testSimpleWhen() throws Exception { - doTestUnfoldAssignmentToWhen("idea/testData/codeInsight/codeTransformations/branched/unfolding/assignmentToWhen/simpleWhen.kt"); + doTestUnfoldAssignmentToWhen("idea/testData/intentions/branched/unfolding/assignmentToWhen/simpleWhen.kt"); } @TestMetadata("simpleWhenWithBlocks.kt") public void testSimpleWhenWithBlocks() throws Exception { - doTestUnfoldAssignmentToWhen("idea/testData/codeInsight/codeTransformations/branched/unfolding/assignmentToWhen/simpleWhenWithBlocks.kt"); + doTestUnfoldAssignmentToWhen("idea/testData/intentions/branched/unfolding/assignmentToWhen/simpleWhenWithBlocks.kt"); } @TestMetadata("simpleWhenWithComplexAssignmentLHS.kt") public void testSimpleWhenWithComplexAssignmentLHS() throws Exception { - doTestUnfoldAssignmentToWhen("idea/testData/codeInsight/codeTransformations/branched/unfolding/assignmentToWhen/simpleWhenWithComplexAssignmentLHS.kt"); + doTestUnfoldAssignmentToWhen("idea/testData/intentions/branched/unfolding/assignmentToWhen/simpleWhenWithComplexAssignmentLHS.kt"); } } - @TestMetadata("idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToIf") + @TestMetadata("idea/testData/intentions/branched/unfolding/propertyToIf") public static class PropertyToIf extends AbstractCodeTransformationTest { public void testAllFilesPresentInPropertyToIf() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToIf"), Pattern.compile("^(.+)\\.kt$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/intentions/branched/unfolding/propertyToIf"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("nestedIfs.kt") public void testNestedIfs() throws Exception { - doTestUnfoldPropertyToIf("idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToIf/nestedIfs.kt"); + doTestUnfoldPropertyToIf("idea/testData/intentions/branched/unfolding/propertyToIf/nestedIfs.kt"); } @TestMetadata("nestedIfs2.kt") public void testNestedIfs2() throws Exception { - doTestUnfoldPropertyToIf("idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToIf/nestedIfs2.kt"); + doTestUnfoldPropertyToIf("idea/testData/intentions/branched/unfolding/propertyToIf/nestedIfs2.kt"); } @TestMetadata("nonLocalProperty.kt") public void testNonLocalProperty() throws Exception { - doTestUnfoldPropertyToIf("idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToIf/nonLocalProperty.kt"); + doTestUnfoldPropertyToIf("idea/testData/intentions/branched/unfolding/propertyToIf/nonLocalProperty.kt"); } @TestMetadata("nonLocalProperty2.kt") public void testNonLocalProperty2() throws Exception { - doTestUnfoldPropertyToIf("idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToIf/nonLocalProperty2.kt"); + doTestUnfoldPropertyToIf("idea/testData/intentions/branched/unfolding/propertyToIf/nonLocalProperty2.kt"); } @TestMetadata("simpleIf.kt") public void testSimpleIf() throws Exception { - doTestUnfoldPropertyToIf("idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToIf/simpleIf.kt"); + doTestUnfoldPropertyToIf("idea/testData/intentions/branched/unfolding/propertyToIf/simpleIf.kt"); } @TestMetadata("simpleIf2.kt") public void testSimpleIf2() throws Exception { - doTestUnfoldPropertyToIf("idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToIf/simpleIf2.kt"); + doTestUnfoldPropertyToIf("idea/testData/intentions/branched/unfolding/propertyToIf/simpleIf2.kt"); } @TestMetadata("simpleIfWithBlocks.kt") public void testSimpleIfWithBlocks() throws Exception { - doTestUnfoldPropertyToIf("idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToIf/simpleIfWithBlocks.kt"); + doTestUnfoldPropertyToIf("idea/testData/intentions/branched/unfolding/propertyToIf/simpleIfWithBlocks.kt"); } @TestMetadata("simpleIfWithBlocks2.kt") public void testSimpleIfWithBlocks2() throws Exception { - doTestUnfoldPropertyToIf("idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToIf/simpleIfWithBlocks2.kt"); + doTestUnfoldPropertyToIf("idea/testData/intentions/branched/unfolding/propertyToIf/simpleIfWithBlocks2.kt"); } @TestMetadata("simpleIfWithType.kt") public void testSimpleIfWithType() throws Exception { - doTestUnfoldPropertyToIf("idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToIf/simpleIfWithType.kt"); + doTestUnfoldPropertyToIf("idea/testData/intentions/branched/unfolding/propertyToIf/simpleIfWithType.kt"); } } - @TestMetadata("idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToWhen") + @TestMetadata("idea/testData/intentions/branched/unfolding/propertyToWhen") public static class PropertyToWhen extends AbstractCodeTransformationTest { public void testAllFilesPresentInPropertyToWhen() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToWhen"), Pattern.compile("^(.+)\\.kt$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/intentions/branched/unfolding/propertyToWhen"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("nonLocalProperty.kt") public void testNonLocalProperty() throws Exception { - doTestUnfoldPropertyToWhen("idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToWhen/nonLocalProperty.kt"); + doTestUnfoldPropertyToWhen("idea/testData/intentions/branched/unfolding/propertyToWhen/nonLocalProperty.kt"); } @TestMetadata("nonLocalProperty2.kt") public void testNonLocalProperty2() throws Exception { - doTestUnfoldPropertyToWhen("idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToWhen/nonLocalProperty2.kt"); + doTestUnfoldPropertyToWhen("idea/testData/intentions/branched/unfolding/propertyToWhen/nonLocalProperty2.kt"); } @TestMetadata("simpleWhen.kt") public void testSimpleWhen() throws Exception { - doTestUnfoldPropertyToWhen("idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToWhen/simpleWhen.kt"); + doTestUnfoldPropertyToWhen("idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhen.kt"); } @TestMetadata("simpleWhen2.kt") public void testSimpleWhen2() throws Exception { - doTestUnfoldPropertyToWhen("idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToWhen/simpleWhen2.kt"); + doTestUnfoldPropertyToWhen("idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhen2.kt"); } @TestMetadata("simpleWhenWithBlocks.kt") public void testSimpleWhenWithBlocks() throws Exception { - doTestUnfoldPropertyToWhen("idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToWhen/simpleWhenWithBlocks.kt"); + doTestUnfoldPropertyToWhen("idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhenWithBlocks.kt"); } @TestMetadata("simpleWhenWithBlocks2.kt") public void testSimpleWhenWithBlocks2() throws Exception { - doTestUnfoldPropertyToWhen("idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToWhen/simpleWhenWithBlocks2.kt"); + doTestUnfoldPropertyToWhen("idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhenWithBlocks2.kt"); } @TestMetadata("simpleWhenWithType.kt") public void testSimpleWhenWithType() throws Exception { - doTestUnfoldPropertyToWhen("idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToWhen/simpleWhenWithType.kt"); + doTestUnfoldPropertyToWhen("idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhenWithType.kt"); } } - @TestMetadata("idea/testData/codeInsight/codeTransformations/branched/unfolding/returnToIf") + @TestMetadata("idea/testData/intentions/branched/unfolding/returnToIf") public static class ReturnToIf extends AbstractCodeTransformationTest { public void testAllFilesPresentInReturnToIf() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/codeInsight/codeTransformations/branched/unfolding/returnToIf"), Pattern.compile("^(.+)\\.kt$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/intentions/branched/unfolding/returnToIf"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("innerIfTransformed.kt") public void testInnerIfTransformed() throws Exception { - doTestUnfoldReturnToIf("idea/testData/codeInsight/codeTransformations/branched/unfolding/returnToIf/innerIfTransformed.kt"); + doTestUnfoldReturnToIf("idea/testData/intentions/branched/unfolding/returnToIf/innerIfTransformed.kt"); } @TestMetadata("simpleIf.kt") public void testSimpleIf() throws Exception { - doTestUnfoldReturnToIf("idea/testData/codeInsight/codeTransformations/branched/unfolding/returnToIf/simpleIf.kt"); + doTestUnfoldReturnToIf("idea/testData/intentions/branched/unfolding/returnToIf/simpleIf.kt"); } @TestMetadata("simpleIfWithBlocks.kt") public void testSimpleIfWithBlocks() throws Exception { - doTestUnfoldReturnToIf("idea/testData/codeInsight/codeTransformations/branched/unfolding/returnToIf/simpleIfWithBlocks.kt"); + doTestUnfoldReturnToIf("idea/testData/intentions/branched/unfolding/returnToIf/simpleIfWithBlocks.kt"); } } - @TestMetadata("idea/testData/codeInsight/codeTransformations/branched/unfolding/returnToWhen") + @TestMetadata("idea/testData/intentions/branched/unfolding/returnToWhen") public static class ReturnToWhen extends AbstractCodeTransformationTest { public void testAllFilesPresentInReturnToWhen() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/codeInsight/codeTransformations/branched/unfolding/returnToWhen"), Pattern.compile("^(.+)\\.kt$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/intentions/branched/unfolding/returnToWhen"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("innerWhenTransformed.kt") public void testInnerWhenTransformed() throws Exception { - doTestUnfoldReturnToWhen("idea/testData/codeInsight/codeTransformations/branched/unfolding/returnToWhen/innerWhenTransformed.kt"); + doTestUnfoldReturnToWhen("idea/testData/intentions/branched/unfolding/returnToWhen/innerWhenTransformed.kt"); } @TestMetadata("simpleWhen.kt") public void testSimpleWhen() throws Exception { - doTestUnfoldReturnToWhen("idea/testData/codeInsight/codeTransformations/branched/unfolding/returnToWhen/simpleWhen.kt"); + doTestUnfoldReturnToWhen("idea/testData/intentions/branched/unfolding/returnToWhen/simpleWhen.kt"); } @TestMetadata("simpleWhenWithBlocks.kt") public void testSimpleWhenWithBlocks() throws Exception { - doTestUnfoldReturnToWhen("idea/testData/codeInsight/codeTransformations/branched/unfolding/returnToWhen/simpleWhenWithBlocks.kt"); + doTestUnfoldReturnToWhen("idea/testData/intentions/branched/unfolding/returnToWhen/simpleWhenWithBlocks.kt"); } } - @TestMetadata("idea/testData/codeInsight/codeTransformations/branched/ifWhen/ifToWhen") + @TestMetadata("idea/testData/intentions/branched/ifWhen/ifToWhen") public static class IfToWhen extends AbstractCodeTransformationTest { public void testAllFilesPresentInIfToWhen() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/codeInsight/codeTransformations/branched/ifWhen/ifToWhen"), Pattern.compile("^(.+)\\.kt$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/intentions/branched/ifWhen/ifToWhen"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ifWithEqualityTests.kt") public void testIfWithEqualityTests() throws Exception { - doTestIfToWhen("idea/testData/codeInsight/codeTransformations/branched/ifWhen/ifToWhen/ifWithEqualityTests.kt"); + doTestIfToWhen("idea/testData/intentions/branched/ifWhen/ifToWhen/ifWithEqualityTests.kt"); } @TestMetadata("ifWithIs.kt") public void testIfWithIs() throws Exception { - doTestIfToWhen("idea/testData/codeInsight/codeTransformations/branched/ifWhen/ifToWhen/ifWithIs.kt"); + doTestIfToWhen("idea/testData/intentions/branched/ifWhen/ifToWhen/ifWithIs.kt"); } @TestMetadata("ifWithMultiConditions.kt") public void testIfWithMultiConditions() throws Exception { - doTestIfToWhen("idea/testData/codeInsight/codeTransformations/branched/ifWhen/ifToWhen/ifWithMultiConditions.kt"); + doTestIfToWhen("idea/testData/intentions/branched/ifWhen/ifToWhen/ifWithMultiConditions.kt"); } @TestMetadata("ifWithNegativeIs.kt") public void testIfWithNegativeIs() throws Exception { - doTestIfToWhen("idea/testData/codeInsight/codeTransformations/branched/ifWhen/ifToWhen/ifWithNegativeIs.kt"); + doTestIfToWhen("idea/testData/intentions/branched/ifWhen/ifToWhen/ifWithNegativeIs.kt"); } @TestMetadata("ifWithNegativeRangeTests.kt") public void testIfWithNegativeRangeTests() throws Exception { - doTestIfToWhen("idea/testData/codeInsight/codeTransformations/branched/ifWhen/ifToWhen/ifWithNegativeRangeTests.kt"); + doTestIfToWhen("idea/testData/intentions/branched/ifWhen/ifToWhen/ifWithNegativeRangeTests.kt"); } @TestMetadata("ifWithRangeTests.kt") public void testIfWithRangeTests() throws Exception { - doTestIfToWhen("idea/testData/codeInsight/codeTransformations/branched/ifWhen/ifToWhen/ifWithRangeTests.kt"); + doTestIfToWhen("idea/testData/intentions/branched/ifWhen/ifToWhen/ifWithRangeTests.kt"); } @TestMetadata("ifWithRangeTestsAndMultiConditions.kt") public void testIfWithRangeTestsAndMultiConditions() throws Exception { - doTestIfToWhen("idea/testData/codeInsight/codeTransformations/branched/ifWhen/ifToWhen/ifWithRangeTestsAndMultiConditions.kt"); + doTestIfToWhen("idea/testData/intentions/branched/ifWhen/ifToWhen/ifWithRangeTestsAndMultiConditions.kt"); } @TestMetadata("ifWithRangeTestsAndUnparenthesizedMultiConditions.kt") public void testIfWithRangeTestsAndUnparenthesizedMultiConditions() throws Exception { - doTestIfToWhen("idea/testData/codeInsight/codeTransformations/branched/ifWhen/ifToWhen/ifWithRangeTestsAndUnparenthesizedMultiConditions.kt"); + doTestIfToWhen("idea/testData/intentions/branched/ifWhen/ifToWhen/ifWithRangeTestsAndUnparenthesizedMultiConditions.kt"); } @TestMetadata("whenWithMultipleConditionTypes.kt") public void testWhenWithMultipleConditionTypes() throws Exception { - doTestIfToWhen("idea/testData/codeInsight/codeTransformations/branched/ifWhen/ifToWhen/whenWithMultipleConditionTypes.kt"); + doTestIfToWhen("idea/testData/intentions/branched/ifWhen/ifToWhen/whenWithMultipleConditionTypes.kt"); } } - @TestMetadata("idea/testData/codeInsight/codeTransformations/branched/ifWhen/whenToIf") + @TestMetadata("idea/testData/intentions/branched/ifWhen/whenToIf") public static class WhenToIf extends AbstractCodeTransformationTest { public void testAllFilesPresentInWhenToIf() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/codeInsight/codeTransformations/branched/ifWhen/whenToIf"), Pattern.compile("^(.+)\\.kt$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/intentions/branched/ifWhen/whenToIf"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("whenWithEqualityTests.kt") public void testWhenWithEqualityTests() throws Exception { - doTestWhenToIf("idea/testData/codeInsight/codeTransformations/branched/ifWhen/whenToIf/whenWithEqualityTests.kt"); + doTestWhenToIf("idea/testData/intentions/branched/ifWhen/whenToIf/whenWithEqualityTests.kt"); } @TestMetadata("whenWithMultiConditions.kt") public void testWhenWithMultiConditions() throws Exception { - doTestWhenToIf("idea/testData/codeInsight/codeTransformations/branched/ifWhen/whenToIf/whenWithMultiConditions.kt"); + doTestWhenToIf("idea/testData/intentions/branched/ifWhen/whenToIf/whenWithMultiConditions.kt"); } @TestMetadata("whenWithMultipleConditionTypes.kt") public void testWhenWithMultipleConditionTypes() throws Exception { - doTestWhenToIf("idea/testData/codeInsight/codeTransformations/branched/ifWhen/whenToIf/whenWithMultipleConditionTypes.kt"); + doTestWhenToIf("idea/testData/intentions/branched/ifWhen/whenToIf/whenWithMultipleConditionTypes.kt"); } @TestMetadata("whenWithNegativePatterns.kt") public void testWhenWithNegativePatterns() throws Exception { - doTestWhenToIf("idea/testData/codeInsight/codeTransformations/branched/ifWhen/whenToIf/whenWithNegativePatterns.kt"); + doTestWhenToIf("idea/testData/intentions/branched/ifWhen/whenToIf/whenWithNegativePatterns.kt"); } @TestMetadata("whenWithNegativeRangeTests.kt") public void testWhenWithNegativeRangeTests() throws Exception { - doTestWhenToIf("idea/testData/codeInsight/codeTransformations/branched/ifWhen/whenToIf/whenWithNegativeRangeTests.kt"); + doTestWhenToIf("idea/testData/intentions/branched/ifWhen/whenToIf/whenWithNegativeRangeTests.kt"); } @TestMetadata("whenWithPatterns.kt") public void testWhenWithPatterns() throws Exception { - doTestWhenToIf("idea/testData/codeInsight/codeTransformations/branched/ifWhen/whenToIf/whenWithPatterns.kt"); + doTestWhenToIf("idea/testData/intentions/branched/ifWhen/whenToIf/whenWithPatterns.kt"); } @TestMetadata("whenWithRangeTests.kt") public void testWhenWithRangeTests() throws Exception { - doTestWhenToIf("idea/testData/codeInsight/codeTransformations/branched/ifWhen/whenToIf/whenWithRangeTests.kt"); + doTestWhenToIf("idea/testData/intentions/branched/ifWhen/whenToIf/whenWithRangeTests.kt"); } @TestMetadata("whenWithRangeTestsAndMultiConditions.kt") public void testWhenWithRangeTestsAndMultiConditions() throws Exception { - doTestWhenToIf("idea/testData/codeInsight/codeTransformations/branched/ifWhen/whenToIf/whenWithRangeTestsAndMultiConditions.kt"); + doTestWhenToIf("idea/testData/intentions/branched/ifWhen/whenToIf/whenWithRangeTestsAndMultiConditions.kt"); } @TestMetadata("whenWithoutSubject.kt") public void testWhenWithoutSubject() throws Exception { - doTestWhenToIf("idea/testData/codeInsight/codeTransformations/branched/ifWhen/whenToIf/whenWithoutSubject.kt"); + doTestWhenToIf("idea/testData/intentions/branched/ifWhen/whenToIf/whenWithoutSubject.kt"); } } - @TestMetadata("idea/testData/codeInsight/codeTransformations/branched/when/flatten") + @TestMetadata("idea/testData/intentions/branched/when/flatten") public static class Flatten extends AbstractCodeTransformationTest { public void testAllFilesPresentInFlatten() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/codeInsight/codeTransformations/branched/when/flatten"), Pattern.compile("^(.+)\\.kt$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/intentions/branched/when/flatten"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("flattenWithSubject.kt") public void testFlattenWithSubject() throws Exception { - doTestFlattenWhen("idea/testData/codeInsight/codeTransformations/branched/when/flatten/flattenWithSubject.kt"); + doTestFlattenWhen("idea/testData/intentions/branched/when/flatten/flattenWithSubject.kt"); } @TestMetadata("flattenWithUnmatchedSubjects.kt") public void testFlattenWithUnmatchedSubjects() throws Exception { - doTestFlattenWhen("idea/testData/codeInsight/codeTransformations/branched/when/flatten/flattenWithUnmatchedSubjects.kt"); + doTestFlattenWhen("idea/testData/intentions/branched/when/flatten/flattenWithUnmatchedSubjects.kt"); } @TestMetadata("flattenWithoutSubject.kt") public void testFlattenWithoutSubject() throws Exception { - doTestFlattenWhen("idea/testData/codeInsight/codeTransformations/branched/when/flatten/flattenWithoutSubject.kt"); + doTestFlattenWhen("idea/testData/intentions/branched/when/flatten/flattenWithoutSubject.kt"); } } - @TestMetadata("idea/testData/codeInsight/codeTransformations/branched/when/introduceSubject") + @TestMetadata("idea/testData/intentions/branched/when/introduceSubject") public static class IntroduceSubject extends AbstractCodeTransformationTest { public void testAllFilesPresentInIntroduceSubject() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/codeInsight/codeTransformations/branched/when/introduceSubject"), Pattern.compile("^(.+)\\.kt$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/intentions/branched/when/introduceSubject"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("whenWithEqualityTests.kt") public void testWhenWithEqualityTests() throws Exception { - doTestIntroduceWhenSubject("idea/testData/codeInsight/codeTransformations/branched/when/introduceSubject/whenWithEqualityTests.kt"); + doTestIntroduceWhenSubject("idea/testData/intentions/branched/when/introduceSubject/whenWithEqualityTests.kt"); } @TestMetadata("whenWithMultipleConditionTypes.kt") public void testWhenWithMultipleConditionTypes() throws Exception { - doTestIntroduceWhenSubject("idea/testData/codeInsight/codeTransformations/branched/when/introduceSubject/whenWithMultipleConditionTypes.kt"); + doTestIntroduceWhenSubject("idea/testData/intentions/branched/when/introduceSubject/whenWithMultipleConditionTypes.kt"); } @TestMetadata("whenWithNegativePatterns.kt") public void testWhenWithNegativePatterns() throws Exception { - doTestIntroduceWhenSubject("idea/testData/codeInsight/codeTransformations/branched/when/introduceSubject/whenWithNegativePatterns.kt"); + doTestIntroduceWhenSubject("idea/testData/intentions/branched/when/introduceSubject/whenWithNegativePatterns.kt"); } @TestMetadata("whenWithNegativeRangeTests.kt") public void testWhenWithNegativeRangeTests() throws Exception { - doTestIntroduceWhenSubject("idea/testData/codeInsight/codeTransformations/branched/when/introduceSubject/whenWithNegativeRangeTests.kt"); + doTestIntroduceWhenSubject("idea/testData/intentions/branched/when/introduceSubject/whenWithNegativeRangeTests.kt"); } @TestMetadata("whenWithNondivisibleConditions.kt") public void testWhenWithNondivisibleConditions() throws Exception { - doTestIntroduceWhenSubject("idea/testData/codeInsight/codeTransformations/branched/when/introduceSubject/whenWithNondivisibleConditions.kt"); + doTestIntroduceWhenSubject("idea/testData/intentions/branched/when/introduceSubject/whenWithNondivisibleConditions.kt"); } @TestMetadata("whenWithPatterns.kt") public void testWhenWithPatterns() throws Exception { - doTestIntroduceWhenSubject("idea/testData/codeInsight/codeTransformations/branched/when/introduceSubject/whenWithPatterns.kt"); + doTestIntroduceWhenSubject("idea/testData/intentions/branched/when/introduceSubject/whenWithPatterns.kt"); } @TestMetadata("whenWithRangeTests.kt") public void testWhenWithRangeTests() throws Exception { - doTestIntroduceWhenSubject("idea/testData/codeInsight/codeTransformations/branched/when/introduceSubject/whenWithRangeTests.kt"); + doTestIntroduceWhenSubject("idea/testData/intentions/branched/when/introduceSubject/whenWithRangeTests.kt"); } @TestMetadata("whenWithRangeTestsAndMultiConditions.kt") public void testWhenWithRangeTestsAndMultiConditions() throws Exception { - doTestIntroduceWhenSubject("idea/testData/codeInsight/codeTransformations/branched/when/introduceSubject/whenWithRangeTestsAndMultiConditions.kt"); + doTestIntroduceWhenSubject("idea/testData/intentions/branched/when/introduceSubject/whenWithRangeTestsAndMultiConditions.kt"); } @TestMetadata("whenWithSubject.kt") public void testWhenWithSubject() throws Exception { - doTestIntroduceWhenSubject("idea/testData/codeInsight/codeTransformations/branched/when/introduceSubject/whenWithSubject.kt"); + doTestIntroduceWhenSubject("idea/testData/intentions/branched/when/introduceSubject/whenWithSubject.kt"); } @TestMetadata("whenWithSwappedEqualityTests.kt") public void testWhenWithSwappedEqualityTests() throws Exception { - doTestIntroduceWhenSubject("idea/testData/codeInsight/codeTransformations/branched/when/introduceSubject/whenWithSwappedEqualityTests.kt"); + doTestIntroduceWhenSubject("idea/testData/intentions/branched/when/introduceSubject/whenWithSwappedEqualityTests.kt"); } @TestMetadata("whenWithUnmatchedCandidateSubjects.kt") public void testWhenWithUnmatchedCandidateSubjects() throws Exception { - doTestIntroduceWhenSubject("idea/testData/codeInsight/codeTransformations/branched/when/introduceSubject/whenWithUnmatchedCandidateSubjects.kt"); + doTestIntroduceWhenSubject("idea/testData/intentions/branched/when/introduceSubject/whenWithUnmatchedCandidateSubjects.kt"); } } - @TestMetadata("idea/testData/codeInsight/codeTransformations/branched/when/eliminateSubject") + @TestMetadata("idea/testData/intentions/branched/when/eliminateSubject") public static class EliminateSubject extends AbstractCodeTransformationTest { public void testAllFilesPresentInEliminateSubject() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/codeInsight/codeTransformations/branched/when/eliminateSubject"), Pattern.compile("^(.+)\\.kt$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/intentions/branched/when/eliminateSubject"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("whenWithEqualityTests.kt") public void testWhenWithEqualityTests() throws Exception { - doTestEliminateWhenSubject("idea/testData/codeInsight/codeTransformations/branched/when/eliminateSubject/whenWithEqualityTests.kt"); + doTestEliminateWhenSubject("idea/testData/intentions/branched/when/eliminateSubject/whenWithEqualityTests.kt"); } @TestMetadata("whenWithMultipleConditionTypes.kt") public void testWhenWithMultipleConditionTypes() throws Exception { - doTestEliminateWhenSubject("idea/testData/codeInsight/codeTransformations/branched/when/eliminateSubject/whenWithMultipleConditionTypes.kt"); + doTestEliminateWhenSubject("idea/testData/intentions/branched/when/eliminateSubject/whenWithMultipleConditionTypes.kt"); } @TestMetadata("whenWithNegativePatterns.kt") public void testWhenWithNegativePatterns() throws Exception { - doTestEliminateWhenSubject("idea/testData/codeInsight/codeTransformations/branched/when/eliminateSubject/whenWithNegativePatterns.kt"); + doTestEliminateWhenSubject("idea/testData/intentions/branched/when/eliminateSubject/whenWithNegativePatterns.kt"); } @TestMetadata("whenWithNegativeRangeTests.kt") public void testWhenWithNegativeRangeTests() throws Exception { - doTestEliminateWhenSubject("idea/testData/codeInsight/codeTransformations/branched/when/eliminateSubject/whenWithNegativeRangeTests.kt"); + doTestEliminateWhenSubject("idea/testData/intentions/branched/when/eliminateSubject/whenWithNegativeRangeTests.kt"); } @TestMetadata("whenWithPatterns.kt") public void testWhenWithPatterns() throws Exception { - doTestEliminateWhenSubject("idea/testData/codeInsight/codeTransformations/branched/when/eliminateSubject/whenWithPatterns.kt"); + doTestEliminateWhenSubject("idea/testData/intentions/branched/when/eliminateSubject/whenWithPatterns.kt"); } @TestMetadata("whenWithRangeTests.kt") public void testWhenWithRangeTests() throws Exception { - doTestEliminateWhenSubject("idea/testData/codeInsight/codeTransformations/branched/when/eliminateSubject/whenWithRangeTests.kt"); + doTestEliminateWhenSubject("idea/testData/intentions/branched/when/eliminateSubject/whenWithRangeTests.kt"); } @TestMetadata("whenWithRangeTestsAndMultiConditions.kt") public void testWhenWithRangeTestsAndMultiConditions() throws Exception { - doTestEliminateWhenSubject("idea/testData/codeInsight/codeTransformations/branched/when/eliminateSubject/whenWithRangeTestsAndMultiConditions.kt"); + doTestEliminateWhenSubject("idea/testData/intentions/branched/when/eliminateSubject/whenWithRangeTestsAndMultiConditions.kt"); } @TestMetadata("whenWithoutSubject.kt") public void testWhenWithoutSubject() throws Exception { - doTestEliminateWhenSubject("idea/testData/codeInsight/codeTransformations/branched/when/eliminateSubject/whenWithoutSubject.kt"); + doTestEliminateWhenSubject("idea/testData/intentions/branched/when/eliminateSubject/whenWithoutSubject.kt"); } } - @TestMetadata("idea/testData/codeInsight/codeTransformations/declarations/split") + @TestMetadata("idea/testData/intentions/declarations/split") public static class Split extends AbstractCodeTransformationTest { public void testAllFilesPresentInSplit() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/codeInsight/codeTransformations/declarations/split"), Pattern.compile("^(.+)\\.kt$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/intentions/declarations/split"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("longInit.kt") public void testLongInit() throws Exception { - doTestSplitProperty("idea/testData/codeInsight/codeTransformations/declarations/split/longInit.kt"); + doTestSplitProperty("idea/testData/intentions/declarations/split/longInit.kt"); } @TestMetadata("longInit2.kt") public void testLongInit2() throws Exception { - doTestSplitProperty("idea/testData/codeInsight/codeTransformations/declarations/split/longInit2.kt"); + doTestSplitProperty("idea/testData/intentions/declarations/split/longInit2.kt"); } @TestMetadata("noInitializer.kt") public void testNoInitializer() throws Exception { - doTestSplitProperty("idea/testData/codeInsight/codeTransformations/declarations/split/noInitializer.kt"); + doTestSplitProperty("idea/testData/intentions/declarations/split/noInitializer.kt"); } @TestMetadata("noInitializer2.kt") public void testNoInitializer2() throws Exception { - doTestSplitProperty("idea/testData/codeInsight/codeTransformations/declarations/split/noInitializer2.kt"); + doTestSplitProperty("idea/testData/intentions/declarations/split/noInitializer2.kt"); } @TestMetadata("nonLocalProperty.kt") public void testNonLocalProperty() throws Exception { - doTestSplitProperty("idea/testData/codeInsight/codeTransformations/declarations/split/nonLocalProperty.kt"); + doTestSplitProperty("idea/testData/intentions/declarations/split/nonLocalProperty.kt"); } @TestMetadata("nonLocalProperty2.kt") public void testNonLocalProperty2() throws Exception { - doTestSplitProperty("idea/testData/codeInsight/codeTransformations/declarations/split/nonLocalProperty2.kt"); + doTestSplitProperty("idea/testData/intentions/declarations/split/nonLocalProperty2.kt"); } @TestMetadata("simpleInit.kt") public void testSimpleInit() throws Exception { - doTestSplitProperty("idea/testData/codeInsight/codeTransformations/declarations/split/simpleInit.kt"); + doTestSplitProperty("idea/testData/intentions/declarations/split/simpleInit.kt"); } @TestMetadata("simpleInit2.kt") public void testSimpleInit2() throws Exception { - doTestSplitProperty("idea/testData/codeInsight/codeTransformations/declarations/split/simpleInit2.kt"); + doTestSplitProperty("idea/testData/intentions/declarations/split/simpleInit2.kt"); } @TestMetadata("simpleInitWithErrorType.kt") public void testSimpleInitWithErrorType() throws Exception { - doTestSplitProperty("idea/testData/codeInsight/codeTransformations/declarations/split/simpleInitWithErrorType.kt"); + doTestSplitProperty("idea/testData/intentions/declarations/split/simpleInitWithErrorType.kt"); } @TestMetadata("simpleInitWithErrorType2.kt") public void testSimpleInitWithErrorType2() throws Exception { - doTestSplitProperty("idea/testData/codeInsight/codeTransformations/declarations/split/simpleInitWithErrorType2.kt"); + doTestSplitProperty("idea/testData/intentions/declarations/split/simpleInitWithErrorType2.kt"); } @TestMetadata("simpleInitWithType.kt") public void testSimpleInitWithType() throws Exception { - doTestSplitProperty("idea/testData/codeInsight/codeTransformations/declarations/split/simpleInitWithType.kt"); + doTestSplitProperty("idea/testData/intentions/declarations/split/simpleInitWithType.kt"); } @TestMetadata("simpleInitWithType2.kt") public void testSimpleInitWithType2() throws Exception { - doTestSplitProperty("idea/testData/codeInsight/codeTransformations/declarations/split/simpleInitWithType2.kt"); + doTestSplitProperty("idea/testData/intentions/declarations/split/simpleInitWithType2.kt"); } } - @TestMetadata("idea/testData/codeInsight/codeTransformations/declarations/join") + @TestMetadata("idea/testData/intentions/declarations/join") public static class Join extends AbstractCodeTransformationTest { public void testAllFilesPresentInJoin() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/codeInsight/codeTransformations/declarations/join"), Pattern.compile("^(.+)\\.kt$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/intentions/declarations/join"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("longInit.kt") public void testLongInit() throws Exception { - doTestJoinProperty("idea/testData/codeInsight/codeTransformations/declarations/join/longInit.kt"); + doTestJoinProperty("idea/testData/intentions/declarations/join/longInit.kt"); } @TestMetadata("longInit2.kt") public void testLongInit2() throws Exception { - doTestJoinProperty("idea/testData/codeInsight/codeTransformations/declarations/join/longInit2.kt"); + doTestJoinProperty("idea/testData/intentions/declarations/join/longInit2.kt"); } @TestMetadata("simpleInit.kt") public void testSimpleInit() throws Exception { - doTestJoinProperty("idea/testData/codeInsight/codeTransformations/declarations/join/simpleInit.kt"); + doTestJoinProperty("idea/testData/intentions/declarations/join/simpleInit.kt"); } @TestMetadata("simpleInit2.kt") public void testSimpleInit2() throws Exception { - doTestJoinProperty("idea/testData/codeInsight/codeTransformations/declarations/join/simpleInit2.kt"); + doTestJoinProperty("idea/testData/intentions/declarations/join/simpleInit2.kt"); } @TestMetadata("simpleInitWithBackticks.kt") public void testSimpleInitWithBackticks() throws Exception { - doTestJoinProperty("idea/testData/codeInsight/codeTransformations/declarations/join/simpleInitWithBackticks.kt"); + doTestJoinProperty("idea/testData/intentions/declarations/join/simpleInitWithBackticks.kt"); } @TestMetadata("simpleInitWithBackticks2.kt") public void testSimpleInitWithBackticks2() throws Exception { - doTestJoinProperty("idea/testData/codeInsight/codeTransformations/declarations/join/simpleInitWithBackticks2.kt"); + doTestJoinProperty("idea/testData/intentions/declarations/join/simpleInitWithBackticks2.kt"); } @TestMetadata("simpleInitWithBackticks3.kt") public void testSimpleInitWithBackticks3() throws Exception { - doTestJoinProperty("idea/testData/codeInsight/codeTransformations/declarations/join/simpleInitWithBackticks3.kt"); + doTestJoinProperty("idea/testData/intentions/declarations/join/simpleInitWithBackticks3.kt"); } @TestMetadata("simpleInitWithComments.kt") public void testSimpleInitWithComments() throws Exception { - doTestJoinProperty("idea/testData/codeInsight/codeTransformations/declarations/join/simpleInitWithComments.kt"); + doTestJoinProperty("idea/testData/intentions/declarations/join/simpleInitWithComments.kt"); } @TestMetadata("simpleInitWithComments2.kt") public void testSimpleInitWithComments2() throws Exception { - doTestJoinProperty("idea/testData/codeInsight/codeTransformations/declarations/join/simpleInitWithComments2.kt"); + doTestJoinProperty("idea/testData/intentions/declarations/join/simpleInitWithComments2.kt"); } @TestMetadata("simpleInitWithSemicolons.kt") public void testSimpleInitWithSemicolons() throws Exception { - doTestJoinProperty("idea/testData/codeInsight/codeTransformations/declarations/join/simpleInitWithSemicolons.kt"); + doTestJoinProperty("idea/testData/intentions/declarations/join/simpleInitWithSemicolons.kt"); } @TestMetadata("simpleInitWithSemicolons2.kt") public void testSimpleInitWithSemicolons2() throws Exception { - doTestJoinProperty("idea/testData/codeInsight/codeTransformations/declarations/join/simpleInitWithSemicolons2.kt"); + doTestJoinProperty("idea/testData/intentions/declarations/join/simpleInitWithSemicolons2.kt"); } @TestMetadata("simpleInitWithSemicolons3.kt") public void testSimpleInitWithSemicolons3() throws Exception { - doTestJoinProperty("idea/testData/codeInsight/codeTransformations/declarations/join/simpleInitWithSemicolons3.kt"); + doTestJoinProperty("idea/testData/intentions/declarations/join/simpleInitWithSemicolons3.kt"); } @TestMetadata("simpleInitWithType.kt") public void testSimpleInitWithType() throws Exception { - doTestJoinProperty("idea/testData/codeInsight/codeTransformations/declarations/join/simpleInitWithType.kt"); + doTestJoinProperty("idea/testData/intentions/declarations/join/simpleInitWithType.kt"); } @TestMetadata("simpleInitWithType2.kt") public void testSimpleInitWithType2() throws Exception { - doTestJoinProperty("idea/testData/codeInsight/codeTransformations/declarations/join/simpleInitWithType2.kt"); + doTestJoinProperty("idea/testData/intentions/declarations/join/simpleInitWithType2.kt"); } } - @TestMetadata("idea/testData/codeInsight/codeTransformations/removeUnnecessaryParentheses") + @TestMetadata("idea/testData/intentions/removeUnnecessaryParentheses") public static class RemoveUnnecessaryParentheses extends AbstractCodeTransformationTest { public void testAllFilesPresentInRemoveUnnecessaryParentheses() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/codeInsight/codeTransformations/removeUnnecessaryParentheses"), Pattern.compile("^(.+)\\.kt$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/intentions/removeUnnecessaryParentheses"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("necessaryParentheses1.kt") public void testNecessaryParentheses1() throws Exception { - doTestRemoveUnnecessaryParentheses("idea/testData/codeInsight/codeTransformations/removeUnnecessaryParentheses/necessaryParentheses1.kt"); + doTestRemoveUnnecessaryParentheses("idea/testData/intentions/removeUnnecessaryParentheses/necessaryParentheses1.kt"); } @TestMetadata("necessaryParentheses2.kt") public void testNecessaryParentheses2() throws Exception { - doTestRemoveUnnecessaryParentheses("idea/testData/codeInsight/codeTransformations/removeUnnecessaryParentheses/necessaryParentheses2.kt"); + doTestRemoveUnnecessaryParentheses("idea/testData/intentions/removeUnnecessaryParentheses/necessaryParentheses2.kt"); } @TestMetadata("necessaryParentheses3.kt") public void testNecessaryParentheses3() throws Exception { - doTestRemoveUnnecessaryParentheses("idea/testData/codeInsight/codeTransformations/removeUnnecessaryParentheses/necessaryParentheses3.kt"); + doTestRemoveUnnecessaryParentheses("idea/testData/intentions/removeUnnecessaryParentheses/necessaryParentheses3.kt"); } @TestMetadata("necessaryParentheses4.kt") public void testNecessaryParentheses4() throws Exception { - doTestRemoveUnnecessaryParentheses("idea/testData/codeInsight/codeTransformations/removeUnnecessaryParentheses/necessaryParentheses4.kt"); + doTestRemoveUnnecessaryParentheses("idea/testData/intentions/removeUnnecessaryParentheses/necessaryParentheses4.kt"); } @TestMetadata("necessaryParentheses5.kt") public void testNecessaryParentheses5() throws Exception { - doTestRemoveUnnecessaryParentheses("idea/testData/codeInsight/codeTransformations/removeUnnecessaryParentheses/necessaryParentheses5.kt"); + doTestRemoveUnnecessaryParentheses("idea/testData/intentions/removeUnnecessaryParentheses/necessaryParentheses5.kt"); } @TestMetadata("unnecessaryParentheses1.kt") public void testUnnecessaryParentheses1() throws Exception { - doTestRemoveUnnecessaryParentheses("idea/testData/codeInsight/codeTransformations/removeUnnecessaryParentheses/unnecessaryParentheses1.kt"); + doTestRemoveUnnecessaryParentheses("idea/testData/intentions/removeUnnecessaryParentheses/unnecessaryParentheses1.kt"); } @TestMetadata("unnecessaryParentheses2.kt") public void testUnnecessaryParentheses2() throws Exception { - doTestRemoveUnnecessaryParentheses("idea/testData/codeInsight/codeTransformations/removeUnnecessaryParentheses/unnecessaryParentheses2.kt"); + doTestRemoveUnnecessaryParentheses("idea/testData/intentions/removeUnnecessaryParentheses/unnecessaryParentheses2.kt"); } @TestMetadata("unnecessaryParentheses3.kt") public void testUnnecessaryParentheses3() throws Exception { - doTestRemoveUnnecessaryParentheses("idea/testData/codeInsight/codeTransformations/removeUnnecessaryParentheses/unnecessaryParentheses3.kt"); + doTestRemoveUnnecessaryParentheses("idea/testData/intentions/removeUnnecessaryParentheses/unnecessaryParentheses3.kt"); } @TestMetadata("unnecessaryParentheses4.kt") public void testUnnecessaryParentheses4() throws Exception { - doTestRemoveUnnecessaryParentheses("idea/testData/codeInsight/codeTransformations/removeUnnecessaryParentheses/unnecessaryParentheses4.kt"); + doTestRemoveUnnecessaryParentheses("idea/testData/intentions/removeUnnecessaryParentheses/unnecessaryParentheses4.kt"); } @TestMetadata("unnecessaryParentheses5.kt") public void testUnnecessaryParentheses5() throws Exception { - doTestRemoveUnnecessaryParentheses("idea/testData/codeInsight/codeTransformations/removeUnnecessaryParentheses/unnecessaryParentheses5.kt"); + doTestRemoveUnnecessaryParentheses("idea/testData/intentions/removeUnnecessaryParentheses/unnecessaryParentheses5.kt"); } @TestMetadata("unnecessaryParentheses6.kt") public void testUnnecessaryParentheses6() throws Exception { - doTestRemoveUnnecessaryParentheses("idea/testData/codeInsight/codeTransformations/removeUnnecessaryParentheses/unnecessaryParentheses6.kt"); + doTestRemoveUnnecessaryParentheses("idea/testData/intentions/removeUnnecessaryParentheses/unnecessaryParentheses6.kt"); } @TestMetadata("unnecessaryParentheses7.kt") public void testUnnecessaryParentheses7() throws Exception { - doTestRemoveUnnecessaryParentheses("idea/testData/codeInsight/codeTransformations/removeUnnecessaryParentheses/unnecessaryParentheses7.kt"); + doTestRemoveUnnecessaryParentheses("idea/testData/intentions/removeUnnecessaryParentheses/unnecessaryParentheses7.kt"); } } diff --git a/idea/tests/org/jetbrains/jet/plugin/codeInsight/ktSignature/SignatureMarkerProviderTest.java b/idea/tests/org/jetbrains/jet/plugin/ktSignature/SignatureMarkerProviderTest.java similarity index 92% rename from idea/tests/org/jetbrains/jet/plugin/codeInsight/ktSignature/SignatureMarkerProviderTest.java rename to idea/tests/org/jetbrains/jet/plugin/ktSignature/SignatureMarkerProviderTest.java index 6d57d6059d6..3a251e44865 100644 --- a/idea/tests/org/jetbrains/jet/plugin/codeInsight/ktSignature/SignatureMarkerProviderTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/ktSignature/SignatureMarkerProviderTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.codeInsight.ktSignature; +package org.jetbrains.jet.plugin.ktSignature; import com.intellij.openapi.project.Project; import com.intellij.psi.JavaPsiFacade; @@ -30,6 +30,7 @@ import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.plugin.JetFileType; import org.jetbrains.jet.plugin.JetLightProjectDescriptor; import org.jetbrains.jet.plugin.caches.resolve.KotlinCacheManager; +import org.jetbrains.jet.plugin.ktSignature.KotlinSignatureInJavaMarkerProvider; import org.jetbrains.jet.plugin.project.TargetPlatform; public class SignatureMarkerProviderTest extends LightCodeInsightFixtureTestCase { @@ -41,7 +42,9 @@ public class SignatureMarkerProviderTest extends LightCodeInsightFixtureTestCase } public void testReResolveJavaClass() { - Project project = myFixture.getProject(); + Project project; + project = myFixture.getProject(); + myFixture.configureByText(JetFileType.INSTANCE, "val t: Thread? = null");