Make JetSimpleNameExpression#isImportDirectiveExpression extension function and move it to util class
This commit is contained in:
@@ -28,16 +28,6 @@ import org.jetbrains.jet.lexer.JetTokens.*
|
|||||||
|
|
||||||
public trait JetSimpleNameExpression : JetReferenceExpression {
|
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 {
|
public fun getReferencedName(): String {
|
||||||
val text = getReferencedNameElement().getNode()!!.getText()
|
val text = getReferencedNameElement().getNode()!!.getText()
|
||||||
return JetPsiUtil.unquoteIdentifierOrFieldReference(text)
|
return JetPsiUtil.unquoteIdentifierOrFieldReference(text)
|
||||||
|
|||||||
@@ -303,3 +303,13 @@ public fun JetSimpleNameExpression.getReceiverExpression(): JetExpression? {
|
|||||||
}
|
}
|
||||||
return null
|
return null
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public fun JetSimpleNameExpression.isImportDirectiveExpression(): Boolean {
|
||||||
|
val parent = getParent()
|
||||||
|
if (parent == null) {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
return parent is JetImportDirective || parent.getParent() is JetImportDirective
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -43,6 +43,7 @@ import org.jetbrains.jet.lang.diagnostics.Diagnostic;
|
|||||||
import org.jetbrains.jet.lang.psi.JetFile;
|
import org.jetbrains.jet.lang.psi.JetFile;
|
||||||
import org.jetbrains.jet.lang.psi.JetPsiUtil;
|
import org.jetbrains.jet.lang.psi.JetPsiUtil;
|
||||||
import org.jetbrains.jet.lang.psi.JetSimpleNameExpression;
|
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.DescriptorUtils;
|
||||||
import org.jetbrains.jet.lang.resolve.ImportPath;
|
import org.jetbrains.jet.lang.resolve.ImportPath;
|
||||||
import org.jetbrains.jet.lang.resolve.lazy.KotlinCodeAnalyzer;
|
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) {
|
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(
|
private static Collection<FqName> getJetTopLevelFunctions(
|
||||||
|
|||||||
Reference in New Issue
Block a user