azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reuse getQualifiedElementSelector() function

Browse Source
This commit is contained in:
Alexey Sedunov
2014-03-03 19:11:36 +04:00
parent e48616e739
commit 12310b5bd9
2 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiUtil.java
+2 -8
View File
@@ -399,14 +399,8 @@ public class JetPsiUtil {
@Nullable @Nullable
public static JetSimpleNameExpression getLastReference(@NotNull JetExpression importedReference) { public static JetSimpleNameExpression getLastReference(@NotNull JetExpression importedReference) {
if (importedReference instanceof JetDotQualifiedExpression) { JetElement selector = PsiUtilPackage.getQualifiedElementSelector(importedReference);
JetExpression selectorExpression = ((JetDotQualifiedExpression) importedReference).getSelectorExpression(); return selector instanceof JetSimpleNameExpression ? (JetSimpleNameExpression) selector : null;
return (selectorExpression instanceof JetSimpleNameExpression) ? (JetSimpleNameExpression) selectorExpression : null;
}
if (importedReference instanceof JetSimpleNameExpression) {
return (JetSimpleNameExpression) importedReference;
}
return null;
} }
public static boolean isSelectorInQualified(@NotNull JetSimpleNameExpression nameExpression) { public static boolean isSelectorInQualified(@NotNull JetSimpleNameExpression nameExpression) {
compiler/frontend/src/org/jetbrains/jet/lang/psi/psiUtil/jetPsiUtil.kt
+1 -1
View File
@@ -242,7 +242,7 @@ fun JetElement.getQualifiedElementSelector(): JetElement? {
if (selector is JetCallExpression) selector.getCalleeExpression() else selector if (selector is JetCallExpression) selector.getCalleeExpression() else selector
} }
is JetUserType -> getReferenceExpression() is JetUserType -> getReferenceExpression()
else -> this else -> null
} }
} }