diff --git a/generators/org/jetbrains/jet/generators/tests/GenerateTests.java b/generators/org/jetbrains/jet/generators/tests/GenerateTests.java index cdcda21f2e6..0b4e2b3d1f0 100644 --- a/generators/org/jetbrains/jet/generators/tests/GenerateTests.java +++ b/generators/org/jetbrains/jet/generators/tests/GenerateTests.java @@ -32,7 +32,7 @@ import org.jetbrains.jet.completion.AbstractJavaWithLibCompletionTest; import org.jetbrains.jet.completion.AbstractJetJSCompletionTest; import org.jetbrains.jet.completion.AbstractKeywordCompletionTest; import org.jetbrains.jet.jvm.compiler.*; -import org.jetbrains.jet.lang.psi.AbstractJetPsiMatcherTest; +import org.jetbrains.jet.psi.AbstractJetPsiMatcherTest; import org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveDescriptorRendererTest; import org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest; import org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveTest; @@ -213,10 +213,10 @@ public class GenerateTests { ); generateTest( - "compiler/tests/", + "idea/tests/", "JetPsiMatcherTest", AbstractJetPsiMatcherTest.class, - testModel("compiler/testData/psi/jetPsiMatcher", "doTestExpressions") + testModel("idea/testData/jetPsiMatcher", "doTestExpressions") ); generateTest( diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/WhenUtils.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/WhenUtils.java index 8f97f83b2cf..cc79bb83b4a 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/WhenUtils.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/WhenUtils.java @@ -4,6 +4,7 @@ import com.intellij.psi.tree.IElementType; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lexer.JetTokens; +import org.jetbrains.jet.plugin.util.JetPsiMatcher; import static org.jetbrains.jet.lang.psi.JetPsiUnparsingUtils.*; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiMatcher.java b/idea/src/org/jetbrains/jet/plugin/util/JetPsiMatcher.java similarity index 99% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiMatcher.java rename to idea/src/org/jetbrains/jet/plugin/util/JetPsiMatcher.java index 4c10080a68b..1f5a669a5ff 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiMatcher.java +++ b/idea/src/org/jetbrains/jet/plugin/util/JetPsiMatcher.java @@ -14,10 +14,11 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.jet.plugin.util; import com.google.common.collect.Lists; import org.jetbrains.annotations.Nullable; +import org.jetbrains.jet.lang.psi.*; import java.util.Arrays; import java.util.List; diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/arrayAccess/_arrayAccess1.kt b/idea/testData/jetPsiMatcher/expressions/arrayAccess/_arrayAccess1.kt similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/arrayAccess/_arrayAccess1.kt rename to idea/testData/jetPsiMatcher/expressions/arrayAccess/_arrayAccess1.kt diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/arrayAccess/_arrayAccess1.kt.2 b/idea/testData/jetPsiMatcher/expressions/arrayAccess/_arrayAccess1.kt.2 similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/arrayAccess/_arrayAccess1.kt.2 rename to idea/testData/jetPsiMatcher/expressions/arrayAccess/_arrayAccess1.kt.2 diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/arrayAccess/_arrayAccess2.kt b/idea/testData/jetPsiMatcher/expressions/arrayAccess/_arrayAccess2.kt similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/arrayAccess/_arrayAccess2.kt rename to idea/testData/jetPsiMatcher/expressions/arrayAccess/_arrayAccess2.kt diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/arrayAccess/_arrayAccess2.kt.2 b/idea/testData/jetPsiMatcher/expressions/arrayAccess/_arrayAccess2.kt.2 similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/arrayAccess/_arrayAccess2.kt.2 rename to idea/testData/jetPsiMatcher/expressions/arrayAccess/_arrayAccess2.kt.2 diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/arrayAccess/_arrayAccess3.kt b/idea/testData/jetPsiMatcher/expressions/arrayAccess/_arrayAccess3.kt similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/arrayAccess/_arrayAccess3.kt rename to idea/testData/jetPsiMatcher/expressions/arrayAccess/_arrayAccess3.kt diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/arrayAccess/_arrayAccess3.kt.2 b/idea/testData/jetPsiMatcher/expressions/arrayAccess/_arrayAccess3.kt.2 similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/arrayAccess/_arrayAccess3.kt.2 rename to idea/testData/jetPsiMatcher/expressions/arrayAccess/_arrayAccess3.kt.2 diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/arrayAccess/arrayAccess1.kt b/idea/testData/jetPsiMatcher/expressions/arrayAccess/arrayAccess1.kt similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/arrayAccess/arrayAccess1.kt rename to idea/testData/jetPsiMatcher/expressions/arrayAccess/arrayAccess1.kt diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/arrayAccess/arrayAccess1.kt.2 b/idea/testData/jetPsiMatcher/expressions/arrayAccess/arrayAccess1.kt.2 similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/arrayAccess/arrayAccess1.kt.2 rename to idea/testData/jetPsiMatcher/expressions/arrayAccess/arrayAccess1.kt.2 diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/arrayAccess/arrayAccess2.kt b/idea/testData/jetPsiMatcher/expressions/arrayAccess/arrayAccess2.kt similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/arrayAccess/arrayAccess2.kt rename to idea/testData/jetPsiMatcher/expressions/arrayAccess/arrayAccess2.kt diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/arrayAccess/arrayAccess2.kt.2 b/idea/testData/jetPsiMatcher/expressions/arrayAccess/arrayAccess2.kt.2 similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/arrayAccess/arrayAccess2.kt.2 rename to idea/testData/jetPsiMatcher/expressions/arrayAccess/arrayAccess2.kt.2 diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/binaryExpr/_binaryExpr1.kt b/idea/testData/jetPsiMatcher/expressions/binaryExpr/_binaryExpr1.kt similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/binaryExpr/_binaryExpr1.kt rename to idea/testData/jetPsiMatcher/expressions/binaryExpr/_binaryExpr1.kt diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/binaryExpr/_binaryExpr1.kt.2 b/idea/testData/jetPsiMatcher/expressions/binaryExpr/_binaryExpr1.kt.2 similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/binaryExpr/_binaryExpr1.kt.2 rename to idea/testData/jetPsiMatcher/expressions/binaryExpr/_binaryExpr1.kt.2 diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/binaryExpr/_binaryExpr2.kt b/idea/testData/jetPsiMatcher/expressions/binaryExpr/_binaryExpr2.kt similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/binaryExpr/_binaryExpr2.kt rename to idea/testData/jetPsiMatcher/expressions/binaryExpr/_binaryExpr2.kt diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/binaryExpr/_binaryExpr2.kt.2 b/idea/testData/jetPsiMatcher/expressions/binaryExpr/_binaryExpr2.kt.2 similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/binaryExpr/_binaryExpr2.kt.2 rename to idea/testData/jetPsiMatcher/expressions/binaryExpr/_binaryExpr2.kt.2 diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/binaryExpr/_binaryExpr3.kt b/idea/testData/jetPsiMatcher/expressions/binaryExpr/_binaryExpr3.kt similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/binaryExpr/_binaryExpr3.kt rename to idea/testData/jetPsiMatcher/expressions/binaryExpr/_binaryExpr3.kt diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/binaryExpr/_binaryExpr3.kt.2 b/idea/testData/jetPsiMatcher/expressions/binaryExpr/_binaryExpr3.kt.2 similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/binaryExpr/_binaryExpr3.kt.2 rename to idea/testData/jetPsiMatcher/expressions/binaryExpr/_binaryExpr3.kt.2 diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/binaryExpr/_binaryExpr4.kt b/idea/testData/jetPsiMatcher/expressions/binaryExpr/_binaryExpr4.kt similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/binaryExpr/_binaryExpr4.kt rename to idea/testData/jetPsiMatcher/expressions/binaryExpr/_binaryExpr4.kt diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/binaryExpr/_binaryExpr4.kt.2 b/idea/testData/jetPsiMatcher/expressions/binaryExpr/_binaryExpr4.kt.2 similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/binaryExpr/_binaryExpr4.kt.2 rename to idea/testData/jetPsiMatcher/expressions/binaryExpr/_binaryExpr4.kt.2 diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/binaryExpr/_binaryExpr5.kt b/idea/testData/jetPsiMatcher/expressions/binaryExpr/_binaryExpr5.kt similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/binaryExpr/_binaryExpr5.kt rename to idea/testData/jetPsiMatcher/expressions/binaryExpr/_binaryExpr5.kt diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/binaryExpr/_binaryExpr5.kt.2 b/idea/testData/jetPsiMatcher/expressions/binaryExpr/_binaryExpr5.kt.2 similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/binaryExpr/_binaryExpr5.kt.2 rename to idea/testData/jetPsiMatcher/expressions/binaryExpr/_binaryExpr5.kt.2 diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/binaryExpr/_binaryExpr6.kt b/idea/testData/jetPsiMatcher/expressions/binaryExpr/_binaryExpr6.kt similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/binaryExpr/_binaryExpr6.kt rename to idea/testData/jetPsiMatcher/expressions/binaryExpr/_binaryExpr6.kt diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/binaryExpr/_binaryExpr6.kt.2 b/idea/testData/jetPsiMatcher/expressions/binaryExpr/_binaryExpr6.kt.2 similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/binaryExpr/_binaryExpr6.kt.2 rename to idea/testData/jetPsiMatcher/expressions/binaryExpr/_binaryExpr6.kt.2 diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/binaryExpr/binaryExpr1.kt b/idea/testData/jetPsiMatcher/expressions/binaryExpr/binaryExpr1.kt similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/binaryExpr/binaryExpr1.kt rename to idea/testData/jetPsiMatcher/expressions/binaryExpr/binaryExpr1.kt diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/binaryExpr/binaryExpr1.kt.2 b/idea/testData/jetPsiMatcher/expressions/binaryExpr/binaryExpr1.kt.2 similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/binaryExpr/binaryExpr1.kt.2 rename to idea/testData/jetPsiMatcher/expressions/binaryExpr/binaryExpr1.kt.2 diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/binaryExpr/binaryExpr2.kt b/idea/testData/jetPsiMatcher/expressions/binaryExpr/binaryExpr2.kt similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/binaryExpr/binaryExpr2.kt rename to idea/testData/jetPsiMatcher/expressions/binaryExpr/binaryExpr2.kt diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/binaryExpr/binaryExpr2.kt.2 b/idea/testData/jetPsiMatcher/expressions/binaryExpr/binaryExpr2.kt.2 similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/binaryExpr/binaryExpr2.kt.2 rename to idea/testData/jetPsiMatcher/expressions/binaryExpr/binaryExpr2.kt.2 diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/binaryExpr/binaryExpr3.kt b/idea/testData/jetPsiMatcher/expressions/binaryExpr/binaryExpr3.kt similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/binaryExpr/binaryExpr3.kt rename to idea/testData/jetPsiMatcher/expressions/binaryExpr/binaryExpr3.kt diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/binaryExpr/binaryExpr3.kt.2 b/idea/testData/jetPsiMatcher/expressions/binaryExpr/binaryExpr3.kt.2 similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/binaryExpr/binaryExpr3.kt.2 rename to idea/testData/jetPsiMatcher/expressions/binaryExpr/binaryExpr3.kt.2 diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/binaryExpr/binaryExpr4.kt b/idea/testData/jetPsiMatcher/expressions/binaryExpr/binaryExpr4.kt similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/binaryExpr/binaryExpr4.kt rename to idea/testData/jetPsiMatcher/expressions/binaryExpr/binaryExpr4.kt diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/binaryExpr/binaryExpr4.kt.2 b/idea/testData/jetPsiMatcher/expressions/binaryExpr/binaryExpr4.kt.2 similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/binaryExpr/binaryExpr4.kt.2 rename to idea/testData/jetPsiMatcher/expressions/binaryExpr/binaryExpr4.kt.2 diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/binaryExpr/binaryExpr5.kt b/idea/testData/jetPsiMatcher/expressions/binaryExpr/binaryExpr5.kt similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/binaryExpr/binaryExpr5.kt rename to idea/testData/jetPsiMatcher/expressions/binaryExpr/binaryExpr5.kt diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/binaryExpr/binaryExpr5.kt.2 b/idea/testData/jetPsiMatcher/expressions/binaryExpr/binaryExpr5.kt.2 similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/binaryExpr/binaryExpr5.kt.2 rename to idea/testData/jetPsiMatcher/expressions/binaryExpr/binaryExpr5.kt.2 diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/call/_call1.kt b/idea/testData/jetPsiMatcher/expressions/call/_call1.kt similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/call/_call1.kt rename to idea/testData/jetPsiMatcher/expressions/call/_call1.kt diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/call/_call1.kt.2 b/idea/testData/jetPsiMatcher/expressions/call/_call1.kt.2 similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/call/_call1.kt.2 rename to idea/testData/jetPsiMatcher/expressions/call/_call1.kt.2 diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/call/_call2.kt b/idea/testData/jetPsiMatcher/expressions/call/_call2.kt similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/call/_call2.kt rename to idea/testData/jetPsiMatcher/expressions/call/_call2.kt diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/call/_call2.kt.2 b/idea/testData/jetPsiMatcher/expressions/call/_call2.kt.2 similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/call/_call2.kt.2 rename to idea/testData/jetPsiMatcher/expressions/call/_call2.kt.2 diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/call/_call3.kt b/idea/testData/jetPsiMatcher/expressions/call/_call3.kt similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/call/_call3.kt rename to idea/testData/jetPsiMatcher/expressions/call/_call3.kt diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/call/_call3.kt.2 b/idea/testData/jetPsiMatcher/expressions/call/_call3.kt.2 similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/call/_call3.kt.2 rename to idea/testData/jetPsiMatcher/expressions/call/_call3.kt.2 diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/call/_call4.kt b/idea/testData/jetPsiMatcher/expressions/call/_call4.kt similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/call/_call4.kt rename to idea/testData/jetPsiMatcher/expressions/call/_call4.kt diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/call/_call4.kt.2 b/idea/testData/jetPsiMatcher/expressions/call/_call4.kt.2 similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/call/_call4.kt.2 rename to idea/testData/jetPsiMatcher/expressions/call/_call4.kt.2 diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/call/call1.kt b/idea/testData/jetPsiMatcher/expressions/call/call1.kt similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/call/call1.kt rename to idea/testData/jetPsiMatcher/expressions/call/call1.kt diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/call/call1.kt.2 b/idea/testData/jetPsiMatcher/expressions/call/call1.kt.2 similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/call/call1.kt.2 rename to idea/testData/jetPsiMatcher/expressions/call/call1.kt.2 diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/call/call2.kt b/idea/testData/jetPsiMatcher/expressions/call/call2.kt similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/call/call2.kt rename to idea/testData/jetPsiMatcher/expressions/call/call2.kt diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/call/call2.kt.2 b/idea/testData/jetPsiMatcher/expressions/call/call2.kt.2 similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/call/call2.kt.2 rename to idea/testData/jetPsiMatcher/expressions/call/call2.kt.2 diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/call/call3.kt b/idea/testData/jetPsiMatcher/expressions/call/call3.kt similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/call/call3.kt rename to idea/testData/jetPsiMatcher/expressions/call/call3.kt diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/call/call3.kt.2 b/idea/testData/jetPsiMatcher/expressions/call/call3.kt.2 similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/call/call3.kt.2 rename to idea/testData/jetPsiMatcher/expressions/call/call3.kt.2 diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/call/call4.kt b/idea/testData/jetPsiMatcher/expressions/call/call4.kt similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/call/call4.kt rename to idea/testData/jetPsiMatcher/expressions/call/call4.kt diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/call/call4.kt.2 b/idea/testData/jetPsiMatcher/expressions/call/call4.kt.2 similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/call/call4.kt.2 rename to idea/testData/jetPsiMatcher/expressions/call/call4.kt.2 diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/const/_const.kt b/idea/testData/jetPsiMatcher/expressions/const/_const.kt similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/const/_const.kt rename to idea/testData/jetPsiMatcher/expressions/const/_const.kt diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/const/_const.kt.2 b/idea/testData/jetPsiMatcher/expressions/const/_const.kt.2 similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/const/_const.kt.2 rename to idea/testData/jetPsiMatcher/expressions/const/_const.kt.2 diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/const/const.kt b/idea/testData/jetPsiMatcher/expressions/const/const.kt similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/const/const.kt rename to idea/testData/jetPsiMatcher/expressions/const/const.kt diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/const/const.kt.2 b/idea/testData/jetPsiMatcher/expressions/const/const.kt.2 similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/const/const.kt.2 rename to idea/testData/jetPsiMatcher/expressions/const/const.kt.2 diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/misc/_misc1.kt b/idea/testData/jetPsiMatcher/expressions/misc/_misc1.kt similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/misc/_misc1.kt rename to idea/testData/jetPsiMatcher/expressions/misc/_misc1.kt diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/misc/_misc1.kt.2 b/idea/testData/jetPsiMatcher/expressions/misc/_misc1.kt.2 similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/misc/_misc1.kt.2 rename to idea/testData/jetPsiMatcher/expressions/misc/_misc1.kt.2 diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/misc/_misc2.kt b/idea/testData/jetPsiMatcher/expressions/misc/_misc2.kt similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/misc/_misc2.kt rename to idea/testData/jetPsiMatcher/expressions/misc/_misc2.kt diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/misc/_misc2.kt.2 b/idea/testData/jetPsiMatcher/expressions/misc/_misc2.kt.2 similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/misc/_misc2.kt.2 rename to idea/testData/jetPsiMatcher/expressions/misc/_misc2.kt.2 diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/misc/_misc3.kt b/idea/testData/jetPsiMatcher/expressions/misc/_misc3.kt similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/misc/_misc3.kt rename to idea/testData/jetPsiMatcher/expressions/misc/_misc3.kt diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/misc/_misc3.kt.2 b/idea/testData/jetPsiMatcher/expressions/misc/_misc3.kt.2 similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/misc/_misc3.kt.2 rename to idea/testData/jetPsiMatcher/expressions/misc/_misc3.kt.2 diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/misc/misc1.kt b/idea/testData/jetPsiMatcher/expressions/misc/misc1.kt similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/misc/misc1.kt rename to idea/testData/jetPsiMatcher/expressions/misc/misc1.kt diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/misc/misc1.kt.2 b/idea/testData/jetPsiMatcher/expressions/misc/misc1.kt.2 similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/misc/misc1.kt.2 rename to idea/testData/jetPsiMatcher/expressions/misc/misc1.kt.2 diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/misc/misc2.kt b/idea/testData/jetPsiMatcher/expressions/misc/misc2.kt similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/misc/misc2.kt rename to idea/testData/jetPsiMatcher/expressions/misc/misc2.kt diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/misc/misc2.kt.2 b/idea/testData/jetPsiMatcher/expressions/misc/misc2.kt.2 similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/misc/misc2.kt.2 rename to idea/testData/jetPsiMatcher/expressions/misc/misc2.kt.2 diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/misc/misc3.kt b/idea/testData/jetPsiMatcher/expressions/misc/misc3.kt similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/misc/misc3.kt rename to idea/testData/jetPsiMatcher/expressions/misc/misc3.kt diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/misc/misc3.kt.2 b/idea/testData/jetPsiMatcher/expressions/misc/misc3.kt.2 similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/misc/misc3.kt.2 rename to idea/testData/jetPsiMatcher/expressions/misc/misc3.kt.2 diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/simpleName/_simpleName.kt b/idea/testData/jetPsiMatcher/expressions/simpleName/_simpleName.kt similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/simpleName/_simpleName.kt rename to idea/testData/jetPsiMatcher/expressions/simpleName/_simpleName.kt diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/simpleName/_simpleName.kt.2 b/idea/testData/jetPsiMatcher/expressions/simpleName/_simpleName.kt.2 similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/simpleName/_simpleName.kt.2 rename to idea/testData/jetPsiMatcher/expressions/simpleName/_simpleName.kt.2 diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/simpleName/simpleName.kt b/idea/testData/jetPsiMatcher/expressions/simpleName/simpleName.kt similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/simpleName/simpleName.kt rename to idea/testData/jetPsiMatcher/expressions/simpleName/simpleName.kt diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/simpleName/simpleName.kt.2 b/idea/testData/jetPsiMatcher/expressions/simpleName/simpleName.kt.2 similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/simpleName/simpleName.kt.2 rename to idea/testData/jetPsiMatcher/expressions/simpleName/simpleName.kt.2 diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/super/_super1.kt b/idea/testData/jetPsiMatcher/expressions/super/_super1.kt similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/super/_super1.kt rename to idea/testData/jetPsiMatcher/expressions/super/_super1.kt diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/super/_super1.kt.2 b/idea/testData/jetPsiMatcher/expressions/super/_super1.kt.2 similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/super/_super1.kt.2 rename to idea/testData/jetPsiMatcher/expressions/super/_super1.kt.2 diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/super/_super2.kt b/idea/testData/jetPsiMatcher/expressions/super/_super2.kt similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/super/_super2.kt rename to idea/testData/jetPsiMatcher/expressions/super/_super2.kt diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/super/_super2.kt.2 b/idea/testData/jetPsiMatcher/expressions/super/_super2.kt.2 similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/super/_super2.kt.2 rename to idea/testData/jetPsiMatcher/expressions/super/_super2.kt.2 diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/super/_super3.kt b/idea/testData/jetPsiMatcher/expressions/super/_super3.kt similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/super/_super3.kt rename to idea/testData/jetPsiMatcher/expressions/super/_super3.kt diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/super/_super3.kt.2 b/idea/testData/jetPsiMatcher/expressions/super/_super3.kt.2 similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/super/_super3.kt.2 rename to idea/testData/jetPsiMatcher/expressions/super/_super3.kt.2 diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/super/_super4.kt b/idea/testData/jetPsiMatcher/expressions/super/_super4.kt similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/super/_super4.kt rename to idea/testData/jetPsiMatcher/expressions/super/_super4.kt diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/super/_super4.kt.2 b/idea/testData/jetPsiMatcher/expressions/super/_super4.kt.2 similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/super/_super4.kt.2 rename to idea/testData/jetPsiMatcher/expressions/super/_super4.kt.2 diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/super/super1.kt b/idea/testData/jetPsiMatcher/expressions/super/super1.kt similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/super/super1.kt rename to idea/testData/jetPsiMatcher/expressions/super/super1.kt diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/super/super1.kt.2 b/idea/testData/jetPsiMatcher/expressions/super/super1.kt.2 similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/super/super1.kt.2 rename to idea/testData/jetPsiMatcher/expressions/super/super1.kt.2 diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/super/super2.kt b/idea/testData/jetPsiMatcher/expressions/super/super2.kt similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/super/super2.kt rename to idea/testData/jetPsiMatcher/expressions/super/super2.kt diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/super/super2.kt.2 b/idea/testData/jetPsiMatcher/expressions/super/super2.kt.2 similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/super/super2.kt.2 rename to idea/testData/jetPsiMatcher/expressions/super/super2.kt.2 diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/super/super3.kt b/idea/testData/jetPsiMatcher/expressions/super/super3.kt similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/super/super3.kt rename to idea/testData/jetPsiMatcher/expressions/super/super3.kt diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/super/super3.kt.2 b/idea/testData/jetPsiMatcher/expressions/super/super3.kt.2 similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/super/super3.kt.2 rename to idea/testData/jetPsiMatcher/expressions/super/super3.kt.2 diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/super/super4.kt b/idea/testData/jetPsiMatcher/expressions/super/super4.kt similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/super/super4.kt rename to idea/testData/jetPsiMatcher/expressions/super/super4.kt diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/super/super4.kt.2 b/idea/testData/jetPsiMatcher/expressions/super/super4.kt.2 similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/super/super4.kt.2 rename to idea/testData/jetPsiMatcher/expressions/super/super4.kt.2 diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/throw/_throw.kt b/idea/testData/jetPsiMatcher/expressions/throw/_throw.kt similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/throw/_throw.kt rename to idea/testData/jetPsiMatcher/expressions/throw/_throw.kt diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/throw/_throw.kt.2 b/idea/testData/jetPsiMatcher/expressions/throw/_throw.kt.2 similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/throw/_throw.kt.2 rename to idea/testData/jetPsiMatcher/expressions/throw/_throw.kt.2 diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/throw/throw.kt b/idea/testData/jetPsiMatcher/expressions/throw/throw.kt similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/throw/throw.kt rename to idea/testData/jetPsiMatcher/expressions/throw/throw.kt diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/throw/throw.kt.2 b/idea/testData/jetPsiMatcher/expressions/throw/throw.kt.2 similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/throw/throw.kt.2 rename to idea/testData/jetPsiMatcher/expressions/throw/throw.kt.2 diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/unaryExpr/_unaryExpr1.kt b/idea/testData/jetPsiMatcher/expressions/unaryExpr/_unaryExpr1.kt similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/unaryExpr/_unaryExpr1.kt rename to idea/testData/jetPsiMatcher/expressions/unaryExpr/_unaryExpr1.kt diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/unaryExpr/_unaryExpr1.kt.2 b/idea/testData/jetPsiMatcher/expressions/unaryExpr/_unaryExpr1.kt.2 similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/unaryExpr/_unaryExpr1.kt.2 rename to idea/testData/jetPsiMatcher/expressions/unaryExpr/_unaryExpr1.kt.2 diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/unaryExpr/_unaryExpr2.kt b/idea/testData/jetPsiMatcher/expressions/unaryExpr/_unaryExpr2.kt similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/unaryExpr/_unaryExpr2.kt rename to idea/testData/jetPsiMatcher/expressions/unaryExpr/_unaryExpr2.kt diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/unaryExpr/_unaryExpr2.kt.2 b/idea/testData/jetPsiMatcher/expressions/unaryExpr/_unaryExpr2.kt.2 similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/unaryExpr/_unaryExpr2.kt.2 rename to idea/testData/jetPsiMatcher/expressions/unaryExpr/_unaryExpr2.kt.2 diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/unaryExpr/_unaryExpr3.kt b/idea/testData/jetPsiMatcher/expressions/unaryExpr/_unaryExpr3.kt similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/unaryExpr/_unaryExpr3.kt rename to idea/testData/jetPsiMatcher/expressions/unaryExpr/_unaryExpr3.kt diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/unaryExpr/_unaryExpr3.kt.2 b/idea/testData/jetPsiMatcher/expressions/unaryExpr/_unaryExpr3.kt.2 similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/unaryExpr/_unaryExpr3.kt.2 rename to idea/testData/jetPsiMatcher/expressions/unaryExpr/_unaryExpr3.kt.2 diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/unaryExpr/unaryExpr1.kt b/idea/testData/jetPsiMatcher/expressions/unaryExpr/unaryExpr1.kt similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/unaryExpr/unaryExpr1.kt rename to idea/testData/jetPsiMatcher/expressions/unaryExpr/unaryExpr1.kt diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/unaryExpr/unaryExpr1.kt.2 b/idea/testData/jetPsiMatcher/expressions/unaryExpr/unaryExpr1.kt.2 similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/unaryExpr/unaryExpr1.kt.2 rename to idea/testData/jetPsiMatcher/expressions/unaryExpr/unaryExpr1.kt.2 diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/unaryExpr/unaryExpr2.kt b/idea/testData/jetPsiMatcher/expressions/unaryExpr/unaryExpr2.kt similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/unaryExpr/unaryExpr2.kt rename to idea/testData/jetPsiMatcher/expressions/unaryExpr/unaryExpr2.kt diff --git a/compiler/testData/psi/jetPsiMatcher/expressions/unaryExpr/unaryExpr2.kt.2 b/idea/testData/jetPsiMatcher/expressions/unaryExpr/unaryExpr2.kt.2 similarity index 100% rename from compiler/testData/psi/jetPsiMatcher/expressions/unaryExpr/unaryExpr2.kt.2 rename to idea/testData/jetPsiMatcher/expressions/unaryExpr/unaryExpr2.kt.2 diff --git a/compiler/tests/org/jetbrains/jet/lang/psi/AbstractJetPsiMatcherTest.java b/idea/tests/org/jetbrains/jet/psi/AbstractJetPsiMatcherTest.java similarity index 91% rename from compiler/tests/org/jetbrains/jet/lang/psi/AbstractJetPsiMatcherTest.java rename to idea/tests/org/jetbrains/jet/psi/AbstractJetPsiMatcherTest.java index 68f543b7342..912904ce789 100644 --- a/compiler/tests/org/jetbrains/jet/lang/psi/AbstractJetPsiMatcherTest.java +++ b/idea/tests/org/jetbrains/jet/psi/AbstractJetPsiMatcherTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.jet.psi; import com.intellij.openapi.util.io.FileUtil; import org.jetbrains.annotations.NotNull; @@ -22,6 +22,9 @@ import org.jetbrains.jet.InTextDirectivesUtils; import org.jetbrains.jet.JetLiteFixture; import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.jet.config.CompilerConfiguration; +import org.jetbrains.jet.lang.psi.JetExpression; +import org.jetbrains.jet.lang.psi.JetPsiFactory; +import org.jetbrains.jet.plugin.util.JetPsiMatcher; import java.io.File; diff --git a/compiler/tests/org/jetbrains/jet/lang/psi/JetPsiMatcherTest.java b/idea/tests/org/jetbrains/jet/psi/JetPsiMatcherTest.java similarity index 61% rename from compiler/tests/org/jetbrains/jet/lang/psi/JetPsiMatcherTest.java rename to idea/tests/org/jetbrains/jet/psi/JetPsiMatcherTest.java index 726cc5153ed..08c57f91d9b 100644 --- a/compiler/tests/org/jetbrains/jet/lang/psi/JetPsiMatcherTest.java +++ b/idea/tests/org/jetbrains/jet/psi/JetPsiMatcherTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.psi; +package org.jetbrains.jet.psi; import junit.framework.Assert; import junit.framework.Test; @@ -26,337 +26,337 @@ import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; -import org.jetbrains.jet.lang.psi.AbstractJetPsiMatcherTest; +import org.jetbrains.jet.psi.AbstractJetPsiMatcherTest; /** This class is generated by {@link org.jetbrains.jet.generators.tests.GenerateTests}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@TestMetadata("compiler/testData/psi/jetPsiMatcher") +@TestMetadata("idea/testData/jetPsiMatcher") @InnerTestClasses({JetPsiMatcherTest.Expressions.class}) public class JetPsiMatcherTest extends AbstractJetPsiMatcherTest { public void testAllFilesPresentInJetPsiMatcher() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/psi/jetPsiMatcher"), Pattern.compile("^(.+)\\.kt$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/jetPsiMatcher"), Pattern.compile("^(.+)\\.kt$"), true); } - @TestMetadata("compiler/testData/psi/jetPsiMatcher/expressions") + @TestMetadata("idea/testData/jetPsiMatcher/expressions") @InnerTestClasses({Expressions.ArrayAccess.class, Expressions.BinaryExpr.class, Expressions.Call.class, Expressions.Const.class, Expressions.Misc.class, Expressions.SimpleName.class, Expressions.Super.class, Expressions.Throw.class, Expressions.UnaryExpr.class}) public static class Expressions extends AbstractJetPsiMatcherTest { public void testAllFilesPresentInExpressions() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/psi/jetPsiMatcher/expressions"), Pattern.compile("^(.+)\\.kt$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/jetPsiMatcher/expressions"), Pattern.compile("^(.+)\\.kt$"), true); } - @TestMetadata("compiler/testData/psi/jetPsiMatcher/expressions/arrayAccess") + @TestMetadata("idea/testData/jetPsiMatcher/expressions/arrayAccess") public static class ArrayAccess extends AbstractJetPsiMatcherTest { public void testAllFilesPresentInArrayAccess() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/psi/jetPsiMatcher/expressions/arrayAccess"), Pattern.compile("^(.+)\\.kt$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/jetPsiMatcher/expressions/arrayAccess"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("arrayAccess1.kt") public void testArrayAccess1() throws Exception { - doTestExpressions("compiler/testData/psi/jetPsiMatcher/expressions/arrayAccess/arrayAccess1.kt"); + doTestExpressions("idea/testData/jetPsiMatcher/expressions/arrayAccess/arrayAccess1.kt"); } @TestMetadata("arrayAccess2.kt") public void testArrayAccess2() throws Exception { - doTestExpressions("compiler/testData/psi/jetPsiMatcher/expressions/arrayAccess/arrayAccess2.kt"); + doTestExpressions("idea/testData/jetPsiMatcher/expressions/arrayAccess/arrayAccess2.kt"); } @TestMetadata("_arrayAccess1.kt") public void test_arrayAccess1() throws Exception { - doTestExpressions("compiler/testData/psi/jetPsiMatcher/expressions/arrayAccess/_arrayAccess1.kt"); + doTestExpressions("idea/testData/jetPsiMatcher/expressions/arrayAccess/_arrayAccess1.kt"); } @TestMetadata("_arrayAccess2.kt") public void test_arrayAccess2() throws Exception { - doTestExpressions("compiler/testData/psi/jetPsiMatcher/expressions/arrayAccess/_arrayAccess2.kt"); + doTestExpressions("idea/testData/jetPsiMatcher/expressions/arrayAccess/_arrayAccess2.kt"); } @TestMetadata("_arrayAccess3.kt") public void test_arrayAccess3() throws Exception { - doTestExpressions("compiler/testData/psi/jetPsiMatcher/expressions/arrayAccess/_arrayAccess3.kt"); + doTestExpressions("idea/testData/jetPsiMatcher/expressions/arrayAccess/_arrayAccess3.kt"); } } - @TestMetadata("compiler/testData/psi/jetPsiMatcher/expressions/binaryExpr") + @TestMetadata("idea/testData/jetPsiMatcher/expressions/binaryExpr") public static class BinaryExpr extends AbstractJetPsiMatcherTest { public void testAllFilesPresentInBinaryExpr() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/psi/jetPsiMatcher/expressions/binaryExpr"), Pattern.compile("^(.+)\\.kt$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/jetPsiMatcher/expressions/binaryExpr"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("binaryExpr1.kt") public void testBinaryExpr1() throws Exception { - doTestExpressions("compiler/testData/psi/jetPsiMatcher/expressions/binaryExpr/binaryExpr1.kt"); + doTestExpressions("idea/testData/jetPsiMatcher/expressions/binaryExpr/binaryExpr1.kt"); } @TestMetadata("binaryExpr2.kt") public void testBinaryExpr2() throws Exception { - doTestExpressions("compiler/testData/psi/jetPsiMatcher/expressions/binaryExpr/binaryExpr2.kt"); + doTestExpressions("idea/testData/jetPsiMatcher/expressions/binaryExpr/binaryExpr2.kt"); } @TestMetadata("binaryExpr3.kt") public void testBinaryExpr3() throws Exception { - doTestExpressions("compiler/testData/psi/jetPsiMatcher/expressions/binaryExpr/binaryExpr3.kt"); + doTestExpressions("idea/testData/jetPsiMatcher/expressions/binaryExpr/binaryExpr3.kt"); } @TestMetadata("binaryExpr4.kt") public void testBinaryExpr4() throws Exception { - doTestExpressions("compiler/testData/psi/jetPsiMatcher/expressions/binaryExpr/binaryExpr4.kt"); + doTestExpressions("idea/testData/jetPsiMatcher/expressions/binaryExpr/binaryExpr4.kt"); } @TestMetadata("binaryExpr5.kt") public void testBinaryExpr5() throws Exception { - doTestExpressions("compiler/testData/psi/jetPsiMatcher/expressions/binaryExpr/binaryExpr5.kt"); + doTestExpressions("idea/testData/jetPsiMatcher/expressions/binaryExpr/binaryExpr5.kt"); } @TestMetadata("_binaryExpr1.kt") public void test_binaryExpr1() throws Exception { - doTestExpressions("compiler/testData/psi/jetPsiMatcher/expressions/binaryExpr/_binaryExpr1.kt"); + doTestExpressions("idea/testData/jetPsiMatcher/expressions/binaryExpr/_binaryExpr1.kt"); } @TestMetadata("_binaryExpr2.kt") public void test_binaryExpr2() throws Exception { - doTestExpressions("compiler/testData/psi/jetPsiMatcher/expressions/binaryExpr/_binaryExpr2.kt"); + doTestExpressions("idea/testData/jetPsiMatcher/expressions/binaryExpr/_binaryExpr2.kt"); } @TestMetadata("_binaryExpr3.kt") public void test_binaryExpr3() throws Exception { - doTestExpressions("compiler/testData/psi/jetPsiMatcher/expressions/binaryExpr/_binaryExpr3.kt"); + doTestExpressions("idea/testData/jetPsiMatcher/expressions/binaryExpr/_binaryExpr3.kt"); } @TestMetadata("_binaryExpr4.kt") public void test_binaryExpr4() throws Exception { - doTestExpressions("compiler/testData/psi/jetPsiMatcher/expressions/binaryExpr/_binaryExpr4.kt"); + doTestExpressions("idea/testData/jetPsiMatcher/expressions/binaryExpr/_binaryExpr4.kt"); } @TestMetadata("_binaryExpr5.kt") public void test_binaryExpr5() throws Exception { - doTestExpressions("compiler/testData/psi/jetPsiMatcher/expressions/binaryExpr/_binaryExpr5.kt"); + doTestExpressions("idea/testData/jetPsiMatcher/expressions/binaryExpr/_binaryExpr5.kt"); } @TestMetadata("_binaryExpr6.kt") public void test_binaryExpr6() throws Exception { - doTestExpressions("compiler/testData/psi/jetPsiMatcher/expressions/binaryExpr/_binaryExpr6.kt"); + doTestExpressions("idea/testData/jetPsiMatcher/expressions/binaryExpr/_binaryExpr6.kt"); } } - @TestMetadata("compiler/testData/psi/jetPsiMatcher/expressions/call") + @TestMetadata("idea/testData/jetPsiMatcher/expressions/call") public static class Call extends AbstractJetPsiMatcherTest { public void testAllFilesPresentInCall() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/psi/jetPsiMatcher/expressions/call"), Pattern.compile("^(.+)\\.kt$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/jetPsiMatcher/expressions/call"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("call1.kt") public void testCall1() throws Exception { - doTestExpressions("compiler/testData/psi/jetPsiMatcher/expressions/call/call1.kt"); + doTestExpressions("idea/testData/jetPsiMatcher/expressions/call/call1.kt"); } @TestMetadata("call2.kt") public void testCall2() throws Exception { - doTestExpressions("compiler/testData/psi/jetPsiMatcher/expressions/call/call2.kt"); + doTestExpressions("idea/testData/jetPsiMatcher/expressions/call/call2.kt"); } @TestMetadata("call3.kt") public void testCall3() throws Exception { - doTestExpressions("compiler/testData/psi/jetPsiMatcher/expressions/call/call3.kt"); + doTestExpressions("idea/testData/jetPsiMatcher/expressions/call/call3.kt"); } @TestMetadata("call4.kt") public void testCall4() throws Exception { - doTestExpressions("compiler/testData/psi/jetPsiMatcher/expressions/call/call4.kt"); + doTestExpressions("idea/testData/jetPsiMatcher/expressions/call/call4.kt"); } @TestMetadata("_call1.kt") public void test_call1() throws Exception { - doTestExpressions("compiler/testData/psi/jetPsiMatcher/expressions/call/_call1.kt"); + doTestExpressions("idea/testData/jetPsiMatcher/expressions/call/_call1.kt"); } @TestMetadata("_call2.kt") public void test_call2() throws Exception { - doTestExpressions("compiler/testData/psi/jetPsiMatcher/expressions/call/_call2.kt"); + doTestExpressions("idea/testData/jetPsiMatcher/expressions/call/_call2.kt"); } @TestMetadata("_call3.kt") public void test_call3() throws Exception { - doTestExpressions("compiler/testData/psi/jetPsiMatcher/expressions/call/_call3.kt"); + doTestExpressions("idea/testData/jetPsiMatcher/expressions/call/_call3.kt"); } @TestMetadata("_call4.kt") public void test_call4() throws Exception { - doTestExpressions("compiler/testData/psi/jetPsiMatcher/expressions/call/_call4.kt"); + doTestExpressions("idea/testData/jetPsiMatcher/expressions/call/_call4.kt"); } } - @TestMetadata("compiler/testData/psi/jetPsiMatcher/expressions/const") + @TestMetadata("idea/testData/jetPsiMatcher/expressions/const") public static class Const extends AbstractJetPsiMatcherTest { public void testAllFilesPresentInConst() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/psi/jetPsiMatcher/expressions/const"), Pattern.compile("^(.+)\\.kt$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/jetPsiMatcher/expressions/const"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("const.kt") public void testConst() throws Exception { - doTestExpressions("compiler/testData/psi/jetPsiMatcher/expressions/const/const.kt"); + doTestExpressions("idea/testData/jetPsiMatcher/expressions/const/const.kt"); } @TestMetadata("_const.kt") public void test_const() throws Exception { - doTestExpressions("compiler/testData/psi/jetPsiMatcher/expressions/const/_const.kt"); + doTestExpressions("idea/testData/jetPsiMatcher/expressions/const/_const.kt"); } } - @TestMetadata("compiler/testData/psi/jetPsiMatcher/expressions/misc") + @TestMetadata("idea/testData/jetPsiMatcher/expressions/misc") public static class Misc extends AbstractJetPsiMatcherTest { public void testAllFilesPresentInMisc() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/psi/jetPsiMatcher/expressions/misc"), Pattern.compile("^(.+)\\.kt$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/jetPsiMatcher/expressions/misc"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("misc1.kt") public void testMisc1() throws Exception { - doTestExpressions("compiler/testData/psi/jetPsiMatcher/expressions/misc/misc1.kt"); + doTestExpressions("idea/testData/jetPsiMatcher/expressions/misc/misc1.kt"); } @TestMetadata("misc2.kt") public void testMisc2() throws Exception { - doTestExpressions("compiler/testData/psi/jetPsiMatcher/expressions/misc/misc2.kt"); + doTestExpressions("idea/testData/jetPsiMatcher/expressions/misc/misc2.kt"); } @TestMetadata("misc3.kt") public void testMisc3() throws Exception { - doTestExpressions("compiler/testData/psi/jetPsiMatcher/expressions/misc/misc3.kt"); + doTestExpressions("idea/testData/jetPsiMatcher/expressions/misc/misc3.kt"); } @TestMetadata("_misc1.kt") public void test_misc1() throws Exception { - doTestExpressions("compiler/testData/psi/jetPsiMatcher/expressions/misc/_misc1.kt"); + doTestExpressions("idea/testData/jetPsiMatcher/expressions/misc/_misc1.kt"); } @TestMetadata("_misc2.kt") public void test_misc2() throws Exception { - doTestExpressions("compiler/testData/psi/jetPsiMatcher/expressions/misc/_misc2.kt"); + doTestExpressions("idea/testData/jetPsiMatcher/expressions/misc/_misc2.kt"); } @TestMetadata("_misc3.kt") public void test_misc3() throws Exception { - doTestExpressions("compiler/testData/psi/jetPsiMatcher/expressions/misc/_misc3.kt"); + doTestExpressions("idea/testData/jetPsiMatcher/expressions/misc/_misc3.kt"); } } - @TestMetadata("compiler/testData/psi/jetPsiMatcher/expressions/simpleName") + @TestMetadata("idea/testData/jetPsiMatcher/expressions/simpleName") public static class SimpleName extends AbstractJetPsiMatcherTest { public void testAllFilesPresentInSimpleName() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/psi/jetPsiMatcher/expressions/simpleName"), Pattern.compile("^(.+)\\.kt$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/jetPsiMatcher/expressions/simpleName"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("simpleName.kt") public void testSimpleName() throws Exception { - doTestExpressions("compiler/testData/psi/jetPsiMatcher/expressions/simpleName/simpleName.kt"); + doTestExpressions("idea/testData/jetPsiMatcher/expressions/simpleName/simpleName.kt"); } @TestMetadata("_simpleName.kt") public void test_simpleName() throws Exception { - doTestExpressions("compiler/testData/psi/jetPsiMatcher/expressions/simpleName/_simpleName.kt"); + doTestExpressions("idea/testData/jetPsiMatcher/expressions/simpleName/_simpleName.kt"); } } - @TestMetadata("compiler/testData/psi/jetPsiMatcher/expressions/super") + @TestMetadata("idea/testData/jetPsiMatcher/expressions/super") public static class Super extends AbstractJetPsiMatcherTest { public void testAllFilesPresentInSuper() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/psi/jetPsiMatcher/expressions/super"), Pattern.compile("^(.+)\\.kt$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/jetPsiMatcher/expressions/super"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("super1.kt") public void testSuper1() throws Exception { - doTestExpressions("compiler/testData/psi/jetPsiMatcher/expressions/super/super1.kt"); + doTestExpressions("idea/testData/jetPsiMatcher/expressions/super/super1.kt"); } @TestMetadata("super2.kt") public void testSuper2() throws Exception { - doTestExpressions("compiler/testData/psi/jetPsiMatcher/expressions/super/super2.kt"); + doTestExpressions("idea/testData/jetPsiMatcher/expressions/super/super2.kt"); } @TestMetadata("super3.kt") public void testSuper3() throws Exception { - doTestExpressions("compiler/testData/psi/jetPsiMatcher/expressions/super/super3.kt"); + doTestExpressions("idea/testData/jetPsiMatcher/expressions/super/super3.kt"); } @TestMetadata("super4.kt") public void testSuper4() throws Exception { - doTestExpressions("compiler/testData/psi/jetPsiMatcher/expressions/super/super4.kt"); + doTestExpressions("idea/testData/jetPsiMatcher/expressions/super/super4.kt"); } @TestMetadata("_super1.kt") public void test_super1() throws Exception { - doTestExpressions("compiler/testData/psi/jetPsiMatcher/expressions/super/_super1.kt"); + doTestExpressions("idea/testData/jetPsiMatcher/expressions/super/_super1.kt"); } @TestMetadata("_super2.kt") public void test_super2() throws Exception { - doTestExpressions("compiler/testData/psi/jetPsiMatcher/expressions/super/_super2.kt"); + doTestExpressions("idea/testData/jetPsiMatcher/expressions/super/_super2.kt"); } @TestMetadata("_super3.kt") public void test_super3() throws Exception { - doTestExpressions("compiler/testData/psi/jetPsiMatcher/expressions/super/_super3.kt"); + doTestExpressions("idea/testData/jetPsiMatcher/expressions/super/_super3.kt"); } @TestMetadata("_super4.kt") public void test_super4() throws Exception { - doTestExpressions("compiler/testData/psi/jetPsiMatcher/expressions/super/_super4.kt"); + doTestExpressions("idea/testData/jetPsiMatcher/expressions/super/_super4.kt"); } } - @TestMetadata("compiler/testData/psi/jetPsiMatcher/expressions/throw") + @TestMetadata("idea/testData/jetPsiMatcher/expressions/throw") public static class Throw extends AbstractJetPsiMatcherTest { public void testAllFilesPresentInThrow() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/psi/jetPsiMatcher/expressions/throw"), Pattern.compile("^(.+)\\.kt$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/jetPsiMatcher/expressions/throw"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("throw.kt") public void testThrow() throws Exception { - doTestExpressions("compiler/testData/psi/jetPsiMatcher/expressions/throw/throw.kt"); + doTestExpressions("idea/testData/jetPsiMatcher/expressions/throw/throw.kt"); } @TestMetadata("_throw.kt") public void test_throw() throws Exception { - doTestExpressions("compiler/testData/psi/jetPsiMatcher/expressions/throw/_throw.kt"); + doTestExpressions("idea/testData/jetPsiMatcher/expressions/throw/_throw.kt"); } } - @TestMetadata("compiler/testData/psi/jetPsiMatcher/expressions/unaryExpr") + @TestMetadata("idea/testData/jetPsiMatcher/expressions/unaryExpr") public static class UnaryExpr extends AbstractJetPsiMatcherTest { public void testAllFilesPresentInUnaryExpr() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/psi/jetPsiMatcher/expressions/unaryExpr"), Pattern.compile("^(.+)\\.kt$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/jetPsiMatcher/expressions/unaryExpr"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("unaryExpr1.kt") public void testUnaryExpr1() throws Exception { - doTestExpressions("compiler/testData/psi/jetPsiMatcher/expressions/unaryExpr/unaryExpr1.kt"); + doTestExpressions("idea/testData/jetPsiMatcher/expressions/unaryExpr/unaryExpr1.kt"); } @TestMetadata("unaryExpr2.kt") public void testUnaryExpr2() throws Exception { - doTestExpressions("compiler/testData/psi/jetPsiMatcher/expressions/unaryExpr/unaryExpr2.kt"); + doTestExpressions("idea/testData/jetPsiMatcher/expressions/unaryExpr/unaryExpr2.kt"); } @TestMetadata("_unaryExpr1.kt") public void test_unaryExpr1() throws Exception { - doTestExpressions("compiler/testData/psi/jetPsiMatcher/expressions/unaryExpr/_unaryExpr1.kt"); + doTestExpressions("idea/testData/jetPsiMatcher/expressions/unaryExpr/_unaryExpr1.kt"); } @TestMetadata("_unaryExpr2.kt") public void test_unaryExpr2() throws Exception { - doTestExpressions("compiler/testData/psi/jetPsiMatcher/expressions/unaryExpr/_unaryExpr2.kt"); + doTestExpressions("idea/testData/jetPsiMatcher/expressions/unaryExpr/_unaryExpr2.kt"); } @TestMetadata("_unaryExpr3.kt") public void test_unaryExpr3() throws Exception { - doTestExpressions("compiler/testData/psi/jetPsiMatcher/expressions/unaryExpr/_unaryExpr3.kt"); + doTestExpressions("idea/testData/jetPsiMatcher/expressions/unaryExpr/_unaryExpr3.kt"); } }