Skip to content

Commit 4c1e740

Browse files
unv-unvunv-unv
authored
Eliminating usage of PlatformIcons in comments. (#277)
1 parent 0f4cf47 commit 4c1e740

3 files changed

Lines changed: 164 additions & 159 deletions

File tree

‎java-language-api/src/main/java/com/intellij/java/language/util/VisibilityIcons.java‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@
2020
package com.intellij.java.language.util;
2121

2222
public class VisibilityIcons {
23-
private VisibilityIcons() {}
23+
private VisibilityIcons() {
24+
}
2425

2526
// public static void setVisibilityIcon(PsiModifierList modifierList, RowIcon baseIcon) {
2627
// if (modifierList != null) {
@@ -37,12 +38,12 @@ private VisibilityIcons() {}
3738
// setVisibilityIcon(PsiUtil.ACCESS_LEVEL_PACKAGE_LOCAL, baseIcon);
3839
// }
3940
// else {
40-
// Icon emptyIcon = new EmptyIcon(PlatformIcons.PUBLIC_ICON.getIconWidth(), PlatformIcons.PUBLIC_ICON.getIconHeight());
41+
// Icon emptyIcon = new EmptyIcon(PlatformIconGroup.nodesC_public().getIconWidth(), PlatformIconGroup.nodesC_public().getIconHeight());
4142
// baseIcon.setIcon(emptyIcon, 1);
4243
// }
4344
// }
44-
// else if (PlatformIcons.PUBLIC_ICON != null) {
45-
// Icon emptyIcon = new EmptyIcon(PlatformIcons.PUBLIC_ICON.getIconWidth(), PlatformIcons.PUBLIC_ICON.getIconHeight());
45+
// else if (PlatformIconGroup.nodesC_public() != null) {
46+
// Icon emptyIcon = new EmptyIcon(PlatformIconGroup.nodesC_public().getIconWidth(), PlatformIconGroup.nodesC_public().getIconHeight());
4647
// baseIcon.setIcon(emptyIcon, 1);
4748
// }
4849
// }
@@ -51,20 +52,20 @@ private VisibilityIcons() {}
5152
// Icon icon;
5253
// switch (accessLevel) {
5354
// case PsiUtil.ACCESS_LEVEL_PUBLIC:
54-
// icon = PlatformIcons.PUBLIC_ICON;
55+
// icon = PlatformIconGroup.nodesC_public();
5556
// break;
5657
// case PsiUtil.ACCESS_LEVEL_PROTECTED:
57-
// icon = PlatformIcons.PROTECTED_ICON;
58+
// icon = PlatformIconGroup.nodesC_protected();
5859
// break;
5960
// case PsiUtil.ACCESS_LEVEL_PACKAGE_LOCAL:
60-
// icon = PlatformIcons.PACKAGE_LOCAL_ICON;
61+
// icon = PlatformIconGroup.nodesC_plocal();
6162
// break;
6263
// case PsiUtil.ACCESS_LEVEL_PRIVATE:
63-
// icon = PlatformIcons.PRIVATE_ICON;
64+
// icon = PlatformIconGroup.nodesC_private();
6465
// break;
6566
// default:
66-
// if (PlatformIcons.PUBLIC_ICON != null) {
67-
// icon = new EmptyIcon(PlatformIcons.PUBLIC_ICON.getIconWidth(), PlatformIcons.PUBLIC_ICON.getIconHeight());
67+
// if (PlatformIconGroup.nodesC_public() != null) {
68+
// icon = new EmptyIcon(PlatformIconGroup.nodesC_public().getIconWidth(), PlatformIconGroup.nodesC_public().getIconHeight());
6869
// }
6970
// else {
7071
// return;

‎java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/light/LightRecordCanonicalConstructor.java‎

Lines changed: 24 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -9,42 +9,39 @@
99
import jakarta.annotation.Nonnull;
1010

1111
public class LightRecordCanonicalConstructor extends LightMethod implements SyntheticElement {
12-
public LightRecordCanonicalConstructor(@Nonnull PsiMethod method,
13-
@Nonnull PsiClass containingClass) {
14-
super(method.getManager(), method, containingClass);
15-
}
12+
public LightRecordCanonicalConstructor(@Nonnull PsiMethod method, @Nonnull PsiClass containingClass) {
13+
super(method.getManager(), method, containingClass);
14+
}
1615

17-
@Override
18-
public int getTextOffset() {
19-
return getNavigationElement().getTextOffset();
20-
}
16+
@Override
17+
public int getTextOffset() {
18+
return getNavigationElement().getTextOffset();
19+
}
2120

22-
@Nonnull
23-
@Override
24-
public PsiElement getNavigationElement() {
25-
return getContainingClass();
26-
}
21+
@Nonnull
22+
@Override
23+
public PsiElement getNavigationElement() {
24+
return getContainingClass();
25+
}
2726

28-
@Override
29-
public PsiFile getContainingFile() {
30-
PsiClass containingClass = getContainingClass();
31-
return containingClass.getContainingFile();
32-
}
27+
@Override
28+
public PsiFile getContainingFile() {
29+
PsiClass containingClass = getContainingClass();
30+
return containingClass.getContainingFile();
31+
}
3332

3433
// @Override
35-
// public Icon getElementIcon(final int flags)
36-
// {
34+
// public Icon getElementIcon(final int flags) {
3735
// final RowIcon baseIcon =
38-
// IconManager.getInstance().createLayeredIcon(this, PlatformIcons.METHOD_ICON, ElementPresentationUtil.getFlags(this, false));
39-
// if(BitUtil.isSet(flags, ICON_FLAG_VISIBILITY))
40-
// {
36+
// IconManager.getInstance().createLayeredIcon(this, PlatformIconGroup.nodesMethod(), ElementPresentationUtil.getFlags(this, false));
37+
// if(BitUtil.isSet(flags, ICON_FLAG_VISIBILITY)) {
4138
// VisibilityIcons.setVisibilityIcon(getContainingClass().getModifierList(), baseIcon);
4239
// }
4340
// return baseIcon;
4441
// }
4542

46-
@Override
47-
public PsiElement getContext() {
48-
return getContainingClass();
49-
}
43+
@Override
44+
public PsiElement getContext() {
45+
return getContainingClass();
46+
}
5047
}

‎java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/light/LightRecordField.java‎

Lines changed: 129 additions & 122 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
import com.intellij.java.language.codeInsight.AnnotationTargetUtil;
55
import com.intellij.java.language.psi.*;
6+
import consulo.annotation.access.RequiredReadAction;
67
import consulo.application.util.CachedValueProvider;
78
import consulo.content.scope.SearchScope;
89
import consulo.language.psi.PsiElement;
@@ -15,139 +16,145 @@
1516

1617
import jakarta.annotation.Nonnull;
1718
import jakarta.annotation.Nullable;
19+
1820
import java.util.Arrays;
1921
import java.util.Objects;
2022

2123
public class LightRecordField extends LightField implements LightRecordMember {
22-
private final
23-
@Nonnull
24-
PsiRecordComponent myRecordComponent;
25-
26-
public LightRecordField(@Nonnull PsiManager manager,
27-
@Nonnull PsiField field,
28-
@Nonnull PsiClass containingClass,
29-
@Nonnull PsiRecordComponent component) {
30-
super(manager, field, containingClass);
31-
myRecordComponent = component;
32-
}
33-
34-
@Override
35-
@Nonnull
36-
public PsiRecordComponent getRecordComponent() {
37-
return myRecordComponent;
38-
}
39-
40-
@Override
41-
public int getTextOffset() {
42-
return myRecordComponent.getTextOffset();
43-
}
44-
45-
@Nonnull
46-
@Override
47-
public PsiElement getNavigationElement() {
48-
return myRecordComponent.getNavigationElement();
49-
}
50-
51-
@Override
52-
public boolean isWritable() {
53-
return true;
54-
}
55-
56-
@Override
57-
public PsiFile getContainingFile() {
58-
PsiClass containingClass = getContainingClass();
59-
if (containingClass == null) {
60-
return null;
61-
}
62-
return containingClass.getContainingFile();
63-
}
64-
65-
@Override
66-
public
67-
@Nonnull
68-
PsiType getType() {
69-
if (DumbService.isDumb(myRecordComponent.getProject())) {
70-
return myRecordComponent.getType();
71-
}
72-
return LanguageCachedValueUtil.getCachedValue(this, () -> {
73-
PsiType type = myRecordComponent.getType()
74-
.annotate(() -> Arrays.stream(myRecordComponent.getAnnotations())
75-
.filter(LightRecordField::hasApplicableAnnotationTarget)
76-
.toArray(PsiAnnotation[]::new)
77-
);
78-
return CachedValueProvider.Result.create(type, this);
79-
});
80-
}
81-
82-
@Override
83-
@Nonnull
84-
public PsiAnnotation[] getAnnotations() {
85-
return getType().getAnnotations();
86-
}
87-
88-
@Override
89-
public boolean hasAnnotation(@Nonnull String fqn) {
90-
PsiType type = getType();
91-
return type.hasAnnotation(fqn);
92-
}
93-
94-
@Override
95-
@Nullable
96-
public PsiAnnotation getAnnotation(@Nonnull String fqn) {
97-
return getType().findAnnotation(fqn);
98-
}
24+
private final
25+
@Nonnull
26+
PsiRecordComponent myRecordComponent;
27+
28+
public LightRecordField(
29+
@Nonnull PsiManager manager,
30+
@Nonnull PsiField field,
31+
@Nonnull PsiClass containingClass,
32+
@Nonnull PsiRecordComponent component
33+
) {
34+
super(manager, field, containingClass);
35+
myRecordComponent = component;
36+
}
37+
38+
@Override
39+
@Nonnull
40+
public PsiRecordComponent getRecordComponent() {
41+
return myRecordComponent;
42+
}
43+
44+
@Override
45+
public int getTextOffset() {
46+
return myRecordComponent.getTextOffset();
47+
}
48+
49+
@Nonnull
50+
@Override
51+
public PsiElement getNavigationElement() {
52+
return myRecordComponent.getNavigationElement();
53+
}
54+
55+
@Override
56+
public boolean isWritable() {
57+
return true;
58+
}
59+
60+
@Override
61+
public PsiFile getContainingFile() {
62+
PsiClass containingClass = getContainingClass();
63+
if (containingClass == null) {
64+
return null;
65+
}
66+
return containingClass.getContainingFile();
67+
}
68+
69+
@Override
70+
public
71+
@Nonnull
72+
PsiType getType() {
73+
if (DumbService.isDumb(myRecordComponent.getProject())) {
74+
return myRecordComponent.getType();
75+
}
76+
return LanguageCachedValueUtil.getCachedValue(this, () -> {
77+
PsiType type = myRecordComponent.getType()
78+
.annotate(() -> Arrays.stream(myRecordComponent.getAnnotations())
79+
.filter(LightRecordField::hasApplicableAnnotationTarget)
80+
.toArray(PsiAnnotation[]::new)
81+
);
82+
return CachedValueProvider.Result.create(type, this);
83+
});
84+
}
85+
86+
@Override
87+
@Nonnull
88+
public PsiAnnotation[] getAnnotations() {
89+
return getType().getAnnotations();
90+
}
91+
92+
@Override
93+
public boolean hasAnnotation(@Nonnull String fqn) {
94+
PsiType type = getType();
95+
return type.hasAnnotation(fqn);
96+
}
97+
98+
@Override
99+
@Nullable
100+
public PsiAnnotation getAnnotation(@Nonnull String fqn) {
101+
return getType().findAnnotation(fqn);
102+
}
99103

100104
// @Override
101-
// public Icon getElementIcon(final int flags)
102-
// {
105+
// public Icon getElementIcon(final int flags) {
103106
// final RowIcon baseIcon =
104-
// IconManager.getInstance().createLayeredIcon(this, PlatformIcons.FIELD_ICON, ElementPresentationUtil.getFlags(this, false));
105-
// if(BitUtil.isSet(flags, ICON_FLAG_VISIBILITY))
106-
// {
107+
// IconManager.getInstance().createLayeredIcon(this, PlatformIconGroup.nodesField(), ElementPresentationUtil.getFlags(this, false));
108+
// if (BitUtil.isSet(flags, ICON_FLAG_VISIBILITY)) {
107109
// VisibilityIcons.setVisibilityIcon(PsiUtil.ACCESS_LEVEL_PRIVATE, baseIcon);
108110
// }
109111
// return baseIcon;
110112
// }
111113

112-
@Override
113-
public PsiElement getContext() {
114-
return getContainingClass();
115-
}
116-
117-
@Override
118-
public
119-
@Nonnull
120-
SearchScope getUseScope() {
121-
PsiClass aClass = Objects.requireNonNull(getContainingClass());
122-
PsiClass containingClass = aClass.getContainingClass();
123-
while (containingClass != null) {
124-
aClass = containingClass;
125-
containingClass = containingClass.getContainingClass();
126-
}
127-
return new LocalSearchScope(aClass);
128-
}
129-
130-
private static boolean hasApplicableAnnotationTarget(PsiAnnotation annotation) {
131-
return AnnotationTargetUtil.findAnnotationTarget(annotation, PsiAnnotation.TargetType.TYPE_USE, PsiAnnotation.TargetType.FIELD) != null;
132-
}
133-
134-
@Override
135-
public void normalizeDeclaration() throws IncorrectOperationException {
136-
// no-op
137-
}
138-
139-
@Override
140-
public boolean equals(Object o) {
141-
if (this == o) {
142-
return true;
143-
}
144-
return o instanceof LightRecordField &&
145-
myRecordComponent.equals(((LightRecordField) o).myRecordComponent);
146-
}
147-
148-
@Override
149-
public int hashCode() {
150-
return Objects.hash(myRecordComponent);
151-
}
114+
@Override
115+
public PsiElement getContext() {
116+
return getContainingClass();
117+
}
118+
119+
@Override
120+
public
121+
@Nonnull
122+
SearchScope getUseScope() {
123+
PsiClass aClass = Objects.requireNonNull(getContainingClass());
124+
PsiClass containingClass = aClass.getContainingClass();
125+
while (containingClass != null) {
126+
aClass = containingClass;
127+
containingClass = containingClass.getContainingClass();
128+
}
129+
return new LocalSearchScope(aClass);
130+
}
131+
132+
@RequiredReadAction
133+
private static boolean hasApplicableAnnotationTarget(PsiAnnotation annotation) {
134+
return AnnotationTargetUtil.findAnnotationTarget(
135+
annotation,
136+
PsiAnnotation.TargetType.TYPE_USE,
137+
PsiAnnotation.TargetType.FIELD
138+
) != null;
139+
}
140+
141+
@Override
142+
public void normalizeDeclaration() throws IncorrectOperationException {
143+
// no-op
144+
}
145+
146+
@Override
147+
public boolean equals(Object o) {
148+
if (this == o) {
149+
return true;
150+
}
151+
return o instanceof LightRecordField &&
152+
myRecordComponent.equals(((LightRecordField) o).myRecordComponent);
153+
}
154+
155+
@Override
156+
public int hashCode() {
157+
return Objects.hash(myRecordComponent);
158+
}
152159

153160
}

0 commit comments

Comments
 (0)