Skip to content

Commit 0995c65

Browse files
VISTALLVISTALL
committed
migrate to new highlight manager api
1 parent 9295f37 commit 0995c65

20 files changed

Lines changed: 52 additions & 130 deletions

‎plugin/src/main/java/com/intellij/java/impl/codeInsight/ExternalAnnotationsManagerImpl.java‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@
3333
import consulo.codeEditor.LogicalPosition;
3434
import consulo.codeEditor.ScrollType;
3535
import consulo.codeEditor.markup.RangeHighlighter;
36-
import consulo.colorScheme.EditorColorsManager;
37-
import consulo.colorScheme.TextAttributes;
3836
import consulo.component.messagebus.MessageBus;
3937
import consulo.component.messagebus.MessageBusConnection;
4038
import consulo.content.bundle.Sdk;
@@ -91,7 +89,10 @@
9189
import consulo.virtualFileSystem.ReadonlyStatusHandler;
9290
import consulo.virtualFileSystem.VirtualFile;
9391
import consulo.virtualFileSystem.VirtualFileManager;
94-
import consulo.virtualFileSystem.event.*;
92+
import consulo.virtualFileSystem.event.VirtualFileCopyEvent;
93+
import consulo.virtualFileSystem.event.VirtualFileEvent;
94+
import consulo.virtualFileSystem.event.VirtualFileListener;
95+
import consulo.virtualFileSystem.event.VirtualFileMoveEvent;
9596
import consulo.virtualFileSystem.util.VirtualFileUtil;
9697
import consulo.xml.ide.highlighter.XmlFileType;
9798
import consulo.xml.psi.XmlElementFactory;
@@ -513,14 +514,11 @@ private static AnnotationPlace confirmNewExternalAnnotationRoot(@Nonnull PsiElem
513514
editor != null && editor.getDocument() == PsiDocumentManager.getInstance(project).getDocument(containingFile);
514515
try {
515516
if (highlight) {
516-
final EditorColorsManager colorsManager = EditorColorsManager.getInstance();
517-
final TextAttributes attributes = colorsManager.getGlobalScheme().getAttributes(EditorColors.SEARCH_RESULT_ATTRIBUTES);
518-
519517
//do not highlight for batch inspections
520518
final TextRange textRange = highlightElement.getTextRange();
521519
HighlightManager.getInstance(project).addRangeHighlight(editor,
522520
textRange.getStartOffset(), textRange.getEndOffset(),
523-
attributes, true, highlighters);
521+
EditorColors.SEARCH_RESULT_ATTRIBUTES, true, highlighters);
524522
final LogicalPosition logicalPosition = editor.offsetToLogicalPosition(textRange.getStartOffset());
525523
editor.getScrollingModel().scrollTo(logicalPosition, ScrollType.CENTER);
526524
}

‎plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/AccessStaticViaInstanceFix.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,7 @@ private boolean checkSideEffects(
131131
if (editor == null) {
132132
return false;
133133
}
134-
TextAttributes attributes = EditorColorsManager.getInstance().getGlobalScheme().getAttributes(EditorColors.SEARCH_RESULT_ATTRIBUTES);
135-
HighlightManager.getInstance(project).addOccurrenceHighlights(editor, PsiUtilCore.toPsiElementArray(sideEffects), attributes, true, null);
134+
HighlightManager.getInstance(project).addOccurrenceHighlights(editor, PsiUtilCore.toPsiElementArray(sideEffects), EditorColors.SEARCH_RESULT_ATTRIBUTES, true, null);
136135
try {
137136
hasSideEffects = PsiUtil.isStatement(factory.createStatementFromText(qualifierExpression.getText(), qualifierExpression));
138137
}

‎plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/RemoveUnusedVariableFix.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,7 @@ public static int showSideEffectsWarning(List<PsiElement> sideEffects,
123123
Project project = editor.getProject();
124124
HighlightManager highlightManager = HighlightManager.getInstance(project);
125125
PsiElement[] elements = PsiUtilCore.toPsiElementArray(sideEffects);
126-
EditorColorsManager manager = EditorColorsManager.getInstance();
127-
TextAttributes attributes = manager.getGlobalScheme().getAttributes(EditorColors.SEARCH_RESULT_ATTRIBUTES);
128-
highlightManager.addOccurrenceHighlights(editor, elements, attributes, true, null);
126+
highlightManager.addOccurrenceHighlights(editor, elements, EditorColors.SEARCH_RESULT_ATTRIBUTES, true, null);
129127

130128
SideEffectWarningDialog dialog = new SideEffectWarningDialog(project, false, variable, beforeText, afterText, canCopeWithSideEffects);
131129
dialog.show();

‎plugin/src/main/java/com/intellij/java/impl/codeInsight/intention/impl/AddOnDemandStaticImportAction.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import consulo.annotation.component.ExtensionImpl;
2222
import consulo.codeEditor.Editor;
2323
import consulo.codeEditor.EditorColors;
24-
import consulo.colorScheme.EditorColorsManager;
2524
import consulo.language.editor.FileModificationService;
2625
import consulo.language.editor.highlight.HighlightManager;
2726
import consulo.language.editor.intention.IntentionMetaData;
@@ -187,7 +186,7 @@ public void visitReferenceElement(PsiJavaCodeReferenceElement expression) {
187186
editor,
188187
expression.getTextRange().getStartOffset(),
189188
expression.getTextRange().getEndOffset(),
190-
EditorColorsManager.getInstance().getGlobalScheme().getAttributes(EditorColors.SEARCH_RESULT_ATTRIBUTES),
189+
EditorColors.SEARCH_RESULT_ATTRIBUTES,
191190
false,
192191
null
193192
);

‎plugin/src/main/java/com/intellij/java/impl/codeInsight/intention/impl/BaseMoveInitializerToMethodAction.java‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@
2121
import com.intellij.java.language.psi.javadoc.PsiDocComment;
2222
import consulo.codeEditor.Editor;
2323
import consulo.codeEditor.EditorColors;
24-
import consulo.colorScheme.EditorColorsManager;
25-
import consulo.colorScheme.TextAttributes;
2624
import consulo.language.editor.FileModificationService;
2725
import consulo.language.editor.highlight.HighlightManager;
2826
import consulo.language.editor.intention.PsiElementBaseIntentionAction;
@@ -93,11 +91,8 @@ public void invoke(@Nonnull Project project, Editor editor, @Nonnull PsiElement
9391
}
9492

9593
private static void highlightRExpression(@Nonnull PsiAssignmentExpression assignment, @Nonnull Project project, Editor editor) {
96-
final EditorColorsManager manager = EditorColorsManager.getInstance();
97-
final TextAttributes attributes = manager.getGlobalScheme().getAttributes(EditorColors.SEARCH_RESULT_ATTRIBUTES);
9894
final PsiExpression expression = assignment.getRExpression();
99-
100-
HighlightManager.getInstance(project).addOccurrenceHighlights(editor, new PsiElement[]{expression}, attributes, false, null);
95+
HighlightManager.getInstance(project).addOccurrenceHighlights(editor, new PsiElement[]{expression}, EditorColors.SEARCH_RESULT_ATTRIBUTES, false, null);
10196
}
10297

10398
@Nonnull

‎plugin/src/main/java/com/intellij/java/impl/codeInsight/intention/impl/MoveFieldAssignmentToInitializerAction.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -199,8 +199,6 @@ public void invoke(@Nonnull Project project, Editor editor, PsiFile file) throws
199199
}
200200
}
201201

202-
EditorColorsManager manager = EditorColorsManager.getInstance();
203-
TextAttributes attributes = manager.getGlobalScheme().getAttributes(EditorColors.SEARCH_RESULT_ATTRIBUTES);
204-
HighlightManager.getInstance(project).addOccurrenceHighlights(editor, new PsiElement[]{field.getInitializer()}, attributes, false, null);
202+
HighlightManager.getInstance(project).addOccurrenceHighlights(editor, new PsiElement[]{field.getInitializer()}, EditorColors.SEARCH_RESULT_ATTRIBUTES, false, null);
205203
}
206204
}

‎plugin/src/main/java/com/intellij/java/impl/ide/hierarchy/call/CallHierarchyNodeDescriptor.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -231,8 +231,6 @@ public void navigate(boolean requestFocus) {
231231
if (editor != null) {
232232

233233
HighlightManager highlightManager = HighlightManager.getInstance(getProject());
234-
EditorColorsManager colorManager = EditorColorsManager.getInstance();
235-
TextAttributes attributes = colorManager.getGlobalScheme().getAttributes(EditorColors.SEARCH_RESULT_ATTRIBUTES);
236234
ArrayList<RangeHighlighter> highlighters = new ArrayList<>();
237235
for (PsiReference psiReference : myReferences) {
238236
PsiElement eachElement = psiReference.getElement();
@@ -244,7 +242,7 @@ public void navigate(boolean requestFocus) {
244242
editor,
245243
textRange.getStartOffset(),
246244
textRange.getEndOffset(),
247-
attributes,
245+
EditorColors.SEARCH_RESULT_ATTRIBUTES,
248246
false,
249247
highlighters
250248
);

‎plugin/src/main/java/com/intellij/java/impl/ig/psiutils/HighlightUtils.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,15 +67,12 @@ public static void highlightElements(
6767
}
6868
final Project project = firstElement.getProject();
6969
final FileEditorManager editorManager = FileEditorManager.getInstance(project);
70-
final EditorColorsManager editorColorsManager = EditorColorsManager.getInstance();
7170
final Editor editor = editorManager.getSelectedTextEditor();
7271
if (editor == null) {
7372
return;
7473
}
75-
final EditorColorsScheme globalScheme = editorColorsManager.getGlobalScheme();
76-
final TextAttributes textattributes = globalScheme.getAttributes(EditorColors.SEARCH_RESULT_ATTRIBUTES);
7774
final HighlightManager highlightManager = HighlightManager.getInstance(project);
78-
highlightManager.addOccurrenceHighlights(editor, elements, textattributes, true, null);
75+
highlightManager.addOccurrenceHighlights(editor, elements, EditorColors.SEARCH_RESULT_ATTRIBUTES, true, null);
7976
final WindowManager windowManager = WindowManager.getInstance();
8077
final StatusBar statusBar = windowManager.getStatusBar(project);
8178
statusBar.setInfo(InspectionGadgetsLocalize.pressEscapeToRemoveHighlightingMessage().get());

‎plugin/src/main/java/com/intellij/java/impl/ipp/decls/MoveDeclarationIntention.java‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@
2222
import consulo.annotation.component.ExtensionImpl;
2323
import consulo.codeEditor.Editor;
2424
import consulo.codeEditor.EditorColors;
25-
import consulo.colorScheme.EditorColorsManager;
26-
import consulo.colorScheme.EditorColorsScheme;
27-
import consulo.colorScheme.TextAttributes;
2825
import consulo.fileEditor.FileEditorManager;
2926
import consulo.language.editor.highlight.HighlightManager;
3027
import consulo.language.editor.intention.IntentionMetaData;
@@ -36,7 +33,6 @@
3633
import consulo.language.util.IncorrectOperationException;
3734
import consulo.project.Project;
3835
import consulo.project.ui.wm.StatusBar;
39-
4036
import jakarta.annotation.Nonnull;
4137

4238
@ExtensionImpl
@@ -94,17 +90,9 @@ private static void highlightElement(@Nonnull PsiElement element) {
9490
FileEditorManager.getInstance(project);
9591
final HighlightManager highlightManager =
9692
HighlightManager.getInstance(project);
97-
final EditorColorsManager editorColorsManager =
98-
EditorColorsManager.getInstance();
9993
final Editor editor = editorManager.getSelectedTextEditor();
100-
final EditorColorsScheme globalScheme =
101-
editorColorsManager.getGlobalScheme();
102-
final TextAttributes textattributes =
103-
globalScheme.getAttributes(
104-
EditorColors.SEARCH_RESULT_ATTRIBUTES);
10594
final PsiElement[] elements = new PsiElement[]{element};
106-
highlightManager.addOccurrenceHighlights(editor, elements,
107-
textattributes, true, null);
95+
highlightManager.addOccurrenceHighlights(editor, elements, EditorColors.SEARCH_RESULT_ATTRIBUTES, true, null);
10896

10997
StatusBar.Info.set(IntentionPowerPackBundle.message(
11098
"status.bar.escape.highlighting.message"), project);

‎plugin/src/main/java/com/intellij/java/impl/ipp/psiutils/HighlightUtil.java‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@
2121
import consulo.application.util.query.Query;
2222
import consulo.codeEditor.Editor;
2323
import consulo.codeEditor.EditorColors;
24-
import consulo.colorScheme.EditorColorsManager;
25-
import consulo.colorScheme.EditorColorsScheme;
26-
import consulo.colorScheme.TextAttributes;
2724
import consulo.document.util.TextRange;
2825
import consulo.fileEditor.FileEditorManager;
2926
import consulo.find.FindManager;
@@ -37,8 +34,8 @@
3734
import consulo.project.Project;
3835
import consulo.project.ui.wm.StatusBar;
3936
import consulo.project.ui.wm.WindowManager;
40-
4137
import jakarta.annotation.Nonnull;
38+
4239
import java.util.Collection;
4340
import java.util.Collections;
4441
import java.util.List;
@@ -63,15 +60,12 @@ public static void highlightElements(
6360
}
6461
final Project project = firstElement.getProject();
6562
final FileEditorManager editorManager = FileEditorManager.getInstance(project);
66-
final EditorColorsManager editorColorsManager = EditorColorsManager.getInstance();
6763
final Editor editor = editorManager.getSelectedTextEditor();
6864
if (editor == null) {
6965
return;
7066
}
71-
final EditorColorsScheme globalScheme = editorColorsManager.getGlobalScheme();
72-
final TextAttributes textattributes = globalScheme.getAttributes(EditorColors.SEARCH_RESULT_ATTRIBUTES);
7367
final HighlightManager highlightManager = HighlightManager.getInstance(project);
74-
highlightManager.addOccurrenceHighlights(editor, elements, textattributes, true, null);
68+
highlightManager.addOccurrenceHighlights(editor, elements, EditorColors.SEARCH_RESULT_ATTRIBUTES, true, null);
7569
final FindManager findmanager = FindManager.getInstance(project);
7670
FindModel findmodel = findmanager.getFindNextModel();
7771
if (findmodel == null) {

0 commit comments

Comments
 (0)