From f35c77e73153a074b6ffec3854ac511b81e5c609 Mon Sep 17 00:00:00 2001
From: Alexey Sedunov <alexey.sedunov@jetbrains.com>
Date: Thu, 21 Nov 2013 16:46:45 +0400
Subject: [PATCH] Move search extensions to separate package

---
 idea/src/META-INF/plugin.xml                         | 12 ++++++------
 .../plugin/highlighter/JetLineMarkerProvider.java    |  2 +-
 .../JetTargetElementEvaluator.kt                     |  2 +-
 .../KotlinAnnotatedElementsSearcher.java             |  2 +-
 .../KotlinDefinitionsSearcher.java                   |  2 +-
 .../KotlinLightMethodTextOccurrenceProcessor.java    |  2 +-
 .../KotlinLightMethodUsagesSearcher.java             |  2 +-
 .../KotlinReferencesSearcher.java                    |  2 +-
 8 files changed, 13 insertions(+), 13 deletions(-)
 rename idea/src/org/jetbrains/jet/plugin/search/{ => ideaExtensions}/JetTargetElementEvaluator.kt (95%)
 rename idea/src/org/jetbrains/jet/plugin/search/{ => ideaExtensions}/KotlinAnnotatedElementsSearcher.java (99%)
 rename idea/src/org/jetbrains/jet/plugin/search/{ => ideaExtensions}/KotlinDefinitionsSearcher.java (99%)
 rename idea/src/org/jetbrains/jet/plugin/search/{ => ideaExtensions}/KotlinLightMethodTextOccurrenceProcessor.java (95%)
 rename idea/src/org/jetbrains/jet/plugin/search/{ => ideaExtensions}/KotlinLightMethodUsagesSearcher.java (90%)
 rename idea/src/org/jetbrains/jet/plugin/search/{ => ideaExtensions}/KotlinReferencesSearcher.java (98%)

diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index d76130a0b3e..140e556e210 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -331,11 +331,11 @@
 
     <psi.treeChangePreprocessor implementation="org.jetbrains.jet.asJava.JetCodeBlockModificationListener"/>
 
-    <referencesSearch implementation="org.jetbrains.jet.plugin.search.KotlinReferencesSearcher"/>
-    <directClassInheritorsSearch implementation="org.jetbrains.jet.plugin.search.KotlinDirectInheritorsSearcher"/>
-    <definitionsScopedSearch implementation="org.jetbrains.jet.plugin.search.KotlinDefinitionsSearcher"/>
-    <annotatedElementsSearch implementation="org.jetbrains.jet.plugin.search.KotlinAnnotatedElementsSearcher"/>
-    <methodReferencesSearch implementation="org.jetbrains.jet.plugin.search.KotlinLightMethodUsagesSearcher"/>
+    <referencesSearch implementation="org.jetbrains.jet.plugin.search.ideaExtensions.KotlinReferencesSearcher"/>
+    <directClassInheritorsSearch implementation="org.jetbrains.jet.plugin.search.ideaExtensions.KotlinDirectInheritorsSearcher"/>
+    <definitionsScopedSearch implementation="org.jetbrains.jet.plugin.search.ideaExtensions.KotlinDefinitionsSearcher"/>
+    <annotatedElementsSearch implementation="org.jetbrains.jet.plugin.search.ideaExtensions.KotlinAnnotatedElementsSearcher"/>
+    <methodReferencesSearch implementation="org.jetbrains.jet.plugin.search.ideaExtensions.KotlinLightMethodUsagesSearcher"/>
 
     <exceptionFilter implementation="org.jetbrains.jet.plugin.filters.JetExceptionFilterFactory" order="first"/>
 
@@ -361,7 +361,7 @@
 
     <targetElementEvaluator
         language="jet"
-        implementationClass="org.jetbrains.jet.plugin.search.JetTargetElementEvaluator" />
+        implementationClass="org.jetbrains.jet.plugin.search.ideaExtensions.JetTargetElementEvaluator" />
 
     <intentionAction>
       <className>org.jetbrains.jet.plugin.intentions.SpecifyTypeExplicitlyAction</className>
diff --git a/idea/src/org/jetbrains/jet/plugin/highlighter/JetLineMarkerProvider.java b/idea/src/org/jetbrains/jet/plugin/highlighter/JetLineMarkerProvider.java
index 95a78a08dfd..6960ffac9b0 100644
--- a/idea/src/org/jetbrains/jet/plugin/highlighter/JetLineMarkerProvider.java
+++ b/idea/src/org/jetbrains/jet/plugin/highlighter/JetLineMarkerProvider.java
@@ -63,7 +63,7 @@ import org.jetbrains.jet.plugin.JetBundle;
 import org.jetbrains.jet.plugin.JetPluginUtil;
 import org.jetbrains.jet.plugin.codeInsight.JetFunctionPsiElementCellRenderer;
 import org.jetbrains.jet.plugin.project.AnalyzerFacadeWithCache;
-import org.jetbrains.jet.plugin.search.KotlinDefinitionsSearcher;
+import org.jetbrains.jet.plugin.search.ideaExtensions.KotlinDefinitionsSearcher;
 import org.jetbrains.jet.renderer.DescriptorRenderer;
 
 import javax.swing.*;
diff --git a/idea/src/org/jetbrains/jet/plugin/search/JetTargetElementEvaluator.kt b/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/JetTargetElementEvaluator.kt
similarity index 95%
rename from idea/src/org/jetbrains/jet/plugin/search/JetTargetElementEvaluator.kt
rename to idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/JetTargetElementEvaluator.kt
index 314de339b29..bad8b885348 100644
--- a/idea/src/org/jetbrains/jet/plugin/search/JetTargetElementEvaluator.kt
+++ b/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/JetTargetElementEvaluator.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.plugin.search
+package org.jetbrains.jet.plugin.search.ideaExtensions
 
 import com.intellij.codeInsight.TargetElementEvaluator
 import com.intellij.psi.PsiElement
diff --git a/idea/src/org/jetbrains/jet/plugin/search/KotlinAnnotatedElementsSearcher.java b/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinAnnotatedElementsSearcher.java
similarity index 99%
rename from idea/src/org/jetbrains/jet/plugin/search/KotlinAnnotatedElementsSearcher.java
rename to idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinAnnotatedElementsSearcher.java
index 83e1ea859c4..5c4ed3342ff 100644
--- a/idea/src/org/jetbrains/jet/plugin/search/KotlinAnnotatedElementsSearcher.java
+++ b/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinAnnotatedElementsSearcher.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.plugin.search;
+package org.jetbrains.jet.plugin.search.ideaExtensions;
 
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.diagnostic.Logger;
diff --git a/idea/src/org/jetbrains/jet/plugin/search/KotlinDefinitionsSearcher.java b/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinDefinitionsSearcher.java
similarity index 99%
rename from idea/src/org/jetbrains/jet/plugin/search/KotlinDefinitionsSearcher.java
rename to idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinDefinitionsSearcher.java
index 6ae7b5dd1c2..6a30564745c 100644
--- a/idea/src/org/jetbrains/jet/plugin/search/KotlinDefinitionsSearcher.java
+++ b/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinDefinitionsSearcher.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.plugin.search;
+package org.jetbrains.jet.plugin.search.ideaExtensions;
 
 import com.intellij.codeInsight.navigation.MethodImplementationsSearch;
 import com.intellij.openapi.application.ApplicationManager;
diff --git a/idea/src/org/jetbrains/jet/plugin/search/KotlinLightMethodTextOccurrenceProcessor.java b/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinLightMethodTextOccurrenceProcessor.java
similarity index 95%
rename from idea/src/org/jetbrains/jet/plugin/search/KotlinLightMethodTextOccurrenceProcessor.java
rename to idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinLightMethodTextOccurrenceProcessor.java
index 2a26c17d51e..48ddf7afe26 100644
--- a/idea/src/org/jetbrains/jet/plugin/search/KotlinLightMethodTextOccurrenceProcessor.java
+++ b/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinLightMethodTextOccurrenceProcessor.java
@@ -1,4 +1,4 @@
-package org.jetbrains.jet.plugin.search;
+package org.jetbrains.jet.plugin.search.ideaExtensions;
 
 import com.intellij.psi.PsiClass;
 import com.intellij.psi.PsiElement;
diff --git a/idea/src/org/jetbrains/jet/plugin/search/KotlinLightMethodUsagesSearcher.java b/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinLightMethodUsagesSearcher.java
similarity index 90%
rename from idea/src/org/jetbrains/jet/plugin/search/KotlinLightMethodUsagesSearcher.java
rename to idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinLightMethodUsagesSearcher.java
index 6a361cd2b92..75ace2e33f9 100644
--- a/idea/src/org/jetbrains/jet/plugin/search/KotlinLightMethodUsagesSearcher.java
+++ b/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinLightMethodUsagesSearcher.java
@@ -1,4 +1,4 @@
-package org.jetbrains.jet.plugin.search;
+package org.jetbrains.jet.plugin.search.ideaExtensions;
 
 import com.intellij.psi.PsiClass;
 import com.intellij.psi.PsiMethod;
diff --git a/idea/src/org/jetbrains/jet/plugin/search/KotlinReferencesSearcher.java b/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinReferencesSearcher.java
similarity index 98%
rename from idea/src/org/jetbrains/jet/plugin/search/KotlinReferencesSearcher.java
rename to idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinReferencesSearcher.java
index 4df0efbf9b7..32d63411847 100644
--- a/idea/src/org/jetbrains/jet/plugin/search/KotlinReferencesSearcher.java
+++ b/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinReferencesSearcher.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.plugin.search;
+package org.jetbrains.jet.plugin.search.ideaExtensions;
 
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.application.QueryExecutorBase;