From 64731e526d0e86a3f43a9347bbed308ba11ec73b Mon Sep 17 00:00:00 2001
From: "Pavel V. Talanov" <talanov.pavel@gmail.com>
Date: Mon, 21 Apr 2014 18:11:19 +0400
Subject: [PATCH] Rename JetStubbedPsiUtil#getContainingDeclaration(PsiElement,
 Class, boolean) to getPsiOrStubParent

---
 .../src/org/jetbrains/jet/lang/psi/JetStubbedPsiUtil.java  | 7 ++++---
 .../org/jetbrains/jet/lang/resolve/lazy/ScopeProvider.java | 3 +--
 .../lazy/descriptors/LazyTypeParameterDescriptor.java      | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetStubbedPsiUtil.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetStubbedPsiUtil.java
index f5e6d71ca39..0c48b6426c3 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetStubbedPsiUtil.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetStubbedPsiUtil.java
@@ -27,16 +27,17 @@ import org.jetbrains.annotations.Nullable;
 public final class JetStubbedPsiUtil {
     @Nullable
     public static JetDeclaration getContainingDeclaration(@NotNull PsiElement element) {
-        return getContainingDeclaration(element, JetDeclaration.class, true);
+        return getPsiOrStubParent(element, JetDeclaration.class, true);
     }
 
     @Nullable
     public static <T extends JetDeclaration> T getContainingDeclaration(@NotNull PsiElement element, @NotNull Class<T> declarationClass) {
-        return getContainingDeclaration(element, declarationClass, true);
+        return getPsiOrStubParent(element, declarationClass, true);
     }
 
+    //TODO: contribute to idea PsiTreeUtil#getPsiOrStubParent
     @Nullable
-    public static <T extends JetDeclaration> T getContainingDeclaration(
+    public static <T extends JetElement> T getPsiOrStubParent(
             @NotNull PsiElement element,
             @NotNull Class<T> declarationClass,
             boolean strict
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ScopeProvider.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ScopeProvider.java
index 799fc8b7f52..adbf0a98ffe 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ScopeProvider.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ScopeProvider.java
@@ -18,7 +18,6 @@ package org.jetbrains.jet.lang.resolve.lazy;
 
 import com.google.common.collect.Lists;
 import com.intellij.psi.PsiElement;
-import com.intellij.psi.util.PsiTreeUtil;
 import kotlin.Function0;
 import kotlin.Function1;
 import org.jetbrains.annotations.NotNull;
@@ -120,7 +119,7 @@ public class ScopeProvider {
 
     @NotNull
     public JetScope getResolutionScopeForDeclaration(@NotNull PsiElement elementOfDeclaration) {
-        JetDeclaration jetDeclaration = JetStubbedPsiUtil.getContainingDeclaration(elementOfDeclaration, JetDeclaration.class, false);
+        JetDeclaration jetDeclaration = JetStubbedPsiUtil.getPsiOrStubParent(elementOfDeclaration, JetDeclaration.class, false);
 
         assert !(elementOfDeclaration instanceof JetDeclaration) || jetDeclaration == elementOfDeclaration :
                 "For JetDeclaration element getParentOfType() should return itself.";
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyTypeParameterDescriptor.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyTypeParameterDescriptor.java
index c162ca5cc84..7ec1916b76b 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyTypeParameterDescriptor.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyTypeParameterDescriptor.java
@@ -78,7 +78,7 @@ public class LazyTypeParameterDescriptor extends AbstractLazyTypeParameterDescri
     }
 
     private void resolveUpperBoundsFromWhereClause(Set<JetType> upperBounds) {
-        JetClassOrObject classOrObject = JetStubbedPsiUtil.getContainingDeclaration(jetTypeParameter, JetClassOrObject.class, true);
+        JetClassOrObject classOrObject = JetStubbedPsiUtil.getPsiOrStubParent(jetTypeParameter, JetClassOrObject.class, true);
         if (classOrObject instanceof JetClass) {
             JetClass jetClass = (JetClass) classOrObject;
             for (JetTypeConstraint jetTypeConstraint : jetClass.getTypeConstraints()) {