diff --git a/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/AnnotatorRunner.java b/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/AnnotatorRunner.java
index 749f0cb005c0..4942c5e78ab5 100644
--- a/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/AnnotatorRunner.java
+++ b/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/AnnotatorRunner.java
@@ -44,11 +44,9 @@ public final class AnnotatorRunner {
   private final AnnotatorStatisticsCollector myAnnotatorStatisticsCollector = new AnnotatorStatisticsCollector();
   private final List<HighlightInfo> results = Collections.synchronizedList(new ArrayList<>());
 
-  public AnnotatorRunner(@NotNull PsiFile psiFile,
-                  boolean batchMode,
-                  @NotNull AnnotationSession annotationSession) {
-    myProject = psiFile.getProject();
-    myPsiFile = psiFile;
+  public AnnotatorRunner(@NotNull AnnotationSession annotationSession, boolean batchMode) {
+    myProject = annotationSession.getFile().getProject();
+    myPsiFile = annotationSession.getFile();
     myAnnotationSession = annotationSession;
     myDumbService = DumbService.getInstance(myProject);
     myBatchMode = batchMode;
diff --git a/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/GeneralHighlightingPass.java b/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/GeneralHighlightingPass.java
index 5b53758ce3db..39af5378b6ba 100644
--- a/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/GeneralHighlightingPass.java
+++ b/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/GeneralHighlightingPass.java
@@ -250,7 +250,7 @@ public sealed class GeneralHighlightingPass extends ProgressableTextEditorHighli
     AnnotationSession session = AnnotationSessionImpl.create(getFile());
     setupAnnotationSession(session, myPriorityRange, myRestrictRange,
                            ((HighlightingSessionImpl)getHighlightingSession()).getMinimumSeverity());
-    AnnotatorRunner annotatorRunner = myRunAnnotators ? new AnnotatorRunner(getFile(), false, session) : null;
+    AnnotatorRunner annotatorRunner = myRunAnnotators ? new AnnotatorRunner(session, false) : null;
     if (annotatorRunner == null) {
       runnable.run();
       return true;
diff --git a/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/InjectedGeneralHighlightingPass.java b/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/InjectedGeneralHighlightingPass.java
index 8d416edcad3f..b6f133c38134 100644
--- a/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/InjectedGeneralHighlightingPass.java
+++ b/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/InjectedGeneralHighlightingPass.java
@@ -186,7 +186,7 @@ final class InjectedGeneralHighlightingPass extends ProgressableTextEditorHighli
     GeneralHighlightingPass.setupAnnotationSession(session, myPriorityRange, myRestrictRange,
                                                    ((HighlightingSessionImpl)getHighlightingSession()).getMinimumSeverity());
 
-    AnnotatorRunner annotatorRunner = myRunAnnotators ? new AnnotatorRunner(injectedPsi, false, session) : null;
+    AnnotatorRunner annotatorRunner = myRunAnnotators ? new AnnotatorRunner(session, false) : null;
     Divider.divideInsideAndOutsideAllRoots(injectedPsi, injectedPsi.getTextRange(), injectedPsi.getTextRange(), GeneralHighlightingPass.SHOULD_HIGHLIGHT_FILTER, dividedElements -> {
       List<? extends @NotNull PsiElement> inside = dividedElements.inside();
       LongList insideRanges = dividedElements.insideRanges();