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

Used KtReference.resolvesByNames instead of own code

Browse Source
This commit is contained in:
Valentin Kipyatkov
2016-10-06 19:48:32 +03:00
parent 5734f2ba9b
commit 326db55835
2 changed files with 3 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/psi/KtPsiUtil.java
-22
View File
@@ -285,28 +285,6 @@ public class KtPsiUtil {
return entries.size() > 1 && entries.get(entries.size() - 1) == declaration;
}
@Nullable
public static Name getConventionName(@NotNull KtSimpleNameExpression simpleNameExpression) {
if (simpleNameExpression.getIdentifier() != null) {
return simpleNameExpression.getReferencedNameAsName();
}
PsiElement firstChild = simpleNameExpression.getFirstChild();
if (firstChild != null) {
IElementType elementType = firstChild.getNode().getElementType();
if (elementType instanceof KtToken) {
KtToken jetToken = (KtToken) elementType;
boolean isPrefixExpression = simpleNameExpression.getParent() instanceof KtPrefixExpression;
if (isPrefixExpression) {
return OperatorConventions.getNameForOperationSymbol(jetToken, true, false);
}
return OperatorConventions.getNameForOperationSymbol(jetToken);
}
}
return null;
}
@Nullable
@Contract("null, _ -> null")
public static PsiElement getTopmostParentOfTypes(