From d00b17c621dd321aebea8f87bb930fd88938d9f6 Mon Sep 17 00:00:00 2001
From: Alexey Sedunov <alexey.sedunov@jetbrains.com>
Date: Mon, 23 Dec 2013 20:26:53 +0400
Subject: [PATCH] Method rename

---
 .../org/jetbrains/jet/lang/psi/JetNamedDeclarationStub.java   | 2 +-
 .../frontend/src/org/jetbrains/jet/lang/psi/JetPsiUtil.java   | 4 ++--
 .../jet/plugin/hierarchy/calls/KotlinCallTreeStructure.java   | 4 ++--
 .../hierarchy/calls/KotlinCallerMethodsTreeStructure.java     | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNamedDeclarationStub.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNamedDeclarationStub.java
index 9c84a0abf94..645870e82ea 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNamedDeclarationStub.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNamedDeclarationStub.java
@@ -85,7 +85,7 @@ abstract class JetNamedDeclarationStub<T extends NamedStub> extends JetDeclarati
     @NotNull
     @Override
     public SearchScope getUseScope() {
-        JetElement enclosingBlock = JetPsiUtil.getEnclosingBlockForLocalDeclaration(this);
+        JetElement enclosingBlock = JetPsiUtil.getEnclosingElementForLocalDeclaration(this);
         if (enclosingBlock != null) {
             return new LocalSearchScope(enclosingBlock);
         }
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiUtil.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiUtil.java
index 1883328386f..2849c79a279 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiUtil.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiUtil.java
@@ -1005,7 +1005,7 @@ public class JetPsiUtil {
     }
 
     @Nullable
-    public static JetElement getEnclosingBlockForLocalDeclaration(@Nullable JetNamedDeclaration declaration) {
+    public static JetElement getEnclosingElementForLocalDeclaration(@Nullable JetNamedDeclaration declaration) {
         if (declaration instanceof JetTypeParameter || declaration instanceof JetParameter) {
             declaration = PsiTreeUtil.getParentOfType(declaration, JetNamedDeclaration.class);
         }
@@ -1021,7 +1021,7 @@ public class JetPsiUtil {
     }
 
     public static boolean isLocal(@NotNull JetNamedDeclaration declaration) {
-        return getEnclosingBlockForLocalDeclaration(declaration) != null;
+        return getEnclosingElementForLocalDeclaration(declaration) != null;
     }
 
     @Nullable
diff --git a/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCallTreeStructure.java b/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCallTreeStructure.java
index b573f3d313a..364997273af 100644
--- a/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCallTreeStructure.java
+++ b/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCallTreeStructure.java
@@ -27,9 +27,9 @@ public abstract class KotlinCallTreeStructure extends HierarchyTreeStructure {
         this.scopeType = scopeType;
     }
 
-    protected static JetElement getEnclosingBlockForLocalDeclaration(PsiElement element) {
+    protected static JetElement getEnclosingElementForLocalDeclaration(PsiElement element) {
         return element instanceof JetNamedDeclaration
-                                   ? JetPsiUtil.getEnclosingBlockForLocalDeclaration((JetNamedDeclaration) element)
+                                   ? JetPsiUtil.getEnclosingElementForLocalDeclaration((JetNamedDeclaration) element)
                                    : null;
     }
 
diff --git a/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCallerMethodsTreeStructure.java b/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCallerMethodsTreeStructure.java
index 810861a128d..cb3d2442c75 100644
--- a/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCallerMethodsTreeStructure.java
+++ b/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCallerMethodsTreeStructure.java
@@ -215,7 +215,7 @@ public abstract class KotlinCallerMethodsTreeStructure extends KotlinCallTreeStr
     }
 
     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);
 
         PsiMethod representativeMethod = getRepresentativePsiMethod(element);