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

KT-7472 function of anonymous class is never used

Browse Source 
#KT-7472 fixed
This commit is contained in:
Evgeny Gerashchenko
2015-05-12 19:34:10 +03:00
parent f00d96d67a
commit 533935f2c0
11 changed files with 138 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/psi/JetPsiUtil.java
+14 -4
View File
@@ -793,6 +793,14 @@ public class JetPsiUtil {
return getEnclosingElementForLocalDeclaration(declaration, true);
}
private static boolean isMemberOfObjectExpression(@NotNull JetCallableDeclaration propertyOrFunction) {
PsiElement parent = PsiTreeUtil.getStubOrPsiParent(propertyOrFunction);
if (!(parent instanceof JetClassBody)) return false;
PsiElement grandparent = PsiTreeUtil.getStubOrPsiParent(parent);
if (!(grandparent instanceof JetObjectDeclaration)) return false;
return PsiTreeUtil.getStubOrPsiParent(grandparent) instanceof JetObjectLiteralExpression;
}
@Nullable
public static JetElement getEnclosingElementForLocalDeclaration(@NotNull JetDeclaration declaration, boolean skipParameters) {
if (declaration instanceof JetTypeParameter && skipParameters) {
@@ -819,10 +827,12 @@ public class JetPsiUtil {
if (current instanceof JetClassInitializer) {
return ((JetClassInitializer) current).getBody();
}
if (current instanceof JetBlockExpression ||
current instanceof JetProperty ||
current instanceof JetParameter ||
current instanceof JetFunction) {
if (current instanceof JetProperty || current instanceof JetFunction) {
if (parent instanceof JetFile || (parent instanceof JetClassBody && !isMemberOfObjectExpression((JetCallableDeclaration) current))) {
return (JetElement) current;
}
}
if (current instanceof JetBlockExpression || current instanceof JetParameter) {
return (JetElement) current;
}