From 84186d3117be1b2834a0e7904c9e1dc4b91c6b17 Mon Sep 17 00:00:00 2001 From: Max Medvedev Date: Tue, 6 Aug 2024 19:21:37 +0200 Subject: [PATCH] delete outdated Pass.WHOLE_FILE_LOCAL_INSPECTIONS GitOrigin-RevId: 6a09bff0c8464359da1ea891cfec76ad4a04216b --- .../intellij/codeInsight/daemon/DaemonAnalyzerTestCase.java | 3 +-- .../codeInsight/daemon/LightDaemonAnalyzerTestCase.java | 3 +-- .../daemon/impl/TextEditorBackgroundHighlighter.kt | 3 +-- .../impl/TextEditorHighlightingPassRegistrarImpl.java | 1 - .../codeInsight/daemon/impl/UpdateHighlightersUtil.java | 1 - .../src/com/intellij/editor/TodoItemsTestCase.java | 4 ++-- .../idea/perf/live/AHeavyInspectionsPerformanceTest.kt | 6 +++--- 7 files changed, 8 insertions(+), 13 deletions(-) diff --git a/java/testFramework/src/com/intellij/codeInsight/daemon/DaemonAnalyzerTestCase.java b/java/testFramework/src/com/intellij/codeInsight/daemon/DaemonAnalyzerTestCase.java index 018e83287956..64d0b42c66a2 100644 --- a/java/testFramework/src/com/intellij/codeInsight/daemon/DaemonAnalyzerTestCase.java +++ b/java/testFramework/src/com/intellij/codeInsight/daemon/DaemonAnalyzerTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.codeInsight.daemon; import com.intellij.codeHighlighting.Pass; @@ -306,7 +306,6 @@ public abstract class DaemonAnalyzerTestCase extends JavaCodeInsightTestCase { toIgnore.add(Pass.LINE_MARKERS); toIgnore.add(Pass.SLOW_LINE_MARKERS); toIgnore.add(Pass.LOCAL_INSPECTIONS); - toIgnore.add(Pass.WHOLE_FILE_LOCAL_INSPECTIONS); toIgnore.add(Pass.POPUP_HINTS); toIgnore.add(Pass.UPDATE_ALL); } diff --git a/java/testFramework/src/com/intellij/codeInsight/daemon/LightDaemonAnalyzerTestCase.java b/java/testFramework/src/com/intellij/codeInsight/daemon/LightDaemonAnalyzerTestCase.java index e5706cf6c002..088fa64b179c 100644 --- a/java/testFramework/src/com/intellij/codeInsight/daemon/LightDaemonAnalyzerTestCase.java +++ b/java/testFramework/src/com/intellij/codeInsight/daemon/LightDaemonAnalyzerTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.codeInsight.daemon; import com.intellij.codeHighlighting.Pass; @@ -134,7 +134,6 @@ public abstract class LightDaemonAnalyzerTestCase extends LightJavaCodeInsightTe } if (!doInspections()) { toIgnoreList.add(Pass.LOCAL_INSPECTIONS); - toIgnoreList.add(Pass.WHOLE_FILE_LOCAL_INSPECTIONS); } int[] toIgnore = toIgnoreList.isEmpty() ? ArrayUtilRt.EMPTY_INT_ARRAY : toIgnoreList.toIntArray(); Editor editor = getEditor(); diff --git a/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/TextEditorBackgroundHighlighter.kt b/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/TextEditorBackgroundHighlighter.kt index 9baa34e9d8b6..50cd10e3d1f8 100644 --- a/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/TextEditorBackgroundHighlighter.kt +++ b/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/TextEditorBackgroundHighlighter.kt @@ -1,4 +1,4 @@ -// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.codeInsight.daemon.impl import com.intellij.codeHighlighting.BackgroundEditorHighlighter @@ -26,7 +26,6 @@ private val IGNORE_FOR_COMPILED = intArrayOf( Pass.UPDATE_FOLDING, Pass.POPUP_HINTS, Pass.LOCAL_INSPECTIONS, - Pass.WHOLE_FILE_LOCAL_INSPECTIONS, Pass.EXTERNAL_TOOLS) class TextEditorBackgroundHighlighter(private val project: Project, private val editor: Editor) : BackgroundEditorHighlighter { diff --git a/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/TextEditorHighlightingPassRegistrarImpl.java b/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/TextEditorHighlightingPassRegistrarImpl.java index 8f718df60a19..c1e87c10fedf 100644 --- a/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/TextEditorHighlightingPassRegistrarImpl.java +++ b/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/TextEditorHighlightingPassRegistrarImpl.java @@ -142,7 +142,6 @@ public final class TextEditorHighlightingPassRegistrarImpl extends TextEditorHig || id == Pass.WOLF || id == Pass.LINE_MARKERS || id == Pass.SLOW_LINE_MARKERS - || id == Pass.WHOLE_FILE_LOCAL_INSPECTIONS ) { continue; } diff --git a/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/UpdateHighlightersUtil.java b/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/UpdateHighlightersUtil.java index 88bfd58669f1..591c479f43cd 100644 --- a/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/UpdateHighlightersUtil.java +++ b/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/UpdateHighlightersUtil.java @@ -241,7 +241,6 @@ public final class UpdateHighlightersUtil { int group = info.getGroup(); if (group != Pass.LOCAL_INSPECTIONS && group != Pass.EXTERNAL_TOOLS - && group != Pass.WHOLE_FILE_LOCAL_INSPECTIONS && group != Pass.UPDATE_ALL && group != GeneralHighlightingPass.POST_UPDATE_ALL ) { diff --git a/platform/testFramework/src/com/intellij/editor/TodoItemsTestCase.java b/platform/testFramework/src/com/intellij/editor/TodoItemsTestCase.java index 3c3b30c4454a..2838a9cd7850 100644 --- a/platform/testFramework/src/com/intellij/editor/TodoItemsTestCase.java +++ b/platform/testFramework/src/com/intellij/editor/TodoItemsTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.editor; import com.intellij.codeHighlighting.Pass; @@ -61,7 +61,7 @@ public abstract class TodoItemsTestCase extends LightPlatformCodeInsightTestCase protected List doHighlighting() { PsiDocumentManager.getInstance(getProject()).commitAllDocuments(); - int[] toIgnore = {Pass.UPDATE_FOLDING, Pass.LOCAL_INSPECTIONS, Pass.WHOLE_FILE_LOCAL_INSPECTIONS}; + int[] toIgnore = {Pass.UPDATE_FOLDING, Pass.LOCAL_INSPECTIONS}; Editor editor = getEditor(); PsiFile file = getFile(); if (editor instanceof EditorWindow) { diff --git a/plugins/kotlin/performance-tests/test/org/jetbrains/kotlin/idea/perf/live/AHeavyInspectionsPerformanceTest.kt b/plugins/kotlin/performance-tests/test/org/jetbrains/kotlin/idea/perf/live/AHeavyInspectionsPerformanceTest.kt index 1506c92ac372..56882bee6976 100644 --- a/plugins/kotlin/performance-tests/test/org/jetbrains/kotlin/idea/perf/live/AHeavyInspectionsPerformanceTest.kt +++ b/plugins/kotlin/performance-tests/test/org/jetbrains/kotlin/idea/perf/live/AHeavyInspectionsPerformanceTest.kt @@ -1,13 +1,13 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package org.jetbrains.kotlin.idea.perf.live import com.intellij.codeHighlighting.Pass import com.intellij.codeInsight.daemon.impl.HighlightInfo import com.intellij.testFramework.UsefulTestCase +import org.jetbrains.kotlin.idea.perf.suite.suite import org.jetbrains.kotlin.idea.perf.util.ExternalProject import org.jetbrains.kotlin.idea.perf.util.lastPathSegment -import org.jetbrains.kotlin.idea.perf.suite.suite import org.jetbrains.kotlin.idea.test.JUnit3RunnerWithInners import org.junit.runner.RunWith @@ -30,7 +30,7 @@ class AHeavyInspectionsPerformanceTest : UsefulTestCase() { "UnusedSymbol", "MemberVisibilityCanBePrivate" ) - private val passesToIgnore = ((1 until 100) - Pass.LOCAL_INSPECTIONS - Pass.WHOLE_FILE_LOCAL_INSPECTIONS).toIntArray() + private val passesToIgnore = ((1 until 100) - Pass.LOCAL_INSPECTIONS).toIntArray() fun testLocalInspection() { suite {