MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-02-04 23:39:07 +07:00
Code Issues Packages Projects Releases Wiki Activity

last ditch effort to fight sticky highlights: blame rogue plugins

Browse Source 
GitOrigin-RevId: 4a046fb99b1184f359dd1a9c25cf214ddb9670b5
This commit is contained in:
Alexey Kudravtsev
2024-05-02 13:27:13 +02:00
committed by intellij-monorepo-bot
parent c6b949dd18
commit 6b2ff26e0b
2 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/HighlightInfoUpdaterImpl.java
View File

@@ -211,7 +211,7 @@ final class HighlightInfoUpdaterImpl extends HighlightInfoUpdater implements Dis
if (LOG.isDebugEnabled()) {
LOG.debug("removeInvalidPsiElements: " + info + " for invalid " + element + " from " + requestor);
}
disposeWithFileLevel(info, highlighter, highlightingSession);
disposeWithFileLevelIgnoreErrors(info, highlighter, highlightingSession);
}
}
iterator.remove();
@@ -232,7 +232,7 @@ final class HighlightInfoUpdaterImpl extends HighlightInfoUpdater implements Dis
for (HighlightInfo info : list) {
RangeHighlighterEx highlighter = info.highlighter;
if (highlighter != null) {
disposeWithFileLevel(info, highlighter, highlightingSession);
disposeWithFileLevelIgnoreErrors(info, highlighter, highlightingSession);
removed++;
}
}
@@ -244,13 +244,19 @@ final class HighlightInfoUpdaterImpl extends HighlightInfoUpdater implements Dis
}
// disposes highlighter, and schedules removal from the file-level component if this highlighter happened to be file-level
static void disposeWithFileLevel(@Nullable HighlightInfo info,
@NotNull RangeHighlighterEx highlighter,
@NotNull HighlightingSession highlightingSession) {
static void disposeWithFileLevelIgnoreErrors(@Nullable HighlightInfo info,
@NotNull RangeHighlighterEx highlighter,
@NotNull HighlightingSession highlightingSession) {
if (info != null && info.isFileLevelAnnotation()) {
((HighlightingSessionImpl)highlightingSession).removeFileLevelHighlight(info);
}
highlighter.dispose();
try {
highlighter.dispose();
}
catch (Exception ignored) {
// in theory, rogue plugin might register a listener on range marker dispose, which can do nasty things, including throwing exceptions
// but in highlighting range highlighters must be removed no matter what, to avoid sticky highlighters, so ignore these exceptions
}
}
private static void putInfosForVisitedPsi(@NotNull Map<Object, ToolHighlights> data,
@@ -357,7 +363,7 @@ final class HighlightInfoUpdaterImpl extends HighlightInfoUpdater implements Dis
RangeHighlighterEx salvagedHighlighter = toReuse.pickupHighlighterFromGarbageBin(0, psiFile.getTextLength(), -409423948);
HighlightInfo oldFileInfo = salvagedHighlighter == null ? null : HighlightInfo.fromRangeHighlighter(salvagedHighlighter);
if (oldFileInfo != null) {
disposeWithFileLevel(oldFileInfo, salvagedHighlighter, session);
disposeWithFileLevelIgnoreErrors(oldFileInfo, salvagedHighlighter, session);
salvagedHighlighter = null;
}
((HighlightingSessionImpl)session).addFileLevelHighlight(info, salvagedHighlighter);
@@ -404,7 +410,7 @@ final class HighlightInfoUpdaterImpl extends HighlightInfoUpdater implements Dis
if (LOG.isTraceEnabled()) {
LOG.trace("removeHighlightsForObsoleteTools: " + highlighter);
}
disposeWithFileLevel(info, highlighter, highlightingSession);
disposeWithFileLevelIgnoreErrors(info, highlighter, highlightingSession);
}
}
}

2
platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/UpdateHighlightersUtil.java
View File

@@ -236,7 +236,7 @@ public final class UpdateHighlightersUtil {
}
if (shouldRemove) {
HighlightInfo info = HighlightInfo.fromRangeHighlighter(highlighter);
HighlightInfoUpdaterImpl.disposeWithFileLevel(info, (RangeHighlighterEx)highlighter, session);
HighlightInfoUpdaterImpl.disposeWithFileLevelIgnoreErrors(info, (RangeHighlighterEx)highlighter, session);
changed = true;
}
}