diff --git a/java/java-impl/src/com/intellij/codeInsight/highlighting/HighlightSuppressedWarningsHandler.java b/java/java-impl/src/com/intellij/codeInsight/highlighting/HighlightSuppressedWarningsHandler.java index 6022b512656a..35f856465785 100644 --- a/java/java-impl/src/com/intellij/codeInsight/highlighting/HighlightSuppressedWarningsHandler.java +++ b/java/java-impl/src/com/intellij/codeInsight/highlighting/HighlightSuppressedWarningsHandler.java @@ -23,6 +23,7 @@ package com.intellij.codeInsight.highlighting; import com.intellij.codeInsight.daemon.impl.CollectHighlightsUtil; import com.intellij.codeInsight.daemon.impl.HighlightInfo; import com.intellij.codeInsight.daemon.impl.LocalInspectionsPass; +import com.intellij.codeInspection.InspectionManager; import com.intellij.codeInspection.InspectionProfile; import com.intellij.codeInspection.InspectionProfileEntry; import com.intellij.codeInspection.ex.GlobalInspectionContextImpl; @@ -123,7 +124,7 @@ public class HighlightSuppressedWarningsHandler extends HighlightUsagesHandlerBa continue; } final LocalInspectionToolWrapper tool = new LocalInspectionToolWrapper(((LocalInspectionToolWrapper)toolById).getTool()); - final InspectionManagerEx managerEx = (InspectionManagerEx)InspectionManagerEx.getInstance(project); + final InspectionManagerEx managerEx = (InspectionManagerEx)InspectionManager.getInstance(project); final GlobalInspectionContextImpl context = managerEx.createNewGlobalContext(false); tool.initialize(context); ((RefManagerImpl)context.getRefManager()).inspectionReadActionStarted(); diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DaemonCodeAnalyzerImpl.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DaemonCodeAnalyzerImpl.java index 84c3ac58c788..e6b8d7f7f946 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DaemonCodeAnalyzerImpl.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DaemonCodeAnalyzerImpl.java @@ -163,7 +163,7 @@ public class DaemonCodeAnalyzerImpl extends DaemonCodeAnalyzer implements JDOMEx psiFile.getTextLength(), LocalInspectionsPass.EMPTY_PRIORITY_RANGE, true); action3.doCollectInformation(progress); - result.addAll(action3.getHighlights()); + result.addAll(action3.getInfos()); return result; } diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/LocalInspectionsPass.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/LocalInspectionsPass.java index 7e9c84af6981..f4339b5141bd 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/LocalInspectionsPass.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/LocalInspectionsPass.java @@ -386,13 +386,6 @@ public class LocalInspectionsPass extends ProgressableTextEditorHighlightingPass }, myFailFastOnAcquireReadAction, indicator)) throw new ProcessCanceledException(); } - public Collection getHighlights() { - List highlights = new ArrayList(); - - addHighlightsFromResults(highlights, new DaemonProgressIndicator()); - return highlights; - } - @Nullable private HighlightInfo highlightInfoFromDescriptor(@NotNull ProblemDescriptor problemDescriptor, @NotNull HighlightInfoType highlightInfoType, @@ -709,6 +702,7 @@ public class LocalInspectionsPass extends ProgressableTextEditorHighlightingPass } } + @NotNull public List getInfos() { return myInfos; }