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

Method rename

Browse Source
This commit is contained in:
Alexey Sedunov
2013-12-23 20:26:53 +04:00
parent fbb03afc0f
commit d00b17c621
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNamedDeclarationStub.java
+1 -1
View File
@@ -85,7 +85,7 @@ abstract class JetNamedDeclarationStub<T extends NamedStub> extends JetDeclarati
@NotNull @NotNull
@Override @Override
public SearchScope getUseScope() { public SearchScope getUseScope() {
JetElement enclosingBlock = JetPsiUtil.getEnclosingBlockForLocalDeclaration(this); JetElement enclosingBlock = JetPsiUtil.getEnclosingElementForLocalDeclaration(this);
if (enclosingBlock != null) { if (enclosingBlock != null) {
return new LocalSearchScope(enclosingBlock); return new LocalSearchScope(enclosingBlock);
} }
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiUtil.java
+2 -2
View File
@@ -1005,7 +1005,7 @@ public class JetPsiUtil {
} }
@Nullable @Nullable
public static JetElement getEnclosingBlockForLocalDeclaration(@Nullable JetNamedDeclaration declaration) { public static JetElement getEnclosingElementForLocalDeclaration(@Nullable JetNamedDeclaration declaration) {
if (declaration instanceof JetTypeParameter || declaration instanceof JetParameter) { if (declaration instanceof JetTypeParameter || declaration instanceof JetParameter) {
declaration = PsiTreeUtil.getParentOfType(declaration, JetNamedDeclaration.class); declaration = PsiTreeUtil.getParentOfType(declaration, JetNamedDeclaration.class);
} }
@@ -1021,7 +1021,7 @@ public class JetPsiUtil {
} }
public static boolean isLocal(@NotNull JetNamedDeclaration declaration) { public static boolean isLocal(@NotNull JetNamedDeclaration declaration) {
return getEnclosingBlockForLocalDeclaration(declaration) != null; return getEnclosingElementForLocalDeclaration(declaration) != null;
} }
@Nullable @Nullable
idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCallTreeStructure.java
+2 -2
View File
@@ -27,9 +27,9 @@ public abstract class KotlinCallTreeStructure extends HierarchyTreeStructure {
this.scopeType = scopeType; this.scopeType = scopeType;
} }
protected static JetElement getEnclosingBlockForLocalDeclaration(PsiElement element) { protected static JetElement getEnclosingElementForLocalDeclaration(PsiElement element) {
return element instanceof JetNamedDeclaration return element instanceof JetNamedDeclaration
? JetPsiUtil.getEnclosingBlockForLocalDeclaration((JetNamedDeclaration) element) ? JetPsiUtil.getEnclosingElementForLocalDeclaration((JetNamedDeclaration) element)
: null; : null;
} }
idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCallerMethodsTreeStructure.java
+1 -1
View File
@@ -215,7 +215,7 @@ public abstract class KotlinCallerMethodsTreeStructure extends KotlinCallTreeStr
} }
public static KotlinCallerMethodsTreeStructure newInstance(@NotNull Project project, @NotNull PsiElement element, String scopeType) { public static KotlinCallerMethodsTreeStructure newInstance(@NotNull Project project, @NotNull PsiElement element, String scopeType) {
JetElement codeBlockForLocalDeclaration = getEnclosingBlockForLocalDeclaration(element); JetElement codeBlockForLocalDeclaration = getEnclosingElementForLocalDeclaration(element);
if (codeBlockForLocalDeclaration != null) return new WithLocalRoot(project, element, scopeType, codeBlockForLocalDeclaration); if (codeBlockForLocalDeclaration != null) return new WithLocalRoot(project, element, scopeType, codeBlockForLocalDeclaration);
PsiMethod representativeMethod = getRepresentativePsiMethod(element); PsiMethod representativeMethod = getRepresentativePsiMethod(element);