MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

rename class to avoid confusion with existing

Browse Source 
GitOrigin-RevId: 24493014b6440ce2015dd1ed1c7163fcd7ab2817
This commit is contained in:
Alexey Kudravtsev
2019-09-10 12:50:55 +00:00
committed by intellij-monorepo-bot
parent 9c51a8a492
commit 3ac4f19905
1 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/codeInsight/highlighting/HighlightManagerImpl.java
+19 -18
View File
@@ -50,12 +50,12 @@ public class HighlightManagerImpl extends HighlightManager {
Document document = event.getDocument();
Editor[] editors = EditorFactory.getInstance().getEditors(document);
for (Editor editor : editors) {
Map<RangeHighlighter, HighlightInfo> map = getHighlightInfoMap(editor, false);
Map<RangeHighlighter, HighlightFlags> map = getHighlightInfoMap(editor, false);
if (map == null) return;
ArrayList<RangeHighlighter> highlightersToRemove = new ArrayList<>();
for (RangeHighlighter highlighter : map.keySet()) {
HighlightInfo info = map.get(highlighter);
HighlightFlags info = map.get(highlighter);
if (!info.editor.getDocument().equals(document)) continue;
if (BitUtil.isSet(info.flags, HIDE_BY_TEXT_CHANGE)) {
highlightersToRemove.add(highlighter);
@@ -72,11 +72,11 @@ public class HighlightManagerImpl extends HighlightManager {
}
@Nullable
private Map<RangeHighlighter, HighlightInfo> getHighlightInfoMap(@NotNull Editor editor, boolean toCreate) {
private Map<RangeHighlighter, HighlightFlags> getHighlightInfoMap(@NotNull Editor editor, boolean toCreate) {
if (editor instanceof EditorWindow) {
editor = ((EditorWindow)editor).getDelegate();
}
Map<RangeHighlighter, HighlightInfo> map = editor.getUserData(HIGHLIGHT_INFO_MAP_KEY);
Map<RangeHighlighter, HighlightFlags> map = editor.getUserData(HIGHLIGHT_INFO_MAP_KEY);
if (map == null && toCreate) {
map = ((UserDataHolderEx)editor).putUserDataIfAbsent(HIGHLIGHT_INFO_MAP_KEY, new HashMap<>());
}
@@ -85,11 +85,11 @@ public class HighlightManagerImpl extends HighlightManager {
@NotNull
public RangeHighlighter[] getHighlighters(@NotNull Editor editor) {
Map<RangeHighlighter, HighlightInfo> highlightersMap = getHighlightInfoMap(editor, false);
Map<RangeHighlighter, HighlightFlags> highlightersMap = getHighlightInfoMap(editor, false);
if (highlightersMap == null) return RangeHighlighter.EMPTY_ARRAY;
Set<RangeHighlighter> set = new HashSet<>();
for (Map.Entry<RangeHighlighter, HighlightInfo> entry : highlightersMap.entrySet()) {
HighlightInfo info = entry.getValue();
for (Map.Entry<RangeHighlighter, HighlightFlags> entry : highlightersMap.entrySet()) {
HighlightFlags info = entry.getValue();
if (info.editor.equals(editor)) set.add(entry.getKey());
}
return set.toArray(RangeHighlighter.EMPTY_ARRAY);
@@ -98,17 +98,17 @@ public class HighlightManagerImpl extends HighlightManager {
private RangeHighlighter addSegmentHighlighter(@NotNull Editor editor, int startOffset, int endOffset, TextAttributes attributes, @HideFlags int flags) {
RangeHighlighter highlighter = editor.getMarkupModel()
.addRangeHighlighter(startOffset, endOffset, HighlighterLayer.SELECTION - 1, attributes, HighlighterTargetArea.EXACT_RANGE);
HighlightInfo info = new HighlightInfo(editor instanceof EditorWindow ? ((EditorWindow)editor).getDelegate() : editor, flags);
Map<RangeHighlighter, HighlightInfo> map = getHighlightInfoMap(editor, true);
HighlightFlags info = new HighlightFlags(editor instanceof EditorWindow ? ((EditorWindow)editor).getDelegate() : editor, flags);
Map<RangeHighlighter, HighlightFlags> map = getHighlightInfoMap(editor, true);
map.put(highlighter, info);
return highlighter;
}
@Override
public boolean removeSegmentHighlighter(@NotNull Editor editor, @NotNull RangeHighlighter highlighter) {
Map<RangeHighlighter, HighlightInfo> map = getHighlightInfoMap(editor, false);
Map<RangeHighlighter, HighlightFlags> map = getHighlightInfoMap(editor, false);
if (map == null) return false;
HighlightInfo info = map.get(highlighter);
HighlightFlags info = map.get(highlighter);
if (info == null) return false;
MarkupModel markupModel = info.editor.getMarkupModel();
if (((MarkupModelEx)markupModel).containsHighlighter(highlighter)) {
@@ -246,13 +246,13 @@ public class HighlightManagerImpl extends HighlightManager {
}
public boolean hideHighlights(@NotNull Editor editor, @HideFlags int mask) {
Map<RangeHighlighter, HighlightInfo> map = getHighlightInfoMap(editor, false);
Map<RangeHighlighter, HighlightFlags> map = getHighlightInfoMap(editor, false);
if (map == null) return false;
boolean done = false;
List<RangeHighlighter> highlightersToRemove = new ArrayList<>();
for (RangeHighlighter highlighter : map.keySet()) {
HighlightInfo info = map.get(highlighter);
HighlightFlags info = map.get(highlighter);
if (!info.editor.equals(editor)) continue;
if ((info.flags & mask) != 0) {
highlightersToRemove.add(highlighter);
@@ -268,9 +268,9 @@ public class HighlightManagerImpl extends HighlightManager {
}
boolean hasHideByEscapeHighlighters(@NotNull Editor editor) {
Map<RangeHighlighter, HighlightInfo> map = getHighlightInfoMap(editor, false);
Map<RangeHighlighter, HighlightFlags> map = getHighlightInfoMap(editor, false);
if (map != null) {
for (HighlightInfo info : map.values()) {
for (HighlightFlags info : map.values()) {
if (!info.editor.equals(editor)) continue;
if ((info.flags & HIDE_BY_ESCAPE) != 0) {
return true;
@@ -299,13 +299,14 @@ public class HighlightManagerImpl extends HighlightManager {
}
private final Key<Map<RangeHighlighter, HighlightInfo>> HIGHLIGHT_INFO_MAP_KEY = Key.create("HIGHLIGHT_INFO_MAP_KEY");
private final Key<Map<RangeHighlighter, HighlightFlags>> HIGHLIGHT_INFO_MAP_KEY = Key.create("HIGHLIGHT_INFO_MAP_KEY");
private static class HighlightInfo {
private static class HighlightFlags {
@NotNull
final Editor editor;
@HideFlags final int flags;
HighlightInfo(Editor editor, @HideFlags int flags) {
HighlightFlags(@NotNull Editor editor, @HideFlags int flags) {
this.editor = editor;
this.flags = flags;
}