MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-04 17:20:55 +07:00
Code Issues Packages Projects Releases Wiki Activity

EA-76156 - PIEAE: CompositePsiElement.getContainingFile

Browse Source
This commit is contained in:
Anna Kozlova
2015-11-24 12:47:35 +01:00
parent aed865ac5a
commit fb2442f9ba
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
java/java-structure-view/src/com/intellij/ide/structureView/impl/java/PropertyGroup.java
View File

@@ -25,6 +25,7 @@ import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.editor.colors.CodeInsightColors; import com.intellij.openapi.editor.colors.CodeInsightColors;
import com.intellij.openapi.editor.colors.TextAttributesKey; import com.intellij.openapi.editor.colors.TextAttributesKey;
import com.intellij.openapi.project.Project; import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Comparing;
import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.IconLoader;
import com.intellij.psi.*; import com.intellij.psi.*;
import com.intellij.psi.util.PropertyUtil; import com.intellij.psi.util.PropertyUtil;
@@ -38,7 +39,7 @@ import java.util.Collection;
public class PropertyGroup implements Group, ColoredItemPresentation, AccessLevelProvider, WeighedItem { public class PropertyGroup implements Group, ColoredItemPresentation, AccessLevelProvider, WeighedItem {
private final String myPropertyName; private final String myPropertyName;
private final PsiType myPropertyType; private final SmartTypePointer myPropertyType;
private SmartPsiElementPointer myFieldPointer; private SmartPsiElementPointer myFieldPointer;
private SmartPsiElementPointer myGetterPointer; private SmartPsiElementPointer myGetterPointer;
@@ -55,7 +56,7 @@ public class PropertyGroup implements Group, ColoredItemPresentation, AccessLeve
private PropertyGroup(String propertyName, PsiType propertyType, boolean isStatic, @NotNull Project project) { private PropertyGroup(String propertyName, PsiType propertyType, boolean isStatic, @NotNull Project project) {
myPropertyName = propertyName; myPropertyName = propertyName;
myPropertyType = propertyType; myPropertyType = SmartTypePointerManager.getInstance(project).createSmartTypePointer(propertyType);
myIsStatic = isStatic; myIsStatic = isStatic;
myProject = project; myProject = project;
} }
@@ -140,7 +141,8 @@ public class PropertyGroup implements Group, ColoredItemPresentation, AccessLeve
@Override @Override
public String getPresentableText() { public String getPresentableText() {
return myPropertyName + ": " + myPropertyType.getPresentableText(); final PsiType type = getPropertyType();
return myPropertyName + (type != null ? ": " + type.getPresentableText() : "");
} }
public String toString() { public String toString() {
@@ -156,12 +158,10 @@ public class PropertyGroup implements Group, ColoredItemPresentation, AccessLeve
if (myPropertyName != null ? !myPropertyName.equals(propertyGroup.myPropertyName) : propertyGroup.myPropertyName != null) return false; if (myPropertyName != null ? !myPropertyName.equals(propertyGroup.myPropertyName) : propertyGroup.myPropertyName != null) return false;
if (myPropertyType != null && !myPropertyType.isValid()) return false; final PsiType propertyType = getPropertyType();
if (propertyGroup.myPropertyType != null && !propertyGroup.myPropertyType.isValid()) return false; final PsiType otherPropertyType = propertyGroup.getPropertyType();
if (myPropertyType != null && myPropertyType.isValid() if (!Comparing.equal(propertyType, otherPropertyType)) {
? !myPropertyType.equals(propertyGroup.myPropertyType)
: propertyGroup.myPropertyType != null) {
return false; return false;
} }
return true; return true;
@@ -172,7 +172,14 @@ public class PropertyGroup implements Group, ColoredItemPresentation, AccessLeve
} }
public String getGetterName() { public String getGetterName() {
return PropertyUtil.suggestGetterName(myPropertyName, myPropertyType); return PropertyUtil.suggestGetterName(myPropertyName, getPropertyType());
}
private PsiType getPropertyType() {
if (myPropertyType == null) {
return null;
}
return myPropertyType.getType();
} }
@Override @Override