MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-17 21:43:33 +07:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
Roman Shevchenko
2011-03-17 15:43:03 +01:00
parent 5b149baa64
commit 68e4ecbeb6
4 changed files with 29 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/psi/impl/source/PsiParameterImpl.java
+7 -6
View File
@@ -179,7 +179,7 @@ public class PsiParameterImpl extends JavaStubPsiElement<PsiParameterStub> imple
public PsiElement getDeclarationScope() {
final PsiElement parent = getParent();
if (parent == null) return this;
if (parent instanceof PsiParameterList){
if (parent instanceof PsiParameterList) {
return parent.getParent();
}
if (parent instanceof PsiForeachStatement) {
@@ -191,16 +191,17 @@ public class PsiParameterImpl extends JavaStubPsiElement<PsiParameterStub> imple
PsiElement[] children = parent.getChildren();
//noinspection ConstantConditions
if (children != null) {
for(int i = 0; i < children.length; i++){
if (children[i].equals(this)){
while(!(children[i] instanceof PsiCodeBlock)){
for (int i = 0; i < children.length; i++) {
if (children[i].equals(this)) {
while (!(children[i] instanceof PsiCodeBlock)) {
//noinspection AssignmentToForLoopParameter
i++;
}
return children[i];
}
}
}
LOG.error("codeblock not found among parameter' "+this+" parents children: "+ Arrays.asList(children));
LOG.error("Code block not found among parameter' " + this + " parents children: " + Arrays.asList(children));
return null;
}
@@ -211,7 +212,7 @@ public class PsiParameterImpl extends JavaStubPsiElement<PsiParameterStub> imple
}
myCachedType = null;
return SourceTreeToPsiMap.psiElementToTree(getTypeElement()).findChildByType(JavaTokenType.ELLIPSIS) != null;
return SourceTreeToPsiMap.psiToTreeNotNull(getTypeElement()).findChildByType(JavaTokenType.ELLIPSIS) != null;
}
@NotNull
java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiReferenceExpressionImpl.java
+16 -20
View File
@@ -49,12 +49,8 @@ import com.intellij.psi.tree.IElementType;
import com.intellij.psi.util.PsiUtil;
import com.intellij.psi.util.TypeConversionUtil;
import com.intellij.refactoring.util.RefactoringUtil;
import com.intellij.util.ArrayUtil;
import com.intellij.util.CharTable;
import com.intellij.util.Function;
import com.intellij.util.IncorrectOperationException;
import com.intellij.util.*;
import gnu.trove.THashSet;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -277,20 +273,18 @@ public class PsiReferenceExpressionImpl extends ExpressionPsiElement implements
return element.getText();
}
@NonNls private static final String LENGTH = "length";
private final Function<PsiReferenceExpressionImpl, PsiType> ourTypeEvaluator = new TypeEvaluator();
private final TypeEvaluator ourTypeEvaluator = new TypeEvaluator();
private static class TypeEvaluator implements Function<PsiReferenceExpressionImpl, PsiType> {
private static class TypeEvaluator implements NullableFunction<PsiReferenceExpressionImpl, PsiType> {
public PsiType fun(final PsiReferenceExpressionImpl expr) {
JavaResolveResult result = expr.advancedResolve(false);
PsiElement resolve = result.getElement();
if (resolve == null) {
ASTNode refName = expr.findChildByRole(ChildRole.REFERENCE_NAME);
if (refName != null && refName.getText().equals(LENGTH)) {
if (refName != null && "length".equals(refName.getText())) {
ASTNode qualifier = expr.findChildByRole(ChildRole.QUALIFIER);
if (qualifier != null && ElementType.EXPRESSION_BIT_SET.contains(qualifier.getElementType())) {
PsiType type = ((PsiExpression)SourceTreeToPsiMap.treeElementToPsi(qualifier)).getType();
PsiType type = SourceTreeToPsiMap.<PsiExpression>treeToPsiNotNull(qualifier).getType();
if (type instanceof PsiArrayType) {
return PsiType.INT;
}
@@ -300,30 +294,32 @@ public class PsiReferenceExpressionImpl extends ExpressionPsiElement implements
}
PsiTypeParameterListOwner owner = null;
PsiType ret;
PsiType ret = null;
if (resolve instanceof PsiVariable) {
PsiType type = ((PsiVariable)resolve).getType();
ret = type instanceof PsiEllipsisType ? ((PsiEllipsisType)type).toArrayType() : type;
if (resolve instanceof PsiField && !((PsiField)resolve).hasModifierProperty(PsiModifier.STATIC)) owner = ((PsiField)resolve).getContainingClass();
if (resolve instanceof PsiField && !((PsiField)resolve).hasModifierProperty(PsiModifier.STATIC)) {
owner = ((PsiField)resolve).getContainingClass();
}
}
else if (resolve instanceof PsiMethod) {
PsiMethod method = (PsiMethod)resolve;
ret = method.getReturnType();
owner = method;
}
else {
return null;
}
if (ret == null) return null;
final LanguageLevel languageLevel = PsiUtil.getLanguageLevel(expr);
if (ret instanceof PsiClassType) {
ret = ((PsiClassType)ret).setLanguageLevel(languageLevel);
}
if (languageLevel.compareTo(LanguageLevel.JDK_1_5) >= 0) {
if (owner != null && PsiUtil.isRawSubstitutor(owner, result.getSubstitutor())) return TypeConversionUtil.erasure(ret);
PsiType substitutedType = result.getSubstitutor().substitute(ret);
return PsiImplUtil.normalizeWildcardTypeByPosition(substitutedType, expr);
if (languageLevel.isAtLeast(LanguageLevel.JDK_1_5)) {
final PsiSubstitutor substitutor = result.getSubstitutor();
if (owner == null || !PsiUtil.isRawSubstitutor(owner, substitutor)) {
PsiType substitutedType = substitutor.substitute(ret);
return PsiImplUtil.normalizeWildcardTypeByPosition(substitutedType, expr);
}
}
return TypeConversionUtil.erasure(ret);