Reuse getQualifiedElement() function
This commit is contained in:
@@ -33,6 +33,7 @@ import org.jetbrains.annotations.Nullable;
|
|||||||
import org.jetbrains.jet.JetNodeTypes;
|
import org.jetbrains.jet.JetNodeTypes;
|
||||||
import org.jetbrains.jet.kdoc.psi.api.KDocElement;
|
import org.jetbrains.jet.kdoc.psi.api.KDocElement;
|
||||||
import org.jetbrains.jet.lang.parsing.JetExpressionParsing;
|
import org.jetbrains.jet.lang.parsing.JetExpressionParsing;
|
||||||
|
import org.jetbrains.jet.lang.psi.psiUtil.PsiUtilPackage;
|
||||||
import org.jetbrains.jet.lang.resolve.ImportPath;
|
import org.jetbrains.jet.lang.resolve.ImportPath;
|
||||||
import org.jetbrains.jet.lang.resolve.name.FqName;
|
import org.jetbrains.jet.lang.resolve.name.FqName;
|
||||||
import org.jetbrains.jet.lang.resolve.name.FqNameUnsafe;
|
import org.jetbrains.jet.lang.resolve.name.FqNameUnsafe;
|
||||||
@@ -409,20 +410,9 @@ public class JetPsiUtil {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static boolean isSelectorInQualified(@NotNull JetSimpleNameExpression nameExpression) {
|
public static boolean isSelectorInQualified(@NotNull JetSimpleNameExpression nameExpression) {
|
||||||
PsiElement nameExpressionParent = nameExpression.getParent();
|
JetElement qualifiedElement = PsiUtilPackage.getQualifiedElement(nameExpression);
|
||||||
|
return qualifiedElement instanceof JetQualifiedExpression
|
||||||
if (nameExpressionParent instanceof JetUserType) {
|
|| ((qualifiedElement instanceof JetUserType) && ((JetUserType) qualifiedElement).getQualifier() != null);
|
||||||
assert ((JetUserType) nameExpressionParent).getReferenceExpression() == nameExpression;
|
|
||||||
return ((JetUserType) nameExpressionParent).getQualifier() != null;
|
|
||||||
}
|
|
||||||
|
|
||||||
JetExpression selector = nameExpression;
|
|
||||||
if (nameExpressionParent instanceof JetCallExpression && ((JetCallExpression) nameExpressionParent).getCalleeExpression() == nameExpression) {
|
|
||||||
selector = (JetCallExpression) nameExpressionParent;
|
|
||||||
}
|
|
||||||
|
|
||||||
PsiElement selectorParent = selector.getParent();
|
|
||||||
return selectorParent instanceof JetQualifiedExpression && (((JetQualifiedExpression) selectorParent).getSelectorExpression() == selector);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static boolean isLHSOfDot(@NotNull JetExpression expression) {
|
public static boolean isLHSOfDot(@NotNull JetExpression expression) {
|
||||||
|
|||||||
Reference in New Issue
Block a user