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

Rename JetStubbedPsiUtil#getContainingDeclaration(PsiElement, Class, boolean) to getPsiOrStubParent

Browse Source
This commit is contained in:
Pavel V. Talanov
2014-04-21 18:11:19 +04:00
parent fd280abcce
commit 64731e526d
3 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/JetStubbedPsiUtil.java
+4 -3
View File
@@ -27,16 +27,17 @@ import org.jetbrains.annotations.Nullable;
public final class JetStubbedPsiUtil { public final class JetStubbedPsiUtil {
@Nullable @Nullable
public static JetDeclaration getContainingDeclaration(@NotNull PsiElement element) { public static JetDeclaration getContainingDeclaration(@NotNull PsiElement element) {
return getContainingDeclaration(element, JetDeclaration.class, true); return getPsiOrStubParent(element, JetDeclaration.class, true);
} }
@Nullable @Nullable
public static <T extends JetDeclaration> T getContainingDeclaration(@NotNull PsiElement element, @NotNull Class<T> declarationClass) { 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 @Nullable
public static <T extends JetDeclaration> T getContainingDeclaration( public static <T extends JetElement> T getPsiOrStubParent(
@NotNull PsiElement element, @NotNull PsiElement element,
@NotNull Class<T> declarationClass, @NotNull Class<T> declarationClass,
boolean strict boolean strict
compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ScopeProvider.java
+1 -2
View File
@@ -18,7 +18,6 @@ package org.jetbrains.jet.lang.resolve.lazy;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElement;
import com.intellij.psi.util.PsiTreeUtil;
import kotlin.Function0; import kotlin.Function0;
import kotlin.Function1; import kotlin.Function1;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
@@ -120,7 +119,7 @@ public class ScopeProvider {
@NotNull @NotNull
public JetScope getResolutionScopeForDeclaration(@NotNull PsiElement elementOfDeclaration) { 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 : assert !(elementOfDeclaration instanceof JetDeclaration) || jetDeclaration == elementOfDeclaration :
"For JetDeclaration element getParentOfType() should return itself."; "For JetDeclaration element getParentOfType() should return itself.";
compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyTypeParameterDescriptor.java
+1 -1
View File
@@ -78,7 +78,7 @@ public class LazyTypeParameterDescriptor extends AbstractLazyTypeParameterDescri
} }
private void resolveUpperBoundsFromWhereClause(Set<JetType> upperBounds) { 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) { if (classOrObject instanceof JetClass) {
JetClass jetClass = (JetClass) classOrObject; JetClass jetClass = (JetClass) classOrObject;
for (JetTypeConstraint jetTypeConstraint : jetClass.getTypeConstraints()) { for (JetTypeConstraint jetTypeConstraint : jetClass.getTypeConstraints()) {