From 3ea5011549848a9b567fc6427c13f5a6c8669b5a Mon Sep 17 00:00:00 2001
From: "Pavel V. Talanov" <talanov.pavel@gmail.com>
Date: Wed, 26 Mar 2014 17:29:55 +0400
Subject: [PATCH] Make JetSimpleNameExpression#isImportDirectiveExpression
 extension function and move it to util class

---
 .../jetbrains/jet/lang/psi/JetSimpleNameExpression.kt  | 10 ----------
 .../org/jetbrains/jet/lang/psi/psiUtil/jetPsiUtil.kt   | 10 ++++++++++
 .../jetbrains/jet/plugin/quickfix/AutoImportFix.java   |  3 ++-
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetSimpleNameExpression.kt b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetSimpleNameExpression.kt
index 2a7f65958f6..613c65d19ec 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetSimpleNameExpression.kt
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetSimpleNameExpression.kt
@@ -28,16 +28,6 @@ import org.jetbrains.jet.lexer.JetTokens.*
 
 public trait JetSimpleNameExpression : JetReferenceExpression {
 
-    public fun isImportDirectiveExpression(): Boolean {
-        val parent = getParent()
-        if (parent == null) {
-            return false
-        }
-        else {
-            return parent is JetImportDirective || parent.getParent() is JetImportDirective
-        }
-    }
-
     public fun getReferencedName(): String {
         val text = getReferencedNameElement().getNode()!!.getText()
         return JetPsiUtil.unquoteIdentifierOrFieldReference(text)
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/psiUtil/jetPsiUtil.kt b/compiler/frontend/src/org/jetbrains/jet/lang/psi/psiUtil/jetPsiUtil.kt
index 95283ae50fe..b902c73a8ad 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/psiUtil/jetPsiUtil.kt
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/psiUtil/jetPsiUtil.kt
@@ -303,3 +303,13 @@ public fun JetSimpleNameExpression.getReceiverExpression(): JetExpression? {
     }
     return null
 }
+
+public fun JetSimpleNameExpression.isImportDirectiveExpression(): Boolean {
+    val parent = getParent()
+    if (parent == null) {
+        return false
+    }
+    else {
+        return parent is JetImportDirective || parent.getParent() is JetImportDirective
+    }
+}
\ No newline at end of file
diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/AutoImportFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/AutoImportFix.java
index 7565402e3fd..c1b10a47f93 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/AutoImportFix.java
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/AutoImportFix.java
@@ -43,6 +43,7 @@ import org.jetbrains.jet.lang.diagnostics.Diagnostic;
 import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.lang.psi.JetPsiUtil;
 import org.jetbrains.jet.lang.psi.JetSimpleNameExpression;
+import org.jetbrains.jet.lang.psi.psiUtil.PsiUtilPackage;
 import org.jetbrains.jet.lang.resolve.DescriptorUtils;
 import org.jetbrains.jet.lang.resolve.ImportPath;
 import org.jetbrains.jet.lang.resolve.lazy.KotlinCodeAnalyzer;
@@ -113,7 +114,7 @@ public class AutoImportFix extends JetHintAction<JetSimpleNameExpression> implem
     }
 
     private static boolean isSuppressedTopLevelImportInPosition(@NotNull JetSimpleNameExpression element) {
-        return element.isImportDirectiveExpression() || JetPsiUtil.isSelectorInQualified(element);
+        return PsiUtilPackage.isImportDirectiveExpression(element) || JetPsiUtil.isSelectorInQualified(element);
     }
 
     private static Collection<FqName> getJetTopLevelFunctions(