Skip to content

Commit 8ed9bd6

Browse files
VISTALLVISTALL
committed
fixed compile after api cleanup inside platform
1 parent e261fd3 commit 8ed9bd6

7 files changed

Lines changed: 487 additions & 478 deletions

File tree

‎java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/JavaHighlightInfoTypes.java‎

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,15 @@
2020
import consulo.codeEditor.CodeInsightColors;
2121
import consulo.colorScheme.TextAttributesKey;
2222
import consulo.language.editor.annotation.HighlightSeverity;
23+
import consulo.language.editor.inspection.HighlightInfoTypeSeverityByKey;
2324
import consulo.language.editor.inspection.localize.InspectionLocalize;
2425
import consulo.language.editor.rawHighlight.HighlightDisplayKey;
2526
import consulo.language.editor.rawHighlight.HighlightInfoType;
26-
27+
import consulo.language.editor.rawHighlight.HighlightInfoTypeImpl;
2728
import jakarta.annotation.Nonnull;
2829

2930
public interface JavaHighlightInfoTypes {
30-
HighlightInfoType UNUSED_IMPORT = new HighlightInfoType.HighlightInfoTypeSeverityByKey(HighlightDisplayKey.findOrRegister(UnusedImportLocalInspection.SHORT_NAME,
31-
InspectionLocalize.unusedImport().get()
32-
), CodeInsightColors.NOT_USED_ELEMENT_ATTRIBUTES);
33-
34-
HighlightInfoType JAVA_KEYWORD = new HighlightInfoType.HighlightInfoTypeImpl(HighlightSeverity.INFORMATION, JavaHighlightingColors.KEYWORD);
31+
HighlightInfoType JAVA_KEYWORD = new HighlightInfoTypeImpl(HighlightSeverity.INFORMATION, JavaHighlightingColors.KEYWORD);
3532

3633
HighlightInfoType PACKAGE_NAME = createSymbolTypeInfo(JavaHighlightingColors.PACKAGE_NAME_ATTRIBUTES);
3734
HighlightInfoType CLASS_NAME = createSymbolTypeInfo(JavaHighlightingColors.CLASS_NAME_ATTRIBUTES);
@@ -52,16 +49,16 @@ public interface JavaHighlightInfoTypes {
5249
HighlightInfoType ANONYMOUS_CLASS_NAME = createSymbolTypeInfo(JavaHighlightingColors.ANONYMOUS_CLASS_NAME_ATTRIBUTES);
5350
HighlightInfoType INTERFACE_NAME = createSymbolTypeInfo(JavaHighlightingColors.INTERFACE_NAME_ATTRIBUTES);
5451
HighlightInfoType ENUM_NAME = createSymbolTypeInfo(JavaHighlightingColors.ENUM_NAME_ATTRIBUTES);
55-
HighlightInfoType TYPE_PARAMETER_NAME = new HighlightInfoType.HighlightInfoTypeImpl(HighlightInfoType.SYMBOL_TYPE_SEVERITY, JavaHighlightingColors.TYPE_PARAMETER_NAME_ATTRIBUTES);
52+
HighlightInfoType TYPE_PARAMETER_NAME = new HighlightInfoTypeImpl(HighlightInfoType.SYMBOL_TYPE_SEVERITY, JavaHighlightingColors.TYPE_PARAMETER_NAME_ATTRIBUTES);
5653
HighlightInfoType ABSTRACT_CLASS_NAME = createSymbolTypeInfo(JavaHighlightingColors.ABSTRACT_CLASS_NAME_ATTRIBUTES);
57-
HighlightInfoType ANNOTATION_NAME = new HighlightInfoType.HighlightInfoTypeImpl(HighlightInfoType.SYMBOL_TYPE_SEVERITY, JavaHighlightingColors.ANNOTATION_NAME_ATTRIBUTES);
58-
HighlightInfoType ANNOTATION_ATTRIBUTE_NAME = new HighlightInfoType.HighlightInfoTypeImpl(HighlightInfoType.SYMBOL_TYPE_SEVERITY, JavaHighlightingColors.ANNOTATION_ATTRIBUTE_NAME_ATTRIBUTES);
59-
HighlightInfoType REASSIGNED_LOCAL_VARIABLE = new HighlightInfoType.HighlightInfoTypeImpl(HighlightInfoType.SYMBOL_TYPE_SEVERITY, JavaHighlightingColors.REASSIGNED_LOCAL_VARIABLE_ATTRIBUTES);
60-
HighlightInfoType REASSIGNED_PARAMETER = new HighlightInfoType.HighlightInfoTypeImpl(HighlightInfoType.SYMBOL_TYPE_SEVERITY, JavaHighlightingColors.REASSIGNED_PARAMETER_ATTRIBUTES);
61-
HighlightInfoType IMPLICIT_ANONYMOUS_CLASS_PARAMETER = new HighlightInfoType.HighlightInfoTypeImpl(HighlightInfoType.SYMBOL_TYPE_SEVERITY, JavaHighlightingColors
54+
HighlightInfoType ANNOTATION_NAME = new HighlightInfoTypeImpl(HighlightInfoType.SYMBOL_TYPE_SEVERITY, JavaHighlightingColors.ANNOTATION_NAME_ATTRIBUTES);
55+
HighlightInfoType ANNOTATION_ATTRIBUTE_NAME = new HighlightInfoTypeImpl(HighlightInfoType.SYMBOL_TYPE_SEVERITY, JavaHighlightingColors.ANNOTATION_ATTRIBUTE_NAME_ATTRIBUTES);
56+
HighlightInfoType REASSIGNED_LOCAL_VARIABLE = new HighlightInfoTypeImpl(HighlightInfoType.SYMBOL_TYPE_SEVERITY, JavaHighlightingColors.REASSIGNED_LOCAL_VARIABLE_ATTRIBUTES);
57+
HighlightInfoType REASSIGNED_PARAMETER = new HighlightInfoTypeImpl(HighlightInfoType.SYMBOL_TYPE_SEVERITY, JavaHighlightingColors.REASSIGNED_PARAMETER_ATTRIBUTES);
58+
HighlightInfoType IMPLICIT_ANONYMOUS_CLASS_PARAMETER = new HighlightInfoTypeImpl(HighlightInfoType.SYMBOL_TYPE_SEVERITY, JavaHighlightingColors
6259
.IMPLICIT_ANONYMOUS_CLASS_PARAMETER_ATTRIBUTES);
6360

6461
static HighlightInfoType createSymbolTypeInfo(@Nonnull TextAttributesKey attributesKey) {
65-
return new HighlightInfoType.HighlightInfoTypeImpl(HighlightInfoType.SYMBOL_TYPE_SEVERITY, attributesKey, false);
62+
return new HighlightInfoTypeImpl(HighlightInfoType.SYMBOL_TYPE_SEVERITY, attributesKey, false);
6663
}
6764
}

‎java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/analysis/PostHighlightingVisitor.java‎

Lines changed: 27 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import com.intellij.java.analysis.codeInsight.daemon.JavaImplicitUsageProvider;
1919
import com.intellij.java.analysis.codeInsight.intention.QuickFixFactory;
2020
import com.intellij.java.analysis.impl.codeInsight.daemon.impl.GlobalUsageHelper;
21-
import com.intellij.java.analysis.impl.codeInsight.daemon.impl.JavaHighlightInfoTypes;
2221
import com.intellij.java.analysis.impl.codeInsight.daemon.impl.UnusedSymbolUtil;
2322
import com.intellij.java.analysis.impl.codeInspection.deadCode.UnusedDeclarationInspectionBase;
2423
import com.intellij.java.analysis.impl.codeInspection.deadCode.UnusedDeclarationInspectionState;
@@ -36,6 +35,7 @@
3635
import consulo.annotation.access.RequiredReadAction;
3736
import consulo.application.progress.ProgressIndicator;
3837
import consulo.application.util.ConcurrentFactoryMap;
38+
import consulo.codeEditor.CodeInsightColors;
3939
import consulo.component.ProcessCanceledException;
4040
import consulo.disposer.Disposable;
4141
import consulo.disposer.Disposer;
@@ -47,16 +47,15 @@
4747
import consulo.language.editor.ImplicitUsageProvider;
4848
import consulo.language.editor.annotation.HighlightSeverity;
4949
import consulo.language.editor.highlight.HighlightingLevelManager;
50+
import consulo.language.editor.inspection.HighlightInfoTypeSeverityByKey;
5051
import consulo.language.editor.inspection.SuppressionUtil;
5152
import consulo.language.editor.inspection.localize.InspectionLocalize;
5253
import consulo.language.editor.inspection.scheme.InspectionProfile;
5354
import consulo.language.editor.inspection.scheme.InspectionProjectProfileManager;
55+
import consulo.language.editor.inspection.scheme.InspectionToolWrapper;
5456
import consulo.language.editor.intention.EmptyIntentionAction;
5557
import consulo.language.editor.intention.IntentionAction;
56-
import consulo.language.editor.rawHighlight.HighlightDisplayKey;
57-
import consulo.language.editor.rawHighlight.HighlightInfo;
58-
import consulo.language.editor.rawHighlight.HighlightInfoHolder;
59-
import consulo.language.editor.rawHighlight.HighlightInfoType;
58+
import consulo.language.editor.rawHighlight.*;
6059
import consulo.language.editor.util.CollectHighlightsUtil;
6160
import consulo.language.file.FileViewProvider;
6261
import consulo.language.pom.PomNamedTarget;
@@ -70,6 +69,7 @@
7069

7170
import java.util.List;
7271
import java.util.Map;
72+
import java.util.Objects;
7373
import java.util.Set;
7474
import java.util.function.Function;
7575

@@ -91,6 +91,8 @@ public class PostHighlightingVisitor {
9191
private final UnusedDeclarationInspectionBase myDeadCodeInspection;
9292
private final UnusedDeclarationInspectionState myDeadCodeState;
9393

94+
private final HighlightInfoType myUnusedImportHighlightType;
95+
9496
private void optimizeImportsOnTheFlyLater(@Nonnull ProgressIndicator progress) {
9597
if ((myHasRedundantImports || myHasMissortedImports) && !progress.isCanceled()) {
9698
// schedule optimise action at the time of session disposal, which is after all applyInformation() calls
@@ -107,14 +109,14 @@ private void optimizeImportsOnTheFlyLater(@Nonnull ProgressIndicator progress) {
107109
});
108110
};
109111
try {
110-
Disposer.register((Disposable)progress, invokeFixLater);
112+
Disposer.register((Disposable) progress, invokeFixLater);
111113
}
112114
catch (Exception ignored) {
113115
// suppress "parent already has been disposed" exception here
114116
}
115117
if (progress.isCanceled()) {
116118
Disposer.dispose(invokeFixLater);
117-
Disposer.dispose((Disposable)progress);
119+
Disposer.dispose((Disposable) progress);
118120
progress.checkCanceled();
119121
}
120122
}
@@ -138,22 +140,24 @@ public PostHighlightingVisitor(
138140

139141
InspectionProfile profile = InspectionProjectProfileManager.getInstance(myProject).getInspectionProfile();
140142

141-
myDeadCodeKey = HighlightDisplayKey.find(UnusedDeclarationInspectionBase.SHORT_NAME);
143+
InspectionToolWrapper tool = Objects.requireNonNull(profile.getToolById(UnusedDeclarationInspectionBase.SHORT_NAME, myFile));
144+
145+
myDeadCodeKey = tool.getHighlightDisplayKey();
146+
147+
myDeadCodeInspection = (UnusedDeclarationInspectionBase) tool.getTool();
142148

143-
myDeadCodeInspection =
144-
(UnusedDeclarationInspectionBase)profile.getUnwrappedTool(UnusedDeclarationInspectionBase.SHORT_NAME, myFile);
145149
myDeadCodeState = profile.getToolState(UnusedDeclarationInspectionBase.SHORT_NAME, myFile);
146150

147-
LOG.assertTrue(myDeadCodeInspection != null);
151+
myUnusedSymbolInspection = myDeadCodeInspection.getSharedLocalInspectionTool();
152+
153+
myDeadCodeInfoType = new HighlightInfoTypeImpl(
154+
profile.getErrorLevel(myDeadCodeKey, myFile).getSeverity(),
155+
HighlightInfoType.RAW_UNUSED_SYMBOL.getAttributesKey()
156+
);
148157

149-
myUnusedSymbolInspection = myDeadCodeInspection != null ? myDeadCodeInspection.getSharedLocalInspectionTool() : null;
158+
InspectionToolWrapper unusedImportTool = Objects.requireNonNull(profile.getToolById(UnusedImportLocalInspection.SHORT_NAME, myFile));
150159

151-
myDeadCodeInfoType = myDeadCodeKey == null
152-
? HighlightInfoType.UNUSED_SYMBOL
153-
: new HighlightInfoType.HighlightInfoTypeImpl(
154-
profile.getErrorLevel(myDeadCodeKey, myFile).getSeverity(),
155-
HighlightInfoType.UNUSED_SYMBOL.getAttributesKey()
156-
);
160+
myUnusedImportHighlightType = new HighlightInfoTypeSeverityByKey(unusedImportTool.getHighlightDisplayKey(), CodeInsightColors.NOT_USED_ELEMENT_ATTRIBUTES);
157161
}
158162

159163
@RequiredReadAction
@@ -192,7 +196,7 @@ public void collectHighlights(@Nonnull HighlightInfoHolder result, @Nonnull Prog
192196

193197
HighlightDisplayKey unusedImportKey = HighlightDisplayKey.find(UnusedImportLocalInspection.SHORT_NAME);
194198
if (isUnusedImportEnabled(unusedImportKey)) {
195-
PsiImportList importList = ((PsiJavaFile)myFile).getImportList();
199+
PsiImportList importList = ((PsiJavaFile) myFile).getImportList();
196200
if (importList != null) {
197201
PsiImportStatementBase[] imports = importList.getAllImportStatements();
198202
for (PsiImportStatementBase statement : imports) {
@@ -580,7 +584,7 @@ private static HighlightInfo.Builder formatUnusedSymbolHighlightInfo(
580584
QuickFixFactory fixFactory = QuickFixFactory.getInstance();
581585
hlBuilder.registerFix(fixFactory.createSafeDeleteFix(aClass), null, LocalizeValue.of(), null, highlightDisplayKey);
582586
SpecialAnnotationsUtilBase.createAddToSpecialAnnotationFixes(
583-
(PsiModifierListOwner)aClass,
587+
(PsiModifierListOwner) aClass,
584588
annoName -> {
585589
hlBuilder.registerFix(fixFactory.createAddToDependencyInjectionAnnotationsFix(project, annoName, element));
586590
return true;
@@ -604,7 +608,7 @@ private HighlightInfo processImport(@Nonnull PsiImportStatementBase importStatem
604608
boolean isRedundant = myRefCountHolder.isRedundant(importStatement);
605609
if (!isRedundant && !(importStatement instanceof PsiImportStaticStatement)) {
606610
//check import from same package
607-
String packageName = ((PsiClassOwner)importStatement.getContainingFile()).getPackageName();
611+
String packageName = ((PsiClassOwner) importStatement.getContainingFile()).getPackageName();
608612
PsiJavaCodeReferenceElement reference = importStatement.getImportReference();
609613
PsiElement resolved = reference == null ? null : reference.resolve();
610614
if (resolved instanceof PsiPackage psiPackage) {
@@ -613,7 +617,7 @@ private HighlightInfo processImport(@Nonnull PsiImportStatementBase importStatem
613617
else if (resolved instanceof PsiClass psiClass && !importStatement.isOnDemand()) {
614618
String qName = psiClass.getQualifiedName();
615619
if (qName != null) {
616-
String name = ((PomNamedTarget)resolved).getName();
620+
String name = ((PomNamedTarget) resolved).getName();
617621
isRedundant = qName.equals(packageName + '.' + name);
618622
}
619623
}
@@ -637,7 +641,7 @@ private HighlightInfo registerRedundantImport(
637641
@Nonnull PsiImportStatementBase importStatement,
638642
@Nonnull HighlightDisplayKey unusedImportKey
639643
) {
640-
HighlightInfo info = HighlightInfo.newHighlightInfo(JavaHighlightInfoTypes.UNUSED_IMPORT)
644+
HighlightInfo info = HighlightInfo.newHighlightInfo(myUnusedImportHighlightType)
641645
.range(importStatement)
642646
.descriptionAndTooltip(InspectionLocalize.unusedImportStatement())
643647
.registerFix(QuickFixFactory.getInstance().createOptimizeImportsFix(false), null, LocalizeValue.of(), null, unusedImportKey)

0 commit comments

Comments
 (0)