MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-03-22 15:19:59 +07:00
Code Issues Packages Projects Releases Wiki Activity

[RDCT] GTW-9165: Fix the hiding occurrence of highlighters by pressing the Esc button

Browse Source 
This action was broken in the commit `ff7c5ff6ae0c75ce03da5e252298163d4f7c34da` by removing `ThinClientOccurrenceHighlightEscapeHandler`. Since we don't have a custom frontend escape handler for this, this commit properly integrates into the `HighlightManagerImpl` structure, so the default escape handler will work properly.

GitOrigin-RevId: d23d91b4d904f343b04f75e361f6b1074002b49f
This commit is contained in:
Vyacheslav Moklev
2024-07-05 10:45:08 +03:00
committed by intellij-monorepo-bot
parent 7b4e5031b5
commit 7d4abcfd3f
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
platform/lang-impl/src/com/intellij/codeInsight/highlighting/HighlightManagerImpl.java
View File

@@ -32,6 +32,7 @@ import com.intellij.psi.PsiFile;
import com.intellij.psi.PsiReference;
import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil;
import com.intellij.ui.ColorUtil;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.Contract;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -170,9 +171,7 @@ public final class HighlightManagerImpl extends HighlightManager {
markupModel.addRangeHighlighterAndChangeAttributes(attributesKey, start, end, OCCURRENCE_LAYER,
HighlighterTargetArea.EXACT_RANGE, false, highlighter -> {
Set<RangeHighlighter> highlighters = getEditorHighlighters(editor, true);
highlighters.add(highlighter);
setHideFlags(highlighter, flags);
addEditorHighlighterWithHideFlags(editor, highlighter, flags);
highlighter.setVisibleIfFolded(true);
if (outHighlighters != null) {
@@ -189,6 +188,15 @@ public final class HighlightManagerImpl extends HighlightManager {
});
}
@ApiStatus.Internal
public static void addEditorHighlighterWithHideFlags(@NotNull Editor editor,
@NotNull RangeHighlighter highlighter,
@HideFlags @Nullable Integer flags) {
Set<RangeHighlighter> highlighters = getEditorHighlighters(editor, true);
highlighters.add(highlighter);
setHideFlags(highlighter, flags);
}
@Override
public void addRangeHighlight(@NotNull Editor editor,
int startOffset,