Move JetPsiMatcher with tests to plugin module

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(

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.*;
 

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;