IJ-MR-162467 don't export intellij.platform.analysis

GitOrigin-RevId: fcbcb68010b58cb507fee2c47473758b999e471b
2026-03-22 15:19:59 +07:00 · 2025-06-01 20:06:26 +02:00
parent 7463a13f0c
commit 65fe061584
649 changed files with 736 additions and 13 deletions
--- a/RegExpSupport/BUILD.bazel
+++ b/RegExpSupport/BUILD.bazel
@@ -13,6 +13,7 @@ jvm_library(
  visibility = ["//visibility:public"],
  srcs = glob(["src/**/*.kt", "src/**/*.java", "gen/**/*.kt", "gen/**/*.java"], allow_empty = True),
  deps = [
+    "//platform/analysis-api:analysis",
    "//platform/editor-ui-api:editor-ui",
    "//platform/indexing-api:indexing",
    "//platform/lang-api:lang",
@@ -36,6 +37,7 @@ jvm_library(
  srcs = glob(["test/**/*.kt", "test/**/*.java"], allow_empty = True),
  associates = [":regexp"],
  deps = [
+    "//platform/analysis-api:analysis",
    "//platform/editor-ui-api:editor-ui",
    "//platform/indexing-api:indexing",
    "//platform/lang-api:lang",
--- a/RegExpSupport/intellij.regexp.iml
+++ b/RegExpSupport/intellij.regexp.iml
@@ -11,6 +11,7 @@
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="intellij.platform.analysis" />
    <orderEntry type="module" module-name="intellij.platform.editor.ui" />
    <orderEntry type="module" module-name="intellij.platform.indexing" />
    <orderEntry type="module" module-name="intellij.platform.lang" />
--- a/grid/impl/BUILD.bazel
+++ b/grid/impl/BUILD.bazel
@@ -25,6 +25,7 @@ jvm_library(
    "//grid/core-impl",
    "//grid/csv:csv-core-impl",
    "//grid/types",
+    "//platform/analysis-api:analysis",
    "//platform/editor-ui-api:editor-ui",
    "//platform/platform-impl:ide-impl",
    "//platform/indexing-api:indexing",
--- a/grid/impl/intellij.grid.impl.iml
+++ b/grid/impl/intellij.grid.impl.iml
@@ -11,6 +11,7 @@
    <orderEntry type="module" module-name="intellij.grid.core.impl" />
    <orderEntry type="module" module-name="intellij.grid.csv.core.impl" />
    <orderEntry type="module" module-name="intellij.grid.types" />
+    <orderEntry type="module" module-name="intellij.platform.analysis" />
    <orderEntry type="module" module-name="intellij.platform.editor.ui" />
    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
    <orderEntry type="module" module-name="intellij.platform.indexing" />
--- a/images/BUILD.bazel
+++ b/images/BUILD.bazel
@@ -13,6 +13,7 @@ jvm_library(
  visibility = ["//visibility:public"],
  srcs = glob(["src/**/*.kt", "src/**/*.java", "src/**/*.form"], allow_empty = True),
  deps = [
+    "//platform/analysis-api:analysis",
    "//platform/editor-ui-api:editor-ui",
    "//platform/indexing-api:indexing",
    "//platform/lang-api:lang",
@@ -41,6 +42,7 @@ jvm_library(
  srcs = glob(["test/**/*.kt", "test/**/*.java", "test/**/*.form"], allow_empty = True),
  associates = [":images"],
  deps = [
+    "//platform/analysis-api:analysis",
    "//platform/editor-ui-api:editor-ui",
    "//platform/indexing-api:indexing",
    "//platform/lang-api:lang",
--- a/images/intellij.platform.images.iml
+++ b/images/intellij.platform.images.iml
@@ -30,6 +30,7 @@
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="intellij.platform.analysis" />
    <orderEntry type="module" module-name="intellij.platform.editor.ui" />
    <orderEntry type="module" module-name="intellij.platform.indexing" />
    <orderEntry type="module" module-name="intellij.platform.lang" />
--- a/java/compiler/BUILD.bazel
+++ b/java/compiler/BUILD.bazel
@@ -19,6 +19,7 @@ jvm_library(
    "@lib//:junit4",
    "//java/compiler/instrumentation-util",
    "//java/idea-ui:ui",
+    "//platform/analysis-api:analysis",
    "//platform/editor-ui-api:editor-ui",
    "//jps/model-api:model",
    "//platform/workspace/storage",
--- a/java/compiler/impl/BUILD.bazel
+++ b/java/compiler/impl/BUILD.bazel
@@ -8,6 +8,7 @@ jvm_library(
  srcs = glob(["src/**/*.kt", "src/**/*.java", "src/**/*.form"], allow_empty = True),
  deps = [
    "//java/compiler/openapi:java-compiler",
+    "//platform/analysis-api:analysis",
    "//platform/editor-ui-api:editor-ui",
    "//jps/model-api:model",
    "//platform/lvcs-api:lvcs",
--- a/java/compiler/impl/intellij.java.compiler.impl.iml
+++ b/java/compiler/impl/intellij.java.compiler.impl.iml
@@ -8,6 +8,7 @@
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="intellij.java.compiler" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.analysis" />
    <orderEntry type="module" module-name="intellij.platform.editor.ui" />
    <orderEntry type="module" module-name="intellij.platform.jps.model" />
    <orderEntry type="module" module-name="intellij.platform.lvcs" />
--- a/java/compiler/intellij.java.compiler.tests.iml
+++ b/java/compiler/intellij.java.compiler.tests.iml
@@ -14,6 +14,7 @@
    <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
    <orderEntry type="module" module-name="intellij.java.compiler.instrumentationUtil" />
    <orderEntry type="module" module-name="intellij.java.ui" />
+    <orderEntry type="module" module-name="intellij.platform.analysis" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.editor.ui" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.jps.model" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.workspace.storage" scope="TEST" />
--- a/java/compiler/openapi/BUILD.bazel
+++ b/java/compiler/openapi/BUILD.bazel
@@ -15,6 +15,7 @@ jvm_library(
  deps = [
    "@lib//:kotlin-stdlib",
    "//java/openapi:java",
+    "//platform/analysis-api:analysis",
    "//platform/editor-ui-api:editor-ui",
    "//jps/model-api:model",
    "//platform/util/jdom",
--- a/java/compiler/openapi/intellij.java.compiler.iml
+++ b/java/compiler/openapi/intellij.java.compiler.iml
@@ -10,6 +10,7 @@
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="library" name="kotlin-stdlib" level="project" />
    <orderEntry type="module" module-name="intellij.java" />
+    <orderEntry type="module" module-name="intellij.platform.analysis" />
    <orderEntry type="module" module-name="intellij.platform.editor.ui" />
    <orderEntry type="module" module-name="intellij.platform.jps.model" />
    <orderEntry type="module" module-name="intellij.platform.util.jdom" />
--- a/java/debugger/impl/BUILD.bazel
+++ b/java/debugger/impl/BUILD.bazel
@@ -17,6 +17,7 @@ jvm_library(
    "//java/openapi:java",
    "//java/execution/openapi:java-execution",
    "//resources:java-resources",
+    "//platform/analysis-api:analysis",
    "//platform/xdebugger-impl:debugger-impl",
    "//platform/editor-ui-api:editor-ui",
    "//platform/indexing-api:indexing",
--- a/java/debugger/impl/intellij.java.debugger.impl.iml
+++ b/java/debugger/impl/intellij.java.debugger.impl.iml
@@ -33,6 +33,7 @@
    <orderEntry type="module" module-name="intellij.java" />
    <orderEntry type="module" module-name="intellij.java.execution" />
    <orderEntry type="module" module-name="intellij.java.resources" />
+    <orderEntry type="module" module-name="intellij.platform.analysis" />
    <orderEntry type="module" module-name="intellij.platform.debugger.impl" />
    <orderEntry type="module" module-name="intellij.platform.editor.ui" />
    <orderEntry type="module" module-name="intellij.platform.indexing" />
--- a/java/debugger/openapi/BUILD.bazel
+++ b/java/debugger/openapi/BUILD.bazel
@@ -17,6 +17,7 @@ jvm_library(
    "//java/jsp-openapi:jsp",
    "//java/java-psi-api:psi",
    "//resources-en:java-resources-en",
+    "//platform/analysis-api:analysis",
    "//platform/editor-ui-api:editor-ui",
    "//platform/util/jdom",
    "//platform/platform-api:ide",
--- a/java/debugger/openapi/intellij.java.debugger.iml
+++ b/java/debugger/openapi/intellij.java.debugger.iml
@@ -12,6 +12,7 @@
    <orderEntry type="module" module-name="intellij.jsp" />
    <orderEntry type="module" module-name="intellij.java.psi" />
    <orderEntry type="module" module-name="intellij.java.resources.en" />
+    <orderEntry type="module" module-name="intellij.platform.analysis" />
    <orderEntry type="module" module-name="intellij.platform.editor.ui" />
    <orderEntry type="module" module-name="intellij.platform.util.jdom" />
    <orderEntry type="module" module-name="intellij.platform.ide" />
--- a/java/execution/impl/BUILD.bazel
+++ b/java/execution/impl/BUILD.bazel
@@ -24,6 +24,7 @@ jvm_library(
  srcs = glob(["src/**/*.kt", "src/**/*.java", "src/**/*.form"], allow_empty = True),
  deps = [
    "//java/openapi:java",
+    "//platform/analysis-api:analysis",
    "//platform/editor-ui-api:editor-ui",
    "//platform/platform-impl:ide-impl",
    "//java/execution/openapi:java-execution",
--- a/java/execution/impl/intellij.java.execution.impl.iml
+++ b/java/execution/impl/intellij.java.execution.impl.iml
@@ -9,6 +9,7 @@
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="intellij.java" />
+    <orderEntry type="module" module-name="intellij.platform.analysis" />
    <orderEntry type="module" module-name="intellij.platform.editor.ui" />
    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
    <orderEntry type="module" module-name="intellij.java.execution" exported="" />
--- a/java/execution/openapi/BUILD.bazel
+++ b/java/execution/openapi/BUILD.bazel
@@ -10,6 +10,7 @@ jvm_library(
    "//java/openapi:java",
    "//resources:java-resources",
    "@lib//:kotlin-stdlib",
+    "//platform/analysis-api:analysis",
    "//platform/util/concurrency",
    "//platform/editor-ui-api:editor-ui",
    "//platform/indexing-api:indexing",
--- a/java/execution/openapi/intellij.java.execution.iml
+++ b/java/execution/openapi/intellij.java.execution.iml
@@ -10,6 +10,7 @@
    <orderEntry type="module" module-name="intellij.java" />
    <orderEntry type="module" module-name="intellij.java.resources" />
    <orderEntry type="library" name="kotlin-stdlib" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.analysis" />
    <orderEntry type="module" module-name="intellij.platform.concurrency" />
    <orderEntry type="module" module-name="intellij.platform.editor.ui" />
    <orderEntry type="module" module-name="intellij.platform.indexing" />
--- a/java/idea-ui/BUILD.bazel
+++ b/java/idea-ui/BUILD.bazel
@@ -16,6 +16,7 @@ jvm_library(
    "//java/openapi:java",
    "//java/compiler/openapi:java-compiler",
    "//java/compiler/impl",
+    "//platform/analysis-api:analysis",
    "//platform/editor-ui-api:editor-ui",
    "//platform/platform-impl:ide-impl",
    "//java/java-impl:impl",
@@ -79,6 +80,7 @@ jvm_library(
    "//aether-dependency-resolver:aether-dependency-resolver_test_lib",
    "//java/execution/impl",
    "@lib//:assert_j",
+    "//platform/analysis-api:analysis",
    "//platform/editor-ui-api:editor-ui",
    "//platform/indexing-api:indexing",
    "//jps/model-api:model",
--- a/java/idea-ui/intellij.java.ui.iml
+++ b/java/idea-ui/intellij.java.ui.iml
@@ -12,6 +12,7 @@
    <orderEntry type="module" module-name="intellij.java" />
    <orderEntry type="module" module-name="intellij.java.compiler" />
    <orderEntry type="module" module-name="intellij.java.compiler.impl" />
+    <orderEntry type="module" module-name="intellij.platform.analysis" />
    <orderEntry type="module" module-name="intellij.platform.editor.ui" />
    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
    <orderEntry type="module" module-name="intellij.java.impl" />
--- a/java/idea-ui/intellij.java.ui.tests.iml
+++ b/java/idea-ui/intellij.java.ui.tests.iml
@@ -12,6 +12,7 @@
    <orderEntry type="module" module-name="intellij.java.aetherDependencyResolver" scope="TEST" />
    <orderEntry type="module" module-name="intellij.java.execution.impl" scope="TEST" />
    <orderEntry type="library" scope="TEST" name="assertJ" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.analysis" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.editor.ui" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.indexing" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.jps.model" scope="TEST" />
--- a/java/java-analysis-impl/BUILD.bazel
+++ b/java/java-analysis-impl/BUILD.bazel
@@ -13,6 +13,7 @@ jvm_library(
  visibility = ["//visibility:public"],
  srcs = glob(["src/**/*.kt", "src/**/*.java"], allow_empty = True),
  deps = [
+    "//platform/analysis-api:analysis",
    "//platform/analysis-impl",
    "//java/java-indexing-impl:indexing-impl",
    "//java/java-psi-impl:psi-impl",
--- a/java/java-analysis-impl/intellij.java.analysis.impl.iml
+++ b/java/java-analysis-impl/intellij.java.analysis.impl.iml
@@ -8,6 +8,7 @@
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="intellij.platform.analysis" />
    <orderEntry type="module" module-name="intellij.platform.analysis.impl" exported="" />
    <orderEntry type="module" module-name="intellij.java.indexing.impl" exported="" />
    <orderEntry type="module" module-name="intellij.java.psi.impl" exported="" />
--- a/java/java-features-trainer/BUILD.bazel
+++ b/java/java-features-trainer/BUILD.bazel
@@ -16,6 +16,7 @@ jvm_library(
    "@lib//:kotlin-stdlib",
    "//java/openapi:java",
    "//java/debugger/openapi:java-debugger",
+    "//platform/analysis-api:analysis",
    "//platform/editor-ui-api:editor-ui",
    "//platform/ide-core-impl",
    "//java/java-impl:impl",
@@ -44,6 +45,7 @@ jvm_library(
    "@lib//:kotlin-stdlib",
    "//java/openapi:java",
    "//java/debugger/openapi:java-debugger",
+    "//platform/analysis-api:analysis",
    "//platform/editor-ui-api:editor-ui",
    "//platform/ide-core-impl",
    "//java/java-impl:impl",
--- a/java/java-features-trainer/intellij.java.featuresTrainer.iml
+++ b/java/java-features-trainer/intellij.java.featuresTrainer.iml
@@ -13,6 +13,7 @@
    <orderEntry type="library" name="kotlin-stdlib" level="project" />
    <orderEntry type="module" module-name="intellij.java" />
    <orderEntry type="module" module-name="intellij.java.debugger" />
+    <orderEntry type="module" module-name="intellij.platform.analysis" />
    <orderEntry type="module" module-name="intellij.platform.editor.ui" />
    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="module" module-name="intellij.java.impl" />
--- a/java/java-frontback-impl/BUILD.bazel
+++ b/java/java-frontback-impl/BUILD.bazel
@@ -15,6 +15,7 @@ jvm_library(
  deps = [
    "//java/java-frontback-psi-api:frontback-psi",
    "//java/java-frontback-psi-impl:frontback-psi-impl",
+    "//platform/analysis-api:analysis",
    "//platform/core-impl",
    "//platform/editor-ui-api:editor-ui",
    "//platform/ide-core-impl",
--- a/java/java-frontback-impl/intellij.java.frontback.impl.iml
+++ b/java/java-frontback-impl/intellij.java.frontback.impl.iml
@@ -10,6 +10,7 @@
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="intellij.java.frontback.psi" exported="" />
    <orderEntry type="module" module-name="intellij.java.frontback.psi.impl" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.analysis" />
    <orderEntry type="module" module-name="intellij.platform.core.impl" exported="" />
    <orderEntry type="module" module-name="intellij.platform.editor.ui" />
    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
--- a/java/java-frontback-tests/BUILD.bazel
+++ b/java/java-frontback-tests/BUILD.bazel
@@ -17,6 +17,7 @@ jvm_library(
    "@lib//:mockito",
    "@lib//:assert_j",
    "@lib//:kotlin-test",
+    "//platform/analysis-api:analysis",
    "//platform/core-ui",
    "//platform/editor-ui-api:editor-ui",
    "//platform/testFramework",
--- a/java/java-frontback-tests/intellij.java.frontback.tests.iml
+++ b/java/java-frontback-tests/intellij.java.frontback.tests.iml
@@ -11,6 +11,7 @@
    <orderEntry type="library" exported="" scope="TEST" name="mockito" level="project" />
    <orderEntry type="library" exported="" scope="TEST" name="assertJ" level="project" />
    <orderEntry type="library" exported="" scope="TEST" name="kotlin-test" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.analysis" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.core.ui" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.editor.ui" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.testFramework" exported="" scope="TEST" />
--- a/java/java-impl-inspections/BUILD.bazel
+++ b/java/java-impl-inspections/BUILD.bazel
@@ -11,6 +11,7 @@ jvm_library(
    "//java/java-analysis-impl:analysis-impl",
    "@lib//:stream_ex",
    "//java/java-impl:impl",
+    "//platform/analysis-api:analysis",
    "//platform/editor-ui-api:editor-ui",
    "//platform/platform-impl:ide-impl",
    "@lib//:fastutil-min",
--- a/java/java-impl-inspections/intellij.java.impl.inspections.iml
+++ b/java/java-impl-inspections/intellij.java.impl.inspections.iml
@@ -11,6 +11,7 @@
    <orderEntry type="module" module-name="intellij.java.analysis.impl" />
    <orderEntry type="library" name="StreamEx" level="project" />
    <orderEntry type="module" module-name="intellij.java.impl" />
+    <orderEntry type="module" module-name="intellij.platform.analysis" />
    <orderEntry type="module" module-name="intellij.platform.editor.ui" />
    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
    <orderEntry type="library" name="fastutil-min" level="project" />
--- a/java/java-impl-refactorings/BUILD.bazel
+++ b/java/java-impl-refactorings/BUILD.bazel
@@ -7,6 +7,7 @@ jvm_library(
  visibility = ["//visibility:public"],
  srcs = glob(["src/**/*.kt", "src/**/*.java", "src/**/*.form"], allow_empty = True),
  deps = [
+    "//platform/analysis-api:analysis",
    "//platform/editor-ui-api:editor-ui",
    "//platform/foldings",
    "//platform/indexing-api:indexing",
--- a/java/java-impl-refactorings/intellij.java.impl.refactorings.iml
+++ b/java/java-impl-refactorings/intellij.java.impl.refactorings.iml
@@ -7,6 +7,7 @@
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="intellij.platform.analysis" />
    <orderEntry type="module" module-name="intellij.platform.editor.ui" />
    <orderEntry type="module" module-name="intellij.platform.foldings" />
    <orderEntry type="module" module-name="intellij.platform.indexing" />
--- a/java/java-impl/BUILD.bazel
+++ b/java/java-impl/BUILD.bazel
@@ -13,6 +13,7 @@ jvm_library(
  visibility = ["//visibility:public"],
  srcs = glob(["src/**/*.kt", "src/**/*.java", "src/**/*.form", "gen/**/*.kt", "gen/**/*.java"], allow_empty = True),
  deps = [
+    "//platform/analysis-api:analysis",
    "//platform/editor-ui-api:editor-ui",
    "//platform/foldings",
    "//platform/indexing-api:indexing",
--- a/java/java-impl/intellij.java.impl.iml
+++ b/java/java-impl/intellij.java.impl.iml
@@ -9,6 +9,7 @@
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="intellij.platform.analysis" />
    <orderEntry type="module" module-name="intellij.platform.editor.ui" />
    <orderEntry type="module" module-name="intellij.platform.foldings" />
    <orderEntry type="module" module-name="intellij.platform.indexing" />
--- a/java/java-tests/BUILD.bazel
+++ b/java/java-tests/BUILD.bazel
@@ -19,6 +19,7 @@ jvm_library(
  srcs = glob(["testSrc/**/*.kt", "testSrc/**/*.java", "testGen/**/*.kt", "testGen/**/*.java"], allow_empty = True, exclude = ["testSrc/com/intellij/java/codeInspection/bytecodeAnalysis/precompiledData/**/*"]),
  associates = ["//java/java-impl:impl"],
  deps = [
+    "//platform/analysis-api:analysis",
    "//platform/editor-ui-api:editor-ui",
    "//platform/foldings",
    "//platform/indexing-api:indexing",
--- a/java/java-tests/intellij.java.tests.iml
+++ b/java/java-tests/intellij.java.tests.iml
@@ -10,6 +10,7 @@
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="intellij.platform.analysis" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.editor.ui" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.foldings" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.indexing" scope="TEST" />
--- a/java/jsp-spi/BUILD.bazel
+++ b/java/jsp-spi/BUILD.bazel
@@ -9,6 +9,7 @@ jvm_library(
  deps = [
    "//java/jsp-openapi:jsp",
    "//java/openapi:java",
+    "//platform/analysis-api:analysis",
    "//jps/model-api:model",
    "//java/jsp-base-openapi:jsp-base",
  ],
--- a/java/jsp-spi/intellij.jsp.spi.iml
+++ b/java/jsp-spi/intellij.jsp.spi.iml
@@ -9,6 +9,7 @@
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="intellij.jsp" exported="" />
    <orderEntry type="module" module-name="intellij.java" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.analysis" />
    <orderEntry type="module" module-name="intellij.platform.jps.model" />
    <orderEntry type="module" module-name="intellij.jsp.base" />
  </component>
--- a/java/openapi/BUILD.bazel
+++ b/java/openapi/BUILD.bazel
@@ -24,6 +24,7 @@ jvm_library(
  visibility = ["//visibility:public"],
  srcs = glob(["src/**/*.kt", "src/**/*.java"], allow_empty = True),
  deps = [
+    "//platform/analysis-api:analysis",
    "//platform/editor-ui-api:editor-ui",
    "//platform/indexing-api:indexing",
    "//jps/model-api:model",
--- a/java/openapi/intellij.java.iml
+++ b/java/openapi/intellij.java.iml
@@ -9,6 +9,7 @@
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="intellij.platform.analysis" />
    <orderEntry type="module" module-name="intellij.platform.editor.ui" />
    <orderEntry type="module" module-name="intellij.platform.indexing" />
    <orderEntry type="module" module-name="intellij.platform.jps.model" />
--- a/java/performancePlugin/BUILD.bazel
+++ b/java/performancePlugin/BUILD.bazel
@@ -15,6 +15,7 @@ jvm_library(
  deps = [
    "//plugins/performanceTesting/core:performanceTesting",
    "//java/java-analysis-impl:analysis-impl",
+    "//platform/analysis-api:analysis",
    "//platform/editor-ui-api:editor-ui",
    "//platform/lang-api:lang",
    "//platform/lang-impl",
--- a/java/performancePlugin/intellij.java.performancePlugin.iml
+++ b/java/performancePlugin/intellij.java.performancePlugin.iml
@@ -10,6 +10,7 @@
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="intellij.performanceTesting" />
    <orderEntry type="module" module-name="intellij.java.analysis.impl" />
+    <orderEntry type="module" module-name="intellij.platform.analysis" />
    <orderEntry type="module" module-name="intellij.platform.editor.ui" />
    <orderEntry type="module" module-name="intellij.platform.lang" />
    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
--- a/java/structuralsearch-java/BUILD.bazel
+++ b/java/structuralsearch-java/BUILD.bazel
@@ -13,6 +13,7 @@ jvm_library(
  visibility = ["//visibility:public"],
  srcs = glob(["src/**/*.kt", "src/**/*.java"], allow_empty = True),
  deps = [
+    "//platform/analysis-api:analysis",
    "//platform/structuralsearch:structuralSearch",
    "//platform/lang-impl",
    "//java/openapi:java",
@@ -28,6 +29,7 @@ jvm_library(
  srcs = glob(["testSrc/**/*.kt", "testSrc/**/*.java"], allow_empty = True),
  associates = [":structuralSearch"],
  deps = [
+    "//platform/analysis-api:analysis",
    "//platform/editor-ui-api:editor-ui",
    "//platform/structuralsearch:structuralSearch",
    "//platform/lang-impl",
--- a/java/structuralsearch-java/intellij.java.structuralSearch.iml
+++ b/java/structuralsearch-java/intellij.java.structuralSearch.iml
@@ -9,6 +9,7 @@
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="intellij.platform.analysis" />
    <orderEntry type="module" module-name="intellij.platform.editor.ui" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.structuralSearch" />
    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
--- a/java/testFramework/BUILD.bazel
+++ b/java/testFramework/BUILD.bazel
@@ -15,6 +15,7 @@ jvm_library(
  deps = [
    "//java/openapi:java",
    "//java/testFramework/shared",
+    "//platform/analysis-api:analysis",
    "//platform/editor-ui-api:editor-ui",
    "//platform/indexing-api:indexing",
    "//jps/model-api:model",
--- a/java/testFramework/intellij.java.testFramework.iml
+++ b/java/testFramework/intellij.java.testFramework.iml
@@ -10,6 +10,7 @@
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="intellij.java" />
    <orderEntry type="module" module-name="intellij.java.testFramework.shared" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.analysis" />
    <orderEntry type="module" module-name="intellij.platform.editor.ui" />
    <orderEntry type="module" module-name="intellij.platform.indexing" />
    <orderEntry type="module" module-name="intellij.platform.jps.model" />
--- a/java/typeMigration/BUILD.bazel
+++ b/java/typeMigration/BUILD.bazel
@@ -13,6 +13,7 @@ jvm_library(
  visibility = ["//visibility:public"],
  srcs = glob(["src/**/*.kt", "src/**/*.java"], allow_empty = True),
  deps = [
+    "//platform/analysis-api:analysis",
    "//platform/editor-ui-api:editor-ui",
    "//platform/refactoring",
    "//platform/util",
@@ -33,6 +34,7 @@ jvm_library(
  srcs = glob(["test/**/*.kt", "test/**/*.java"], allow_empty = True),
  associates = [":typeMigration"],
  deps = [
+    "//platform/analysis-api:analysis",
    "//platform/core-ui",
    "//platform/editor-ui-api:editor-ui",
    "//platform/refactoring",
--- a/java/typeMigration/intellij.java.typeMigration.iml
+++ b/java/typeMigration/intellij.java.typeMigration.iml
@@ -9,6 +9,7 @@
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="intellij.platform.analysis" />
    <orderEntry type="module" module-name="intellij.platform.core.ui" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.editor.ui" />
    <orderEntry type="module" module-name="intellij.platform.refactoring" />
--- a/json/BUILD.bazel
+++ b/json/BUILD.bazel
@@ -13,6 +13,7 @@ jvm_library(
  visibility = ["//visibility:public"],
  srcs = glob(["gen/**/*.kt", "gen/**/*.java", "src/**/*.kt", "src/**/*.java"], allow_empty = True),
  deps = [
+    "//platform/analysis-api:analysis",
    "//platform/core-api:core",
    "//platform/platform-impl:ide-impl",
    "//platform/core-impl",
--- a/json/backend/BUILD.bazel
+++ b/json/backend/BUILD.bazel
@@ -13,6 +13,7 @@ jvm_library(
  visibility = ["//visibility:public"],
  srcs = glob(["src/**/*.kt", "src/**/*.java"], allow_empty = True),
  deps = [
+    "//platform/analysis-api:analysis",
    "//platform/core-api:core",
    "//platform/editor-ui-api:editor-ui",
    "//platform/platform-api:ide",
--- a/json/backend/intellij.json.backend.iml
+++ b/json/backend/intellij.json.backend.iml
@@ -8,6 +8,7 @@
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="intellij.platform.analysis" />
    <orderEntry type="module" module-name="intellij.platform.core" />
    <orderEntry type="module" module-name="intellij.platform.editor.ui" />
    <orderEntry type="module" module-name="intellij.platform.ide" />
--- a/json/backend/tests/BUILD.bazel
+++ b/json/backend/tests/BUILD.bazel
@@ -18,6 +18,7 @@ jvm_library(
  visibility = ["//visibility:public"],
  srcs = glob(["test/**/*.kt", "test/**/*.java"], allow_empty = True),
  deps = [
+    "//platform/analysis-api:analysis",
    "//platform/core-ui",
    "//platform/editor-ui-api:editor-ui",
    "//platform/indexing-api:indexing",
--- a/json/backend/tests/intellij.json.tests.iml
+++ b/json/backend/tests/intellij.json.tests.iml
@@ -8,6 +8,7 @@
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="intellij.platform.analysis" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.core.ui" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.editor.ui" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.indexing" scope="TEST" />
--- a/json/intellij.json.iml
+++ b/json/intellij.json.iml
@@ -9,6 +9,7 @@
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="intellij.platform.analysis" />
    <orderEntry type="module" module-name="intellij.platform.core" />
    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
    <orderEntry type="module" module-name="intellij.platform.core.impl" />
--- a/jvm/jvm-analysis-api/BUILD.bazel
+++ b/jvm/jvm-analysis-api/BUILD.bazel
@@ -18,7 +18,6 @@ jvm_library(
  exports = [
    "//uast/uast-common:uast",
    "//java/java-psi-api:psi",
-    "//platform/analysis-api:analysis",
    "//uast/uast-common-ide:ide",
  ]
 )
--- a/jvm/jvm-analysis-api/intellij.jvm.analysis.iml
+++ b/jvm/jvm-analysis-api/intellij.jvm.analysis.iml
@@ -9,7 +9,7 @@
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="intellij.platform.uast" exported="" />
    <orderEntry type="module" module-name="intellij.java.psi" exported="" />
-    <orderEntry type="module" module-name="intellij.platform.analysis" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.analysis" />
    <orderEntry type="library" name="kotlin-stdlib" level="project" />
    <orderEntry type="module" module-name="intellij.platform.util" />
    <orderEntry type="module" module-name="intellij.java.analysis" />
--- a/jvm/jvm-analysis-impl/BUILD.bazel
+++ b/jvm/jvm-analysis-impl/BUILD.bazel
@@ -16,6 +16,7 @@ jvm_library(
    "//jvm/jvm-analysis-api:analysis",
    "//java/openapi:java",
    "@lib//:stream_ex",
+    "//platform/analysis-api:analysis",
    "//platform/core-ui",
    "//platform/editor-ui-api:editor-ui",
    "//platform/platform-impl:ide-impl",
--- a/jvm/jvm-analysis-impl/intellij.jvm.analysis.impl.iml
+++ b/jvm/jvm-analysis-impl/intellij.jvm.analysis.impl.iml
@@ -11,6 +11,7 @@
    <orderEntry type="module" module-name="intellij.jvm.analysis" exported="" />
    <orderEntry type="module" module-name="intellij.java" />
    <orderEntry type="library" name="StreamEx" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.analysis" />
    <orderEntry type="module" module-name="intellij.platform.core.ui" />
    <orderEntry type="module" module-name="intellij.platform.editor.ui" />
    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
--- a/jvm/jvm-analysis-internal-testFramework/BUILD.bazel
+++ b/jvm/jvm-analysis-internal-testFramework/BUILD.bazel
@@ -9,6 +9,7 @@ jvm_library(
  deps = [
    "//jvm/jvm-analysis-impl:analysis-impl",
    "//jvm/jvm-analysis-testFramework:analysis-testFramework",
+    "//platform/analysis-api:analysis",
    "//platform/editor-ui-api:editor-ui",
    "//jps/model-api:model",
    "//platform/refactoring",
--- a/jvm/jvm-analysis-internal-testFramework/intellij.jvm.analysis.internal.testFramework.iml
+++ b/jvm/jvm-analysis-internal-testFramework/intellij.jvm.analysis.internal.testFramework.iml
@@ -9,6 +9,7 @@
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="intellij.jvm.analysis.impl" />
    <orderEntry type="module" module-name="intellij.jvm.analysis.testFramework" />
+    <orderEntry type="module" module-name="intellij.platform.analysis" />
    <orderEntry type="module" module-name="intellij.platform.editor.ui" />
    <orderEntry type="module" module-name="intellij.platform.jps.model" />
    <orderEntry type="module" module-name="intellij.platform.refactoring" />
--- a/jvm/jvm-analysis-java-tests/BUILD.bazel
+++ b/jvm/jvm-analysis-java-tests/BUILD.bazel
@@ -14,6 +14,7 @@ jvm_library(
  deps = [
    "//java/openapi:java",
    "//java/testFramework",
+    "//platform/analysis-api:analysis",
    "//platform/editor-ui-api:editor-ui",
    "//jps/model-api:model",
    "//platform/testFramework",
--- a/jvm/jvm-analysis-java-tests/intellij.jvm.analysis.java.tests.iml
+++ b/jvm/jvm-analysis-java-tests/intellij.jvm.analysis.java.tests.iml
@@ -8,6 +8,7 @@
    <orderEntry type="inheritedJdk" />
    <orderEntry type="module" module-name="intellij.java" scope="TEST" />
    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.analysis" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.editor.ui" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.jps.model" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
--- a/jvm/jvm-analysis-kotlin-tests-shared/BUILD.bazel
+++ b/jvm/jvm-analysis-kotlin-tests-shared/BUILD.bazel
@@ -12,6 +12,7 @@ jvm_library(
  visibility = ["//visibility:public"],
  srcs = glob(["testSrc/**/*.kt", "testSrc/**/*.java"], allow_empty = True),
  deps = [
+    "//platform/analysis-api:analysis",
    "//platform/editor-ui-api:editor-ui",
    "//jps/model-api:model",
    "//plugins/kotlin/plugin/common",
--- a/jvm/jvm-analysis-kotlin-tests-shared/intellij.jvm.analysis.kotlin.tests.shared.iml
+++ b/jvm/jvm-analysis-kotlin-tests-shared/intellij.jvm.analysis.kotlin.tests.shared.iml
@@ -7,6 +7,7 @@
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="intellij.platform.analysis" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.editor.ui" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.jps.model" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.plugin.common" exported="" scope="TEST" />
--- a/jvm/jvm-analysis-refactoring/BUILD.bazel
+++ b/jvm/jvm-analysis-refactoring/BUILD.bazel
@@ -8,6 +8,7 @@ jvm_library(
  srcs = glob(["src/**/*.kt", "src/**/*.java"], allow_empty = True),
  deps = [
    "@lib//:kotlin-stdlib",
+    "//platform/analysis-api:analysis",
    "//platform/util",
    "//uast/uast-common:uast",
    "//jvm/jvm-analysis-api:analysis",
--- a/jvm/jvm-analysis-refactoring/intellij.jvm.analysis.refactoring.iml
+++ b/jvm/jvm-analysis-refactoring/intellij.jvm.analysis.refactoring.iml
@@ -8,6 +8,7 @@
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="library" name="kotlin-stdlib" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.analysis" />
    <orderEntry type="module" module-name="intellij.platform.util" />
    <orderEntry type="module" module-name="intellij.platform.uast" />
    <orderEntry type="module" module-name="intellij.jvm.analysis" />
--- a/jvm/jvm-analysis-testFramework/BUILD.bazel
+++ b/jvm/jvm-analysis-testFramework/BUILD.bazel
@@ -8,6 +8,7 @@ jvm_library(
  srcs = glob(["src/**/*.kt", "src/**/*.java"], allow_empty = True),
  deps = [
    "@lib//:kotlin-stdlib",
+    "//platform/analysis-api:analysis",
    "//platform/core-ui",
    "//platform/editor-ui-api:editor-ui",
    "//platform/testFramework",
--- a/jvm/jvm-analysis-testFramework/intellij.jvm.analysis.testFramework.iml
+++ b/jvm/jvm-analysis-testFramework/intellij.jvm.analysis.testFramework.iml
@@ -8,6 +8,7 @@
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="library" name="kotlin-stdlib" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.analysis" />
    <orderEntry type="module" module-name="intellij.platform.core.ui" />
    <orderEntry type="module" module-name="intellij.platform.editor.ui" />
    <orderEntry type="module" module-name="intellij.platform.testFramework" />
--- a/notebooks/visualization/BUILD.bazel
+++ b/notebooks/visualization/BUILD.bazel
@@ -24,6 +24,7 @@ jvm_library(
  kotlinc_opts = ":custom",
  deps = [
    "@lib//:gson",
+    "//platform/analysis-api:analysis",
    "//platform/editor-ui-api:editor-ui",
    "//platform/platform-impl:ide-impl",
    "//platform/lang-impl",
@@ -50,6 +51,7 @@ jvm_library(
  associates = [":visualization"],
  deps = [
    "@lib//:gson",
+    "//platform/analysis-api:analysis",
    "//platform/editor-ui-api:editor-ui",
    "//platform/platform-impl:ide-impl",
    "//platform/platform-impl:ide-impl_test_lib",
--- a/notebooks/visualization/intellij.notebooks.visualization.iml
+++ b/notebooks/visualization/intellij.notebooks.visualization.iml
@@ -33,6 +33,7 @@
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="library" name="gson" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.analysis" />
    <orderEntry type="module" module-name="intellij.platform.editor.ui" />
    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
--- a/platform/analysis-impl/BUILD.bazel
+++ b/platform/analysis-impl/BUILD.bazel
@@ -44,7 +44,6 @@ jvm_library(
    "//platform/util-class-loader:util-classLoader",
  ],
  exports = [
-    "//platform/analysis-api:analysis",
    "//platform/core-impl",
    "//platform/projectModel-impl",
  ],
--- a/platform/analysis-impl/intellij.platform.analysis.impl.iml
+++ b/platform/analysis-impl/intellij.platform.analysis.impl.iml
@@ -9,7 +9,7 @@
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="intellij.platform.analysis" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.analysis" />
    <orderEntry type="module" module-name="intellij.platform.core" />
    <orderEntry type="module" module-name="intellij.platform.core.impl" exported="" />
    <orderEntry type="module" module-name="intellij.platform.jps.model" />
--- a/platform/bookmarks/BUILD.bazel
+++ b/platform/bookmarks/BUILD.bazel
@@ -15,6 +15,7 @@ jvm_library(
  deps = [
    "@lib//:kotlin-stdlib",
    "@lib//:jetbrains-annotations",
+    "//platform/analysis-api:analysis",
    "//platform/editor-ui-api:editor-ui",
    "//platform/kernel/shared:kernel",
    "@lib//:kotlinx-serialization-core",
--- a/platform/bookmarks/intellij.platform.bookmarks.iml
+++ b/platform/bookmarks/intellij.platform.bookmarks.iml
@@ -36,6 +36,7 @@
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="library" name="kotlin-stdlib" level="project" />
    <orderEntry type="library" name="jetbrains-annotations" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.analysis" />
    <orderEntry type="module" module-name="intellij.platform.editor.ui" />
    <orderEntry type="module" module-name="intellij.platform.kernel" />
    <orderEntry type="library" name="kotlinx-serialization-core" level="project" />
--- a/platform/built-in-server/BUILD.bazel
+++ b/platform/built-in-server/BUILD.bazel
@@ -13,6 +13,7 @@ jvm_library(
  visibility = ["//visibility:public"],
  srcs = glob(["src/**/*.kt", "src/**/*.java"], allow_empty = True),
  deps = [
+    "//platform/analysis-api:analysis",
    "//platform/editor-ui-api:editor-ui",
    "//jps/model-api:model",
    "//platform/projectModel-api:projectModel",
@@ -67,6 +68,7 @@ jvm_library(
  srcs = glob(["testSrc/**/*.kt", "testSrc/**/*.java"], allow_empty = True),
  associates = ["//platform/built-in-server:builtInServer-impl"],
  deps = [
+    "//platform/analysis-api:analysis",
    "//platform/editor-ui-api:editor-ui",
    "//platform/ide-core-impl",
    "//jps/model-api:model",
--- a/platform/built-in-server/intellij.platform.builtInServer.impl.iml
+++ b/platform/built-in-server/intellij.platform.builtInServer.impl.iml
@@ -11,6 +11,7 @@
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="intellij.platform.analysis" />
    <orderEntry type="module" module-name="intellij.platform.editor.ui" />
    <orderEntry type="module" module-name="intellij.platform.jps.model" />
    <orderEntry type="module" module-name="intellij.platform.projectModel" />
--- a/platform/built-in-server/intellij.platform.builtInServer.tests.iml
+++ b/platform/built-in-server/intellij.platform.builtInServer.tests.iml
@@ -9,6 +9,7 @@
      <sourceFolder url="file://$MODULE_DIR$/testSrc" isTestSource="true" />
    </content>
    <orderEntry type="inheritedJdk" />
+    <orderEntry type="module" module-name="intellij.platform.analysis" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.editor.ui" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="sourceFolder" forTests="false" />
--- a/platform/code-style-impl/BUILD.bazel
+++ b/platform/code-style-impl/BUILD.bazel
@@ -13,6 +13,7 @@ jvm_library(
  visibility = ["//visibility:public"],
  srcs = glob(["src/**/*.kt", "src/**/*.java"], allow_empty = True),
  deps = [
+    "//platform/analysis-api:analysis",
    "//platform/analysis-impl",
    "//platform/code-style-api:codeStyle",
    "//platform/util",
--- a/platform/code-style-impl/intellij.platform.codeStyle.impl.iml
+++ b/platform/code-style-impl/intellij.platform.codeStyle.impl.iml
@@ -8,6 +8,7 @@
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="intellij.platform.analysis" />
    <orderEntry type="module" module-name="intellij.platform.analysis.impl" />
    <orderEntry type="module" module-name="intellij.platform.codeStyle" />
    <orderEntry type="module" module-name="intellij.platform.util" />
--- a/platform/collaboration-tools/BUILD.bazel
+++ b/platform/collaboration-tools/BUILD.bazel
@@ -13,6 +13,7 @@ jvm_library(
  visibility = ["//visibility:public"],
  srcs = glob(["src/**/*.kt", "src/**/*.java", "gen/**/*.kt", "gen/**/*.java"], allow_empty = True),
  deps = [
+    "//platform/analysis-api:analysis",
    "//platform/credential-store",
    "//platform/editor-ui-api:editor-ui",
    "//platform/platform-api:ide",
@@ -55,6 +56,7 @@ jvm_library(
  srcs = glob(["test/**/*.kt", "test/**/*.java"], allow_empty = True),
  associates = [":collaboration-tools"],
  deps = [
+    "//platform/analysis-api:analysis",
    "//platform/credential-store",
    "//platform/editor-ui-api:editor-ui",
    "//platform/platform-api:ide",
--- a/platform/collaboration-tools/intellij.platform.collaborationTools.iml
+++ b/platform/collaboration-tools/intellij.platform.collaborationTools.iml
@@ -10,6 +10,7 @@
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="intellij.platform.analysis" />
    <orderEntry type="module" module-name="intellij.platform.credentialStore" />
    <orderEntry type="module" module-name="intellij.platform.editor.ui" />
    <orderEntry type="module" module-name="intellij.platform.ide" />
--- a/platform/configuration-store-impl/BUILD.bazel
+++ b/platform/configuration-store-impl/BUILD.bazel
@@ -72,6 +72,7 @@ jvm_library(
  associates = ["//platform/configuration-store-impl:configurationStore-impl"],
  deps = [
    "@lib//:kotlin-stdlib",
+    "//platform/analysis-api:analysis",
    "//platform/ide-core/plugins",
    "@lib//:assert_j",
    "//jps/model-api:model",
--- a/platform/configuration-store-impl/intellij.platform.configurationStore.tests.iml
+++ b/platform/configuration-store-impl/intellij.platform.configurationStore.tests.iml
@@ -33,6 +33,7 @@
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="library" scope="TEST" name="kotlin-stdlib" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.analysis" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.ide.core.plugins" />
    <orderEntry type="library" scope="TEST" name="assertJ" level="project" />
    <orderEntry type="module" module-name="intellij.platform.jps.model" scope="TEST" />
--- a/platform/diff-impl/BUILD.bazel
+++ b/platform/diff-impl/BUILD.bazel
@@ -13,6 +13,7 @@ jvm_library(
  visibility = ["//visibility:public"],
  srcs = glob(["src/**/*.kt", "src/**/*.java", "src/**/*.form"], allow_empty = True),
  deps = [
+    "//platform/analysis-api:analysis",
    "//platform/core-api:core",
    "//platform/diff-api:diff",
    "//platform/editor-ui-api:editor-ui",
--- a/platform/diff-impl/intellij.platform.diff.impl.iml
+++ b/platform/diff-impl/intellij.platform.diff.impl.iml
@@ -8,6 +8,7 @@
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="intellij.platform.analysis" />
    <orderEntry type="module" module-name="intellij.platform.core" />
    <orderEntry type="module" module-name="intellij.platform.diff" exported="" />
    <orderEntry type="module" module-name="intellij.platform.editor.ui" />
--- a/platform/dvcs-impl/BUILD.bazel
+++ b/platform/dvcs-impl/BUILD.bazel
@@ -13,6 +13,7 @@ jvm_library(
  visibility = ["//visibility:public"],
  srcs = glob(["src/**/*.kt", "src/**/*.java"], allow_empty = True),
  deps = [
+    "//platform/analysis-api:analysis",
    "//platform/core-api:core",
    "//platform/editor-ui-api:editor-ui",
    "//platform/lvcs-api:lvcs",
@@ -50,6 +51,7 @@ jvm_library(
  srcs = glob(["testSrc/**/*.kt", "testSrc/**/*.java"], allow_empty = True),
  associates = [":vcs-dvcs-impl"],
  deps = [
+    "//platform/analysis-api:analysis",
    "//platform/core-api:core",
    "//platform/editor-ui-api:editor-ui",
    "//platform/lvcs-api:lvcs",
--- a/platform/dvcs-impl/intellij.platform.vcs.dvcs.impl.iml
+++ b/platform/dvcs-impl/intellij.platform.vcs.dvcs.impl.iml
@@ -9,6 +9,7 @@
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="intellij.platform.analysis" />
    <orderEntry type="module" module-name="intellij.platform.core" />
    <orderEntry type="module" module-name="intellij.platform.editor.ui" />
    <orderEntry type="module" module-name="intellij.platform.lvcs" />
--- a/platform/eel/BUILD.bazel
+++ b/platform/eel/BUILD.bazel
@@ -31,6 +31,7 @@ jvm_library(
    "//plugins/copyright:copyright_test_lib",
    "//java/openapi:java",
    "//java/java-impl:impl",
+    "//platform/analysis-api:analysis",
    "//platform/indexing-api:indexing",
    "//jps/model-api:model",
    "//platform/testFramework",
--- a/platform/eel/intellij.platform.eel.codegen.iml
+++ b/platform/eel/intellij.platform.eel.codegen.iml
@@ -14,6 +14,7 @@
    <orderEntry type="module" module-name="intellij.copyright" />
    <orderEntry type="module" module-name="intellij.java" />
    <orderEntry type="module" module-name="intellij.java.impl" />
+    <orderEntry type="module" module-name="intellij.platform.analysis" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.indexing" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.jps.model" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.testFramework" />
--- a/platform/execution-impl/BUILD.bazel
+++ b/platform/execution-impl/BUILD.bazel
@@ -14,6 +14,7 @@ jvm_library(
  srcs = glob(["src/**/*.kt", "src/**/*.java", "src/**/*.form"], allow_empty = True),
  deps = [
    "@lib//:kotlin-stdlib",
+    "//platform/analysis-api:analysis",
    "//platform/core-impl",
    "//platform/core-api:core",
    "//platform/editor-ui-api:editor-ui",
--- a/platform/execution-impl/intellij.platform.execution.impl.iml
+++ b/platform/execution-impl/intellij.platform.execution.impl.iml
@@ -35,6 +35,7 @@
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="library" name="kotlin-stdlib" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.analysis" />
    <orderEntry type="module" module-name="intellij.platform.core.impl" />
    <orderEntry type="module" module-name="intellij.platform.core" />
    <orderEntry type="module" module-name="intellij.platform.editor.ui" />
--- a/platform/execution.serviceView/BUILD.bazel
+++ b/platform/execution.serviceView/BUILD.bazel
@@ -13,6 +13,7 @@ jvm_library(
  visibility = ["//visibility:public"],
  srcs = glob(["src/**/*.kt", "src/**/*.java"], allow_empty = True),
  deps = [
+    "//platform/analysis-api:analysis",
    "//platform/editor-ui-api:editor-ui",
    "//platform/util",
    "//platform/util/jdom",
--- a/platform/execution.serviceView/intellij.platform.execution.serviceView.iml
+++ b/platform/execution.serviceView/intellij.platform.execution.serviceView.iml
@@ -8,6 +8,7 @@
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="intellij.platform.analysis" />
    <orderEntry type="module" module-name="intellij.platform.editor.ui" />
    <orderEntry type="module" module-name="intellij.platform.util" />
    <orderEntry type="module" module-name="intellij.platform.util.jdom" />
--- a/platform/external-system-api/BUILD.bazel
+++ b/platform/external-system-api/BUILD.bazel
@@ -13,6 +13,7 @@ jvm_library(
  visibility = ["//visibility:public"],
  srcs = glob(["src/**/*.kt", "src/**/*.java", "gen/**/*.kt", "gen/**/*.java"], allow_empty = True),
  deps = [
+    "//platform/analysis-api:analysis",
    "//platform/editor-ui-api:editor-ui",
    "//jps/model-api:model",
    "//platform/util",
--- a/platform/external-system-api/intellij.platform.externalSystem.iml
+++ b/platform/external-system-api/intellij.platform.externalSystem.iml
@@ -9,6 +9,7 @@
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="intellij.platform.analysis" />
    <orderEntry type="module" module-name="intellij.platform.editor.ui" />
    <orderEntry type="module" module-name="intellij.platform.jps.model" />
    <orderEntry type="module" module-name="intellij.platform.util" />
--- a/platform/external-system-api/testFramework/BUILD.bazel
+++ b/platform/external-system-api/testFramework/BUILD.bazel
@@ -7,6 +7,7 @@ jvm_library(
  visibility = ["//visibility:public"],
  srcs = glob(["src/**/*.kt", "src/**/*.java"], allow_empty = True),
  deps = [
+    "//platform/analysis-api:analysis",
    "//platform/core-ui",
    "//platform/external-system-api:externalSystem",
    "//platform/external-system-impl:externalSystem-impl",
--- a/platform/external-system-api/testFramework/intellij.platform.externalSystem.testFramework.iml
+++ b/platform/external-system-api/testFramework/intellij.platform.externalSystem.testFramework.iml
@@ -7,6 +7,7 @@
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="intellij.platform.analysis" />
    <orderEntry type="module" module-name="intellij.platform.core.ui" />
    <orderEntry type="module" module-name="intellij.platform.externalSystem" />
    <orderEntry type="module" module-name="intellij.platform.externalSystem.impl" />
--- a/Show More
+++ b/Show More