MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-16 14:23:28 +07:00
Code Issues Packages Projects Releases Wiki Activity

do not recycle inspection highlights in annotator runner because they should be recycled in inspection pass (part of IDEA-321013)

Browse Source 
GitOrigin-RevId: 122c8eb0b3459698b27e2cee4fc0491ed261c5ee
This commit is contained in:
Alexey Kudravtsev
2024-02-20 18:07:59 +01:00
committed by intellij-monorepo-bot
parent 45d1228fa8
commit c705e3d84f
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -68,7 +68,7 @@ final class AnnotatorRunner {
List<PsiElement> insideThenOutside = ContainerUtil.concat(inside, outside); List<PsiElement> insideThenOutside = ContainerUtil.concat(inside, outside);
Map<Annotator, Set<Language>> supportedLanguages = calcSupportedLanguages(insideThenOutside); Map<Annotator, Set<Language>> supportedLanguages = calcSupportedLanguages(insideThenOutside);
HighlightInfoUpdater highlightInfoUpdater = HighlightInfoUpdater.getInstance(myProject); HighlightInfoUpdater highlightInfoUpdater = HighlightInfoUpdater.getInstance(myProject);
HighlightersRecycler invalidElementsRecycler = highlightInfoUpdater.removeOrRecycleInvalidPsiElements(myPsiFile); HighlightersRecycler invalidElementsRecycler = highlightInfoUpdater.removeOrRecycleInvalidPsiElements(myPsiFile, "AnnotationRunner", false, true);
try { try {
PairProcessor<Annotator, JobLauncher.QueueController<? super Annotator>> processor = (annotator, __) -> PairProcessor<Annotator, JobLauncher.QueueController<? super Annotator>> processor = (annotator, __) ->
ApplicationManagerEx.getApplicationEx().tryRunReadAction(() -> runAnnotator(annotator, insideThenOutside, supportedLanguages, ApplicationManagerEx.getApplicationEx().tryRunReadAction(() -> runAnnotator(annotator, insideThenOutside, supportedLanguages,

9
platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/HighlightInfoUpdater.java
View File

@@ -106,7 +106,7 @@ final class HighlightInfoUpdater implements Disposable {
} }
@NotNull @NotNull
HighlightersRecycler removeOrRecycleInvalidPsiElements(@NotNull PsiFile psiFile) { HighlightersRecycler removeOrRecycleInvalidPsiElements(@NotNull PsiFile psiFile, @NotNull Object origin, boolean removeInspectionHighlights, boolean removeAnnotatorHighlights) {
PsiFile hostFile = InjectedLanguageManager.getInstance(psiFile.getProject()).getTopLevelFile(psiFile); PsiFile hostFile = InjectedLanguageManager.getInstance(psiFile.getProject()).getTopLevelFile(psiFile);
Document hostDocument = hostFile.getFileDocument(); Document hostDocument = hostFile.getFileDocument();
Map<PsiFile, Map<Object, ToolHighlights>> hostMap = getOrCreateHostMap(hostDocument); Map<PsiFile, Map<Object, ToolHighlights>> hostMap = getOrCreateHostMap(hostDocument);
@@ -129,7 +129,7 @@ final class HighlightInfoUpdater implements Disposable {
} }
} }
if (LOG.isDebugEnabled()) { if (LOG.isDebugEnabled()) {
LOG.debug("removeOrRecycleInvalidPsiElements: removed invalid file: "+psi+" ("+removed+" highlighters removed)"); LOG.debug("removeOrRecycleInvalidPsiElements: removed invalid file: "+psi+" ("+removed+" highlighters removed); from "+origin);
} }
return true; return true;
}); });
@@ -139,6 +139,7 @@ final class HighlightInfoUpdater implements Disposable {
return toReuse; return toReuse;
} }
for (Map.Entry<Object, ToolHighlights> toolEntry: map.entrySet()) { for (Map.Entry<Object, ToolHighlights> toolEntry: map.entrySet()) {
Object toolId = toolEntry.getKey();
ToolHighlights toolHighlights = toolEntry.getValue(); ToolHighlights toolHighlights = toolEntry.getValue();
toolHighlights.elementHighlights.entrySet().removeIf(entry -> { toolHighlights.elementHighlights.entrySet().removeIf(entry -> {
PsiElement psiElement = entry.getKey(); PsiElement psiElement = entry.getKey();
@@ -148,8 +149,10 @@ final class HighlightInfoUpdater implements Disposable {
for (HighlightInfo info : entry.getValue()) { for (HighlightInfo info : entry.getValue()) {
RangeHighlighterEx highlighter = info.getHighlighter(); RangeHighlighterEx highlighter = info.getHighlighter();
if (highlighter != null) { if (highlighter != null) {
if (info.isFromAnnotator() && !removeAnnotatorHighlights) continue;
if (isInspectionToolId(toolId) && !removeInspectionHighlights) continue;
if (LOG.isDebugEnabled()) { if (LOG.isDebugEnabled()) {
LOG.debug("removeOrRecycleInvalidPsiElements: recycle " + info + " for " + psiElement); LOG.debug("removeOrRecycleInvalidPsiElements: recycle " + info + " for invalid " + psiElement+" from "+origin);
} }
toReuse.recycleHighlighter(highlighter); toReuse.recycleHighlighter(highlighter);
} }

2
platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/LocalInspectionsPass.java
View File

@@ -91,7 +91,7 @@ public final class LocalInspectionsPass extends ProgressableTextEditorHighlighti
@Override @Override
protected void collectInformationWithProgress(@NotNull ProgressIndicator progress) { protected void collectInformationWithProgress(@NotNull ProgressIndicator progress) {
HighlightInfoUpdater highlightInfoUpdater = HighlightInfoUpdater.getInstance(getFile().getProject()); HighlightInfoUpdater highlightInfoUpdater = HighlightInfoUpdater.getInstance(getFile().getProject());
HighlightersRecycler invalidElementsRecycler = highlightInfoUpdater.removeOrRecycleInvalidPsiElements(getFile()); HighlightersRecycler invalidElementsRecycler = highlightInfoUpdater.removeOrRecycleInvalidPsiElements(getFile(), this, true, false);
try { try {
List<HighlightInfo> fileInfos = Collections.synchronizedList(new ArrayList<>()); List<HighlightInfo> fileInfos = Collections.synchronizedList(new ArrayList<>());
List<? extends LocalInspectionToolWrapper> toolWrappers = getInspectionTools(myProfileWrapper); List<? extends LocalInspectionToolWrapper> toolWrappers = getInspectionTools(myProfileWrapper);