diff --git a/RegExpSupport/BUILD.bazel b/RegExpSupport/BUILD.bazel index 9ca25cfd541d..e59be8c9e248 100644 --- a/RegExpSupport/BUILD.bazel +++ b/RegExpSupport/BUILD.bazel @@ -29,6 +29,7 @@ jvm_library( "//platform/core-impl", "//libraries/fastutil", "//platform/ide-core-impl", + "//platform/ide-core", "//platform/core-ui", "//platform/util/jdom", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", @@ -58,6 +59,7 @@ jvm_library( "//platform/core-impl:core-impl_test_lib", "//libraries/fastutil:fastutil_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/core-ui:core-ui_test_lib", "//platform/util/jdom:jdom_test_lib", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", diff --git a/RegExpSupport/intellij.regexp.iml b/RegExpSupport/intellij.regexp.iml index db63578e6006..608f09519d50 100644 --- a/RegExpSupport/intellij.regexp.iml +++ b/RegExpSupport/intellij.regexp.iml @@ -25,6 +25,7 @@ + diff --git a/aether-dependency-resolver/BUILD.bazel b/aether-dependency-resolver/BUILD.bazel index 2fbfb79a7cbf..a2b30bb1c839 100644 --- a/aether-dependency-resolver/BUILD.bazel +++ b/aether-dependency-resolver/BUILD.bazel @@ -28,6 +28,7 @@ jvm_library( "//libraries/plexus-utils", "//libraries/commons/codec", "//platform/util", + "//platform/util/base", ] ) @@ -48,6 +49,7 @@ jvm_library( "//libraries/plexus-utils:plexus-utils_test_lib", "//libraries/commons/codec:codec_test_lib", "//platform/util:util_test_lib", + "//platform/util/base:base_test_lib", ] ) ### auto-generated section `build intellij.java.aetherDependencyResolver` end @@ -97,6 +99,8 @@ jvm_library( "//libraries/commons/codec:codec_test_lib", "//platform/util", "//platform/util:util_test_lib", + "//platform/util/base", + "//platform/util/base:base_test_lib", ], runtime_deps = [":java-aetherDependencyResolver-tests"] ) diff --git a/aether-dependency-resolver/intellij.java.aetherDependencyResolver.iml b/aether-dependency-resolver/intellij.java.aetherDependencyResolver.iml index 6ec5300ccafa..aab4901430f4 100644 --- a/aether-dependency-resolver/intellij.java.aetherDependencyResolver.iml +++ b/aether-dependency-resolver/intellij.java.aetherDependencyResolver.iml @@ -110,5 +110,6 @@ + \ No newline at end of file diff --git a/aether-dependency-resolver/intellij.java.aetherDependencyResolver.tests.iml b/aether-dependency-resolver/intellij.java.aetherDependencyResolver.tests.iml index 87e5c24c8289..abcea2f56192 100644 --- a/aether-dependency-resolver/intellij.java.aetherDependencyResolver.tests.iml +++ b/aether-dependency-resolver/intellij.java.aetherDependencyResolver.tests.iml @@ -93,6 +93,7 @@ + diff --git a/build/BUILD.bazel b/build/BUILD.bazel index 615e846d0b04..1951cad1b372 100644 --- a/build/BUILD.bazel +++ b/build/BUILD.bazel @@ -90,6 +90,7 @@ jvm_library( "//platform/build-scripts", "@lib//:kotlin-stdlib", "//platform/util", + "//platform/util/base", "//jps/model-api:model", "//build/deps:dependencies", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", @@ -118,6 +119,7 @@ jvm_library( ":build", "//platform/build-scripts:build-scripts_test_lib", "//platform/util:util_test_lib", + "//platform/util/base:base_test_lib", "//jps/model-api:model_test_lib", "//build/deps:dependencies_test_lib", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", diff --git a/build/intellij.idea.community.build.iml b/build/intellij.idea.community.build.iml index 5bed0cf1cf6d..474a4c7d3381 100644 --- a/build/intellij.idea.community.build.iml +++ b/build/intellij.idea.community.build.iml @@ -25,6 +25,7 @@ + diff --git a/build/launch/BUILD.bazel b/build/launch/BUILD.bazel index 87c8d5b6bc4f..c89ddebe4ddf 100644 --- a/build/launch/BUILD.bazel +++ b/build/launch/BUILD.bazel @@ -18,6 +18,7 @@ jvm_library( "//libraries/kotlinx/coroutines/core", "//platform/runtime/product", "//platform/util", + "//platform/util/base", "//jps/model-api:model", "//jps/model-serialization", "//platform/build-scripts/downloader", @@ -35,6 +36,7 @@ jvm_library( "//libraries/kotlinx/coroutines/core:core_test_lib", "//platform/runtime/product:product_test_lib", "//platform/util:util_test_lib", + "//platform/util/base:base_test_lib", "//jps/model-api:model_test_lib", "//jps/model-serialization:model-serialization_test_lib", "//platform/build-scripts/downloader:downloader_test_lib", diff --git a/build/launch/intellij.idea.tools.launch.iml b/build/launch/intellij.idea.tools.launch.iml index 9e2aeec40814..2a327684e12f 100644 --- a/build/launch/intellij.idea.tools.launch.iml +++ b/build/launch/intellij.idea.tools.launch.iml @@ -12,6 +12,7 @@ + diff --git a/grid/api/BUILD.bazel b/grid/api/BUILD.bazel index 327417a35beb..12f3f4369204 100644 --- a/grid/api/BUILD.bazel +++ b/grid/api/BUILD.bazel @@ -15,6 +15,7 @@ jvm_library( resources = [":grid_resources"], deps = [ "//platform/util", + "//platform/util/base", "//platform/core-api:core", ] ) @@ -27,6 +28,7 @@ jvm_library( runtime_deps = [ ":grid", "//platform/util:util_test_lib", + "//platform/util/base:base_test_lib", "//platform/core-api:core_test_lib", ] ) diff --git a/grid/api/intellij.grid.iml b/grid/api/intellij.grid.iml index 2483c7eab345..a068dd34cbc8 100644 --- a/grid/api/intellij.grid.iml +++ b/grid/api/intellij.grid.iml @@ -9,6 +9,7 @@ + \ No newline at end of file diff --git a/grid/csv/BUILD.bazel b/grid/csv/BUILD.bazel index 61164d4f0505..9fbedaf8d2b6 100644 --- a/grid/csv/BUILD.bazel +++ b/grid/csv/BUILD.bazel @@ -17,6 +17,7 @@ jvm_library( "@lib//:jetbrains-annotations", "//platform/util", "//platform/util/jdom", + "//platform/util/base", "//platform/core-api:core", "//grid/types", "//platform/core-impl", @@ -35,6 +36,7 @@ jvm_library( ":csv-core-impl", "//platform/util:util_test_lib", "//platform/util/jdom:jdom_test_lib", + "//platform/util/base:base_test_lib", "//platform/core-api:core_test_lib", "//grid/types:types_test_lib", "//platform/core-impl:core-impl_test_lib", diff --git a/grid/csv/intellij.grid.csv.core.impl.iml b/grid/csv/intellij.grid.csv.core.impl.iml index 6f1fd2f3ebc7..c01a9553c006 100644 --- a/grid/csv/intellij.grid.csv.core.impl.iml +++ b/grid/csv/intellij.grid.csv.core.impl.iml @@ -11,6 +11,7 @@ + diff --git a/grid/impl-ide/BUILD.bazel b/grid/impl-ide/BUILD.bazel index 93c4dde2266f..36e5b9ea746d 100644 --- a/grid/impl-ide/BUILD.bazel +++ b/grid/impl-ide/BUILD.bazel @@ -23,6 +23,8 @@ jvm_library( "//platform/util", "//grid/core-impl", "//grid/impl", + "//platform/util:util-ui", + "//platform/editor-ui-api:editor-ui", ] ) @@ -41,6 +43,8 @@ jvm_library( "//platform/util:util_test_lib", "//grid/core-impl:core-impl_test_lib", "//grid/impl:impl_test_lib", + "//platform/util:util-ui_test_lib", + "//platform/editor-ui-api:editor-ui_test_lib", ] ) ### auto-generated section `build intellij.grid.impl.ide` end diff --git a/grid/impl-ide/intellij.grid.impl.ide.iml b/grid/impl-ide/intellij.grid.impl.ide.iml index cca53bbfe37f..0aaa12e2124a 100644 --- a/grid/impl-ide/intellij.grid.impl.ide.iml +++ b/grid/impl-ide/intellij.grid.impl.ide.iml @@ -17,5 +17,7 @@ + + \ No newline at end of file diff --git a/grid/impl/BUILD.bazel b/grid/impl/BUILD.bazel index 1b22cabe4629..4d4ab76e4382 100644 --- a/grid/impl/BUILD.bazel +++ b/grid/impl/BUILD.bazel @@ -61,6 +61,7 @@ jvm_library( "//platform/editor-ui-ex:editor-ex", "//platform/core-impl", "//platform/ide-core/plugins", + "//platform/ide-core", "//platform/execution-impl", "//platform/platform-api:ide", "//platform/util/jdom", @@ -72,6 +73,7 @@ jvm_library( "//platform/lang-api:lang", "//platform/forms_rt:java-guiForms-rt", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", + "//platform/util:util-ui", ] ) @@ -112,6 +114,7 @@ jvm_library( "//platform/editor-ui-ex:editor-ex_test_lib", "//platform/core-impl:core-impl_test_lib", "//platform/ide-core/plugins:plugins_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/execution-impl:execution-impl_test_lib", "//platform/platform-api:ide_test_lib", "//platform/util/jdom:jdom_test_lib", @@ -123,6 +126,7 @@ jvm_library( "//platform/lang-api:lang_test_lib", "//platform/forms_rt:java-guiForms-rt_test_lib", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", + "//platform/util:util-ui_test_lib", ] ) ### auto-generated section `build intellij.grid.impl` end diff --git a/grid/impl/intellij.grid.impl.iml b/grid/impl/intellij.grid.impl.iml index a9cc510c75a7..a04eb40aeb2d 100644 --- a/grid/impl/intellij.grid.impl.iml +++ b/grid/impl/intellij.grid.impl.iml @@ -58,6 +58,7 @@ + @@ -69,5 +70,6 @@ + \ No newline at end of file diff --git a/images/BUILD.bazel b/images/BUILD.bazel index c973f986e4ed..d218513dbaec 100644 --- a/images/BUILD.bazel +++ b/images/BUILD.bazel @@ -27,6 +27,7 @@ jvm_library( "//platform/forms_rt:java-guiForms-rt", "//platform/core-ui", "//platform/platform-util-io:ide-util-io", + "//platform/ide-core", "//platform/util/jdom", "//libraries/jcef", "//libraries/kotlinx/serialization/core", @@ -66,6 +67,7 @@ jvm_library( "//platform/forms_rt:java-guiForms-rt_test_lib", "//platform/core-ui:core-ui_test_lib", "//platform/platform-util-io:ide-util-io_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/util/jdom:jdom_test_lib", "//libraries/jcef:jcef_test_lib", "//libraries/kotlinx/serialization/core:core_test_lib", diff --git a/images/intellij.platform.images.iml b/images/intellij.platform.images.iml index 5c1555b85fca..13e10785f084 100644 --- a/images/intellij.platform.images.iml +++ b/images/intellij.platform.images.iml @@ -42,6 +42,7 @@ + diff --git a/java/codeserver/core/BUILD.bazel b/java/codeserver/core/BUILD.bazel index 16b657fc7a59..1b03daca9d04 100644 --- a/java/codeserver/core/BUILD.bazel +++ b/java/codeserver/core/BUILD.bazel @@ -17,8 +17,11 @@ jvm_library( "@lib//:jetbrains-annotations", "//libraries/stream", "//platform/core-api:core", + "//platform/core-impl", "//jps/model-api:model", "//platform/util", + "//platform/util/multiplatform", + "//platform/util/base", "//platform/projectModel-api:projectModel", "//platform/indexing-api:indexing", "//platform/workspace/jps", @@ -26,6 +29,7 @@ jvm_library( "//java/java-frontback-psi-api:frontback-psi", "//java/java-psi-api:psi", "//java/java-psi-impl:psi-impl", + "//java/java-syntax:syntax", "//platform/workspace/storage", "//java/java-indexing-api:indexing", ], @@ -41,8 +45,11 @@ jvm_library( ":core", "//libraries/stream:stream_test_lib", "//platform/core-api:core_test_lib", + "//platform/core-impl:core-impl_test_lib", "//jps/model-api:model_test_lib", "//platform/util:util_test_lib", + "//platform/util/multiplatform:multiplatform_test_lib", + "//platform/util/base:base_test_lib", "//platform/projectModel-api:projectModel_test_lib", "//platform/indexing-api:indexing_test_lib", "//platform/workspace/jps:jps_test_lib", @@ -50,6 +57,7 @@ jvm_library( "//java/java-frontback-psi-api:frontback-psi_test_lib", "//java/java-psi-api:psi_test_lib", "//java/java-psi-impl:psi-impl_test_lib", + "//java/java-syntax:syntax_test_lib", "//platform/workspace/storage:storage_test_lib", "//java/java-indexing-api:indexing_test_lib", "//platform/backend:backend_test_lib", diff --git a/java/codeserver/core/intellij.java.codeserver.core.iml b/java/codeserver/core/intellij.java.codeserver.core.iml index f3fad2001c29..11c28db263b5 100644 --- a/java/codeserver/core/intellij.java.codeserver.core.iml +++ b/java/codeserver/core/intellij.java.codeserver.core.iml @@ -11,8 +11,11 @@ + + + @@ -20,6 +23,7 @@ + diff --git a/java/codeserver/highlighting/BUILD.bazel b/java/codeserver/highlighting/BUILD.bazel index 0a92abdcabab..a271ea750276 100644 --- a/java/codeserver/highlighting/BUILD.bazel +++ b/java/codeserver/highlighting/BUILD.bazel @@ -17,6 +17,7 @@ jvm_library( "@lib//:jetbrains-annotations", "//libraries/stream", "//platform/core-api:core", + "//platform/core-impl", "//jps/model-api:model", "//platform/util", "//platform/projectModel-api:projectModel", @@ -24,6 +25,7 @@ jvm_library( "//java/java-frontback-psi-api:frontback-psi", "//java/java-psi-api:psi", "//java/java-psi-impl:psi-impl", + "//java/java-syntax:syntax", "//java/java-indexing-api:indexing", "//java/codeserver/core", "//java/java-frontback-impl:frontback-impl", @@ -41,6 +43,7 @@ jvm_library( ":highlighting", "//libraries/stream:stream_test_lib", "//platform/core-api:core_test_lib", + "//platform/core-impl:core-impl_test_lib", "//jps/model-api:model_test_lib", "//platform/util:util_test_lib", "//platform/projectModel-api:projectModel_test_lib", @@ -48,6 +51,7 @@ jvm_library( "//java/java-frontback-psi-api:frontback-psi_test_lib", "//java/java-psi-api:psi_test_lib", "//java/java-psi-impl:psi-impl_test_lib", + "//java/java-syntax:syntax_test_lib", "//java/java-indexing-api:indexing_test_lib", "//java/codeserver/core:core_test_lib", "//java/java-frontback-impl:frontback-impl_test_lib", diff --git a/java/codeserver/highlighting/intellij.java.codeserver.highlighting.iml b/java/codeserver/highlighting/intellij.java.codeserver.highlighting.iml index b4d745d8773f..391d00c45443 100644 --- a/java/codeserver/highlighting/intellij.java.codeserver.highlighting.iml +++ b/java/codeserver/highlighting/intellij.java.codeserver.highlighting.iml @@ -11,6 +11,7 @@ + @@ -18,6 +19,7 @@ + diff --git a/java/compiler/BUILD.bazel b/java/compiler/BUILD.bazel index b347216f54ff..6c52082e5310 100644 --- a/java/compiler/BUILD.bazel +++ b/java/compiler/BUILD.bazel @@ -13,6 +13,7 @@ jvm_library( "//java/openapi:java", "//java/compiler/instrumentation-util", "//java/idea-ui:ui", + "//java/java-syntax:syntax", "//spellchecker", "//platform/core-ui", "//platform/workspace/jps", @@ -38,6 +39,8 @@ jvm_library( "//java/compiler/instrumentation-util:instrumentation-util_test_lib", "//java/idea-ui:ui", "//java/idea-ui:ui_test_lib", + "//java/java-syntax:syntax", + "//java/java-syntax:syntax_test_lib", "//platform/analysis-api:analysis", "//platform/analysis-api:analysis_test_lib", "//platform/core-api:core", @@ -48,6 +51,8 @@ jvm_library( "//jps/model-api:model_test_lib", "//platform/lang-core", "//platform/lang-core:lang-core_test_lib", + "//platform/lang-api:lang", + "//platform/lang-api:lang_test_lib", "//platform/projectModel-api:projectModel", "//platform/projectModel-api:projectModel_test_lib", "//platform/workspace/storage", @@ -63,10 +68,14 @@ jvm_library( "@community//build:build-javac-rt_test_lib", "//platform/core-ui", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", "//platform/workspace/jps", "//platform/workspace/jps:jps_test_lib", "//platform/util/jdom", "//platform/util/jdom:jdom_test_lib", + "//platform/util:util-ui", + "//platform/util:util-ui_test_lib", "//libraries/kotlinx/coroutines/core", "//libraries/kotlinx/coroutines/core:core_test_lib", "//platform/backend/workspace", @@ -80,10 +89,14 @@ jvm_library( "//platform/util/concurrency:concurrency_test_lib", "//jps/jps-builders:build", "//jps/jps-builders:build_test_lib", + "//platform/ide-core", + "//platform/progress/shared:ide-progress", ], runtime_deps = [ ":compiler-tests", "//spellchecker:spellchecker_test_lib", + "//platform/ide-core:ide-core_test_lib", + "//platform/progress/shared:ide-progress_test_lib", ] ) ### auto-generated section `build intellij.java.compiler.tests` end diff --git a/java/compiler/forms-compiler/BUILD.bazel b/java/compiler/forms-compiler/BUILD.bazel index 88b492528cdd..6f6143df1042 100644 --- a/java/compiler/forms-compiler/BUILD.bazel +++ b/java/compiler/forms-compiler/BUILD.bazel @@ -85,6 +85,8 @@ jvm_library( "//java/compiler/instrumentation-util:instrumentation-util_test_lib", "//platform/util", "//platform/util:util_test_lib", + "//platform/util/multiplatform", + "//platform/util/multiplatform:multiplatform_test_lib", "@lib//:jetbrains-annotations", "@lib//:junit4", ], diff --git a/java/compiler/forms-compiler/intellij.java.guiForms.compiler.tests.iml b/java/compiler/forms-compiler/intellij.java.guiForms.compiler.tests.iml index fadae9b37faf..60fea0ad53ee 100644 --- a/java/compiler/forms-compiler/intellij.java.guiForms.compiler.tests.iml +++ b/java/compiler/forms-compiler/intellij.java.guiForms.compiler.tests.iml @@ -13,6 +13,7 @@ + diff --git a/java/compiler/impl/BUILD.bazel b/java/compiler/impl/BUILD.bazel index 9f1c39277423..4c6fc3104405 100644 --- a/java/compiler/impl/BUILD.bazel +++ b/java/compiler/impl/BUILD.bazel @@ -31,9 +31,12 @@ jvm_library( "//platform/refactoring", "//platform/util/jdom", "//platform/util", + "//platform/util:util-ui", + "//platform/util-ex", "//java/openapi:java", "//platform/platform-impl:ide-impl", "//java/java-runtime:rt", + "//java/java-psi-api:psi", "//platform/ide-core/plugins", "//java/compiler/instrumentation-util", "//platform/vcs-api:vcs", @@ -44,16 +47,21 @@ jvm_library( "@community//build:build-javac-rt", "//jps/jps-builders:build", "//platform/ide-core-impl", + "//platform/ide-core", "//jps/jps-launcher:build-launcher", "//jps/model-impl", "//java/java-analysis-impl:analysis-impl", + "//java/java-syntax:syntax", "//platform/built-in-server:builtInServer-impl", + "//platform/built-in-server-api:builtInServer", "//platform/vcs-impl", "//platform/external-system-api:externalSystem", "//platform/statistics", "//platform/core-ui", + "//platform/core-impl", "//platform/workspace/jps", "//platform/platform-util-io-impl:ide-util-io-impl", + "//platform/platform-util-io:ide-util-io", "//platform/platform-util-netty:ide-util-netty", "//platform/workspace/storage", "//platform/wsl-impl", @@ -83,8 +91,11 @@ jvm_library( "@lib//:netty-codec-protobuf", "//platform/eel-provider", "//xml/xml-psi-api:psi", + "//xml/xml-parser:parser", "//platform/execution", "//platform/forms_rt:java-guiForms-rt", + "//java/java-frontback-psi-api:frontback-psi", + "//platform/lang-api:lang", ], exports = ["//java/compiler/openapi:java-compiler"] ) @@ -117,9 +128,12 @@ jvm_library( "//platform/refactoring:refactoring_test_lib", "//platform/util/jdom:jdom_test_lib", "//platform/util:util_test_lib", + "//platform/util:util-ui_test_lib", + "//platform/util-ex:util-ex_test_lib", "//java/openapi:java_test_lib", "//platform/platform-impl:ide-impl_test_lib", "//java/java-runtime:rt_test_lib", + "//java/java-psi-api:psi_test_lib", "//platform/ide-core/plugins:plugins_test_lib", "//java/compiler/instrumentation-util:instrumentation-util_test_lib", "//platform/vcs-api:vcs_test_lib", @@ -130,16 +144,21 @@ jvm_library( "@community//build:build-javac-rt_test_lib", "//jps/jps-builders:build_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//jps/jps-launcher:build-launcher_test_lib", "//jps/model-impl:model-impl_test_lib", "//java/java-analysis-impl:analysis-impl_test_lib", + "//java/java-syntax:syntax_test_lib", "//platform/built-in-server:builtInServer-impl_test_lib", + "//platform/built-in-server-api:builtInServer_test_lib", "//platform/vcs-impl:vcs-impl_test_lib", "//platform/external-system-api:externalSystem_test_lib", "//platform/statistics:statistics_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl:core-impl_test_lib", "//platform/workspace/jps:jps_test_lib", "//platform/platform-util-io-impl:ide-util-io-impl_test_lib", + "//platform/platform-util-io:ide-util-io_test_lib", "//platform/platform-util-netty:ide-util-netty_test_lib", "//platform/workspace/storage:storage_test_lib", "//platform/wsl-impl:wsl-impl_test_lib", @@ -164,8 +183,11 @@ jvm_library( "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", "//platform/eel-provider:eel-provider_test_lib", "//xml/xml-psi-api:psi_test_lib", + "//xml/xml-parser:parser_test_lib", "//platform/execution:execution_test_lib", "//platform/forms_rt:java-guiForms-rt_test_lib", + "//java/java-frontback-psi-api:frontback-psi_test_lib", + "//platform/lang-api:lang_test_lib", ] ) ### auto-generated section `build intellij.java.compiler.impl` end diff --git a/java/compiler/impl/intellij.java.compiler.impl.iml b/java/compiler/impl/intellij.java.compiler.impl.iml index f7718924e791..0544d1f045c9 100644 --- a/java/compiler/impl/intellij.java.compiler.impl.iml +++ b/java/compiler/impl/intellij.java.compiler.impl.iml @@ -25,9 +25,12 @@ + + + @@ -38,16 +41,21 @@ + + + + + @@ -77,8 +85,11 @@ + + + diff --git a/java/compiler/intellij.java.compiler.tests.iml b/java/compiler/intellij.java.compiler.tests.iml index 083dd609bc74..a365c01e6a0d 100644 --- a/java/compiler/intellij.java.compiler.tests.iml +++ b/java/compiler/intellij.java.compiler.tests.iml @@ -14,11 +14,13 @@ + + @@ -28,8 +30,10 @@ + + @@ -37,6 +41,8 @@ + + diff --git a/java/compiler/openapi/BUILD.bazel b/java/compiler/openapi/BUILD.bazel index fee8920be21d..b34c1379b907 100644 --- a/java/compiler/openapi/BUILD.bazel +++ b/java/compiler/openapi/BUILD.bazel @@ -29,6 +29,10 @@ jvm_library( "//platform/projectModel-api:projectModel", "//platform/workspace/jps", "//platform/execution", + "//platform/ide-core", + "//platform/platform-api:ide", + "//platform/lang-api:lang", + "//java/java-psi-api:psi", ], exports = ["//platform/workspace/jps"] ) @@ -58,6 +62,10 @@ jvm_library( "//platform/projectModel-api:projectModel_test_lib", "//platform/workspace/jps:jps_test_lib", "//platform/execution:execution_test_lib", + "//platform/ide-core:ide-core_test_lib", + "//platform/platform-api:ide_test_lib", + "//platform/lang-api:lang_test_lib", + "//java/java-psi-api:psi_test_lib", ] ) ### auto-generated section `build intellij.java.compiler` end diff --git a/java/compiler/openapi/intellij.java.compiler.iml b/java/compiler/openapi/intellij.java.compiler.iml index 1333300008da..9a1713bb1466 100644 --- a/java/compiler/openapi/intellij.java.compiler.iml +++ b/java/compiler/openapi/intellij.java.compiler.iml @@ -23,6 +23,10 @@ + + + + diff --git a/java/debugger/impl/BUILD.bazel b/java/debugger/impl/BUILD.bazel index 37e75a54fe1b..eeda4516684d 100644 --- a/java/debugger/impl/BUILD.bazel +++ b/java/debugger/impl/BUILD.bazel @@ -23,6 +23,8 @@ jvm_library( "//java/debugger/openapi:java-debugger", "//java/openapi:java", "//java/execution/openapi:java-execution", + "//java/java-syntax:syntax", + "//java/java-psi-api:psi", "//java/java-indexing-api:indexing", "//platform/analysis-api:analysis", "//platform/util/concurrency", @@ -38,6 +40,7 @@ jvm_library( "//platform/forms_rt:java-guiForms-rt", "//java/java-runtime:rt", "//platform/ide-core-impl", + "//platform/ide-core", "//java/jsp-openapi:jsp", "//java/java-impl:impl", "//java/java-impl-refactorings:impl-refactorings", @@ -52,8 +55,11 @@ jvm_library( "//libraries/stream", "//platform/statistics", "//platform/core-ui", + "//platform/core-impl", "//libraries/fastutil", "//platform/platform-util-io-impl:ide-util-io-impl", + "//platform/platform-util-io:ide-util-io", + "//platform/progress/shared:ide-progress", "//libraries/gson", "//libraries/asm", "//platform/util/jdom", @@ -64,10 +70,13 @@ jvm_library( "//libraries/kotlinx/serialization/core", "//libraries/kotlinx/serialization/json", "//platform/util/coroutines", + "//platform/util:util-ui", + "//platform/util-ex", "//platform/threadDumpParser", "//java/debugger/shared", "//platform/eel-provider", "//java/codeserver/highlighting", + "//java/java-frontback-psi-api:frontback-psi", "//xml/xml-psi-api:psi", "//platform/xdebugger-impl/shared", "//platform/xdebugger-impl/rpc", @@ -93,6 +102,10 @@ jvm_library( "//java/openapi:java_test_lib", "//java/execution/openapi:java-execution", "//java/execution/openapi:java-execution_test_lib", + "//java/java-syntax:syntax", + "//java/java-syntax:syntax_test_lib", + "//java/java-psi-api:psi", + "//java/java-psi-api:psi_test_lib", "//java/java-indexing-api:indexing", "//java/java-indexing-api:indexing_test_lib", "//platform/analysis-api:analysis", @@ -122,6 +135,7 @@ jvm_library( "//java/java-runtime:rt", "//java/java-runtime:rt_test_lib", "//platform/ide-core-impl", + "//platform/ide-core", "//java/jsp-openapi:jsp", "//java/jsp-openapi:jsp_test_lib", "//java/java-impl:impl", @@ -147,9 +161,13 @@ jvm_library( "//platform/statistics:statistics_test_lib", "//platform/core-ui", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", "//libraries/fastutil", "//libraries/fastutil:fastutil_test_lib", "//platform/platform-util-io-impl:ide-util-io-impl", + "//platform/platform-util-io:ide-util-io", + "//platform/progress/shared:ide-progress", "//libraries/gson", "//libraries/gson:gson_test_lib", "//libraries/asm", @@ -170,6 +188,10 @@ jvm_library( "//libraries/kotlinx/serialization/json:json_test_lib", "//platform/util/coroutines", "//platform/util/coroutines:coroutines_test_lib", + "//platform/util:util-ui", + "//platform/util:util-ui_test_lib", + "//platform/util-ex", + "//platform/util-ex:util-ex_test_lib", "//platform/threadDumpParser", "//platform/threadDumpParser:threadDumpParser_test_lib", "//java/debugger/shared", @@ -178,6 +200,8 @@ jvm_library( "//platform/eel-provider:eel-provider_test_lib", "//java/codeserver/highlighting", "//java/codeserver/highlighting:highlighting_test_lib", + "//java/java-frontback-psi-api:frontback-psi", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//xml/xml-psi-api:psi", "//xml/xml-psi-api:psi_test_lib", "//platform/xdebugger-impl/shared", @@ -201,8 +225,11 @@ jvm_library( ], runtime_deps = [ "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/platform-impl:ide-impl_test_lib", "//platform/platform-util-io-impl:ide-util-io-impl_test_lib", + "//platform/platform-util-io:ide-util-io_test_lib", + "//platform/progress/shared:ide-progress_test_lib", ] ) ### auto-generated section `build intellij.java.debugger.impl` end diff --git a/java/debugger/impl/intellij.java.debugger.impl.iml b/java/debugger/impl/intellij.java.debugger.impl.iml index 566b63dffe33..5a5bbc0cceef 100644 --- a/java/debugger/impl/intellij.java.debugger.impl.iml +++ b/java/debugger/impl/intellij.java.debugger.impl.iml @@ -34,6 +34,8 @@ + + @@ -49,6 +51,7 @@ + @@ -80,8 +83,11 @@ + + + @@ -92,10 +98,13 @@ + + + diff --git a/java/debugger/openapi/BUILD.bazel b/java/debugger/openapi/BUILD.bazel index d04e8d961776..de6bf487604f 100644 --- a/java/debugger/openapi/BUILD.bazel +++ b/java/debugger/openapi/BUILD.bazel @@ -15,8 +15,10 @@ jvm_library( resources = [":java-debugger_resources"], deps = [ "//java/execution/openapi:java-execution", + "//java/java-syntax:syntax", "//java/jsp-openapi:jsp", "//java/java-psi-api:psi", + "//java/java-frontback-psi-api:frontback-psi", "//platform/analysis-api:analysis", "//platform/core-api:core", "//platform/editor-ui-api:editor-ui", @@ -46,8 +48,10 @@ jvm_library( runtime_deps = [ ":java-debugger", "//java/execution/openapi:java-execution_test_lib", + "//java/java-syntax:syntax_test_lib", "//java/jsp-openapi:jsp_test_lib", "//java/java-psi-api:psi_test_lib", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//platform/analysis-api:analysis_test_lib", "//platform/core-api:core_test_lib", "//platform/editor-ui-api:editor-ui_test_lib", diff --git a/java/debugger/openapi/intellij.java.debugger.iml b/java/debugger/openapi/intellij.java.debugger.iml index f8b29b0546b3..755de81b76f7 100644 --- a/java/debugger/openapi/intellij.java.debugger.iml +++ b/java/debugger/openapi/intellij.java.debugger.iml @@ -9,8 +9,10 @@ + + diff --git a/java/debugger/shared/BUILD.bazel b/java/debugger/shared/BUILD.bazel index 3efe520dffe4..53b08d36711a 100644 --- a/java/debugger/shared/BUILD.bazel +++ b/java/debugger/shared/BUILD.bazel @@ -29,10 +29,12 @@ jvm_library( "//libraries/kotlinx/serialization/core", "//libraries/kotlinx/serialization/json", "//platform/platform-impl/rpc", + "//platform/ide-core", "//platform/execution", "//platform/execution-impl", "//java/java-frontback-impl:frontback-impl", "//platform/util/coroutines", + "//platform/util:util-ui", "//platform/xdebugger-impl/rpc", "//platform/xdebugger-impl/shared", "//platform/xdebugger-impl/ui", @@ -61,10 +63,12 @@ jvm_library( "//libraries/kotlinx/serialization/core:core_test_lib", "//libraries/kotlinx/serialization/json:json_test_lib", "//platform/platform-impl/rpc:rpc_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/execution:execution_test_lib", "//platform/execution-impl:execution-impl_test_lib", "//java/java-frontback-impl:frontback-impl_test_lib", "//platform/util/coroutines:coroutines_test_lib", + "//platform/util:util-ui_test_lib", "//platform/xdebugger-impl/rpc:rpc_test_lib", "//platform/xdebugger-impl/shared:shared_test_lib", "//platform/xdebugger-impl/ui:ui_test_lib", diff --git a/java/debugger/shared/intellij.java.debugger.impl.shared.iml b/java/debugger/shared/intellij.java.debugger.impl.shared.iml index 0bcfdaadc8ca..92e8da049843 100644 --- a/java/debugger/shared/intellij.java.debugger.impl.shared.iml +++ b/java/debugger/shared/intellij.java.debugger.impl.shared.iml @@ -48,10 +48,12 @@ + + diff --git a/java/execution/backend/BUILD.bazel b/java/execution/backend/BUILD.bazel index 6564cd5c552a..0c98fdf7ef87 100644 --- a/java/execution/backend/BUILD.bazel +++ b/java/execution/backend/BUILD.bazel @@ -31,6 +31,7 @@ jvm_library( "//platform/smRunner", "//platform/core-ui", "//platform/execution", + "//platform/testRunner", ], runtime_deps = ["//platform/backend"] ) @@ -60,6 +61,7 @@ jvm_library( "//platform/smRunner:smRunner_test_lib", "//platform/core-ui:core-ui_test_lib", "//platform/execution:execution_test_lib", + "//platform/testRunner:testRunner_test_lib", ] ) ### auto-generated section `build intellij.java.execution.impl.backend` end diff --git a/java/execution/backend/intellij.java.execution.impl.backend.iml b/java/execution/backend/intellij.java.execution.impl.backend.iml index 288bca379ea2..2214b2c28345 100644 --- a/java/execution/backend/intellij.java.execution.impl.backend.iml +++ b/java/execution/backend/intellij.java.execution.impl.backend.iml @@ -51,5 +51,6 @@ + \ No newline at end of file diff --git a/java/execution/frontend/BUILD.bazel b/java/execution/frontend/BUILD.bazel index 13af6aa0d72e..68f4ab97afe0 100644 --- a/java/execution/frontend/BUILD.bazel +++ b/java/execution/frontend/BUILD.bazel @@ -22,9 +22,11 @@ jvm_library( "//platform/editor-ui-api:editor-ui", "//platform/platform-impl/rpc", "//platform/platform-impl:ide-impl", + "//platform/ide-core", "//platform/kernel/shared:kernel", "//platform/project/shared:project", "//platform/testRunner", + "//platform/util:util-ui", "//java/java-frontback-impl:frontback-impl", ] ) @@ -44,9 +46,11 @@ jvm_library( "//platform/editor-ui-api:editor-ui_test_lib", "//platform/platform-impl/rpc:rpc_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/kernel/shared:kernel_test_lib", "//platform/project/shared:project_test_lib", "//platform/testRunner:testRunner_test_lib", + "//platform/util:util-ui_test_lib", "//java/java-frontback-impl:frontback-impl_test_lib", ] ) diff --git a/java/execution/frontend/intellij.java.execution.impl.frontend.iml b/java/execution/frontend/intellij.java.execution.impl.frontend.iml index e83631dc6271..0d72fe872b65 100644 --- a/java/execution/frontend/intellij.java.execution.impl.frontend.iml +++ b/java/execution/frontend/intellij.java.execution.impl.frontend.iml @@ -41,9 +41,11 @@ + + \ No newline at end of file diff --git a/java/execution/impl/BUILD.bazel b/java/execution/impl/BUILD.bazel index a06fcb59b71a..8c3ed0639e9c 100644 --- a/java/execution/impl/BUILD.bazel +++ b/java/execution/impl/BUILD.bazel @@ -16,26 +16,31 @@ jvm_library( deps = [ "//java/openapi:java", "//platform/analysis-api:analysis", + "//java/java-psi-api:psi", "//platform/util/concurrency", "//platform/core-api:core", "//platform/editor-ui-api:editor-ui", "//platform/execution-impl", "//platform/platform-impl:ide-impl", + "//platform/lang-api:lang", "//java/execution/openapi:java-execution", "//java/java-runtime:rt", "//java/debugger/impl", "//platform/indexing-api:indexing", "//jps/model-api:model", + "//jps/model-serialization", "//platform/lang-core", "//platform/projectModel-api:projectModel", "//platform/testRunner", "//platform/vcs-api:vcs", "//platform/usageView", "//platform/ide-core-impl", + "//platform/ide-core", "//java/compiler/openapi:java-compiler", "//java/debugger/openapi:java-debugger", "//java/java-impl:impl", "//java/java-indexing-api:indexing", + "//java/java-syntax:syntax", "//platform/smRunner", "@lib//:intellij-test-discovery", "//platform/external-system-api:externalSystem", @@ -53,8 +58,12 @@ jvm_library( "//platform/util-class-loader:util-classLoader", "//platform/diff-api:diff", "//platform/core-ui", + "//platform/core-impl", "//platform/platform-util-io-impl:ide-util-io-impl", + "//platform/platform-util-io:ide-util-io", "//platform/util/jdom", + "//platform/util:util-ui", + "//platform/util-ex", "//platform/threadDumpParser", "//platform/eel-provider", "//java/debugger/shared", @@ -62,13 +71,10 @@ jvm_library( "//java/codeserver/core", "//platform/execution", "//platform/forms_rt:java-guiForms-rt", + "//java/java-frontback-psi-api:frontback-psi", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", ], - exports = [ - "//java/execution/openapi:java-execution", - "//platform/testRunner", - "//platform/statistics", - ] + exports = ["//java/execution/openapi:java-execution"] ) jvm_library( @@ -79,35 +85,36 @@ jvm_library( exports = [ "//java/execution/openapi:java-execution", "//java/execution/openapi:java-execution_test_lib", - "//platform/testRunner", - "//platform/testRunner:testRunner_test_lib", - "//platform/statistics", - "//platform/statistics:statistics_test_lib", ], runtime_deps = [ ":impl", "//java/openapi:java_test_lib", "//platform/analysis-api:analysis_test_lib", + "//java/java-psi-api:psi_test_lib", "//platform/util/concurrency:concurrency_test_lib", "//platform/core-api:core_test_lib", "//platform/editor-ui-api:editor-ui_test_lib", "//platform/execution-impl:execution-impl_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/lang-api:lang_test_lib", "//java/execution/openapi:java-execution_test_lib", "//java/java-runtime:rt_test_lib", "//java/debugger/impl:impl_test_lib", "//platform/indexing-api:indexing_test_lib", "//jps/model-api:model_test_lib", + "//jps/model-serialization:model-serialization_test_lib", "//platform/lang-core:lang-core_test_lib", "//platform/projectModel-api:projectModel_test_lib", "//platform/testRunner:testRunner_test_lib", "//platform/vcs-api:vcs_test_lib", "//platform/usageView:usageView_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//java/compiler/openapi:java-compiler_test_lib", "//java/debugger/openapi:java-debugger_test_lib", "//java/java-impl:impl_test_lib", "//java/java-indexing-api:indexing_test_lib", + "//java/java-syntax:syntax_test_lib", "//platform/smRunner:smRunner_test_lib", "//platform/external-system-api:externalSystem_test_lib", "//platform/external-system-impl:externalSystem-impl_test_lib", @@ -124,8 +131,12 @@ jvm_library( "//platform/util-class-loader:util-classLoader_test_lib", "//platform/diff-api:diff_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl:core-impl_test_lib", "//platform/platform-util-io-impl:ide-util-io-impl_test_lib", + "//platform/platform-util-io:ide-util-io_test_lib", "//platform/util/jdom:jdom_test_lib", + "//platform/util:util-ui_test_lib", + "//platform/util-ex:util-ex_test_lib", "//platform/threadDumpParser:threadDumpParser_test_lib", "//platform/eel-provider:eel-provider_test_lib", "//java/debugger/shared:shared_test_lib", @@ -133,6 +144,7 @@ jvm_library( "//java/codeserver/core:core_test_lib", "//platform/execution:execution_test_lib", "//platform/forms_rt:java-guiForms-rt_test_lib", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", ] ) diff --git a/java/execution/impl/intellij.java.execution.impl.iml b/java/execution/impl/intellij.java.execution.impl.iml index 02d3bc79fc80..88d9b360ad78 100644 --- a/java/execution/impl/intellij.java.execution.impl.iml +++ b/java/execution/impl/intellij.java.execution.impl.iml @@ -10,26 +10,31 @@ + + + - + + + @@ -43,12 +48,16 @@ - + + + + + @@ -56,6 +65,7 @@ + diff --git a/java/execution/openapi/BUILD.bazel b/java/execution/openapi/BUILD.bazel index 4cfae40116b4..614221ccd268 100644 --- a/java/execution/openapi/BUILD.bazel +++ b/java/execution/openapi/BUILD.bazel @@ -15,6 +15,8 @@ jvm_library( resources = [":java-execution_resources"], deps = [ "//java/openapi:java", + "//java/java-syntax:syntax", + "//java/java-frontback-psi-api:frontback-psi", "//java/java-indexing-api:indexing", "@lib//:kotlin-stdlib", "//platform/analysis-api:analysis", @@ -29,6 +31,10 @@ jvm_library( "//platform/core-ui", "//platform/platform-util-io:ide-util-io", "//platform/execution", + "//platform/platform-api:ide", + "//platform/ide-core", + "//platform/lang-api:lang", + "//java/java-psi-api:psi", ], runtime_deps = ["//platform/backend"] ) @@ -42,6 +48,8 @@ jvm_library( ":java-execution", "//platform/backend:backend_test_lib", "//java/openapi:java_test_lib", + "//java/java-syntax:syntax_test_lib", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//java/java-indexing-api:indexing_test_lib", "//platform/analysis-api:analysis_test_lib", "//platform/util/concurrency:concurrency_test_lib", @@ -55,6 +63,10 @@ jvm_library( "//platform/core-ui:core-ui_test_lib", "//platform/platform-util-io:ide-util-io_test_lib", "//platform/execution:execution_test_lib", + "//platform/platform-api:ide_test_lib", + "//platform/ide-core:ide-core_test_lib", + "//platform/lang-api:lang_test_lib", + "//java/java-psi-api:psi_test_lib", ] ) ### auto-generated section `build intellij.java.execution` end diff --git a/java/execution/openapi/intellij.java.execution.iml b/java/execution/openapi/intellij.java.execution.iml index a37213108afd..8b5c2682b0f6 100644 --- a/java/execution/openapi/intellij.java.execution.iml +++ b/java/execution/openapi/intellij.java.execution.iml @@ -10,6 +10,8 @@ + + @@ -24,6 +26,10 @@ + + + + diff --git a/java/ide-customization/BUILD.bazel b/java/ide-customization/BUILD.bazel index 5df30b23ed84..9d16bd800574 100644 --- a/java/ide-customization/BUILD.bazel +++ b/java/ide-customization/BUILD.bazel @@ -15,6 +15,7 @@ jvm_library( resources = [":ide-customization_resources"], deps = [ "//java/java-psi-api:psi", + "//java/java-frontback-psi-api:frontback-psi", "@lib//:kotlin-stdlib", "//platform/core-api:core", "//platform/lang-api:lang", @@ -41,6 +42,7 @@ jvm_library( runtime_deps = [ ":ide-customization", "//java/java-psi-api:psi_test_lib", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//platform/core-api:core_test_lib", "//platform/lang-api:lang_test_lib", "//platform/lang-impl:lang-impl_test_lib", @@ -102,6 +104,7 @@ jvm_library( "//platform/lang-api:lang", "//platform/lang-api:lang_test_lib", "//platform/platform-impl:ide-impl", + "//platform/ide-core", "//platform/lang-core", "//platform/lang-core:lang-core_test_lib", "@lib//:junit5", @@ -122,6 +125,7 @@ jvm_library( "//platform/testRunner:testRunner_test_lib", "//notebooks/visualization:visualization_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", ] ) ### auto-generated section `build intellij.java.ide.customization.tests` end diff --git a/java/ide-customization/intellij.java.ide.customization.iml b/java/ide-customization/intellij.java.ide.customization.iml index a1940e7ce18d..8d217448610c 100644 --- a/java/ide-customization/intellij.java.ide.customization.iml +++ b/java/ide-customization/intellij.java.ide.customization.iml @@ -9,6 +9,7 @@ + diff --git a/java/ide-customization/intellij.java.ide.customization.tests.iml b/java/ide-customization/intellij.java.ide.customization.tests.iml index a6ba32c15422..b79b3d3646c6 100644 --- a/java/ide-customization/intellij.java.ide.customization.tests.iml +++ b/java/ide-customization/intellij.java.ide.customization.tests.iml @@ -19,6 +19,7 @@ + diff --git a/java/idea-ui/BUILD.bazel b/java/idea-ui/BUILD.bazel index 17010d4506b9..52d7ccf8cebd 100644 --- a/java/idea-ui/BUILD.bazel +++ b/java/idea-ui/BUILD.bazel @@ -17,12 +17,14 @@ jvm_library( "//java/openapi:java", "//java/compiler/openapi:java-compiler", "//java/compiler/impl", + "//java/java-psi-api:psi", "//platform/analysis-api:analysis", "//platform/core-api:core", "//platform/editor-ui-api:editor-ui", "//platform/platform-impl:ide-impl", "//java/java-impl:impl", "//platform/ide-core-impl", + "//platform/ide-core", "//platform/execution", "//java/java-impl-refactorings:impl-refactorings", "//platform/indexing-api:indexing", @@ -47,15 +49,18 @@ jvm_library( "//platform/statistics", "//libraries/fastutil", "//platform/core-ui", + "//platform/core-impl", "//platform/lang-impl", "//platform/workspace/jps", "//platform/platform-util-io:ide-util-io", + "//platform/progress/shared:ide-progress", "//platform/feedback", "//platform/util/jdom", "//platform/backend/workspace", "//platform/workspace/storage", "//xml/dom-openapi:dom", "//platform/util/coroutines", + "//platform/util:util-ui", "//platform/backend/observation", "//platform/eel-provider", "//platform/util/concurrency", @@ -67,8 +72,10 @@ jvm_library( "//libraries/jackson/jackson", "//libraries/jackson/databind", "//platform/forms_rt:java-guiForms-rt", + "//java/java-frontback-psi-api:frontback-psi", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", "//jps/jps-builders:build", + "//platform/lang-api:lang", ] ) @@ -82,12 +89,14 @@ jvm_library( "//java/openapi:java_test_lib", "//java/compiler/openapi:java-compiler_test_lib", "//java/compiler/impl:impl_test_lib", + "//java/java-psi-api:psi_test_lib", "//platform/analysis-api:analysis_test_lib", "//platform/core-api:core_test_lib", "//platform/editor-ui-api:editor-ui_test_lib", "//platform/platform-impl:ide-impl_test_lib", "//java/java-impl:impl_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/execution:execution_test_lib", "//java/java-impl-refactorings:impl-refactorings_test_lib", "//platform/indexing-api:indexing_test_lib", @@ -111,15 +120,18 @@ jvm_library( "//platform/statistics:statistics_test_lib", "//libraries/fastutil:fastutil_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl:core-impl_test_lib", "//platform/lang-impl:lang-impl_test_lib", "//platform/workspace/jps:jps_test_lib", "//platform/platform-util-io:ide-util-io_test_lib", + "//platform/progress/shared:ide-progress_test_lib", "//platform/feedback:feedback_test_lib", "//platform/util/jdom:jdom_test_lib", "//platform/backend/workspace:workspace_test_lib", "//platform/workspace/storage:storage_test_lib", "//xml/dom-openapi:dom_test_lib", "//platform/util/coroutines:coroutines_test_lib", + "//platform/util:util-ui_test_lib", "//platform/backend/observation:observation_test_lib", "//platform/eel-provider:eel-provider_test_lib", "//platform/util/concurrency:concurrency_test_lib", @@ -130,8 +142,10 @@ jvm_library( "//libraries/jackson/jackson:jackson_test_lib", "//libraries/jackson/databind:databind_test_lib", "//platform/forms_rt:java-guiForms-rt_test_lib", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", "//jps/jps-builders:build_test_lib", + "//platform/lang-api:lang_test_lib", ] ) ### auto-generated section `build intellij.java.ui` end @@ -188,17 +202,26 @@ jvm_library( "//jps/model-serialization:model-serialization_test_lib", "//platform/lang-core", "//platform/lang-core:lang-core_test_lib", + "//platform/lang-api:lang", + "//platform/lang-api:lang_test_lib", "//platform/projectModel-api:projectModel", "//platform/projectModel-api:projectModel_test_lib", "//platform/platform-tests:tests", "//platform/platform-tests:tests_test_lib", "//platform/core-ui", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", "//java/compiler/openapi:java-compiler", "//java/compiler/openapi:java-compiler_test_lib", "//java/openapi:java", "//java/openapi:java_test_lib", + "//java/java-syntax:syntax", + "//java/java-syntax:syntax_test_lib", + "//java/java-psi-api:psi", + "//java/java-psi-api:psi_test_lib", "//platform/ide-core-impl", + "//platform/ide-core", "//platform/util/jdom", "//platform/util/jdom:jdom_test_lib", "//libraries/kotlinx/coroutines/core", @@ -214,6 +237,10 @@ jvm_library( "@lib//:kotlin-test", "//platform/util", "//platform/util:util_test_lib", + "//platform/util:util-ui", + "//platform/util:util-ui_test_lib", + "//platform/util-ex", + "//platform/util-ex:util-ex_test_lib", "@lib//:ktor-server-cio", "//platform/testFramework/junit5/eel", "//platform/testFramework/junit5/eel:eel_test_lib", @@ -231,10 +258,13 @@ jvm_library( "//platform/execution:execution_test_lib", "//platform/forms_rt:java-guiForms-rt", "//platform/forms_rt:java-guiForms-rt_test_lib", + "//java/java-frontback-psi-api:frontback-psi", + "//java/java-frontback-psi-api:frontback-psi_test_lib", ], runtime_deps = [ ":ui-tests", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", ] ) ### auto-generated section `build intellij.java.ui.tests` end diff --git a/java/idea-ui/intellij.java.ui.iml b/java/idea-ui/intellij.java.ui.iml index 0991793653a6..17b7000000f8 100644 --- a/java/idea-ui/intellij.java.ui.iml +++ b/java/idea-ui/intellij.java.ui.iml @@ -12,12 +12,14 @@ + + @@ -42,15 +44,18 @@ + + + @@ -62,7 +67,9 @@ + + \ No newline at end of file diff --git a/java/idea-ui/intellij.java.ui.tests.iml b/java/idea-ui/intellij.java.ui.tests.iml index 854d4506aa03..a25530aaa5ed 100644 --- a/java/idea-ui/intellij.java.ui.tests.iml +++ b/java/idea-ui/intellij.java.ui.tests.iml @@ -20,12 +20,17 @@ + + + + + @@ -34,6 +39,8 @@ + + @@ -43,5 +50,6 @@ + \ No newline at end of file diff --git a/java/java-analysis-api/BUILD.bazel b/java/java-analysis-api/BUILD.bazel index 7e43ba2389c9..b6e5482a664d 100644 --- a/java/java-analysis-api/BUILD.bazel +++ b/java/java-analysis-api/BUILD.bazel @@ -23,6 +23,8 @@ jvm_library( deps = [ "//platform/analysis-api:analysis", "//java/java-psi-api:psi", + "//java/java-frontback-psi-api:frontback-psi", + "//java/java-syntax:syntax", "//platform/core-api:core", "//jps/model-api:model", "//platform/projectModel-api:projectModel", @@ -34,10 +36,7 @@ jvm_library( "//platform/workspace/storage", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", ], - exports = [ - "//uast/uast-common:uast", - "//uast/uast-common-ide:ide", - ] + exports = ["//uast/uast-common:uast"] ) jvm_library( @@ -49,13 +48,13 @@ jvm_library( exports = [ "//uast/uast-common:uast", "//uast/uast-common:uast_test_lib", - "//uast/uast-common-ide:ide", - "//uast/uast-common-ide:ide_test_lib", ], runtime_deps = [ ":analysis", "//platform/analysis-api:analysis_test_lib", "//java/java-psi-api:psi_test_lib", + "//java/java-frontback-psi-api:frontback-psi_test_lib", + "//java/java-syntax:syntax_test_lib", "//platform/core-api:core_test_lib", "//jps/model-api:model_test_lib", "//platform/projectModel-api:projectModel_test_lib", diff --git a/java/java-analysis-api/intellij.java.analysis.iml b/java/java-analysis-api/intellij.java.analysis.iml index dba6df5583a5..0db232cf86cc 100644 --- a/java/java-analysis-api/intellij.java.analysis.iml +++ b/java/java-analysis-api/intellij.java.analysis.iml @@ -26,13 +26,15 @@ + + - + diff --git a/java/java-analysis-impl/BUILD.bazel b/java/java-analysis-impl/BUILD.bazel index b571c8a60fc0..7b5b5f673475 100644 --- a/java/java-analysis-impl/BUILD.bazel +++ b/java/java-analysis-impl/BUILD.bazel @@ -25,19 +25,24 @@ jvm_library( "//platform/analysis-api:analysis", "//platform/analysis-impl", "//java/java-indexing-impl:indexing-impl", + "//java/java-psi-api:psi", "//java/java-psi-impl:psi-impl", "//platform/code-style-api:codeStyle", "//platform/util/concurrency", + "//uast/uast-common-ide:ide", "//platform/core-api:core", "//platform/editor-ui-api:editor-ui", "//platform/indexing-api:indexing", "//jps/model-api:model", + "//jps/model-serialization", "//platform/projectModel-api:projectModel", "//platform/projectModel-impl", "//java/java-analysis-api:analysis", + "//java/java-syntax:syntax", "//xml/xml-psi-api:psi", "//xml/xml-psi-impl:psi-impl", "//platform/platform-api:ide", + "//platform/ide-core", "//libraries/asm", "//libraries/stream", "@lib//:kotlin-stdlib", @@ -50,6 +55,7 @@ jvm_library( "//platform/workspace/jps", "//platform/backend/workspace", "//java/java-frontback-impl:frontback-impl", + "//java/java-frontback-psi-api:frontback-psi", "//platform/editor-ui-ex:editor-ex", "//java/codeserver/highlighting", "//java/codeserver/core", @@ -58,6 +64,8 @@ jvm_library( "//libraries/jsoup", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", "//platform/core-ui", + "//platform/core-impl", + "//platform/lang-api:lang", ], exports = [ "//platform/analysis-impl", @@ -95,19 +103,24 @@ jvm_library( "//platform/analysis-api:analysis_test_lib", "//platform/analysis-impl:analysis-impl_test_lib", "//java/java-indexing-impl:indexing-impl_test_lib", + "//java/java-psi-api:psi_test_lib", "//java/java-psi-impl:psi-impl_test_lib", "//platform/code-style-api:codeStyle_test_lib", "//platform/util/concurrency:concurrency_test_lib", + "//uast/uast-common-ide:ide_test_lib", "//platform/core-api:core_test_lib", "//platform/editor-ui-api:editor-ui_test_lib", "//platform/indexing-api:indexing_test_lib", "//jps/model-api:model_test_lib", + "//jps/model-serialization:model-serialization_test_lib", "//platform/projectModel-api:projectModel_test_lib", "//platform/projectModel-impl:projectModel-impl_test_lib", "//java/java-analysis-api:analysis_test_lib", + "//java/java-syntax:syntax_test_lib", "//xml/xml-psi-api:psi_test_lib", "//xml/xml-psi-impl:psi-impl_test_lib", "//platform/platform-api:ide_test_lib", + "//platform/ide-core:ide-core_test_lib", "//libraries/asm:asm_test_lib", "//libraries/stream:stream_test_lib", "//java/openapi:java_test_lib", @@ -119,6 +132,7 @@ jvm_library( "//platform/workspace/jps:jps_test_lib", "//platform/backend/workspace:workspace_test_lib", "//java/java-frontback-impl:frontback-impl_test_lib", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//platform/editor-ui-ex:editor-ex_test_lib", "//java/codeserver/highlighting:highlighting_test_lib", "//java/codeserver/core:core_test_lib", @@ -127,6 +141,8 @@ jvm_library( "//libraries/jsoup:jsoup_test_lib", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl:core-impl_test_lib", + "//platform/lang-api:lang_test_lib", ] ) ### auto-generated section `build intellij.java.analysis.impl` end diff --git a/java/java-analysis-impl/intellij.java.analysis.impl.iml b/java/java-analysis-impl/intellij.java.analysis.impl.iml index 3e1b58dc87e3..1d0278ff657d 100644 --- a/java/java-analysis-impl/intellij.java.analysis.impl.iml +++ b/java/java-analysis-impl/intellij.java.analysis.impl.iml @@ -28,19 +28,24 @@ + + + + + @@ -53,6 +58,7 @@ + @@ -61,5 +67,7 @@ + + \ No newline at end of file diff --git a/java/java-backend/BUILD.bazel b/java/java-backend/BUILD.bazel index 534db6b7c358..8bf0196a4bab 100644 --- a/java/java-backend/BUILD.bazel +++ b/java/java-backend/BUILD.bazel @@ -14,10 +14,7 @@ jvm_library( srcs = glob(["src/**/*.kt", "src/**/*.java", "src/**/*.form"], allow_empty = True), resources = [":backend_resources"], exports = [ - "//java/java-syntax:syntax", - "//java/java-frontback-psi-api:frontback-psi", "//java/java-frontback-psi-impl:frontback-psi-impl", - "//java/java-psi-api:psi", "//java/java-psi-impl:psi-impl", "//java/java-frontback-impl:frontback-impl", "//java/java-indexing-api:indexing", diff --git a/java/java-backend/intellij.java.backend.iml b/java/java-backend/intellij.java.backend.iml index 9530aa6bd992..0afded57581b 100644 --- a/java/java-backend/intellij.java.backend.iml +++ b/java/java-backend/intellij.java.backend.iml @@ -8,10 +8,10 @@ - - + + - + diff --git a/java/java-copyright/BUILD.bazel b/java/java-copyright/BUILD.bazel index c19547792deb..0c0c594558dd 100644 --- a/java/java-copyright/BUILD.bazel +++ b/java/java-copyright/BUILD.bazel @@ -18,6 +18,7 @@ jvm_library( "//plugins/copyright", "//platform/core-api:core", "//java/java-psi-api:psi", + "//java/java-frontback-psi-api:frontback-psi", "//platform/util", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", ] @@ -33,6 +34,7 @@ jvm_library( "//plugins/copyright:copyright_test_lib", "//platform/core-api:core_test_lib", "//java/java-psi-api:psi_test_lib", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//platform/util:util_test_lib", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", ] diff --git a/java/java-copyright/intellij.java.copyright.iml b/java/java-copyright/intellij.java.copyright.iml index ab39a2464fa5..38b992e29b4a 100644 --- a/java/java-copyright/intellij.java.copyright.iml +++ b/java/java-copyright/intellij.java.copyright.iml @@ -12,6 +12,7 @@ + diff --git a/java/java-features-trainer/BUILD.bazel b/java/java-features-trainer/BUILD.bazel index 9ee1588ed7f8..054baa63778b 100644 --- a/java/java-features-trainer/BUILD.bazel +++ b/java/java-features-trainer/BUILD.bazel @@ -16,18 +16,22 @@ jvm_library( deps = [ "@lib//:kotlin-stdlib", "//java/openapi:java", + "//java/java-syntax:syntax", "//java/debugger/openapi:java-debugger", + "//java/java-psi-api:psi", "//platform/analysis-api:analysis", "//platform/core-api:core", "//platform/editor-ui-api:editor-ui", "//platform/execution-impl", "//platform/ide-core-impl", + "//platform/ide-core", "//java/java-impl:impl", "//java/idea-ui:ui", "//plugins/ide-features-trainer:featuresTrainer", "//platform/platform-impl:ide-impl", "//platform/xdebugger-api:debugger", "//platform/core-ui", + "//platform/core-impl", "//java/debugger/impl", "//libraries/kotlinx/serialization/core", "//libraries/kotlinx/serialization/json", @@ -37,7 +41,10 @@ jvm_library( "//platform/refactoring", "//java/execution/impl", "//java/debugger/shared", + "//java/java-frontback-psi-api:frontback-psi", "//platform/execution", + "//platform/lang-api:lang", + "//platform/util:util-ui", ] ) @@ -49,18 +56,22 @@ jvm_library( runtime_deps = [ ":featuresTrainer", "//java/openapi:java_test_lib", + "//java/java-syntax:syntax_test_lib", "//java/debugger/openapi:java-debugger_test_lib", + "//java/java-psi-api:psi_test_lib", "//platform/analysis-api:analysis_test_lib", "//platform/core-api:core_test_lib", "//platform/editor-ui-api:editor-ui_test_lib", "//platform/execution-impl:execution-impl_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//java/java-impl:impl_test_lib", "//java/idea-ui:ui_test_lib", "//plugins/ide-features-trainer:featuresTrainer_test_lib", "//platform/platform-impl:ide-impl_test_lib", "//platform/xdebugger-api:debugger_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl:core-impl_test_lib", "//java/debugger/impl:impl_test_lib", "//libraries/kotlinx/serialization/core:core_test_lib", "//libraries/kotlinx/serialization/json:json_test_lib", @@ -72,7 +83,10 @@ jvm_library( "//platform/testFramework:testFramework_test_lib", "//java/execution/impl:impl_test_lib", "//java/debugger/shared:shared_test_lib", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//platform/execution:execution_test_lib", + "//platform/lang-api:lang_test_lib", + "//platform/util:util-ui_test_lib", ] ) ### auto-generated section `build intellij.java.featuresTrainer` end diff --git a/java/java-features-trainer/intellij.java.featuresTrainer.iml b/java/java-features-trainer/intellij.java.featuresTrainer.iml index b27f52d732f0..036b43c966a1 100644 --- a/java/java-features-trainer/intellij.java.featuresTrainer.iml +++ b/java/java-features-trainer/intellij.java.featuresTrainer.iml @@ -11,18 +11,22 @@ + + + + @@ -33,6 +37,9 @@ + + + \ No newline at end of file diff --git a/java/java-frontback-impl/BUILD.bazel b/java/java-frontback-impl/BUILD.bazel index c56db7cdebcc..50ed08a4e699 100644 --- a/java/java-frontback-impl/BUILD.bazel +++ b/java/java-frontback-impl/BUILD.bazel @@ -21,17 +21,22 @@ jvm_library( "//platform/core-impl", "//platform/editor-ui-api:editor-ui", "//platform/ide-core-impl", + "//platform/ide-core", "//platform/lang-impl", "//platform/platform-impl:ide-impl", "//platform/analysis-impl", "//platform/core-ui", "//platform/projectModel-api:projectModel", "//platform/refactoring", + "//platform/util:util-ui", "//xml/xml-parser:parser", "//platform/core-api:core", "//platform/util/jdom", "//platform/syntax/syntax-psi:psi", + "//platform/syntax/syntax-util:util", + "//java/java-psi-api:psi", "//java/java-psi-impl:psi-impl", + "//java/java-syntax:syntax", "//platform/statistics", "//platform/threadDumpParser", "//platform/code-style-impl:codeStyle-impl", @@ -42,12 +47,7 @@ jvm_library( "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", "//platform/util/concurrency", ], - exports = [ - "//java/java-frontback-psi-api:frontback-psi", - "//java/java-frontback-psi-impl:frontback-psi-impl", - "//platform/core-impl", - "//xml/xml-parser:parser", - ] + exports = ["//java/java-frontback-psi-impl:frontback-psi-impl"] ) jvm_library( @@ -56,14 +56,8 @@ jvm_library( visibility = ["//visibility:public"], srcs = glob([], allow_empty = True), exports = [ - "//java/java-frontback-psi-api:frontback-psi", - "//java/java-frontback-psi-api:frontback-psi_test_lib", "//java/java-frontback-psi-impl:frontback-psi-impl", "//java/java-frontback-psi-impl:frontback-psi-impl_test_lib", - "//platform/core-impl", - "//platform/core-impl:core-impl_test_lib", - "//xml/xml-parser:parser", - "//xml/xml-parser:parser_test_lib", ], runtime_deps = [ ":frontback-impl", @@ -74,17 +68,22 @@ jvm_library( "//platform/core-impl:core-impl_test_lib", "//platform/editor-ui-api:editor-ui_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/lang-impl:lang-impl_test_lib", "//platform/platform-impl:ide-impl_test_lib", "//platform/analysis-impl:analysis-impl_test_lib", "//platform/core-ui:core-ui_test_lib", "//platform/projectModel-api:projectModel_test_lib", "//platform/refactoring:refactoring_test_lib", + "//platform/util:util-ui_test_lib", "//xml/xml-parser:parser_test_lib", "//platform/core-api:core_test_lib", "//platform/util/jdom:jdom_test_lib", "//platform/syntax/syntax-psi:psi_test_lib", + "//platform/syntax/syntax-util:util_test_lib", + "//java/java-psi-api:psi_test_lib", "//java/java-psi-impl:psi-impl_test_lib", + "//java/java-syntax:syntax_test_lib", "//platform/statistics:statistics_test_lib", "//platform/threadDumpParser:threadDumpParser_test_lib", "//platform/code-style-impl:codeStyle-impl_test_lib", diff --git a/java/java-frontback-impl/intellij.java.frontback.impl.iml b/java/java-frontback-impl/intellij.java.frontback.impl.iml index 0f9dec4df7b6..75a0827ab572 100644 --- a/java/java-frontback-impl/intellij.java.frontback.impl.iml +++ b/java/java-frontback-impl/intellij.java.frontback.impl.iml @@ -16,7 +16,6 @@ $KOTLIN_BUNDLED$/lib/kotlinx-serialization-compiler-plugin.jar - @@ -30,24 +29,29 @@ - + - + + - + + + + + diff --git a/java/java-frontback-psi-api/BUILD.bazel b/java/java-frontback-psi-api/BUILD.bazel index dad8a98dbaad..df73cd1992ae 100644 --- a/java/java-frontback-psi-api/BUILD.bazel +++ b/java/java-frontback-psi-api/BUILD.bazel @@ -20,8 +20,7 @@ jvm_library( "@lib//:kotlin-stdlib", "//java/java-syntax:syntax", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", - ], - exports = ["//java/java-syntax:syntax"] + ] ) jvm_library( @@ -30,10 +29,6 @@ jvm_library( visibility = ["//visibility:public"], srcs = glob([], allow_empty = True), kotlinc_opts = "@community//:k8", - exports = [ - "//java/java-syntax:syntax", - "//java/java-syntax:syntax_test_lib", - ], runtime_deps = [ ":frontback-psi", "//platform/util:util_test_lib", diff --git a/java/java-frontback-psi-api/intellij.java.frontback.psi.iml b/java/java-frontback-psi-api/intellij.java.frontback.psi.iml index e0ed6e7cf4b9..b0b4a9981c3a 100644 --- a/java/java-frontback-psi-api/intellij.java.frontback.psi.iml +++ b/java/java-frontback-psi-api/intellij.java.frontback.psi.iml @@ -27,7 +27,7 @@ - + \ No newline at end of file diff --git a/java/java-frontback-psi-impl/BUILD.bazel b/java/java-frontback-psi-impl/BUILD.bazel index 2a991624bb01..d1a3180bacd8 100644 --- a/java/java-frontback-psi-impl/BUILD.bazel +++ b/java/java-frontback-psi-impl/BUILD.bazel @@ -25,11 +25,8 @@ jvm_library( "@lib//:kotlin-stdlib", "//libraries/kotlinx/serialization/core", "//platform/syntax/syntax-psi:psi", + "//java/java-syntax:syntax", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", - ], - exports = [ - "//java/java-frontback-psi-api:frontback-psi", - "//platform/core-impl", ] ) @@ -39,12 +36,6 @@ jvm_library( visibility = ["//visibility:public"], srcs = glob([], allow_empty = True), kotlinc_opts = "@community//:k8", - exports = [ - "//java/java-frontback-psi-api:frontback-psi", - "//java/java-frontback-psi-api:frontback-psi_test_lib", - "//platform/core-impl", - "//platform/core-impl:core-impl_test_lib", - ], runtime_deps = [ ":frontback-psi-impl", "//java/java-frontback-psi-api:frontback-psi_test_lib", @@ -56,6 +47,7 @@ jvm_library( "//libraries/fastutil:fastutil_test_lib", "//libraries/kotlinx/serialization/core:core_test_lib", "//platform/syntax/syntax-psi:psi_test_lib", + "//java/java-syntax:syntax_test_lib", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", ] ) diff --git a/java/java-frontback-psi-impl/intellij.java.frontback.psi.impl.iml b/java/java-frontback-psi-impl/intellij.java.frontback.psi.impl.iml index 60ca0203e5f8..e09c239d604f 100644 --- a/java/java-frontback-psi-impl/intellij.java.frontback.psi.impl.iml +++ b/java/java-frontback-psi-impl/intellij.java.frontback.psi.impl.iml @@ -16,7 +16,6 @@ $KOTLIN_BUNDLED$/lib/kotlinx-serialization-compiler-plugin.jar - @@ -31,9 +30,9 @@ - + - + @@ -41,6 +40,7 @@ + \ No newline at end of file diff --git a/java/java-frontback-tests/BUILD.bazel b/java/java-frontback-tests/BUILD.bazel index 0f1f5588bbbb..5c5d6b7c3c54 100644 --- a/java/java-frontback-tests/BUILD.bazel +++ b/java/java-frontback-tests/BUILD.bazel @@ -39,6 +39,8 @@ jvm_library( "//platform/core-api:core_test_lib", "//platform/core-ui", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", "//platform/editor-ui-api:editor-ui", "//platform/editor-ui-api:editor-ui_test_lib", "//platform/projectModel-api:projectModel", @@ -46,8 +48,11 @@ jvm_library( "//platform/testFramework", "//platform/testFramework:testFramework_test_lib", "//platform/ide-core-impl", + "//platform/ide-core", "//java/java-frontback-psi-impl:frontback-psi-impl", "//java/java-frontback-psi-impl:frontback-psi-impl_test_lib", + "//java/java-frontback-psi-api:frontback-psi", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//platform/testFramework/junit5", "//platform/testFramework/junit5:junit5_test_lib", "//platform/backend/workspace", @@ -62,10 +67,16 @@ jvm_library( "//java/testFramework/shared:shared_test_lib", "//platform/syntax/syntax-psi:psi", "//platform/syntax/syntax-psi:psi_test_lib", + "//platform/syntax/syntax-util:util", + "//platform/syntax/syntax-util:util_test_lib", "//java/java-syntax:syntax", "//java/java-syntax:syntax_test_lib", "//platform/syntax/syntax-tree:tree", "//platform/syntax/syntax-tree:tree_test_lib", + "//platform/lang-api:lang", + "//platform/lang-api:lang_test_lib", + "//java/java-psi-api:psi", + "//java/java-psi-api:psi_test_lib", "@lib//:jet_check", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", @@ -89,6 +100,7 @@ jvm_library( runtime_deps = [ ":frontback-tests", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", ] ) ### auto-generated section `build intellij.java.frontback.tests` end diff --git a/java/java-frontback-tests/intellij.java.frontback.tests.iml b/java/java-frontback-tests/intellij.java.frontback.tests.iml index 5a11d9f8e45e..e2254537c6a2 100644 --- a/java/java-frontback-tests/intellij.java.frontback.tests.iml +++ b/java/java-frontback-tests/intellij.java.frontback.tests.iml @@ -15,11 +15,14 @@ + + + @@ -27,8 +30,11 @@ + + + diff --git a/java/java-impl-inspections/BUILD.bazel b/java/java-impl-inspections/BUILD.bazel index faef39f1c407..e4a160f8ecac 100644 --- a/java/java-impl-inspections/BUILD.bazel +++ b/java/java-impl-inspections/BUILD.bazel @@ -17,6 +17,7 @@ jvm_library( "//java/openapi:java", "//java/java-analysis-impl:analysis-impl", "//libraries/stream", + "//java/java-psi-api:psi", "//java/java-impl:impl", "//java/java-indexing-api:indexing", "//platform/analysis-api:analysis", @@ -26,6 +27,7 @@ jvm_library( "//platform/platform-impl:ide-impl", "//libraries/fastutil", "//platform/ide-core-impl", + "//platform/ide-core", "//java/compiler/openapi:java-compiler", "//libraries/asm", "//java/java-impl-refactorings:impl-refactorings", @@ -37,14 +39,17 @@ jvm_library( "//platform/usageView", "//platform/backend/workspace", "//platform/core-ui", + "//platform/core-impl", "//platform/util/text-matching", "//java/codeserver/highlighting", "//java/codeserver/core", "//platform/workspace/storage", "//java/java-syntax:syntax", + "//java/java-frontback-psi-api:frontback-psi", "//xml/xml-psi-api:psi", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", "//platform/util/concurrency", + "//platform/lang-api:lang", ] ) @@ -58,6 +63,7 @@ jvm_library( "//java/openapi:java_test_lib", "//java/java-analysis-impl:analysis-impl_test_lib", "//libraries/stream:stream_test_lib", + "//java/java-psi-api:psi_test_lib", "//java/java-impl:impl_test_lib", "//java/java-indexing-api:indexing_test_lib", "//platform/analysis-api:analysis_test_lib", @@ -67,6 +73,7 @@ jvm_library( "//platform/platform-impl:ide-impl_test_lib", "//libraries/fastutil:fastutil_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//java/compiler/openapi:java-compiler_test_lib", "//libraries/asm:asm_test_lib", "//java/java-impl-refactorings:impl-refactorings_test_lib", @@ -78,14 +85,17 @@ jvm_library( "//platform/usageView:usageView_test_lib", "//platform/backend/workspace:workspace_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl:core-impl_test_lib", "//platform/util/text-matching:text-matching_test_lib", "//java/codeserver/highlighting:highlighting_test_lib", "//java/codeserver/core:core_test_lib", "//platform/workspace/storage:storage_test_lib", "//java/java-syntax:syntax_test_lib", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//xml/xml-psi-api:psi_test_lib", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", "//platform/util/concurrency:concurrency_test_lib", + "//platform/lang-api:lang_test_lib", ] ) ### auto-generated section `build intellij.java.impl.inspections` end diff --git a/java/java-impl-inspections/intellij.java.impl.inspections.iml b/java/java-impl-inspections/intellij.java.impl.inspections.iml index 1a2cab9b9209..46b0692a88ed 100644 --- a/java/java-impl-inspections/intellij.java.impl.inspections.iml +++ b/java/java-impl-inspections/intellij.java.impl.inspections.iml @@ -11,6 +11,7 @@ + @@ -20,6 +21,7 @@ + @@ -31,13 +33,16 @@ + + + \ No newline at end of file diff --git a/java/java-impl-refactorings/BUILD.bazel b/java/java-impl-refactorings/BUILD.bazel index 657f10096b97..70767694e335 100644 --- a/java/java-impl-refactorings/BUILD.bazel +++ b/java/java-impl-refactorings/BUILD.bazel @@ -36,12 +36,15 @@ jvm_library( "//platform/refactoring", "//platform/statistics", "//java/openapi:java", + "//java/java-syntax:syntax", "//java/java-psi-impl:psi-impl", "//java/java-impl:impl", "//java/jsp-openapi:jsp", "//platform/structure-view-impl:structureView-impl", "//platform/usageView", "//platform/ide-core-impl", + "//platform/ide-core", + "//platform/progress/shared:ide-progress", "//libraries/stream", "//platform/code-style-impl:codeStyle-impl", "//libraries/fastutil", @@ -49,12 +52,15 @@ jvm_library( "//platform/usageView-impl", "//platform/util/diff", "//platform/util/jdom", + "//platform/util:util-ui", "//platform/core-ui", "//xml/xml-psi-api:psi", "//java/codeserver/core", "//platform/execution", "//platform/forms_rt:java-guiForms-rt", + "//java/java-frontback-psi-api:frontback-psi", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", + "//uast/uast-common-ide:ide", ] ) @@ -87,12 +93,15 @@ jvm_library( "//platform/refactoring:refactoring_test_lib", "//platform/statistics:statistics_test_lib", "//java/openapi:java_test_lib", + "//java/java-syntax:syntax_test_lib", "//java/java-psi-impl:psi-impl_test_lib", "//java/java-impl:impl_test_lib", "//java/jsp-openapi:jsp_test_lib", "//platform/structure-view-impl:structureView-impl_test_lib", "//platform/usageView:usageView_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", + "//platform/progress/shared:ide-progress_test_lib", "//libraries/stream:stream_test_lib", "//platform/code-style-impl:codeStyle-impl_test_lib", "//libraries/fastutil:fastutil_test_lib", @@ -100,12 +109,15 @@ jvm_library( "//platform/usageView-impl:usageView-impl_test_lib", "//platform/util/diff:diff_test_lib", "//platform/util/jdom:jdom_test_lib", + "//platform/util:util-ui_test_lib", "//platform/core-ui:core-ui_test_lib", "//xml/xml-psi-api:psi_test_lib", "//java/codeserver/core:core_test_lib", "//platform/execution:execution_test_lib", "//platform/forms_rt:java-guiForms-rt_test_lib", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", + "//uast/uast-common-ide:ide_test_lib", ] ) ### auto-generated section `build intellij.java.impl.refactorings` end diff --git a/java/java-impl-refactorings/intellij.java.impl.refactorings.iml b/java/java-impl-refactorings/intellij.java.impl.refactorings.iml index 5edd784f9bc1..9eb73b42953e 100644 --- a/java/java-impl-refactorings/intellij.java.impl.refactorings.iml +++ b/java/java-impl-refactorings/intellij.java.impl.refactorings.iml @@ -30,12 +30,15 @@ + + + @@ -43,11 +46,14 @@ + + + \ No newline at end of file diff --git a/java/java-impl/BUILD.bazel b/java/java-impl/BUILD.bazel index 62d3173554d9..1347b4a606d4 100644 --- a/java/java-impl/BUILD.bazel +++ b/java/java-impl/BUILD.bazel @@ -57,6 +57,7 @@ jvm_library( "//platform/execution-impl", "//java/jsp-openapi:jsp", "//platform/ide-core-impl", + "//platform/ide-core", "//java/jsp-spi", "//java/execution/openapi:java-execution", "//xml/dom-impl", @@ -64,6 +65,7 @@ jvm_library( "//platform/icons", "//java/java-psi-impl:psi-impl", "//java/java-frontback-impl:frontback-impl", + "//java/java-frontback-psi-api:frontback-psi", "//RegExpSupport:regexp", "//java/java-indexing-impl:indexing-impl", "//java/java-indexing-api:indexing", @@ -86,16 +88,22 @@ jvm_library( "//platform/statistics", "//libraries/fastutil", "//platform/core-ui", + "//platform/core-impl", "//platform/code-style-impl:codeStyle-impl", "//platform/platform-util-io-impl:ide-util-io-impl", + "//platform/platform-util-io:ide-util-io", "//platform/workspace/storage", "//platform/ml-api:ml", "//platform/util/text-matching", + "//platform/util:util-ui", + "//platform/util-ex", "//platform/workspace/jps", "//platform/platform-impl/internal", "//platform/backend/workspace", "//libraries/caffeine", "//platform/platform-impl:ide-impl", + "//platform/progress/shared:ide-progress", + "//platform/favoritesTreeView", "//platform/markdown-utils", "//libraries/markdown", "//platform/threadDumpParser", @@ -105,11 +113,13 @@ jvm_library( "//java/codeserver/highlighting", "//java/codeserver/core", "//xml/xml-psi-api:psi", + "//xml/xml-parser:parser", "//java/java-syntax:syntax", "//java/java-psi-api:psi", "//platform/execution", "//libraries/kotlinx/serialization/core", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", + "//platform/lang-api:lang", ], exports = [ "//java/openapi:java", @@ -119,7 +129,6 @@ jvm_library( "//java/java-indexing-impl:indexing-impl", "//java/java-analysis-impl:analysis-impl", "//java/java-structure-view:structureView", - "//platform/statistics", ], runtime_deps = ["@lib//:jaxb-runtime"] ) @@ -189,6 +198,7 @@ jvm_library( "//java/jsp-openapi:jsp", "//java/jsp-openapi:jsp_test_lib", "//platform/ide-core-impl", + "//platform/ide-core", "//java/jsp-spi", "//java/jsp-spi:jsp-spi_test_lib", "//java/execution/openapi:java-execution", @@ -203,6 +213,8 @@ jvm_library( "//java/java-psi-impl:psi-impl_test_lib", "//java/java-frontback-impl:frontback-impl", "//java/java-frontback-impl:frontback-impl_test_lib", + "//java/java-frontback-psi-api:frontback-psi", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//RegExpSupport:regexp", "//RegExpSupport:regexp_test_lib", "//java/java-indexing-impl:indexing-impl", @@ -246,9 +258,12 @@ jvm_library( "//libraries/fastutil:fastutil_test_lib", "//platform/core-ui", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", "//platform/code-style-impl:codeStyle-impl", "//platform/code-style-impl:codeStyle-impl_test_lib", "//platform/platform-util-io-impl:ide-util-io-impl", + "//platform/platform-util-io:ide-util-io", "//plugins/completion-ml-ranking", "//plugins/completion-ml-ranking:completion-ml-ranking_test_lib", "//platform/workspace/storage", @@ -257,6 +272,10 @@ jvm_library( "//platform/ml-api:ml_test_lib", "//platform/util/text-matching", "//platform/util/text-matching:text-matching_test_lib", + "//platform/util:util-ui", + "//platform/util:util-ui_test_lib", + "//platform/util-ex", + "//platform/util-ex:util-ex_test_lib", "//platform/workspace/jps", "//platform/workspace/jps:jps_test_lib", "//platform/platform-impl/internal", @@ -265,6 +284,8 @@ jvm_library( "//libraries/caffeine", "//libraries/caffeine:caffeine_test_lib", "//platform/platform-impl:ide-impl", + "//platform/progress/shared:ide-progress", + "//platform/favoritesTreeView", "//platform/markdown-utils", "//platform/markdown-utils:markdown-utils_test_lib", "//libraries/markdown", @@ -283,6 +304,8 @@ jvm_library( "//java/codeserver/core:core_test_lib", "//xml/xml-psi-api:psi", "//xml/xml-psi-api:psi_test_lib", + "//xml/xml-parser:parser", + "//xml/xml-parser:parser_test_lib", "//java/java-syntax:syntax", "//java/java-syntax:syntax_test_lib", "//java/java-psi-api:psi", @@ -295,6 +318,8 @@ jvm_library( "//libraries/kotlinx/serialization/core:core_test_lib", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", + "//platform/lang-api:lang", + "//platform/lang-api:lang_test_lib", ], exports = [ "//java/openapi:java", @@ -311,16 +336,18 @@ jvm_library( "//java/java-analysis-impl:analysis-impl_test_lib", "//java/java-structure-view:structureView", "//java/java-structure-view:structureView_test_lib", - "//platform/statistics", - "//platform/statistics:statistics_test_lib", ], runtime_deps = [ "//platform/platform-impl/concurrency:concurrency_test_lib", "//platform/platform-impl/codeinsight-inline:ide-codeinsight-inline_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/platform-util-io-impl:ide-util-io-impl_test_lib", + "//platform/platform-util-io:ide-util-io_test_lib", "//platform/platform-impl/internal:internal_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/progress/shared:ide-progress_test_lib", + "//platform/favoritesTreeView:favoritesTreeView_test_lib", ] ) ### auto-generated section `build intellij.java.impl` end diff --git a/java/java-impl/intellij.java.impl.iml b/java/java-impl/intellij.java.impl.iml index 3e0a65628a3b..16c49b06c95b 100644 --- a/java/java-impl/intellij.java.impl.iml +++ b/java/java-impl/intellij.java.impl.iml @@ -62,6 +62,7 @@ + @@ -69,6 +70,7 @@ + @@ -106,20 +108,26 @@ - + + + + + + + @@ -129,12 +137,14 @@ + + diff --git a/java/java-indexing-api/BUILD.bazel b/java/java-indexing-api/BUILD.bazel index fa37e1b33648..00c229089f9d 100644 --- a/java/java-indexing-api/BUILD.bazel +++ b/java/java-indexing-api/BUILD.bazel @@ -17,8 +17,10 @@ jvm_library( "@lib//:kotlin-stdlib", "//platform/core-api:core", "//java/java-psi-api:psi", + "//java/java-frontback-psi-api:frontback-psi", "//platform/indexing-api:indexing", "//platform/util", + "//platform/util/base", "//platform/util/concurrency", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", ], @@ -34,8 +36,10 @@ jvm_library( ":indexing", "//platform/core-api:core_test_lib", "//java/java-psi-api:psi_test_lib", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//platform/indexing-api:indexing_test_lib", "//platform/util:util_test_lib", + "//platform/util/base:base_test_lib", "//platform/util/concurrency:concurrency_test_lib", "//platform/backend:backend_test_lib", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", diff --git a/java/java-indexing-api/intellij.java.indexing.iml b/java/java-indexing-api/intellij.java.indexing.iml index 506eafa3774a..12d3320bbb5e 100644 --- a/java/java-indexing-api/intellij.java.indexing.iml +++ b/java/java-indexing-api/intellij.java.indexing.iml @@ -11,8 +11,10 @@ + + diff --git a/java/java-indexing-impl/BUILD.bazel b/java/java-indexing-impl/BUILD.bazel index a075ece49dbe..5716536fe4a7 100644 --- a/java/java-indexing-impl/BUILD.bazel +++ b/java/java-indexing-impl/BUILD.bazel @@ -18,6 +18,7 @@ jvm_library( "//java/java-psi-impl:psi-impl", "//platform/util/concurrency", "//platform/core-api:core", + "//platform/core-impl", "//platform/indexing-api:indexing", "//platform/indexing-impl", "//jps/model-api:model", @@ -25,18 +26,20 @@ jvm_library( "//platform/projectModel-impl", "//platform/util", "//platform/util/nanoxml", + "//platform/util/multiplatform", + "//platform/util/base", "//java/java-indexing-api:indexing", "@lib//:kotlin-stdlib", "//libraries/fastutil", "//java/codeserver/core", "//java/java-syntax:syntax", + "//java/java-frontback-psi-api:frontback-psi", "//platform/workspace/jps", "//platform/workspace/storage", "//platform/backend/workspace", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", ], exports = [ - "//java/java-psi-api:psi", "//java/java-psi-impl:psi-impl", "//platform/indexing-api:indexing", "//platform/indexing-impl", @@ -49,8 +52,6 @@ jvm_library( visibility = ["//visibility:public"], srcs = glob([], allow_empty = True), exports = [ - "//java/java-psi-api:psi", - "//java/java-psi-api:psi_test_lib", "//java/java-psi-impl:psi-impl", "//java/java-psi-impl:psi-impl_test_lib", "//platform/indexing-api:indexing", @@ -64,6 +65,7 @@ jvm_library( "//java/java-psi-impl:psi-impl_test_lib", "//platform/util/concurrency:concurrency_test_lib", "//platform/core-api:core_test_lib", + "//platform/core-impl:core-impl_test_lib", "//platform/indexing-api:indexing_test_lib", "//platform/indexing-impl:indexing-impl_test_lib", "//jps/model-api:model_test_lib", @@ -71,10 +73,13 @@ jvm_library( "//platform/projectModel-impl:projectModel-impl_test_lib", "//platform/util:util_test_lib", "//platform/util/nanoxml:nanoxml_test_lib", + "//platform/util/multiplatform:multiplatform_test_lib", + "//platform/util/base:base_test_lib", "//java/java-indexing-api:indexing_test_lib", "//libraries/fastutil:fastutil_test_lib", "//java/codeserver/core:core_test_lib", "//java/java-syntax:syntax_test_lib", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//platform/workspace/jps:jps_test_lib", "//platform/workspace/storage:storage_test_lib", "//platform/backend/workspace:workspace_test_lib", diff --git a/java/java-indexing-impl/intellij.java.indexing.impl.iml b/java/java-indexing-impl/intellij.java.indexing.impl.iml index d14e38086d07..edb7fd8c17a4 100644 --- a/java/java-indexing-impl/intellij.java.indexing.impl.iml +++ b/java/java-indexing-impl/intellij.java.indexing.impl.iml @@ -8,10 +8,11 @@ - + + @@ -19,11 +20,14 @@ + + + diff --git a/java/java-promo/BUILD.bazel b/java/java-promo/BUILD.bazel index 7f3e31ed0e78..3435675b0bd2 100644 --- a/java/java-promo/BUILD.bazel +++ b/java/java-promo/BUILD.bazel @@ -16,16 +16,19 @@ jvm_library( deps = [ "//platform/lang-core", "//platform/util", + "//platform/util:util-ui", "@lib//:kotlin-stdlib", "//java/openapi:java", "//java/idea-ui:ui", "//platform/platform-impl:ide-impl", + "//platform/ide-core", "//platform/extensions", "//platform/core-api:core", "//xml/xml-psi-api:psi", "//platform/lang-impl", "//platform/projectModel-api:projectModel", "//platform/analysis-api:analysis", + "//platform/editor-ui-api:editor-ui", ] ) @@ -38,15 +41,18 @@ jvm_library( ":promo", "//platform/lang-core:lang-core_test_lib", "//platform/util:util_test_lib", + "//platform/util:util-ui_test_lib", "//java/openapi:java_test_lib", "//java/idea-ui:ui_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/extensions:extensions_test_lib", "//platform/core-api:core_test_lib", "//xml/xml-psi-api:psi_test_lib", "//platform/lang-impl:lang-impl_test_lib", "//platform/projectModel-api:projectModel_test_lib", "//platform/analysis-api:analysis_test_lib", + "//platform/editor-ui-api:editor-ui_test_lib", ] ) ### auto-generated section `build intellij.java.promo` end diff --git a/java/java-promo/intellij.java.promo.iml b/java/java-promo/intellij.java.promo.iml index 95ebe6a5722a..90b69f6dee49 100644 --- a/java/java-promo/intellij.java.promo.iml +++ b/java/java-promo/intellij.java.promo.iml @@ -10,15 +10,18 @@ + + + \ No newline at end of file diff --git a/java/java-psi-api/BUILD.bazel b/java/java-psi-api/BUILD.bazel index ee609207819f..d34fcd369dd1 100644 --- a/java/java-psi-api/BUILD.bazel +++ b/java/java-psi-api/BUILD.bazel @@ -17,13 +17,14 @@ jvm_library( deps = [ "//platform/core-api:core", "//platform/util", + "//platform/util/multiplatform", + "//platform/util/base", "//java/java-frontback-psi-api:frontback-psi", "@lib//:kotlin-stdlib", "//java/java-syntax:syntax", "//libraries/fastutil", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", - ], - exports = ["//java/java-frontback-psi-api:frontback-psi"] + ] ) jvm_library( @@ -32,14 +33,12 @@ jvm_library( visibility = ["//visibility:public"], srcs = glob([], allow_empty = True), kotlinc_opts = "@community//:k8", - exports = [ - "//java/java-frontback-psi-api:frontback-psi", - "//java/java-frontback-psi-api:frontback-psi_test_lib", - ], runtime_deps = [ ":psi", "//platform/core-api:core_test_lib", "//platform/util:util_test_lib", + "//platform/util/multiplatform:multiplatform_test_lib", + "//platform/util/base:base_test_lib", "//java/java-frontback-psi-api:frontback-psi_test_lib", "//java/java-syntax:syntax_test_lib", "//libraries/fastutil:fastutil_test_lib", diff --git a/java/java-psi-api/intellij.java.psi.iml b/java/java-psi-api/intellij.java.psi.iml index 10a4972dffa7..80ec2b49ae84 100644 --- a/java/java-psi-api/intellij.java.psi.iml +++ b/java/java-psi-api/intellij.java.psi.iml @@ -26,7 +26,9 @@ - + + + diff --git a/java/java-psi-impl/BUILD.bazel b/java/java-psi-impl/BUILD.bazel index 76305e9886b1..1c59a8fd67ec 100644 --- a/java/java-psi-impl/BUILD.bazel +++ b/java/java-psi-impl/BUILD.bazel @@ -17,20 +17,22 @@ jvm_library( deps = [ "//java/java-psi-api:psi", "//java/java-frontback-psi-impl:frontback-psi-impl", + "//java/java-frontback-psi-api:frontback-psi", "//platform/core-api:core", "//platform/core-impl", "//libraries/asm", "//platform/util", + "//platform/util/multiplatform", + "//platform/util/base", "//libraries/stream", "//libraries/fastutil", "//java/java-syntax:syntax", "//platform/syntax/syntax-psi:psi", + "//platform/syntax/syntax-util:util", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", ], exports = [ - "//java/java-psi-api:psi", "//java/java-frontback-psi-impl:frontback-psi-impl", - "//platform/core-impl", "//platform/syntax/syntax-psi:psi", ] ) @@ -42,12 +44,8 @@ jvm_library( srcs = glob([], allow_empty = True), kotlinc_opts = "@community//:k8", exports = [ - "//java/java-psi-api:psi", - "//java/java-psi-api:psi_test_lib", "//java/java-frontback-psi-impl:frontback-psi-impl", "//java/java-frontback-psi-impl:frontback-psi-impl_test_lib", - "//platform/core-impl", - "//platform/core-impl:core-impl_test_lib", "//platform/syntax/syntax-psi:psi", "//platform/syntax/syntax-psi:psi_test_lib", ], @@ -55,14 +53,18 @@ jvm_library( ":psi-impl", "//java/java-psi-api:psi_test_lib", "//java/java-frontback-psi-impl:frontback-psi-impl_test_lib", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//platform/core-api:core_test_lib", "//platform/core-impl:core-impl_test_lib", "//libraries/asm:asm_test_lib", "//platform/util:util_test_lib", + "//platform/util/multiplatform:multiplatform_test_lib", + "//platform/util/base:base_test_lib", "//libraries/stream:stream_test_lib", "//libraries/fastutil:fastutil_test_lib", "//java/java-syntax:syntax_test_lib", "//platform/syntax/syntax-psi:psi_test_lib", + "//platform/syntax/syntax-util:util_test_lib", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", ] ) diff --git a/java/java-psi-impl/intellij.java.psi.impl.iml b/java/java-psi-impl/intellij.java.psi.impl.iml index 6335619bc06a..25129a147770 100644 --- a/java/java-psi-impl/intellij.java.psi.impl.iml +++ b/java/java-psi-impl/intellij.java.psi.impl.iml @@ -24,16 +24,20 @@ - + + - + + + + \ No newline at end of file diff --git a/java/java-structure-view/BUILD.bazel b/java/java-structure-view/BUILD.bazel index 4d80ab7447b5..0fd4a156feb4 100644 --- a/java/java-structure-view/BUILD.bazel +++ b/java/java-structure-view/BUILD.bazel @@ -15,11 +15,14 @@ jvm_library( resources = [":structureView_resources"], deps = [ "//platform/core-api:core", + "//platform/core-impl", "//platform/editor-ui-api:editor-ui", "//platform/structure-view-impl:structureView-impl", + "//java/java-psi-api:psi", "//java/java-psi-impl:psi-impl", "//platform/util:util-ui", "//java/java-analysis-impl:analysis-impl", + "//java/java-frontback-psi-api:frontback-psi", "//platform/platform-api:ide", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", ] @@ -33,11 +36,14 @@ jvm_library( runtime_deps = [ ":structureView", "//platform/core-api:core_test_lib", + "//platform/core-impl:core-impl_test_lib", "//platform/editor-ui-api:editor-ui_test_lib", "//platform/structure-view-impl:structureView-impl_test_lib", + "//java/java-psi-api:psi_test_lib", "//java/java-psi-impl:psi-impl_test_lib", "//platform/util:util-ui_test_lib", "//java/java-analysis-impl:analysis-impl_test_lib", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//platform/platform-api:ide_test_lib", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", ] diff --git a/java/java-structure-view/intellij.java.structureView.iml b/java/java-structure-view/intellij.java.structureView.iml index 83170d6ec120..3da65f5175e0 100644 --- a/java/java-structure-view/intellij.java.structureView.iml +++ b/java/java-structure-view/intellij.java.structureView.iml @@ -9,11 +9,14 @@ + + + diff --git a/java/java-syntax/BUILD.bazel b/java/java-syntax/BUILD.bazel index e36906e8510f..db6566fa0b57 100644 --- a/java/java-syntax/BUILD.bazel +++ b/java/java-syntax/BUILD.bazel @@ -36,10 +36,6 @@ jvm_library( "//platform/util/multiplatform", "//platform/syntax/syntax-util:util", "//platform/syntax/syntax-extensions:extensions", - ], - exports = [ - "//platform/syntax/syntax-api:syntax", - "//platform/syntax/syntax-util:util", ] ) @@ -49,12 +45,6 @@ jvm_library( visibility = ["//visibility:public"], srcs = glob([], allow_empty = True), kotlinc_opts = ":custom_syntax", - exports = [ - "//platform/syntax/syntax-api:syntax", - "//platform/syntax/syntax-api:syntax_test_lib", - "//platform/syntax/syntax-util:util", - "//platform/syntax/syntax-util:util_test_lib", - ], runtime_deps = [ ":syntax", "//platform/syntax/syntax-api:syntax_test_lib", diff --git a/java/java-syntax/intellij.java.syntax.iml b/java/java-syntax/intellij.java.syntax.iml index 9e61e82d3c9a..99696baa1e3f 100644 --- a/java/java-syntax/intellij.java.syntax.iml +++ b/java/java-syntax/intellij.java.syntax.iml @@ -25,13 +25,13 @@ - + - + \ No newline at end of file diff --git a/java/java-tests/BUILD.bazel b/java/java-tests/BUILD.bazel index 4fcfbc6213b9..23b3560b95db 100644 --- a/java/java-tests/BUILD.bazel +++ b/java/java-tests/BUILD.bazel @@ -183,6 +183,8 @@ jvm_library( "//xml/xml-analysis-impl:analysis-impl_test_lib", "//xml/xml-psi-api:psi", "//xml/xml-psi-api:psi_test_lib", + "//xml/xml-parser:parser", + "//xml/xml-parser:parser_test_lib", "//xml/xml-psi-impl:psi-impl", "//xml/xml-psi-impl:psi-impl_test_lib", "@lib//:kotlin-test", @@ -229,10 +231,14 @@ jvm_library( "//platform/code-style-impl:codeStyle-impl", "//platform/code-style-impl:codeStyle-impl_test_lib", "//platform/platform-util-io:ide-util-io", + "//platform/ide-core", + "//platform/progress/shared:ide-progress", "//platform/service-container", "//platform/service-container:service-container_test_lib", "//java/java-frontback-tests:frontback-tests", "//java/java-frontback-tests:frontback-tests_test_lib", + "//java/java-frontback-psi-api:frontback-psi", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "@lib//:junit5", "//platform/lang-api:lang", "//platform/lang-api:lang_test_lib", @@ -253,10 +259,16 @@ jvm_library( "//platform/util:util_test_lib", "//platform/core-api:core", "//platform/core-api:core_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", "//tools/intellij.tools.ide.metrics.benchmark:ide-metrics-benchmark", "//tools/intellij.tools.ide.metrics.benchmark:ide-metrics-benchmark_test_lib", "//platform/util/coroutines", "//platform/util/coroutines:coroutines_test_lib", + "//platform/util:util-ui", + "//platform/util:util-ui_test_lib", + "//platform/util-ex", + "//platform/util-ex:util-ex_test_lib", "//platform/navbar/testFramework", "//platform/navbar/testFramework:testFramework_test_lib", "//java/unscramble", @@ -297,6 +309,8 @@ jvm_library( "//plugins/grazie/src:core_test_lib", "//platform/testFramework/junit5/codeInsight", "//platform/testFramework/junit5/codeInsight:codeInsight_test_lib", + "//java/java-psi-api:psi", + "//java/java-psi-api:psi_test_lib", "//java/java-psi-impl:psi-impl", "//java/java-psi-impl:psi-impl_test_lib", "//platform/execution", @@ -316,6 +330,8 @@ jvm_library( "//platform/locking-impl:locking-impl_test_lib", "//platform/smRunner:smRunner-tests", "//platform/smRunner:smRunner-tests_test_lib", + "//platform/testRunner", + "//platform/testRunner:testRunner_test_lib", ], exports = [ "//plugins/java-i18n", @@ -334,6 +350,8 @@ jvm_library( "//platform/platform-impl/internal:internal_test_lib", "//platform/platform-impl:ide-impl_test_lib", "//platform/platform-util-io:ide-util-io_test_lib", + "//platform/ide-core:ide-core_test_lib", + "//platform/progress/shared:ide-progress_test_lib", ] ) ### auto-generated section `build intellij.java.tests` end diff --git a/java/java-tests/intellij.java.tests.iml b/java/java-tests/intellij.java.tests.iml index 7a8ca92914bd..7ac1d628dfdf 100644 --- a/java/java-tests/intellij.java.tests.iml +++ b/java/java-tests/intellij.java.tests.iml @@ -75,6 +75,7 @@ + @@ -100,8 +101,11 @@ + + + @@ -113,8 +117,11 @@ + + + @@ -135,6 +142,7 @@ + @@ -145,5 +153,6 @@ + \ No newline at end of file diff --git a/java/jsp-spi/BUILD.bazel b/java/jsp-spi/BUILD.bazel index e68b468e71b8..f0aeeec4ece9 100644 --- a/java/jsp-spi/BUILD.bazel +++ b/java/jsp-spi/BUILD.bazel @@ -22,6 +22,8 @@ jvm_library( "//platform/projectModel-api:projectModel", "//xml/xml-psi-api:psi", "//java/jsp-base-openapi:jsp-base", + "//platform/ide-core", + "//java/java-psi-api:psi", ], exports = [ "//java/jsp-openapi:jsp", @@ -52,6 +54,8 @@ jvm_library( "//xml/xml-psi-api:psi_test_lib", "//java/jsp-base-openapi:jsp-base_test_lib", "//platform/backend:backend_test_lib", + "//platform/ide-core:ide-core_test_lib", + "//java/java-psi-api:psi_test_lib", ] ) ### auto-generated section `build intellij.jsp.spi` end diff --git a/java/jsp-spi/intellij.jsp.spi.iml b/java/jsp-spi/intellij.jsp.spi.iml index 0a46cd559690..27d07cd4e523 100644 --- a/java/jsp-spi/intellij.jsp.spi.iml +++ b/java/jsp-spi/intellij.jsp.spi.iml @@ -17,6 +17,8 @@ + + diff --git a/java/langInjection/BUILD.bazel b/java/langInjection/BUILD.bazel index 5bfbe840b3ff..af2a1be5ac24 100644 --- a/java/langInjection/BUILD.bazel +++ b/java/langInjection/BUILD.bazel @@ -21,6 +21,8 @@ jvm_library( deps = [ "//java/openapi:java", "//java/java-indexing-api:indexing", + "//java/java-syntax:syntax", + "//java/java-psi-api:psi", "//platform/analysis-api:analysis", "//platform/core-api:core", "//platform/editor-ui-api:editor-ui", @@ -31,13 +33,20 @@ jvm_library( "//platform/projectModel-api:projectModel", "//RegExpSupport:regexp", "//platform/platform-api:ide", + "//platform/ide-core", "//java/java-impl:impl", "//plugins/IntelliLang:langInjection", "//platform/core-ui", + "//platform/core-impl", "//platform/util/jdom", + "//platform/util:util-ui", + "//platform/util-ex", "//platform/forms_rt:java-guiForms-rt", + "//java/java-frontback-psi-api:frontback-psi", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", "//platform/util/concurrency", + "//platform/lang-api:lang", + "//uast/uast-common-ide:ide", ":plugins_IntelliLang_backend_provided", ], runtime_deps = [ @@ -55,6 +64,8 @@ jvm_library( ":langInjection", "//java/openapi:java_test_lib", "//java/java-indexing-api:indexing_test_lib", + "//java/java-syntax:syntax_test_lib", + "//java/java-psi-api:psi_test_lib", "//platform/analysis-api:analysis_test_lib", "//platform/core-api:core_test_lib", "//platform/editor-ui-api:editor-ui_test_lib", @@ -65,17 +76,24 @@ jvm_library( "//platform/projectModel-api:projectModel_test_lib", "//RegExpSupport:regexp_test_lib", "//platform/platform-api:ide_test_lib", + "//platform/ide-core:ide-core_test_lib", "//java/java-impl:impl_test_lib", "//plugins/IntelliLang:langInjection_test_lib", "//java/langInjection/jps:jps_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl:core-impl_test_lib", "//platform/util/jdom:jdom_test_lib", + "//platform/util:util-ui_test_lib", + "//platform/util-ex:util-ex_test_lib", "//plugins/IntelliLang/backend", "//plugins/IntelliLang/backend:backend_test_lib", "//platform/forms_rt:java-guiForms-rt_test_lib", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//platform/backend:backend_test_lib", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", "//platform/util/concurrency:concurrency_test_lib", + "//platform/lang-api:lang_test_lib", + "//uast/uast-common-ide:ide_test_lib", ] ) ### auto-generated section `build intellij.java.langInjection` end diff --git a/java/langInjection/intellij.java.langInjection.iml b/java/langInjection/intellij.java.langInjection.iml index 19da0de41337..7a485f7ef6bf 100644 --- a/java/langInjection/intellij.java.langInjection.iml +++ b/java/langInjection/intellij.java.langInjection.iml @@ -10,6 +10,8 @@ + + @@ -20,16 +22,23 @@ + + + + + + + diff --git a/java/langInjection/jps/BUILD.bazel b/java/langInjection/jps/BUILD.bazel index 8ba97d91b94d..b08c2f0a1b08 100644 --- a/java/langInjection/jps/BUILD.bazel +++ b/java/langInjection/jps/BUILD.bazel @@ -23,6 +23,7 @@ jvm_library( "//jps/model-serialization", "//libraries/asm", "//platform/util/jdom", + "//platform/util/base", "@lib//:jetbrains-annotations", ] ) @@ -43,6 +44,7 @@ jvm_library( "//jps/model-serialization:model-serialization_test_lib", "//libraries/asm:asm_test_lib", "//platform/util/jdom:jdom_test_lib", + "//platform/util/base:base_test_lib", ] ) ### auto-generated section `build intellij.java.langInjection.jps` end diff --git a/java/langInjection/jps/intellij.java.langInjection.jps.iml b/java/langInjection/jps/intellij.java.langInjection.jps.iml index e2710da34d41..abd76d28566e 100644 --- a/java/langInjection/jps/intellij.java.langInjection.jps.iml +++ b/java/langInjection/jps/intellij.java.langInjection.jps.iml @@ -32,6 +32,7 @@ + \ No newline at end of file diff --git a/java/manifest/BUILD.bazel b/java/manifest/BUILD.bazel index c430650bd985..a82cddc45cc5 100644 --- a/java/manifest/BUILD.bazel +++ b/java/manifest/BUILD.bazel @@ -18,6 +18,7 @@ jvm_library( "//platform/editor-ui-api:editor-ui", "//platform/projectModel-api:projectModel", "//platform/util", + "//platform/util:util-ui", "//platform/core-api:core", "//platform/platform-impl:ide-impl", "//platform/analysis-api:analysis", @@ -26,6 +27,7 @@ jvm_library( "//platform/core-impl", "//java/java-psi-api:psi", "//java/java-impl:impl", + "//java/java-frontback-psi-api:frontback-psi", "//spellchecker", "//platform/core-ui", "//libraries/fastutil", @@ -44,6 +46,7 @@ jvm_library( "//platform/editor-ui-api:editor-ui_test_lib", "//platform/projectModel-api:projectModel_test_lib", "//platform/util:util_test_lib", + "//platform/util:util-ui_test_lib", "//platform/core-api:core_test_lib", "//platform/platform-impl:ide-impl_test_lib", "//platform/analysis-api:analysis_test_lib", @@ -56,6 +59,7 @@ jvm_library( "//platform/testFramework:testFramework_test_lib", "//java/testFramework", "//java/testFramework:testFramework_test_lib", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//spellchecker:spellchecker_test_lib", "//platform/core-ui:core-ui_test_lib", "//libraries/fastutil:fastutil_test_lib", diff --git a/java/manifest/intellij.java.manifest.iml b/java/manifest/intellij.java.manifest.iml index a099102528dc..198a6966d593 100644 --- a/java/manifest/intellij.java.manifest.iml +++ b/java/manifest/intellij.java.manifest.iml @@ -12,6 +12,7 @@ + @@ -22,6 +23,7 @@ + diff --git a/java/openapi/BUILD.bazel b/java/openapi/BUILD.bazel index 1fad7194c366..2d3bb87c4cb9 100644 --- a/java/openapi/BUILD.bazel +++ b/java/openapi/BUILD.bazel @@ -41,11 +41,14 @@ jvm_library( "//platform/icons", "//platform/workspace/storage", "//platform/platform-api:ide", + "//platform/ide-core", "//platform/lang-api:lang", "//platform/vcs-api:vcs", "//xml/dom-openapi:dom", "//platform/refactoring", "//java/java-psi-api:psi", + "//java/java-frontback-psi-api:frontback-psi", + "//java/java-syntax:syntax", "//java/java-indexing-api:indexing", "//java/java-analysis-api:analysis", "//platform/util:util-ui", @@ -63,8 +66,6 @@ jvm_library( ], exports = [ "//platform/util", - "//platform/lang-api:lang", - "//java/java-psi-api:psi", "//java/java-analysis-api:analysis", ], runtime_deps = ["//platform/backend"] @@ -78,10 +79,6 @@ jvm_library( exports = [ "//platform/util", "//platform/util:util_test_lib", - "//platform/lang-api:lang", - "//platform/lang-api:lang_test_lib", - "//java/java-psi-api:psi", - "//java/java-psi-api:psi_test_lib", "//java/java-analysis-api:analysis", "//java/java-analysis-api:analysis_test_lib", ], @@ -102,11 +99,14 @@ jvm_library( "//platform/icons:icons_test_lib", "//platform/workspace/storage:storage_test_lib", "//platform/platform-api:ide_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/lang-api:lang_test_lib", "//platform/vcs-api:vcs_test_lib", "//xml/dom-openapi:dom_test_lib", "//platform/refactoring:refactoring_test_lib", "//java/java-psi-api:psi_test_lib", + "//java/java-frontback-psi-api:frontback-psi_test_lib", + "//java/java-syntax:syntax_test_lib", "//java/java-indexing-api:indexing_test_lib", "//java/java-analysis-api:analysis_test_lib", "//platform/util:util-ui_test_lib", diff --git a/java/openapi/intellij.java.iml b/java/openapi/intellij.java.iml index b1cf7a8bbaf7..1bfbd52e9289 100644 --- a/java/openapi/intellij.java.iml +++ b/java/openapi/intellij.java.iml @@ -23,11 +23,14 @@ - + + - + + + diff --git a/java/performancePlugin/BUILD.bazel b/java/performancePlugin/BUILD.bazel index ce5a391d9ceb..1c20ba6481aa 100644 --- a/java/performancePlugin/BUILD.bazel +++ b/java/performancePlugin/BUILD.bazel @@ -19,12 +19,14 @@ jvm_library( "//platform/analysis-api:analysis", "//platform/util/concurrency", "//platform/core-api:core", + "//platform/core-impl", "//platform/editor-ui-api:editor-ui", "//platform/lang-api:lang", "//platform/lang-impl", "//java/compiler/openapi:java-compiler", "@lib//:opentelemetry", "//platform/platform-impl:ide-impl", + "//platform/ide-core", "@lib//:opentelemetry-semconv", "//java/idea-ui:ui", "//platform/diagnostic/telemetry", @@ -35,6 +37,7 @@ jvm_library( "//platform/projectModel-api:projectModel", "//platform/refactoring", "//java/openapi:java", + "//java/java-frontback-psi-api:frontback-psi", ] ) @@ -50,11 +53,13 @@ jvm_library( "//platform/analysis-api:analysis_test_lib", "//platform/util/concurrency:concurrency_test_lib", "//platform/core-api:core_test_lib", + "//platform/core-impl:core-impl_test_lib", "//platform/editor-ui-api:editor-ui_test_lib", "//platform/lang-api:lang_test_lib", "//platform/lang-impl:lang-impl_test_lib", "//java/compiler/openapi:java-compiler_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//java/idea-ui:ui_test_lib", "//platform/diagnostic/telemetry:telemetry_test_lib", "//java/java-psi-api:psi_test_lib", @@ -64,6 +69,7 @@ jvm_library( "//platform/projectModel-api:projectModel_test_lib", "//platform/refactoring:refactoring_test_lib", "//java/openapi:java_test_lib", + "//java/java-frontback-psi-api:frontback-psi_test_lib", ] ) ### auto-generated section `build intellij.java.performancePlugin` end diff --git a/java/performancePlugin/intellij.java.performancePlugin.iml b/java/performancePlugin/intellij.java.performancePlugin.iml index b1bd5b8438a1..ee96056eab01 100644 --- a/java/performancePlugin/intellij.java.performancePlugin.iml +++ b/java/performancePlugin/intellij.java.performancePlugin.iml @@ -13,12 +13,14 @@ + + @@ -29,5 +31,6 @@ + \ No newline at end of file diff --git a/java/remote-servers/impl/BUILD.bazel b/java/remote-servers/impl/BUILD.bazel index 8d2226aae433..e9331ad8afd4 100644 --- a/java/remote-servers/impl/BUILD.bazel +++ b/java/remote-servers/impl/BUILD.bazel @@ -17,6 +17,7 @@ jvm_library( "//java/remote-servers/api:java-remoteServers", "//java/compiler/impl", "//platform/core-api:core", + "//platform/lang-api:lang", "//platform/editor-ui-api:editor-ui", "//platform/platform-impl:ide-impl", "//java/debugger/impl", @@ -33,7 +34,10 @@ jvm_library( "//java/idea-ui:ui", "//platform/core-ui", "//platform/platform-util-io-impl:ide-util-io-impl", + "//platform/platform-util-io:ide-util-io", + "//platform/ide-core", "//platform/util/jdom", + "//platform/util:util-ui", "//platform/execution", ] ) @@ -48,6 +52,7 @@ jvm_library( "//java/remote-servers/api:java-remoteServers_test_lib", "//java/compiler/impl:impl_test_lib", "//platform/core-api:core_test_lib", + "//platform/lang-api:lang_test_lib", "//platform/editor-ui-api:editor-ui_test_lib", "//platform/platform-impl:ide-impl_test_lib", "//java/debugger/impl:impl_test_lib", @@ -64,7 +69,10 @@ jvm_library( "//java/idea-ui:ui_test_lib", "//platform/core-ui:core-ui_test_lib", "//platform/platform-util-io-impl:ide-util-io-impl_test_lib", + "//platform/platform-util-io:ide-util-io_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/util/jdom:jdom_test_lib", + "//platform/util:util-ui_test_lib", "//platform/execution:execution_test_lib", ] ) diff --git a/java/remote-servers/impl/intellij.java.remoteServers.impl.iml b/java/remote-servers/impl/intellij.java.remoteServers.impl.iml index 7c78e9a8dc76..cbcc0ff28395 100644 --- a/java/remote-servers/impl/intellij.java.remoteServers.impl.iml +++ b/java/remote-servers/impl/intellij.java.remoteServers.impl.iml @@ -11,6 +11,7 @@ + @@ -27,7 +28,10 @@ + + + \ No newline at end of file diff --git a/java/structuralsearch-java/BUILD.bazel b/java/structuralsearch-java/BUILD.bazel index f7ce4a027157..23f7d89b9da4 100644 --- a/java/structuralsearch-java/BUILD.bazel +++ b/java/structuralsearch-java/BUILD.bazel @@ -20,8 +20,12 @@ jvm_library( "//platform/structuralsearch:structuralSearch", "//platform/lang-impl", "//java/openapi:java", + "//java/java-syntax:syntax", + "//java/java-psi-api:psi", "//java/java-impl:impl", "//platform/duplicates-analysis", + "//java/java-frontback-psi-api:frontback-psi", + "//platform/core-impl", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", "//jps/model-api:model", ] @@ -44,16 +48,20 @@ jvm_library( "//platform/testFramework", "//platform/testFramework:testFramework_test_lib", "//java/openapi:java_test_lib", + "//java/java-syntax:syntax_test_lib", + "//java/java-psi-api:psi_test_lib", "//java/java-impl:impl_test_lib", "//platform/duplicates-analysis:duplicates-analysis_test_lib", "//java/testFramework", "//java/testFramework:testFramework_test_lib", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//platform/structuralsearch:structuralSearch-tests", "//platform/structuralsearch:structuralSearch-tests_test_lib", "//tools/intellij.tools.ide.metrics.benchmark:ide-metrics-benchmark", "//tools/intellij.tools.ide.metrics.benchmark:ide-metrics-benchmark_test_lib", "//platform/core-ui", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl:core-impl_test_lib", "//platform/util/jdom", "//platform/util/jdom:jdom_test_lib", "//platform/projectModel-api:projectModel", @@ -111,12 +119,16 @@ jvm_library( "//platform/duplicates-analysis:duplicates-analysis_test_lib", "//java/testFramework", "//java/testFramework:testFramework_test_lib", + "//java/java-syntax:syntax", + "//java/java-syntax:syntax_test_lib", "//platform/structuralsearch:structuralSearch-tests", "//platform/structuralsearch:structuralSearch-tests_test_lib", "//tools/intellij.tools.ide.metrics.benchmark:ide-metrics-benchmark", "//tools/intellij.tools.ide.metrics.benchmark:ide-metrics-benchmark_test_lib", "//platform/core-ui", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", "//platform/util/jdom", "//platform/util/jdom:jdom_test_lib", "//platform/projectModel-api:projectModel", @@ -127,6 +139,8 @@ jvm_library( "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", "//jps/model-api:model", "//jps/model-api:model_test_lib", + "//java/java-psi-api:psi", + "//java/java-psi-api:psi_test_lib", ], runtime_deps = [":structuralSearch-tests"] ) diff --git a/java/structuralsearch-java/intellij.java.structuralSearch.iml b/java/structuralsearch-java/intellij.java.structuralSearch.iml index 55c95d88883d..9a058d4009b8 100644 --- a/java/structuralsearch-java/intellij.java.structuralSearch.iml +++ b/java/structuralsearch-java/intellij.java.structuralSearch.iml @@ -16,12 +16,16 @@ + + + + diff --git a/java/structuralsearch-java/intellij.java.structuralSearch.tests.iml b/java/structuralsearch-java/intellij.java.structuralSearch.tests.iml index c9a8af5a61d6..b0d6fd298007 100644 --- a/java/structuralsearch-java/intellij.java.structuralSearch.tests.iml +++ b/java/structuralsearch-java/intellij.java.structuralSearch.tests.iml @@ -18,15 +18,18 @@ + + + \ No newline at end of file diff --git a/java/testFramework/BUILD.bazel b/java/testFramework/BUILD.bazel index 4fbb55d92b8b..e417f3dae3a6 100644 --- a/java/testFramework/BUILD.bazel +++ b/java/testFramework/BUILD.bazel @@ -29,6 +29,7 @@ jvm_library( "//platform/util", "//libraries/junit4", "//platform/util/jdom", + "//platform/util:util-ui", "//platform/lang-api:lang", "//platform/backend/workspace", "//platform/lang-impl", @@ -37,6 +38,7 @@ jvm_library( "//java/java-impl:impl", "//java/java-backend:backend", "//platform/ide-core-impl", + "//platform/ide-core", "//java/execution/impl", "//platform/editor-ui-ex:editor-ex", "//platform/testFramework", @@ -48,8 +50,10 @@ jvm_library( "//libraries/stream", "//libraries/fastutil", "//platform/core-ui", + "//platform/core-impl", "//platform/code-style-impl:codeStyle-impl", "//platform/platform-util-io:ide-util-io", + "//platform/progress/shared:ide-progress", "//libraries/asm", "@lib//:org-codehaus-groovy-groovy", "//java/java-impl-refactorings:impl-refactorings", @@ -59,11 +63,14 @@ jvm_library( "//platform/xdebugger-testFramework:debugger-testFramework", "//xml/xml-psi-api:psi", "//java/java-syntax:syntax", + "//xml/xml-parser:parser", "//platform/eel", + "//java/java-psi-api:psi", "//platform/execution", "//platform/testFramework/junit5", "//platform/testFramework/junit5/codeInsight", "//java/java-frontback-psi-impl:frontback-psi-impl", + "//java/java-frontback-psi-api:frontback-psi", "//platform/xdebugger-impl/shared", "//java/testFramework/backend", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", @@ -72,8 +79,6 @@ jvm_library( exports = [ "//java/openapi:java", "//java/testFramework/shared", - "//platform/util", - "//platform/lang-api:lang", "//java/java-impl:impl", "//java/java-backend:backend", ], @@ -93,10 +98,6 @@ jvm_library( "//java/openapi:java_test_lib", "//java/testFramework/shared", "//java/testFramework/shared:shared_test_lib", - "//platform/util", - "//platform/util:util_test_lib", - "//platform/lang-api:lang", - "//platform/lang-api:lang_test_lib", "//java/java-impl:impl", "//java/java-impl:impl_test_lib", "//java/java-backend:backend", @@ -119,6 +120,7 @@ jvm_library( "//platform/util:util_test_lib", "//libraries/junit4:junit4_test_lib", "//platform/util/jdom:jdom_test_lib", + "//platform/util:util-ui_test_lib", "//platform/lang-api:lang_test_lib", "//platform/backend/workspace:workspace_test_lib", "//platform/lang-impl:lang-impl_test_lib", @@ -127,6 +129,7 @@ jvm_library( "//java/java-impl:impl_test_lib", "//java/java-backend:backend_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//java/execution/impl:impl_test_lib", "//java/plugin:plugin_test_lib", "//platform/editor-ui-ex:editor-ex_test_lib", @@ -142,8 +145,10 @@ jvm_library( "//libraries/stream:stream_test_lib", "//libraries/fastutil:fastutil_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl:core-impl_test_lib", "//platform/code-style-impl:codeStyle-impl_test_lib", "//platform/platform-util-io:ide-util-io_test_lib", + "//platform/progress/shared:ide-progress_test_lib", "//libraries/asm:asm_test_lib", "//java/java-impl-refactorings:impl-refactorings_test_lib", "//platform/xdebugger-impl:debugger-impl_test_lib", @@ -152,11 +157,14 @@ jvm_library( "//platform/xdebugger-testFramework:debugger-testFramework_test_lib", "//xml/xml-psi-api:psi_test_lib", "//java/java-syntax:syntax_test_lib", + "//xml/xml-parser:parser_test_lib", "//platform/eel:eel_test_lib", + "//java/java-psi-api:psi_test_lib", "//platform/execution:execution_test_lib", "//platform/testFramework/junit5:junit5_test_lib", "//platform/testFramework/junit5/codeInsight:codeInsight_test_lib", "//java/java-frontback-psi-impl:frontback-psi-impl_test_lib", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//platform/xdebugger-impl/shared:shared_test_lib", "//java/testFramework/backend:backend_test_lib", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", @@ -269,6 +277,8 @@ jvm_library( "//libraries/fastutil:fastutil_test_lib", "//platform/core-ui", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", "//platform/code-style-impl:codeStyle-impl", "//platform/code-style-impl:codeStyle-impl_test_lib", "//platform/platform-util-io:ide-util-io", @@ -299,6 +309,8 @@ jvm_library( "//platform/testFramework/junit5/codeInsight:codeInsight_test_lib", "//java/java-frontback-psi-impl:frontback-psi-impl", "//java/java-frontback-psi-impl:frontback-psi-impl_test_lib", + "//java/java-frontback-psi-api:frontback-psi", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//platform/xdebugger-impl/shared", "//platform/xdebugger-impl/shared:shared_test_lib", "//java/testFramework/backend", diff --git a/java/testFramework/backend/BUILD.bazel b/java/testFramework/backend/BUILD.bazel index 444365239339..b958aeab028f 100644 --- a/java/testFramework/backend/BUILD.bazel +++ b/java/testFramework/backend/BUILD.bazel @@ -22,6 +22,7 @@ jvm_library( "//platform/projectModel-api:projectModel", "//platform/testFramework/common", "//platform/util", + "//platform/util-ex", "//jps/jps-builders:build", "//jps/model-api:model", ] @@ -42,6 +43,7 @@ jvm_library( "//platform/projectModel-api:projectModel_test_lib", "//platform/testFramework/common:common_test_lib", "//platform/util:util_test_lib", + "//platform/util-ex:util-ex_test_lib", "//jps/jps-builders:build_test_lib", "//jps/model-api:model_test_lib", ] diff --git a/java/testFramework/backend/intellij.java.testFramework.backend.iml b/java/testFramework/backend/intellij.java.testFramework.backend.iml index eb185da6ab47..52c351e62e3c 100644 --- a/java/testFramework/backend/intellij.java.testFramework.backend.iml +++ b/java/testFramework/backend/intellij.java.testFramework.backend.iml @@ -16,6 +16,7 @@ + diff --git a/java/testFramework/intellij.java.testFramework.iml b/java/testFramework/intellij.java.testFramework.iml index 5342ac17a6f4..71e84f98e330 100644 --- a/java/testFramework/intellij.java.testFramework.iml +++ b/java/testFramework/intellij.java.testFramework.iml @@ -20,10 +20,11 @@ - + - + + @@ -31,6 +32,7 @@ + @@ -45,8 +47,10 @@ + + @@ -56,11 +60,14 @@ + + + diff --git a/java/testFramework/intellij.java.testFramework.tests.iml b/java/testFramework/intellij.java.testFramework.tests.iml index 3834f017ddf6..88118b124179 100644 --- a/java/testFramework/intellij.java.testFramework.tests.iml +++ b/java/testFramework/intellij.java.testFramework.tests.iml @@ -44,6 +44,7 @@ + @@ -60,6 +61,7 @@ + diff --git a/java/testFramework/shared/BUILD.bazel b/java/testFramework/shared/BUILD.bazel index bd9c38a61621..97c9b4f916be 100644 --- a/java/testFramework/shared/BUILD.bazel +++ b/java/testFramework/shared/BUILD.bazel @@ -16,6 +16,7 @@ jvm_library( deps = [ "//java/openapi:java", "//platform/core-api:core", + "//java/java-psi-api:psi", "//jps/model-api:model", "//platform/lang-core", "//platform/projectModel-api:projectModel", @@ -29,12 +30,9 @@ jvm_library( "//platform/execution", "@lib//:org-codehaus-groovy-groovy", "//java/java-syntax:syntax", + "//java/java-frontback-psi-api:frontback-psi", ], - exports = [ - "//platform/util", - "//platform/lang-api:lang", - "//java/java-impl:impl", - ] + exports = ["//java/java-impl:impl"] ) jvm_library( @@ -43,10 +41,6 @@ jvm_library( visibility = ["//visibility:public"], srcs = glob([], allow_empty = True), exports = [ - "//platform/util", - "//platform/util:util_test_lib", - "//platform/lang-api:lang", - "//platform/lang-api:lang_test_lib", "//java/java-impl:impl", "//java/java-impl:impl_test_lib", ], @@ -54,6 +48,7 @@ jvm_library( ":shared", "//java/openapi:java_test_lib", "//platform/core-api:core_test_lib", + "//java/java-psi-api:psi_test_lib", "//jps/model-api:model_test_lib", "//platform/lang-core:lang-core_test_lib", "//platform/projectModel-api:projectModel_test_lib", @@ -65,6 +60,7 @@ jvm_library( "//java/idea-ui:ui_test_lib", "//platform/execution:execution_test_lib", "//java/java-syntax:syntax_test_lib", + "//java/java-frontback-psi-api:frontback-psi_test_lib", ] ) ### auto-generated section `build intellij.java.testFramework.shared` end diff --git a/java/testFramework/shared/intellij.java.testFramework.shared.iml b/java/testFramework/shared/intellij.java.testFramework.shared.iml index a5ea31ea0973..ee06633e75d4 100644 --- a/java/testFramework/shared/intellij.java.testFramework.shared.iml +++ b/java/testFramework/shared/intellij.java.testFramework.shared.iml @@ -10,18 +10,20 @@ + - + - + + \ No newline at end of file diff --git a/java/typeMigration/BUILD.bazel b/java/typeMigration/BUILD.bazel index 6a18d1018ff2..b8bd847f862d 100644 --- a/java/typeMigration/BUILD.bazel +++ b/java/typeMigration/BUILD.bazel @@ -24,9 +24,12 @@ jvm_library( "//platform/lang-impl", "//java/openapi:java", "//platform/structuralsearch:structuralSearch", + "//java/java-syntax:syntax", + "//java/java-psi-api:psi", "//java/java-impl:impl", "//java/java-impl-refactorings:impl-refactorings", "//java/codeserver/highlighting", + "//java/java-frontback-psi-api:frontback-psi", "//libraries/fastutil", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", "//jps/model-api:model", @@ -52,6 +55,8 @@ jvm_library( "//platform/lang-impl:lang-impl_test_lib", "//java/openapi:java_test_lib", "//platform/structuralsearch:structuralSearch_test_lib", + "//java/java-syntax:syntax_test_lib", + "//java/java-psi-api:psi_test_lib", "//platform/testFramework", "//platform/testFramework:testFramework_test_lib", "//java/java-impl:impl_test_lib", @@ -61,6 +66,7 @@ jvm_library( "//platform/code-style-impl:codeStyle-impl_test_lib", "//java/java-impl-refactorings:impl-refactorings_test_lib", "//java/codeserver/highlighting:highlighting_test_lib", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//platform/projectModel-api:projectModel", "//platform/projectModel-api:projectModel_test_lib", "//libraries/fastutil:fastutil_test_lib", @@ -115,6 +121,10 @@ jvm_library( "//java/openapi:java_test_lib", "//platform/structuralsearch:structuralSearch", "//platform/structuralsearch:structuralSearch_test_lib", + "//java/java-syntax:syntax", + "//java/java-syntax:syntax_test_lib", + "//java/java-psi-api:psi", + "//java/java-psi-api:psi_test_lib", "//platform/testFramework", "//platform/testFramework:testFramework_test_lib", "//java/java-impl:impl", @@ -135,6 +145,8 @@ jvm_library( "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", "//jps/model-api:model", "//jps/model-api:model_test_lib", + "//java/java-frontback-psi-api:frontback-psi", + "//java/java-frontback-psi-api:frontback-psi_test_lib", ], runtime_deps = [":typeMigration-tests"] ) diff --git a/java/typeMigration/intellij.java.typeMigration.iml b/java/typeMigration/intellij.java.typeMigration.iml index 5e8ff9d40925..82c32bac9e36 100644 --- a/java/typeMigration/intellij.java.typeMigration.iml +++ b/java/typeMigration/intellij.java.typeMigration.iml @@ -19,12 +19,15 @@ + + + diff --git a/java/typeMigration/intellij.java.typeMigration.tests.iml b/java/typeMigration/intellij.java.typeMigration.tests.iml index c15286723eaf..ff36d9676150 100644 --- a/java/typeMigration/intellij.java.typeMigration.tests.iml +++ b/java/typeMigration/intellij.java.typeMigration.tests.iml @@ -18,6 +18,8 @@ + + @@ -29,6 +31,7 @@ + \ No newline at end of file diff --git a/java/unscramble/BUILD.bazel b/java/unscramble/BUILD.bazel index 4f8446a16f19..2a52c9319278 100644 --- a/java/unscramble/BUILD.bazel +++ b/java/unscramble/BUILD.bazel @@ -22,9 +22,11 @@ jvm_library( "//java/openapi:java", "//platform/vcs-impl", "//platform/platform-impl:ide-impl", + "//platform/ide-core", "//platform/lang-impl", "//platform/vcs-api:vcs", "//platform/core-ui", + "//platform/core-impl", "//java/java-impl:impl", "//platform/threadDumpParser", "//platform/forms_rt:java-guiForms-rt", @@ -47,9 +49,11 @@ jvm_library( "//java/openapi:java_test_lib", "//platform/vcs-impl:vcs-impl_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/lang-impl:lang-impl_test_lib", "//platform/vcs-api:vcs_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl:core-impl_test_lib", "//java/java-impl:impl_test_lib", "//platform/threadDumpParser:threadDumpParser_test_lib", "//platform/forms_rt:java-guiForms-rt_test_lib", diff --git a/java/unscramble/intellij.java.unscramble.iml b/java/unscramble/intellij.java.unscramble.iml index 7ecb1c69cc88..e8a460791eb9 100644 --- a/java/unscramble/intellij.java.unscramble.iml +++ b/java/unscramble/intellij.java.unscramble.iml @@ -16,9 +16,11 @@ + + diff --git a/java/vcs/BUILD.bazel b/java/vcs/BUILD.bazel index 46b67cad4da2..eb3430365d42 100644 --- a/java/vcs/BUILD.bazel +++ b/java/vcs/BUILD.bazel @@ -21,9 +21,11 @@ jvm_library( "//platform/lang-api:lang", "//platform/projectModel-api:projectModel", "//platform/vcs-api:vcs", + "//java/java-psi-api:psi", "//uast/uast-common:uast", "//platform/diff-api:diff", "//platform/vcs-impl", + "//platform/ide-core", ] ) @@ -41,9 +43,11 @@ jvm_library( "//platform/lang-api:lang_test_lib", "//platform/projectModel-api:projectModel_test_lib", "//platform/vcs-api:vcs_test_lib", + "//java/java-psi-api:psi_test_lib", "//uast/uast-common:uast_test_lib", "//platform/diff-api:diff_test_lib", "//platform/vcs-impl:vcs-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", ] ) ### auto-generated section `build intellij.java.vcs` end diff --git a/java/vcs/intellij.java.vcs.iml b/java/vcs/intellij.java.vcs.iml index e5ceec6a20df..941b69064593 100644 --- a/java/vcs/intellij.java.vcs.iml +++ b/java/vcs/intellij.java.vcs.iml @@ -15,8 +15,10 @@ + + \ No newline at end of file diff --git a/jps/jps-builders/BUILD.bazel b/jps/jps-builders/BUILD.bazel index cd89ab04235c..8fd2e3831705 100644 --- a/jps/jps-builders/BUILD.bazel +++ b/jps/jps-builders/BUILD.bazel @@ -36,6 +36,9 @@ jvm_library( "@community//build:build-javac-rt", "//platform/tracing:tracing-rt", "//platform/util/zip", + "//platform/util/multiplatform", + "//platform/util/base/multiplatform", + "//platform/util/base", "@community//build:dependency-graph", "//libraries/caffeine", "@lib//:kotlin-stdlib-provided", @@ -86,6 +89,9 @@ jvm_library( "@community//build:build-javac-rt_test_lib", "//platform/tracing:tracing-rt_test_lib", "//platform/util/zip:zip_test_lib", + "//platform/util/multiplatform:multiplatform_test_lib", + "//platform/util/base/multiplatform:multiplatform_test_lib", + "//platform/util/base:base_test_lib", "@community//build:dependency-graph_test_lib", "//libraries/caffeine:caffeine_test_lib", "@lib//:kotlin-stdlib-provided", @@ -175,6 +181,10 @@ jvm_library( "@lib//:memoryfilesystem", "//jps/model-test-framework:model-testFramework", "//jps/model-test-framework:model-testFramework_test_lib", + "//platform/util-ex", + "//platform/util-ex:util-ex_test_lib", + "//java/java-syntax:syntax", + "//java/java-syntax:syntax_test_lib", ], runtime_deps = [ ":build-tests", diff --git a/jps/jps-builders/intellij.platform.jps.build.iml b/jps/jps-builders/intellij.platform.jps.build.iml index daf2246f6383..800f9eade819 100644 --- a/jps/jps-builders/intellij.platform.jps.build.iml +++ b/jps/jps-builders/intellij.platform.jps.build.iml @@ -65,6 +65,9 @@ + + + diff --git a/jps/jps-builders/intellij.platform.jps.build.tests.iml b/jps/jps-builders/intellij.platform.jps.build.tests.iml index 01df9dc6b57e..1de640fc8f0a 100644 --- a/jps/jps-builders/intellij.platform.jps.build.tests.iml +++ b/jps/jps-builders/intellij.platform.jps.build.tests.iml @@ -81,5 +81,7 @@ + + \ No newline at end of file diff --git a/jps/model-api/BUILD.bazel b/jps/model-api/BUILD.bazel index 5f9439a2b4fd..a2804e3f0be7 100644 --- a/jps/model-api/BUILD.bazel +++ b/jps/model-api/BUILD.bazel @@ -9,6 +9,9 @@ jvm_library( kotlinc_opts = "@community//:k11", deps = [ "//platform/util", + "//platform/util/multiplatform", + "//platform/util/base/multiplatform", + "//platform/util/base", "@lib//:jetbrains-annotations", ] ) @@ -22,6 +25,9 @@ jvm_library( runtime_deps = [ ":model", "//platform/util:util_test_lib", + "//platform/util/multiplatform:multiplatform_test_lib", + "//platform/util/base/multiplatform:multiplatform_test_lib", + "//platform/util/base:base_test_lib", ] ) ### auto-generated section `build intellij.platform.jps.model` end diff --git a/jps/model-api/intellij.platform.jps.model.iml b/jps/model-api/intellij.platform.jps.model.iml index fa14c9f9fdbe..3b45323b8326 100644 --- a/jps/model-api/intellij.platform.jps.model.iml +++ b/jps/model-api/intellij.platform.jps.model.iml @@ -24,6 +24,9 @@ + + + \ No newline at end of file diff --git a/jps/model-impl/BUILD.bazel b/jps/model-impl/BUILD.bazel index 2b434000ca20..cc560acf6e85 100644 --- a/jps/model-impl/BUILD.bazel +++ b/jps/model-impl/BUILD.bazel @@ -16,6 +16,9 @@ jvm_library( kotlinc_opts = "@community//:k11", deps = [ "//platform/util", + "//platform/util/multiplatform", + "//platform/util/base/multiplatform", + "//platform/util/base", "//jps/model-api:model", "//libraries/fastutil", ] @@ -30,6 +33,9 @@ jvm_library( runtime_deps = [ ":model-impl", "//platform/util:util_test_lib", + "//platform/util/multiplatform:multiplatform_test_lib", + "//platform/util/base/multiplatform:multiplatform_test_lib", + "//platform/util/base:base_test_lib", "//jps/model-api:model_test_lib", "//libraries/fastutil:fastutil_test_lib", ] @@ -80,6 +86,10 @@ jvm_library( "//platform/testFramework/extensions:testExtensions_test_lib", "//jps/model-test-framework:model-testFramework", "//jps/model-test-framework:model-testFramework_test_lib", + "//platform/util/multiplatform", + "//platform/util/multiplatform:multiplatform_test_lib", + "//platform/util/base", + "//platform/util/base:base_test_lib", ], runtime_deps = [":model-tests"] ) diff --git a/jps/model-impl/intellij.platform.jps.model.impl.iml b/jps/model-impl/intellij.platform.jps.model.impl.iml index 571c2c7ecec6..6487987a161c 100644 --- a/jps/model-impl/intellij.platform.jps.model.impl.iml +++ b/jps/model-impl/intellij.platform.jps.model.impl.iml @@ -25,6 +25,9 @@ + + + diff --git a/jps/model-impl/intellij.platform.jps.model.tests.iml b/jps/model-impl/intellij.platform.jps.model.tests.iml index 1bde1ed47814..ca98eb21be26 100644 --- a/jps/model-impl/intellij.platform.jps.model.tests.iml +++ b/jps/model-impl/intellij.platform.jps.model.tests.iml @@ -18,5 +18,7 @@ + + \ No newline at end of file diff --git a/jps/model-serialization/BUILD.bazel b/jps/model-serialization/BUILD.bazel index 90ce56ea62fb..540304ec9b65 100644 --- a/jps/model-serialization/BUILD.bazel +++ b/jps/model-serialization/BUILD.bazel @@ -19,6 +19,8 @@ jvm_library( "//jps/model-api:model", "//libraries/fastutil", "//platform/util/jdom", + "//platform/util/base/multiplatform", + "//platform/util/base", "@lib//:opentelemetry", "@lib//:opentelemetry-semconv", "//libraries/kotlinx/coroutines/core", @@ -37,6 +39,8 @@ jvm_library( "//jps/model-api:model_test_lib", "//libraries/fastutil:fastutil_test_lib", "//platform/util/jdom:jdom_test_lib", + "//platform/util/base/multiplatform:multiplatform_test_lib", + "//platform/util/base:base_test_lib", "//libraries/kotlinx/coroutines/core:core_test_lib", ] ) diff --git a/jps/model-serialization/intellij.platform.jps.model.serialization.iml b/jps/model-serialization/intellij.platform.jps.model.serialization.iml index 766ba32d21a4..9ee075d61de7 100644 --- a/jps/model-serialization/intellij.platform.jps.model.serialization.iml +++ b/jps/model-serialization/intellij.platform.jps.model.serialization.iml @@ -28,6 +28,8 @@ + + diff --git a/json/BUILD.bazel b/json/BUILD.bazel index f135ba0d2853..f62865b667be 100644 --- a/json/BUILD.bazel +++ b/json/BUILD.bazel @@ -18,6 +18,7 @@ jvm_library( "//platform/code-style-api:codeStyle", "//platform/core-api:core", "//platform/platform-impl:ide-impl", + "//platform/ide-core", "//platform/core-impl", "//platform/analysis-impl", "//platform/lang-api:lang", @@ -51,6 +52,7 @@ jvm_library( "//platform/code-style-api:codeStyle_test_lib", "//platform/core-api:core_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/core-impl:core-impl_test_lib", "//platform/analysis-impl:analysis-impl_test_lib", "//platform/lang-api:lang_test_lib", diff --git a/json/backend/BUILD.bazel b/json/backend/BUILD.bazel index cefc5be823e7..a7e6314097fd 100644 --- a/json/backend/BUILD.bazel +++ b/json/backend/BUILD.bazel @@ -33,6 +33,7 @@ jvm_library( "//platform/analysis-impl", "//platform/platform-impl:ide-impl", "//platform/ide-core-impl", + "//platform/ide-core", "//libraries/gson", "//platform/indexing-impl", "//platform/refactoring", @@ -42,6 +43,7 @@ jvm_library( "//platform/code-style-impl:codeStyle-impl", "@lib//:kotlin-stdlib", "//platform/platform-util-io:ide-util-io", + "//platform/progress/shared:ide-progress", "//libraries/kotlinx/coroutines/core", "//libraries/jackson/databind", "//libraries/jackson/jackson", @@ -57,6 +59,7 @@ jvm_library( "//platform/syntax/syntax-util:util", "//platform/execution", "//jps/model-api:model", + "//platform/util:util-ui", ], exports = ["//json"], runtime_deps = ["//platform/backend"] @@ -94,6 +97,7 @@ jvm_library( "//platform/analysis-impl:analysis-impl_test_lib", "//platform/platform-impl:ide-impl_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//libraries/gson:gson_test_lib", "//platform/backend:backend_test_lib", "//platform/indexing-impl:indexing-impl_test_lib", @@ -103,6 +107,7 @@ jvm_library( "//platform/core-ui:core-ui_test_lib", "//platform/code-style-impl:codeStyle-impl_test_lib", "//platform/platform-util-io:ide-util-io_test_lib", + "//platform/progress/shared:ide-progress_test_lib", "//libraries/kotlinx/coroutines/core:core_test_lib", "//libraries/jackson/databind:databind_test_lib", "//libraries/jackson/jackson:jackson_test_lib", @@ -118,6 +123,7 @@ jvm_library( "//platform/syntax/syntax-util:util_test_lib", "//platform/execution:execution_test_lib", "//jps/model-api:model_test_lib", + "//platform/util:util-ui_test_lib", ] ) ### auto-generated section `build intellij.json.backend` end diff --git a/json/backend/intellij.json.backend.iml b/json/backend/intellij.json.backend.iml index 864736a79854..165345488145 100644 --- a/json/backend/intellij.json.backend.iml +++ b/json/backend/intellij.json.backend.iml @@ -28,6 +28,7 @@ + @@ -38,6 +39,7 @@ + @@ -53,5 +55,6 @@ + \ No newline at end of file diff --git a/json/backend/tests/BUILD.bazel b/json/backend/tests/BUILD.bazel index fa55d52fe7f0..88feefc8d7e6 100644 --- a/json/backend/tests/BUILD.bazel +++ b/json/backend/tests/BUILD.bazel @@ -68,6 +68,7 @@ jvm_library( "//RegExpSupport:regexp", "//RegExpSupport:regexp_test_lib", "//platform/ide-core-impl", + "//platform/ide-core", "//tools/intellij.tools.ide.metrics.benchmark:ide-metrics-benchmark", "//tools/intellij.tools.ide.metrics.benchmark:ide-metrics-benchmark_test_lib", "//libraries/kotlin/reflect", @@ -82,6 +83,8 @@ jvm_library( "//platform/core-impl:core-impl_test_lib", "//platform/util/jdom", "//platform/util/jdom:jdom_test_lib", + "//platform/util:util-ui", + "//platform/util:util-ui_test_lib", "//platform/structure-view-impl:structureView-impl", "//platform/structure-view-impl:structureView-impl_test_lib", "//libraries/fastutil", @@ -94,6 +97,7 @@ jvm_library( runtime_deps = [ ":tests", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", ] ) ### auto-generated section `build intellij.json.tests` end diff --git a/json/backend/tests/intellij.json.tests.iml b/json/backend/tests/intellij.json.tests.iml index 1b3cbc36e4f9..e719a8bc5759 100644 --- a/json/backend/tests/intellij.json.tests.iml +++ b/json/backend/tests/intellij.json.tests.iml @@ -31,6 +31,7 @@ + @@ -38,6 +39,7 @@ + diff --git a/json/intellij.json.iml b/json/intellij.json.iml index 288a08586bb0..ee2542d47624 100644 --- a/json/intellij.json.iml +++ b/json/intellij.json.iml @@ -13,6 +13,7 @@ + diff --git a/jvm/jvm-analysis-api/BUILD.bazel b/jvm/jvm-analysis-api/BUILD.bazel index 9d7e846ba291..1863878b7bb9 100644 --- a/jvm/jvm-analysis-api/BUILD.bazel +++ b/jvm/jvm-analysis-api/BUILD.bazel @@ -25,7 +25,6 @@ jvm_library( ], exports = [ "//uast/uast-common:uast", - "//java/java-psi-api:psi", "//uast/uast-common-ide:ide", ], runtime_deps = ["//platform/backend"] @@ -39,8 +38,6 @@ jvm_library( exports = [ "//uast/uast-common:uast", "//uast/uast-common:uast_test_lib", - "//java/java-psi-api:psi", - "//java/java-psi-api:psi_test_lib", "//uast/uast-common-ide:ide", "//uast/uast-common-ide:ide_test_lib", ], diff --git a/jvm/jvm-analysis-api/intellij.jvm.analysis.iml b/jvm/jvm-analysis-api/intellij.jvm.analysis.iml index 58c40db1b68e..98b0e8163869 100644 --- a/jvm/jvm-analysis-api/intellij.jvm.analysis.iml +++ b/jvm/jvm-analysis-api/intellij.jvm.analysis.iml @@ -10,7 +10,7 @@ - + diff --git a/jvm/jvm-analysis-impl/BUILD.bazel b/jvm/jvm-analysis-impl/BUILD.bazel index a729ab8c5e05..8a8501ec54c1 100644 --- a/jvm/jvm-analysis-impl/BUILD.bazel +++ b/jvm/jvm-analysis-impl/BUILD.bazel @@ -18,9 +18,12 @@ jvm_library( "//jvm/jvm-analysis-api:analysis", "//java/openapi:java", "//libraries/stream", + "//java/java-syntax:syntax", + "//java/java-psi-api:psi", "//platform/analysis-api:analysis", "//platform/core-api:core", "//platform/core-ui", + "//platform/core-impl", "//platform/editor-ui-api:editor-ui", "//platform/platform-impl:ide-impl", "//java/java-impl:impl", @@ -33,13 +36,18 @@ jvm_library( "//jvm/jvm-analysis-refactoring:analysis-refactoring", "//java/java-impl-refactorings:impl-refactorings", "//platform/util/jdom", + "//platform/util:util-ui", "//platform/ide-core-impl", + "//platform/ide-core", "//jvm/jvm-analysis-quickFix:analysis-quickFix", "//java/codeserver/core", + "//java/java-frontback-psi-api:frontback-psi", "//platform/execution", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", "//platform/util/concurrency", "//libraries/fastutil", + "//platform/lang-api:lang", + "//platform/statistics", ], exports = ["//jvm/jvm-analysis-api:analysis"] ) @@ -59,9 +67,12 @@ jvm_library( "//jvm/jvm-analysis-api:analysis_test_lib", "//java/openapi:java_test_lib", "//libraries/stream:stream_test_lib", + "//java/java-syntax:syntax_test_lib", + "//java/java-psi-api:psi_test_lib", "//platform/analysis-api:analysis_test_lib", "//platform/core-api:core_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl:core-impl_test_lib", "//platform/editor-ui-api:editor-ui_test_lib", "//platform/platform-impl:ide-impl_test_lib", "//java/java-impl:impl_test_lib", @@ -74,13 +85,18 @@ jvm_library( "//jvm/jvm-analysis-refactoring:analysis-refactoring_test_lib", "//java/java-impl-refactorings:impl-refactorings_test_lib", "//platform/util/jdom:jdom_test_lib", + "//platform/util:util-ui_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//jvm/jvm-analysis-quickFix:analysis-quickFix_test_lib", "//java/codeserver/core:core_test_lib", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//platform/execution:execution_test_lib", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", "//platform/util/concurrency:concurrency_test_lib", "//libraries/fastutil:fastutil_test_lib", + "//platform/lang-api:lang_test_lib", + "//platform/statistics:statistics_test_lib", ] ) ### auto-generated section `build intellij.jvm.analysis.impl` end diff --git a/jvm/jvm-analysis-impl/intellij.jvm.analysis.impl.iml b/jvm/jvm-analysis-impl/intellij.jvm.analysis.impl.iml index 7d672d500b29..7238a7be2ed2 100644 --- a/jvm/jvm-analysis-impl/intellij.jvm.analysis.impl.iml +++ b/jvm/jvm-analysis-impl/intellij.jvm.analysis.impl.iml @@ -12,9 +12,12 @@ + + + @@ -27,12 +30,17 @@ + + + + + \ No newline at end of file diff --git a/jvm/jvm-analysis-internal-testFramework/BUILD.bazel b/jvm/jvm-analysis-internal-testFramework/BUILD.bazel index b38b5024775e..91fc8bca29d3 100644 --- a/jvm/jvm-analysis-internal-testFramework/BUILD.bazel +++ b/jvm/jvm-analysis-internal-testFramework/BUILD.bazel @@ -11,20 +11,26 @@ jvm_library( "//jvm/jvm-analysis-testFramework:analysis-testFramework", "//platform/analysis-api:analysis", "//platform/core-api:core", + "//platform/core-impl", "//platform/editor-ui-api:editor-ui", "//platform/execution-impl", "//jps/model-api:model", "//platform/lang-core", + "//platform/lang-api:lang", "//platform/projectModel-api:projectModel", "//platform/refactoring", "//platform/execution", "//platform/testFramework", "//java/java-impl-refactorings:impl-refactorings", "//platform/smRunner", + "//platform/ide-core", "//java/openapi:java", + "//java/java-psi-api:psi", + "//java/java-syntax:syntax", "//java/execution/impl", "//java/testFramework", "//java/codeserver/core", + "//java/java-frontback-psi-api:frontback-psi", ] ) @@ -39,20 +45,26 @@ jvm_library( "//jvm/jvm-analysis-testFramework:analysis-testFramework_test_lib", "//platform/analysis-api:analysis_test_lib", "//platform/core-api:core_test_lib", + "//platform/core-impl:core-impl_test_lib", "//platform/editor-ui-api:editor-ui_test_lib", "//platform/execution-impl:execution-impl_test_lib", "//jps/model-api:model_test_lib", "//platform/lang-core:lang-core_test_lib", + "//platform/lang-api:lang_test_lib", "//platform/projectModel-api:projectModel_test_lib", "//platform/refactoring:refactoring_test_lib", "//platform/execution:execution_test_lib", "//platform/testFramework:testFramework_test_lib", "//java/java-impl-refactorings:impl-refactorings_test_lib", "//platform/smRunner:smRunner_test_lib", + "//platform/ide-core:ide-core_test_lib", "//java/openapi:java_test_lib", + "//java/java-psi-api:psi_test_lib", + "//java/java-syntax:syntax_test_lib", "//java/execution/impl:impl_test_lib", "//java/testFramework:testFramework_test_lib", "//java/codeserver/core:core_test_lib", + "//java/java-frontback-psi-api:frontback-psi_test_lib", ] ) ### auto-generated section `build intellij.jvm.analysis.internal.testFramework` end diff --git a/jvm/jvm-analysis-internal-testFramework/intellij.jvm.analysis.internal.testFramework.iml b/jvm/jvm-analysis-internal-testFramework/intellij.jvm.analysis.internal.testFramework.iml index 4ef1ab35f691..3a6eacd8847c 100644 --- a/jvm/jvm-analysis-internal-testFramework/intellij.jvm.analysis.internal.testFramework.iml +++ b/jvm/jvm-analysis-internal-testFramework/intellij.jvm.analysis.internal.testFramework.iml @@ -11,19 +11,25 @@ + + + + + + \ No newline at end of file diff --git a/jvm/jvm-analysis-java-tests/BUILD.bazel b/jvm/jvm-analysis-java-tests/BUILD.bazel index 7b5e182c5deb..ecc37847a59b 100644 --- a/jvm/jvm-analysis-java-tests/BUILD.bazel +++ b/jvm/jvm-analysis-java-tests/BUILD.bazel @@ -16,6 +16,8 @@ jvm_library( deps = [ "//java/openapi:java", "//java/openapi:java_test_lib", + "//java/java-psi-api:psi", + "//java/java-psi-api:psi_test_lib", "//java/testFramework", "//java/testFramework:testFramework_test_lib", "//platform/analysis-api:analysis", @@ -24,6 +26,8 @@ jvm_library( "//platform/code-style-api:codeStyle_test_lib", "//platform/core-api:core", "//platform/core-api:core_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", "//platform/editor-ui-api:editor-ui", "//platform/editor-ui-api:editor-ui_test_lib", "//jps/model-api:model", @@ -38,6 +42,8 @@ jvm_library( "//jvm/jvm-analysis-testFramework:analysis-testFramework_test_lib", "//java/java-impl-refactorings:impl-refactorings", "//java/java-impl-refactorings:impl-refactorings_test_lib", + "//java/java-syntax:syntax", + "//java/java-syntax:syntax_test_lib", "//jvm/jvm-analysis-internal-testFramework:analysis-internal-testFramework", "//jvm/jvm-analysis-internal-testFramework:analysis-internal-testFramework_test_lib", "@lib//:jet_check", diff --git a/jvm/jvm-analysis-java-tests/intellij.jvm.analysis.java.tests.iml b/jvm/jvm-analysis-java-tests/intellij.jvm.analysis.java.tests.iml index 2f370248d41d..2e5399f083c8 100644 --- a/jvm/jvm-analysis-java-tests/intellij.jvm.analysis.java.tests.iml +++ b/jvm/jvm-analysis-java-tests/intellij.jvm.analysis.java.tests.iml @@ -7,10 +7,12 @@ + + @@ -18,6 +20,7 @@ + diff --git a/jvm/jvm-analysis-kotlin-tests-k1/BUILD.bazel b/jvm/jvm-analysis-kotlin-tests-k1/BUILD.bazel index 0db2d703021a..c7ff61e72a54 100644 --- a/jvm/jvm-analysis-kotlin-tests-k1/BUILD.bazel +++ b/jvm/jvm-analysis-kotlin-tests-k1/BUILD.bazel @@ -19,6 +19,10 @@ jvm_library( "//java/testFramework:testFramework_test_lib", "//platform/core-api:core", "//platform/core-api:core_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", + "//java/java-psi-api:psi", + "//java/java-psi-api:psi_test_lib", "//platform/testFramework", "//platform/testFramework:testFramework_test_lib", "//plugins/kotlin/base/plugin", @@ -29,6 +33,8 @@ jvm_library( "//plugins/kotlin/base/test:test_test_lib", "//jvm/jvm-analysis-kotlin-tests-shared:analysis-kotlin-tests-shared", "//jvm/jvm-analysis-kotlin-tests-shared:analysis-kotlin-tests-shared_test_lib", + "//java/java-syntax:syntax", + "//java/java-syntax:syntax_test_lib", ], runtime_deps = [ ":analysis-kotlin-tests-k1", diff --git a/jvm/jvm-analysis-kotlin-tests-k1/intellij.jvm.analysis.kotlin.tests.k1.iml b/jvm/jvm-analysis-kotlin-tests-k1/intellij.jvm.analysis.kotlin.tests.k1.iml index 59a48c76f5b6..f116c7756f2f 100644 --- a/jvm/jvm-analysis-kotlin-tests-k1/intellij.jvm.analysis.kotlin.tests.k1.iml +++ b/jvm/jvm-analysis-kotlin-tests-k1/intellij.jvm.analysis.kotlin.tests.k1.iml @@ -9,11 +9,14 @@ + + + \ No newline at end of file diff --git a/jvm/jvm-analysis-kotlin-tests-k2/BUILD.bazel b/jvm/jvm-analysis-kotlin-tests-k2/BUILD.bazel index 7ed8a631d07f..dc4ec9d7dade 100644 --- a/jvm/jvm-analysis-kotlin-tests-k2/BUILD.bazel +++ b/jvm/jvm-analysis-kotlin-tests-k2/BUILD.bazel @@ -17,6 +17,10 @@ jvm_library( deps = [ "//platform/core-api:core", "//platform/core-api:core_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", + "//java/java-psi-api:psi", + "//java/java-psi-api:psi_test_lib", "//java/testFramework", "//java/testFramework:testFramework_test_lib", "//platform/testFramework", @@ -27,6 +31,8 @@ jvm_library( "//plugins/kotlin/base/test:test_test_lib", "//jvm/jvm-analysis-kotlin-tests-shared:analysis-kotlin-tests-shared", "//jvm/jvm-analysis-kotlin-tests-shared:analysis-kotlin-tests-shared_test_lib", + "//java/java-syntax:syntax", + "//java/java-syntax:syntax_test_lib", ], runtime_deps = [ ":analysis-kotlin-tests-k2", diff --git a/jvm/jvm-analysis-kotlin-tests-k2/intellij.jvm.analysis.kotlin.tests.k2.iml b/jvm/jvm-analysis-kotlin-tests-k2/intellij.jvm.analysis.kotlin.tests.k2.iml index 5f28e0ae605a..c53d21a01395 100644 --- a/jvm/jvm-analysis-kotlin-tests-k2/intellij.jvm.analysis.kotlin.tests.k2.iml +++ b/jvm/jvm-analysis-kotlin-tests-k2/intellij.jvm.analysis.kotlin.tests.k2.iml @@ -8,11 +8,14 @@ + + + \ No newline at end of file diff --git a/jvm/jvm-analysis-kotlin-tests-shared/BUILD.bazel b/jvm/jvm-analysis-kotlin-tests-shared/BUILD.bazel index d5fedd97a139..f005999387cc 100644 --- a/jvm/jvm-analysis-kotlin-tests-shared/BUILD.bazel +++ b/jvm/jvm-analysis-kotlin-tests-shared/BUILD.bazel @@ -26,8 +26,12 @@ jvm_library( "//platform/analysis-api:analysis_test_lib", "//platform/core-api:core", "//platform/core-api:core_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", "//platform/editor-ui-api:editor-ui", "//platform/editor-ui-api:editor-ui_test_lib", + "//java/java-psi-api:psi", + "//java/java-psi-api:psi_test_lib", "//jps/model-api:model", "//jps/model-api:model_test_lib", "//platform/projectModel-api:projectModel", @@ -58,6 +62,8 @@ jvm_library( "//platform/testFramework:testFramework_test_lib", "//plugins/kotlin/test-framework", "//plugins/kotlin/test-framework:test-framework_test_lib", + "//java/java-syntax:syntax", + "//java/java-syntax:syntax_test_lib", ], exports = [ "//plugins/kotlin/plugin/common", diff --git 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 index 1d5218345b50..0b688bb0cb0a 100644 --- 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 @@ -9,7 +9,9 @@ + + @@ -25,5 +27,6 @@ + \ No newline at end of file diff --git a/jvm/jvm-analysis-refactoring/BUILD.bazel b/jvm/jvm-analysis-refactoring/BUILD.bazel index 39478df3b058..4adff7ac4ebf 100644 --- a/jvm/jvm-analysis-refactoring/BUILD.bazel +++ b/jvm/jvm-analysis-refactoring/BUILD.bazel @@ -20,6 +20,7 @@ jvm_library( "//uast/uast-common:uast", "//jvm/jvm-analysis-api:analysis", "//platform/core-api:core", + "//java/java-psi-api:psi", ] ) @@ -35,6 +36,7 @@ jvm_library( "//uast/uast-common:uast_test_lib", "//jvm/jvm-analysis-api:analysis_test_lib", "//platform/core-api:core_test_lib", + "//java/java-psi-api:psi_test_lib", ] ) ### auto-generated section `build intellij.jvm.analysis.refactoring` end diff --git a/jvm/jvm-analysis-refactoring/intellij.jvm.analysis.refactoring.iml b/jvm/jvm-analysis-refactoring/intellij.jvm.analysis.refactoring.iml index dbc21ddbc1cc..07d406fa2f01 100644 --- a/jvm/jvm-analysis-refactoring/intellij.jvm.analysis.refactoring.iml +++ b/jvm/jvm-analysis-refactoring/intellij.jvm.analysis.refactoring.iml @@ -14,5 +14,6 @@ + \ No newline at end of file diff --git a/jvm/jvm-analysis-testFramework/BUILD.bazel b/jvm/jvm-analysis-testFramework/BUILD.bazel index 1408aa63a13d..43935e48a7cb 100644 --- a/jvm/jvm-analysis-testFramework/BUILD.bazel +++ b/jvm/jvm-analysis-testFramework/BUILD.bazel @@ -11,10 +11,12 @@ jvm_library( "//platform/analysis-api:analysis", "//platform/core-api:core", "//platform/core-ui", + "//java/java-syntax:syntax", "//platform/editor-ui-api:editor-ui", "//platform/projectModel-api:projectModel", "//platform/testFramework", "//java/testFramework", + "//platform/lang-api:lang", ] ) @@ -28,10 +30,12 @@ jvm_library( "//platform/analysis-api:analysis_test_lib", "//platform/core-api:core_test_lib", "//platform/core-ui:core-ui_test_lib", + "//java/java-syntax:syntax_test_lib", "//platform/editor-ui-api:editor-ui_test_lib", "//platform/projectModel-api:projectModel_test_lib", "//platform/testFramework:testFramework_test_lib", "//java/testFramework:testFramework_test_lib", + "//platform/lang-api:lang_test_lib", ] ) ### auto-generated section `build intellij.jvm.analysis.testFramework` end diff --git a/jvm/jvm-analysis-testFramework/intellij.jvm.analysis.testFramework.iml b/jvm/jvm-analysis-testFramework/intellij.jvm.analysis.testFramework.iml index 64f27f1ce9d8..ebb90d80eb77 100644 --- a/jvm/jvm-analysis-testFramework/intellij.jvm.analysis.testFramework.iml +++ b/jvm/jvm-analysis-testFramework/intellij.jvm.analysis.testFramework.iml @@ -11,9 +11,11 @@ + + \ No newline at end of file diff --git a/notebooks/notebook-ui/BUILD.bazel b/notebooks/notebook-ui/BUILD.bazel index dea6d9e3ec1e..ae210c992b6d 100644 --- a/notebooks/notebook-ui/BUILD.bazel +++ b/notebooks/notebook-ui/BUILD.bazel @@ -33,6 +33,7 @@ jvm_library( "//platform/observable", "//platform/code-style-api:codeStyle", "//platform/core-ui", + "//platform/util:util-ui", "//platform/projectModel-impl", "//platform/editor-ui-ex:editor-ex", ] @@ -54,6 +55,7 @@ jvm_library( "//platform/observable:observable_test_lib", "//platform/code-style-api:codeStyle_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/util:util-ui_test_lib", "//platform/projectModel-impl:projectModel-impl_test_lib", "//platform/editor-ui-ex:editor-ex_test_lib", ] diff --git a/notebooks/notebook-ui/intellij.notebooks.ui.iml b/notebooks/notebook-ui/intellij.notebooks.ui.iml index 7ad59cb1280b..da96c800b9d7 100644 --- a/notebooks/notebook-ui/intellij.notebooks.ui.iml +++ b/notebooks/notebook-ui/intellij.notebooks.ui.iml @@ -41,6 +41,7 @@ + diff --git a/notebooks/visualization/BUILD.bazel b/notebooks/visualization/BUILD.bazel index b8f61da4e7d4..155bb3217339 100644 --- a/notebooks/visualization/BUILD.bazel +++ b/notebooks/visualization/BUILD.bazel @@ -35,6 +35,7 @@ jvm_library( "//platform/core-impl", "//platform/core-ui", "//platform/ide-core-impl", + "//platform/ide-core", "//platform/observable", "//platform/platform-util-io:ide-util-io", "//notebooks/notebook-ui:ui", @@ -46,6 +47,7 @@ jvm_library( "//platform/util", "//platform/util/jdom", "//jupyter:notebooks-jupyter-core", + "//platform/util:util-ui", ] ) @@ -68,6 +70,7 @@ jvm_library( "//platform/core-impl:core-impl_test_lib", "//platform/core-ui:core-ui_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/observable:observable_test_lib", "//platform/platform-util-io:ide-util-io_test_lib", "//notebooks/notebook-ui:ui_test_lib", @@ -82,6 +85,7 @@ jvm_library( "//platform/util:util_test_lib", "//platform/util/jdom:jdom_test_lib", "//jupyter:notebooks-jupyter-core_test_lib", + "//platform/util:util-ui_test_lib", ] ) ### auto-generated section `build intellij.notebooks.visualization` end diff --git a/notebooks/visualization/intellij.notebooks.visualization.iml b/notebooks/visualization/intellij.notebooks.visualization.iml index 6ba2c1dcba55..88179adfa5ce 100644 --- a/notebooks/visualization/intellij.notebooks.visualization.iml +++ b/notebooks/visualization/intellij.notebooks.visualization.iml @@ -42,6 +42,7 @@ + @@ -55,5 +56,6 @@ + \ No newline at end of file diff --git a/platform/analysis-api/BUILD.bazel b/platform/analysis-api/BUILD.bazel index e76488b0468c..a930461a3431 100644 --- a/platform/analysis-api/BUILD.bazel +++ b/platform/analysis-api/BUILD.bazel @@ -27,6 +27,8 @@ jvm_library( "//platform/platform-util-io:ide-util-io", "@lib//:kotlin-stdlib", "//platform/util/text-matching", + "//platform/util/multiplatform", + "//platform/util/base", "//libraries/fastutil", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", ] @@ -51,6 +53,8 @@ jvm_library( "//platform/util-ex:util-ex_test_lib", "//platform/platform-util-io:ide-util-io_test_lib", "//platform/util/text-matching:text-matching_test_lib", + "//platform/util/multiplatform:multiplatform_test_lib", + "//platform/util/base:base_test_lib", "//libraries/fastutil:fastutil_test_lib", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", ] diff --git a/platform/analysis-api/intellij.platform.analysis.iml b/platform/analysis-api/intellij.platform.analysis.iml index 5609ddf46dcd..e121712f1642 100644 --- a/platform/analysis-api/intellij.platform.analysis.iml +++ b/platform/analysis-api/intellij.platform.analysis.iml @@ -21,6 +21,8 @@ + + diff --git a/platform/analysis-impl/BUILD.bazel b/platform/analysis-impl/BUILD.bazel index 86d85f05c011..4548c619c8be 100644 --- a/platform/analysis-impl/BUILD.bazel +++ b/platform/analysis-impl/BUILD.bazel @@ -46,6 +46,7 @@ jvm_library( "//libraries/jackson3/jackson:libraries-jackson3", "//libraries/jackson3/module-kotlin:libraries-jackson3-module-kotlin", "//platform/util-class-loader:util-classLoader", + "//platform/util-ex", "//libraries/kotlinx/serialization/core", "//libraries/kotlinx/serialization/json", "//platform/workspace/jps", @@ -96,6 +97,7 @@ jvm_library( "//libraries/jackson3/jackson:libraries-jackson3_test_lib", "//libraries/jackson3/module-kotlin:libraries-jackson3-module-kotlin_test_lib", "//platform/util-class-loader:util-classLoader_test_lib", + "//platform/util-ex:util-ex_test_lib", "//libraries/kotlinx/serialization/core:core_test_lib", "//libraries/kotlinx/serialization/json:json_test_lib", "//platform/workspace/jps:jps_test_lib", diff --git a/platform/analysis-impl/intellij.platform.analysis.impl.iml b/platform/analysis-impl/intellij.platform.analysis.impl.iml index 8075f0ac031f..878f5cdd03cb 100644 --- a/platform/analysis-impl/intellij.platform.analysis.impl.iml +++ b/platform/analysis-impl/intellij.platform.analysis.impl.iml @@ -63,6 +63,7 @@ + diff --git a/platform/bookmarks/BUILD.bazel b/platform/bookmarks/BUILD.bazel index bebea89633b3..e4adb592ed5c 100644 --- a/platform/bookmarks/BUILD.bazel +++ b/platform/bookmarks/BUILD.bazel @@ -30,14 +30,15 @@ jvm_library( "//platform/platform-impl/concurrency", "//platform/lang-api:lang", "//platform/favoritesTreeView", + "//platform/ide-core", "//platform/core-ui", "//platform/lang-impl", "//platform/projectModel-api:projectModel", + "//platform/util:util-ui", "//platform/util/jdom", "//platform/editor-ui-ex:editor-ex", "//platform/execution", - ], - exports = ["//platform/favoritesTreeView"] + ] ) jvm_library( @@ -45,10 +46,6 @@ jvm_library( module_name = "intellij.platform.bookmarks", visibility = ["//visibility:public"], srcs = glob([], allow_empty = True), - exports = [ - "//platform/favoritesTreeView", - "//platform/favoritesTreeView:favoritesTreeView_test_lib", - ], runtime_deps = [ ":bookmarks", "//platform/analysis-api:analysis_test_lib", @@ -65,9 +62,11 @@ jvm_library( "//platform/platform-impl/concurrency:concurrency_test_lib", "//platform/lang-api:lang_test_lib", "//platform/favoritesTreeView:favoritesTreeView_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/core-ui:core-ui_test_lib", "//platform/lang-impl:lang-impl_test_lib", "//platform/projectModel-api:projectModel_test_lib", + "//platform/util:util-ui_test_lib", "//platform/util/jdom:jdom_test_lib", "//platform/editor-ui-ex:editor-ex_test_lib", "//platform/execution:execution_test_lib", diff --git a/platform/bookmarks/intellij.platform.bookmarks.iml b/platform/bookmarks/intellij.platform.bookmarks.iml index 0eb8c330d985..9e3c88340ea4 100644 --- a/platform/bookmarks/intellij.platform.bookmarks.iml +++ b/platform/bookmarks/intellij.platform.bookmarks.iml @@ -19,7 +19,6 @@ $MAVEN_REPOSITORY$/com/jetbrains/fleet/rpc-compiler-plugin/2.3.20-0.1/rpc-compiler-plugin-2.3.20-0.1.jar - @@ -48,10 +47,12 @@ - + + + diff --git a/platform/bootstrap/BUILD.bazel b/platform/bootstrap/BUILD.bazel index 1df11e48fd47..380d2eac9e0a 100644 --- a/platform/bootstrap/BUILD.bazel +++ b/platform/bootstrap/BUILD.bazel @@ -10,6 +10,7 @@ jvm_library( "//platform/core-api:core", "//platform/projectModel-api:projectModel", "//platform/util", + "//platform/util:util-ui", "//platform/util-class-loader:util-classLoader", "//platform/util/xmlDom", "//libraries/kotlinx/coroutines/core", @@ -40,6 +41,7 @@ jvm_library( "//platform/core-api:core_test_lib", "//platform/projectModel-api:projectModel_test_lib", "//platform/util:util_test_lib", + "//platform/util:util-ui_test_lib", "//platform/util-class-loader:util-classLoader_test_lib", "//platform/util/xmlDom:xmlDom_test_lib", "//libraries/kotlinx/coroutines/core:core_test_lib", diff --git a/platform/bootstrap/intellij.platform.bootstrap.iml b/platform/bootstrap/intellij.platform.bootstrap.iml index 6fa192dc880e..1364c7692739 100644 --- a/platform/bootstrap/intellij.platform.bootstrap.iml +++ b/platform/bootstrap/intellij.platform.bootstrap.iml @@ -11,6 +11,7 @@ + diff --git a/platform/build-scripts/BUILD.bazel b/platform/build-scripts/BUILD.bazel index 0f96be991e54..ae45a574fdb7 100644 --- a/platform/build-scripts/BUILD.bazel +++ b/platform/build-scripts/BUILD.bazel @@ -79,6 +79,9 @@ jvm_library( "//libraries/io", "@lib//:netty-tcnative-boringssl", "//platform/util/coroutines", + "//platform/util/multiplatform", + "//platform/util/base/multiplatform", + "//platform/util/base", "@community//build:zip", "@lib//:com-jetbrains-fus-reporting-fus-api", "@lib//:com-jetbrains-fus-reporting-ap-validation-all", @@ -189,6 +192,9 @@ jvm_library( "//libraries/snakeyaml:snakeyaml_test_lib", "//libraries/snakeyaml-engine:snakeyaml-engine_test_lib", "//platform/util/coroutines:coroutines_test_lib", + "//platform/util/multiplatform:multiplatform_test_lib", + "//platform/util/base/multiplatform:multiplatform_test_lib", + "//platform/util/base:base_test_lib", "@community//build:zip_test_lib", "//libraries/ktor/client:client_test_lib", "//platform/pluginSystem/parser/impl:impl_test_lib", diff --git a/platform/build-scripts/bazel/intellij.platform.buildScripts.bazel.iml b/platform/build-scripts/bazel/intellij.platform.buildScripts.bazel.iml index 60dcf197c2e1..594e00c7b771 100644 --- a/platform/build-scripts/bazel/intellij.platform.buildScripts.bazel.iml +++ b/platform/build-scripts/bazel/intellij.platform.buildScripts.bazel.iml @@ -16,7 +16,6 @@ $KOTLIN_BUNDLED$/lib/kotlinx-serialization-compiler-plugin.jar - @@ -66,5 +65,7 @@ + + \ No newline at end of file diff --git a/platform/build-scripts/icons/BUILD.bazel b/platform/build-scripts/icons/BUILD.bazel index d2f28e8149ed..fcdb448018e4 100644 --- a/platform/build-scripts/icons/BUILD.bazel +++ b/platform/build-scripts/icons/BUILD.bazel @@ -31,6 +31,7 @@ jvm_library( "//libraries/kotlinx/coroutines/core", "//libraries/fastutil", "//platform/util/zip", + "//platform/util/base", "@lib//:platform-images-build-pngencoder", "//libraries/hash4j", "@lib//:jetbrains-intellij-deps-eclipse-jgit", @@ -65,6 +66,7 @@ jvm_library( "//libraries/kotlinx/coroutines/core:core_test_lib", "//libraries/fastutil:fastutil_test_lib", "//platform/util/zip:zip_test_lib", + "//platform/util/base:base_test_lib", "//libraries/hash4j:hash4j_test_lib", "//images:images-tests", "//images:images-tests_test_lib", diff --git a/platform/build-scripts/icons/intellij.platform.images.build.iml b/platform/build-scripts/icons/intellij.platform.images.build.iml index 54c1c244ea99..a61f39794c0b 100644 --- a/platform/build-scripts/icons/intellij.platform.images.build.iml +++ b/platform/build-scripts/icons/intellij.platform.images.build.iml @@ -29,6 +29,7 @@ + diff --git a/platform/build-scripts/intellij.platform.buildScripts.iml b/platform/build-scripts/intellij.platform.buildScripts.iml index 4219e613fd3a..664df45ca026 100644 --- a/platform/build-scripts/intellij.platform.buildScripts.iml +++ b/platform/build-scripts/intellij.platform.buildScripts.iml @@ -212,6 +212,9 @@ + + + diff --git a/platform/build-scripts/tests/BUILD.bazel b/platform/build-scripts/tests/BUILD.bazel index a9cf3ae2ddf9..801d70adac14 100644 --- a/platform/build-scripts/tests/BUILD.bazel +++ b/platform/build-scripts/tests/BUILD.bazel @@ -53,6 +53,8 @@ jvm_library( "//platform/util/jdom:jdom_test_lib", "//platform/util-ex", "//platform/util-ex:util-ex_test_lib", + "//platform/util/base", + "//platform/util/base:base_test_lib", "@community//build:zip", "@community//build:zip_test_lib", "//libraries/netty/buffer", diff --git a/platform/build-scripts/tests/intellij.platform.buildScripts.tests.iml b/platform/build-scripts/tests/intellij.platform.buildScripts.tests.iml index 4d137406ea4e..3302db957515 100644 --- a/platform/build-scripts/tests/intellij.platform.buildScripts.tests.iml +++ b/platform/build-scripts/tests/intellij.platform.buildScripts.tests.iml @@ -27,6 +27,7 @@ + diff --git a/platform/buildView/frontend/BUILD.bazel b/platform/buildView/frontend/BUILD.bazel index 3f56f425caf9..20519a3dc49e 100644 --- a/platform/buildView/frontend/BUILD.bazel +++ b/platform/buildView/frontend/BUILD.bazel @@ -26,10 +26,12 @@ jvm_library( "//platform/util/coroutines", "//platform/platform-impl/rpc", "//platform/ide-core-impl", + "//platform/ide-core", "//platform/project/shared:project", "//platform/platform-util-io:ide-util-io", "//platform/execution", "//platform/execution-impl", + "//platform/util:util-ui", ] ) @@ -51,10 +53,12 @@ jvm_library( "//platform/util/coroutines:coroutines_test_lib", "//platform/platform-impl/rpc:rpc_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/project/shared:project_test_lib", "//platform/platform-util-io:ide-util-io_test_lib", "//platform/execution:execution_test_lib", "//platform/execution-impl:execution-impl_test_lib", + "//platform/util:util-ui_test_lib", ] ) ### auto-generated section `build intellij.platform.buildView.frontend` end diff --git a/platform/buildView/frontend/intellij.platform.buildView.frontend.iml b/platform/buildView/frontend/intellij.platform.buildView.frontend.iml index e47a8ed24fb5..473e02b566d3 100644 --- a/platform/buildView/frontend/intellij.platform.buildView.frontend.iml +++ b/platform/buildView/frontend/intellij.platform.buildView.frontend.iml @@ -45,9 +45,11 @@ + + \ No newline at end of file diff --git a/platform/built-in-server/BUILD.bazel b/platform/built-in-server/BUILD.bazel index aa59e3a4c1de..37ddbda2d25d 100644 --- a/platform/built-in-server/BUILD.bazel +++ b/platform/built-in-server/BUILD.bazel @@ -20,10 +20,12 @@ jvm_library( "//platform/editor-ui-api:editor-ui", "//jps/model-api:model", "//platform/projectModel-api:projectModel", + "//platform/platform-util-io:ide-util-io", "//platform/core-impl", "//platform/projectModel-impl", "//platform/platform-impl:ide-impl", "//platform/ide-core/plugins", + "//platform/ide-core", "//libraries/guava", "//libraries/gson", "//libraries/commons/imaging", @@ -39,14 +41,16 @@ jvm_library( "//libraries/caffeine", "//platform/util/concurrency", "//platform/core-ui", + "//platform/util:util-ui", "//platform/platform-util-io-impl:ide-util-io-impl", "//platform/platform-util-netty:ide-util-netty", + "//platform/progress/shared:ide-progress", "//platform/util/progress", + "//platform/util-ex", "//libraries/kotlinx/coroutines/core", "//libraries/netty/codec-compression:libraries-netty-codec-compression", "//platform/execution", - ], - exports = ["//platform/built-in-server-api:builtInServer"] + ] ) jvm_library( @@ -54,10 +58,6 @@ jvm_library( module_name = "intellij.platform.builtInServer.impl", visibility = ["//visibility:public"], srcs = glob([], allow_empty = True), - exports = [ - "//platform/built-in-server-api:builtInServer", - "//platform/built-in-server-api:builtInServer_test_lib", - ], runtime_deps = [ ":builtInServer-impl", "//platform/analysis-api:analysis_test_lib", @@ -66,10 +66,12 @@ jvm_library( "//platform/editor-ui-api:editor-ui_test_lib", "//jps/model-api:model_test_lib", "//platform/projectModel-api:projectModel_test_lib", + "//platform/platform-util-io:ide-util-io_test_lib", "//platform/core-impl:core-impl_test_lib", "//platform/projectModel-impl:projectModel-impl_test_lib", "//platform/platform-impl:ide-impl_test_lib", "//platform/ide-core/plugins:plugins_test_lib", + "//platform/ide-core:ide-core_test_lib", "//libraries/guava:guava_test_lib", "//libraries/gson:gson_test_lib", "//libraries/commons/imaging:imaging_test_lib", @@ -84,9 +86,12 @@ jvm_library( "//libraries/caffeine:caffeine_test_lib", "//platform/util/concurrency:concurrency_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/util:util-ui_test_lib", "//platform/platform-util-io-impl:ide-util-io-impl_test_lib", "//platform/platform-util-netty:ide-util-netty_test_lib", + "//platform/progress/shared:ide-progress_test_lib", "//platform/util/progress:progress_test_lib", + "//platform/util-ex:util-ex_test_lib", "//libraries/kotlinx/coroutines/core:core_test_lib", "//libraries/netty/codec-compression:libraries-netty-codec-compression_test_lib", "//platform/execution:execution_test_lib", @@ -149,6 +154,7 @@ jvm_library( "//platform/editor-ui-api:editor-ui", "//platform/editor-ui-api:editor-ui_test_lib", "//platform/ide-core-impl", + "//platform/ide-core", "//jps/model-api:model", "//jps/model-api:model_test_lib", "//platform/lang-core", @@ -188,10 +194,15 @@ jvm_library( "//platform/core-ui:core-ui_test_lib", "//platform/platform-util-io:ide-util-io", "//platform/platform-util-netty:ide-util-netty", + "//platform/util:util-ui", + "//platform/util:util-ui_test_lib", + "//platform/util-ex", + "//platform/util-ex:util-ex_test_lib", ], runtime_deps = [ ":builtInServer-tests", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/platform-impl:ide-impl_test_lib", "//platform/platform-util-io:ide-util-io_test_lib", "//platform/platform-util-netty:ide-util-netty_test_lib", diff --git a/platform/built-in-server/intellij.platform.builtInServer.impl.iml b/platform/built-in-server/intellij.platform.builtInServer.impl.iml index 831a6daa2a0c..1bbc27b58fe6 100644 --- a/platform/built-in-server/intellij.platform.builtInServer.impl.iml +++ b/platform/built-in-server/intellij.platform.builtInServer.impl.iml @@ -17,14 +17,16 @@ + + - + @@ -36,9 +38,12 @@ + + + diff --git a/platform/built-in-server/intellij.platform.builtInServer.tests.iml b/platform/built-in-server/intellij.platform.builtInServer.tests.iml index a4b9bcebe6f4..905ac33443e2 100644 --- a/platform/built-in-server/intellij.platform.builtInServer.tests.iml +++ b/platform/built-in-server/intellij.platform.builtInServer.tests.iml @@ -14,6 +14,7 @@ + @@ -37,5 +38,7 @@ + + \ No newline at end of file diff --git a/platform/code-style-api/BUILD.bazel b/platform/code-style-api/BUILD.bazel index 6817728952fb..a2a09ac1665b 100644 --- a/platform/code-style-api/BUILD.bazel +++ b/platform/code-style-api/BUILD.bazel @@ -21,6 +21,8 @@ jvm_library( "//platform/projectModel-api:projectModel", "@lib//:kotlin-stdlib", "//platform/util/jdom", + "//platform/util/multiplatform", + "//platform/util/base", "//platform/util/concurrency", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", ] @@ -39,6 +41,8 @@ jvm_library( "//platform/util:util_test_lib", "//platform/projectModel-api:projectModel_test_lib", "//platform/util/jdom:jdom_test_lib", + "//platform/util/multiplatform:multiplatform_test_lib", + "//platform/util/base:base_test_lib", "//platform/util/concurrency:concurrency_test_lib", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", ] diff --git a/platform/code-style-api/intellij.platform.codeStyle.iml b/platform/code-style-api/intellij.platform.codeStyle.iml index 41ed2c7e10aa..45d407dcebcc 100644 --- a/platform/code-style-api/intellij.platform.codeStyle.iml +++ b/platform/code-style-api/intellij.platform.codeStyle.iml @@ -15,6 +15,8 @@ + + diff --git a/platform/collaboration-tools/BUILD.bazel b/platform/collaboration-tools/BUILD.bazel index 7675cf7a2c12..d0e3eb5028cb 100644 --- a/platform/collaboration-tools/BUILD.bazel +++ b/platform/collaboration-tools/BUILD.bazel @@ -28,6 +28,7 @@ jvm_library( "//platform/vcs-log/impl", "//platform/platform-impl:ide-impl", "//platform/ide-core-impl", + "//platform/ide-core", "//platform/vcs-api:vcs", "//platform/observable", "//platform/core-api:core", @@ -42,6 +43,7 @@ jvm_library( "//platform/credential-store-ui:credentialStore-ui", "//platform/vcs-impl", "//platform/platform-util-io:ide-util-io", + "//platform/progress/shared:ide-progress", "//platform/vcs-log/api:vcs-log", "//libraries/caffeine", "//libraries/kotlinx/coroutines/core", @@ -52,6 +54,7 @@ jvm_library( "//platform/dvcs-impl/shared", "//libraries/http-client", "//platform/vcs-impl/shared", + "//platform/util:util-ui", ] ) @@ -76,6 +79,7 @@ jvm_library( "//platform/vcs-log/impl:impl_test_lib", "//platform/platform-impl:ide-impl_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/vcs-api:vcs_test_lib", "//platform/observable:observable_test_lib", "//platform/core-api:core_test_lib", @@ -92,6 +96,7 @@ jvm_library( "//platform/testFramework:testFramework_test_lib", "//platform/vcs-impl:vcs-impl_test_lib", "//platform/platform-util-io:ide-util-io_test_lib", + "//platform/progress/shared:ide-progress_test_lib", "//platform/vcs-log/api:vcs-log_test_lib", "//libraries/caffeine:caffeine_test_lib", "//libraries/kotlinx/coroutines/core:core_test_lib", @@ -112,6 +117,7 @@ jvm_library( "@lib//:app-cash-turbine-jvm", "@lib//:assert_j", "//platform/vcs-impl/shared:shared_test_lib", + "//platform/util:util-ui_test_lib", ] ) ### auto-generated section `build intellij.platform.collaborationTools` end diff --git a/platform/collaboration-tools/intellij.platform.collaborationTools.iml b/platform/collaboration-tools/intellij.platform.collaborationTools.iml index 3f4e1a139174..13de8584b97a 100644 --- a/platform/collaboration-tools/intellij.platform.collaborationTools.iml +++ b/platform/collaboration-tools/intellij.platform.collaborationTools.iml @@ -23,6 +23,7 @@ + @@ -39,6 +40,7 @@ + @@ -56,5 +58,6 @@ + \ No newline at end of file diff --git a/platform/completion/common/BUILD.bazel b/platform/completion/common/BUILD.bazel index 9e75489d5574..c736003b6d81 100644 --- a/platform/completion/common/BUILD.bazel +++ b/platform/completion/common/BUILD.bazel @@ -22,6 +22,8 @@ jvm_library( "//platform/platform-impl:ide-impl", "//platform/project/shared:project", "//libraries/kotlinx/serialization/core", + "//platform/util:util-ui", + "//platform/editor-ui-api:editor-ui", "//platform/analysis-api:analysis", "//platform/platform-impl/rpc", "//platform/lang-api:lang", @@ -41,6 +43,8 @@ jvm_library( "//platform/platform-impl:ide-impl_test_lib", "//platform/project/shared:project_test_lib", "//libraries/kotlinx/serialization/core:core_test_lib", + "//platform/util:util-ui_test_lib", + "//platform/editor-ui-api:editor-ui_test_lib", "//platform/analysis-api:analysis_test_lib", "//platform/platform-impl/rpc:rpc_test_lib", "//platform/lang-api:lang_test_lib", diff --git a/platform/completion/common/intellij.platform.completion.common.iml b/platform/completion/common/intellij.platform.completion.common.iml index 290981528924..6820be658571 100644 --- a/platform/completion/common/intellij.platform.completion.common.iml +++ b/platform/completion/common/intellij.platform.completion.common.iml @@ -41,6 +41,8 @@ + + diff --git a/platform/compose/BUILD.bazel b/platform/compose/BUILD.bazel index 694240f7552c..16c88fa92956 100644 --- a/platform/compose/BUILD.bazel +++ b/platform/compose/BUILD.bazel @@ -22,6 +22,7 @@ jvm_library( "//platform/jewel/ide-laf-bridge", "//platform/core-ui", "//platform/platform-impl:ide-impl", + "//platform/ide-core", "//platform/analysis-api:analysis", "@lib//:jetbrains-annotations", "//libraries/kotlinx/coroutines/core", @@ -63,6 +64,7 @@ jvm_library( "//platform/jewel/ide-laf-bridge:ide-laf-bridge_test_lib", "//platform/core-ui:core-ui_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/analysis-api:analysis_test_lib", "//libraries/kotlinx/coroutines/core:core_test_lib", "//libraries/compose-runtime-desktop:compose-runtime-desktop_test_lib", @@ -121,6 +123,7 @@ jvm_library( "//platform/core-ui", "//platform/core-ui:core-ui_test_lib", "//platform/platform-impl:ide-impl", + "//platform/ide-core", "//platform/analysis-api:analysis", "//platform/analysis-api:analysis_test_lib", "@lib//:jetbrains-annotations", @@ -151,6 +154,7 @@ jvm_library( runtime_deps = [ ":compose-tests", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", ], plugins = ["@lib//:compose-plugin"] ) diff --git a/platform/compose/intellij.platform.compose.iml b/platform/compose/intellij.platform.compose.iml index 95d6c4d5b113..babef6fb3cc7 100644 --- a/platform/compose/intellij.platform.compose.iml +++ b/platform/compose/intellij.platform.compose.iml @@ -37,6 +37,7 @@ + diff --git a/platform/compose/intellij.platform.compose.tests.iml b/platform/compose/intellij.platform.compose.tests.iml index db784f8d9fb6..83639649b103 100644 --- a/platform/compose/intellij.platform.compose.tests.iml +++ b/platform/compose/intellij.platform.compose.tests.iml @@ -36,6 +36,7 @@ + diff --git a/platform/configuration-store-impl/BUILD.bazel b/platform/configuration-store-impl/BUILD.bazel index 16b3e6bc705e..4ec6f071ccab 100644 --- a/platform/configuration-store-impl/BUILD.bazel +++ b/platform/configuration-store-impl/BUILD.bazel @@ -21,6 +21,7 @@ jvm_library( "//jps/model-serialization", "//platform/projectModel-api:projectModel", "//platform/util", + "//platform/util:util-ui", "//platform/core-api:core", "//platform/platform-api:ide", "//platform/projectModel-impl", @@ -32,6 +33,7 @@ jvm_library( "//platform/object-serializer", "//platform/service-container", "//platform/ide-core-impl", + "//platform/ide-core", "//libraries/snakeyaml-engine", "//platform/statistics", "//libraries/fastutil", @@ -40,6 +42,7 @@ jvm_library( "//libraries/aalto-xml", "//platform/util/xmlDom", "//platform/util/jdom", + "//platform/util-ex", "//libraries/hash4j", "@lib//:opentelemetry", "@lib//:opentelemetry-semconv", @@ -50,6 +53,7 @@ jvm_library( "//platform/workspace/storage", "//libraries/kotlinx/serialization/json", "//platform/platform-impl/initial-config-import", + "//platform/progress/shared:ide-progress", "//platform/eel-provider", ] ) @@ -67,6 +71,7 @@ jvm_library( "//jps/model-serialization:model-serialization_test_lib", "//platform/projectModel-api:projectModel_test_lib", "//platform/util:util_test_lib", + "//platform/util:util-ui_test_lib", "//platform/core-api:core_test_lib", "//platform/platform-api:ide_test_lib", "//platform/projectModel-impl:projectModel-impl_test_lib", @@ -78,6 +83,7 @@ jvm_library( "//platform/object-serializer:object-serializer_test_lib", "//platform/service-container:service-container_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//libraries/snakeyaml-engine:snakeyaml-engine_test_lib", "//platform/statistics:statistics_test_lib", "//libraries/fastutil:fastutil_test_lib", @@ -86,6 +92,7 @@ jvm_library( "//libraries/aalto-xml:aalto-xml_test_lib", "//platform/util/xmlDom:xmlDom_test_lib", "//platform/util/jdom:jdom_test_lib", + "//platform/util-ex:util-ex_test_lib", "//libraries/hash4j:hash4j_test_lib", "//platform/diagnostic/telemetry:telemetry_test_lib", "//platform/backend/workspace:workspace_test_lib", @@ -94,6 +101,7 @@ jvm_library( "//platform/workspace/storage:storage_test_lib", "//libraries/kotlinx/serialization/json:json_test_lib", "//platform/platform-impl/initial-config-import:initial-config-import_test_lib", + "//platform/progress/shared:ide-progress_test_lib", "//platform/eel-provider:eel-provider_test_lib", ] ) @@ -137,6 +145,8 @@ jvm_library( "//platform/code-style-api:codeStyle_test_lib", "//platform/core-api:core", "//platform/core-api:core_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", "//platform/ide-core/plugins", "@lib//:assert_j", "//jps/model-api:model", @@ -154,6 +164,7 @@ jvm_library( "//platform/service-container", "//platform/service-container:service-container_test_lib", "//platform/ide-core-impl", + "//platform/ide-core", "//libraries/kotlinx/coroutines/core", "//libraries/kotlinx/coroutines/core:core_test_lib", "//platform/statistics", @@ -162,6 +173,8 @@ jvm_library( "//libraries/fastutil:fastutil_test_lib", "//platform/util/jdom", "//platform/util/jdom:jdom_test_lib", + "//platform/util-ex", + "//platform/util-ex:util-ex_test_lib", "//platform/settings", "//platform/settings:settings_test_lib", "//platform/settings-local", @@ -181,6 +194,7 @@ jvm_library( ":configurationStore-tests", "//platform/ide-core/plugins:plugins_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", ] ) ### auto-generated section `build intellij.platform.configurationStore.tests` end diff --git a/platform/configuration-store-impl/intellij.platform.configurationStore.impl.iml b/platform/configuration-store-impl/intellij.platform.configurationStore.impl.iml index f38dc6baae94..e19a673d6274 100644 --- a/platform/configuration-store-impl/intellij.platform.configurationStore.impl.iml +++ b/platform/configuration-store-impl/intellij.platform.configurationStore.impl.iml @@ -15,6 +15,7 @@ + @@ -26,6 +27,7 @@ + @@ -34,6 +36,7 @@ + @@ -44,6 +47,7 @@ + \ No newline at end of file diff --git a/platform/configuration-store-impl/intellij.platform.configurationStore.tests.iml b/platform/configuration-store-impl/intellij.platform.configurationStore.tests.iml index 3a1f49e4c1b6..4960778ede39 100644 --- a/platform/configuration-store-impl/intellij.platform.configurationStore.tests.iml +++ b/platform/configuration-store-impl/intellij.platform.configurationStore.tests.iml @@ -36,6 +36,7 @@ + @@ -47,10 +48,12 @@ + + diff --git a/platform/core-api/BUILD.bazel b/platform/core-api/BUILD.bazel index 9a72bf1ed05c..b395fc1c71fb 100644 --- a/platform/core-api/BUILD.bazel +++ b/platform/core-api/BUILD.bazel @@ -25,10 +25,18 @@ jvm_library( "//platform/diagnostic", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", "//platform/util/coroutines", + "//platform/util/multiplatform", + "//platform/util/base/multiplatform", + "//platform/util/base", "@lib//:jetbrains-annotations", "//libraries/fastutil", ], - exports = ["//platform/extensions"] + exports = [ + "//platform/extensions", + "//platform/util/multiplatform", + "//platform/util/base/multiplatform", + "//platform/util/base", + ] ) jvm_library( @@ -40,6 +48,12 @@ jvm_library( exports = [ "//platform/extensions", "//platform/extensions:extensions_test_lib", + "//platform/util/multiplatform", + "//platform/util/multiplatform:multiplatform_test_lib", + "//platform/util/base/multiplatform", + "//platform/util/base/multiplatform:multiplatform_test_lib", + "//platform/util/base", + "//platform/util/base:base_test_lib", ], runtime_deps = [ ":core", @@ -52,6 +66,9 @@ jvm_library( "//platform/diagnostic:diagnostic_test_lib", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", "//platform/util/coroutines:coroutines_test_lib", + "//platform/util/multiplatform:multiplatform_test_lib", + "//platform/util/base/multiplatform:multiplatform_test_lib", + "//platform/util/base:base_test_lib", "//libraries/fastutil:fastutil_test_lib", ] ) diff --git a/platform/core-api/intellij.platform.core.iml b/platform/core-api/intellij.platform.core.iml index 839d805c8422..1df71e51ec0e 100644 --- a/platform/core-api/intellij.platform.core.iml +++ b/platform/core-api/intellij.platform.core.iml @@ -34,6 +34,9 @@ + + + diff --git a/platform/core-impl/BUILD.bazel b/platform/core-impl/BUILD.bazel index 0828abcc97d1..96201f50ceca 100644 --- a/platform/core-impl/BUILD.bazel +++ b/platform/core-impl/BUILD.bazel @@ -32,6 +32,8 @@ jvm_library( "@lib//:opentelemetry", "@lib//:opentelemetry-semconv", "//platform/util/coroutines", + "//platform/util/multiplatform", + "//platform/util/base", "//platform/pluginSystem/parser/impl", "//platform/syntax/syntax-api:syntax", "//platform/eel", @@ -63,6 +65,8 @@ jvm_library( "//platform/util:util_test_lib", "//platform/diagnostic/telemetry:telemetry_test_lib", "//platform/util/coroutines:coroutines_test_lib", + "//platform/util/multiplatform:multiplatform_test_lib", + "//platform/util/base:base_test_lib", "//platform/pluginSystem/parser/impl:impl_test_lib", "//platform/syntax/syntax-api:syntax_test_lib", "//platform/eel:eel_test_lib", diff --git a/platform/core-impl/intellij.platform.core.impl.iml b/platform/core-impl/intellij.platform.core.impl.iml index c86bc5735a24..7a3b32c9fe43 100644 --- a/platform/core-impl/intellij.platform.core.impl.iml +++ b/platform/core-impl/intellij.platform.core.impl.iml @@ -41,6 +41,8 @@ + + diff --git a/platform/core-ui/BUILD.bazel b/platform/core-ui/BUILD.bazel index 2760611aab80..64cdbd3cb3a6 100644 --- a/platform/core-ui/BUILD.bazel +++ b/platform/core-ui/BUILD.bazel @@ -17,6 +17,8 @@ jvm_library( "//platform/util", "//platform/core-api:core", "//platform/util:util-ui", + "//platform/util/multiplatform", + "//platform/util/base", "@lib//:kotlin-stdlib", "//libraries/hash4j", ] @@ -32,6 +34,8 @@ jvm_library( "//platform/util:util_test_lib", "//platform/core-api:core_test_lib", "//platform/util:util-ui_test_lib", + "//platform/util/multiplatform:multiplatform_test_lib", + "//platform/util/base:base_test_lib", "//libraries/hash4j:hash4j_test_lib", ] ) diff --git a/platform/core-ui/intellij.platform.core.ui.iml b/platform/core-ui/intellij.platform.core.ui.iml index de297648caaa..58dffc7f357c 100644 --- a/platform/core-ui/intellij.platform.core.ui.iml +++ b/platform/core-ui/intellij.platform.core.ui.iml @@ -11,6 +11,8 @@ + + diff --git a/platform/credential-store-impl/BUILD.bazel b/platform/credential-store-impl/BUILD.bazel index 371ecb49b652..e6ce2ae76c9b 100644 --- a/platform/credential-store-impl/BUILD.bazel +++ b/platform/credential-store-impl/BUILD.bazel @@ -28,6 +28,7 @@ jvm_library( "//platform/remote-core", "//platform/editor-ui-api:editor-ui", "//platform/util:util-ui", + "//platform/util-ex", "//platform/core-api:core", "@lib//:kotlin-stdlib", "//libraries/kotlinx/coroutines/core", @@ -64,6 +65,7 @@ jvm_library( "//platform/remote-core:remote-core_test_lib", "//platform/editor-ui-api:editor-ui_test_lib", "//platform/util:util-ui_test_lib", + "//platform/util-ex:util-ex_test_lib", "//platform/core-api:core_test_lib", "//libraries/kotlinx/coroutines/core:core_test_lib", "//libraries/guava:guava_test_lib", @@ -137,6 +139,8 @@ jvm_library( "//platform/editor-ui-api:editor-ui_test_lib", "//platform/util:util-ui", "//platform/util:util-ui_test_lib", + "//platform/util-ex", + "//platform/util-ex:util-ex_test_lib", "//platform/core-api:core", "//platform/core-api:core_test_lib", "@lib//:kotlin-stdlib", diff --git a/platform/credential-store-impl/intellij.platform.credentialStore.impl.iml b/platform/credential-store-impl/intellij.platform.credentialStore.impl.iml index 6717ffc56b65..ce6c22b2f42b 100644 --- a/platform/credential-store-impl/intellij.platform.credentialStore.impl.iml +++ b/platform/credential-store-impl/intellij.platform.credentialStore.impl.iml @@ -22,6 +22,7 @@ + diff --git a/platform/credential-store-impl/intellij.platform.credentialStore.impl.tests.iml b/platform/credential-store-impl/intellij.platform.credentialStore.impl.tests.iml index e57db76f52c4..48ee82bc73bb 100644 --- a/platform/credential-store-impl/intellij.platform.credentialStore.impl.tests.iml +++ b/platform/credential-store-impl/intellij.platform.credentialStore.impl.tests.iml @@ -21,6 +21,7 @@ + diff --git a/platform/credential-store-ui/BUILD.bazel b/platform/credential-store-ui/BUILD.bazel index a3577106e15f..c25181f9bafe 100644 --- a/platform/credential-store-ui/BUILD.bazel +++ b/platform/credential-store-ui/BUILD.bazel @@ -23,6 +23,7 @@ jvm_library( "//platform/projectModel-api:projectModel", "//platform/util:util-ui", "//platform/platform-impl:ide-impl", + "//platform/ide-core", "//platform/core-ui", ] ) @@ -42,6 +43,7 @@ jvm_library( "//platform/projectModel-api:projectModel_test_lib", "//platform/util:util-ui_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/core-ui:core-ui_test_lib", ] ) diff --git a/platform/credential-store-ui/intellij.platform.credentialStore.ui.iml b/platform/credential-store-ui/intellij.platform.credentialStore.ui.iml index 355825ec3076..80059029b70d 100644 --- a/platform/credential-store-ui/intellij.platform.credentialStore.ui.iml +++ b/platform/credential-store-ui/intellij.platform.credentialStore.ui.iml @@ -17,6 +17,7 @@ + \ No newline at end of file diff --git a/platform/diagnostic/freezeInPluginNotifier/BUILD.bazel b/platform/diagnostic/freezeInPluginNotifier/BUILD.bazel index 32d4789b7307..502d177b822d 100644 --- a/platform/diagnostic/freezeInPluginNotifier/BUILD.bazel +++ b/platform/diagnostic/freezeInPluginNotifier/BUILD.bazel @@ -23,6 +23,7 @@ jvm_library( "//platform/core-impl", "//platform/platform-api:ide", "//platform/platform-impl:ide-impl", + "//platform/ide-core", "//libraries/kotlinx/serialization/json", "//platform/analysis-api:analysis", "//libraries/kotlinx/serialization/core", @@ -46,6 +47,7 @@ jvm_library( "//platform/core-impl:core-impl_test_lib", "//platform/platform-api:ide_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//libraries/kotlinx/serialization/json:json_test_lib", "//platform/analysis-api:analysis_test_lib", "//libraries/kotlinx/serialization/core:core_test_lib", diff --git a/platform/diagnostic/freezeInPluginNotifier/intellij.platform.diagnostic.freezes.iml b/platform/diagnostic/freezeInPluginNotifier/intellij.platform.diagnostic.freezes.iml index ec4d3876693c..2edd0e20e602 100644 --- a/platform/diagnostic/freezeInPluginNotifier/intellij.platform.diagnostic.freezes.iml +++ b/platform/diagnostic/freezeInPluginNotifier/intellij.platform.diagnostic.freezes.iml @@ -38,6 +38,7 @@ + diff --git a/platform/diagnostic/startUpPerformanceReporter/BUILD.bazel b/platform/diagnostic/startUpPerformanceReporter/BUILD.bazel index 91480ff8e186..d3c9ce10edb5 100644 --- a/platform/diagnostic/startUpPerformanceReporter/BUILD.bazel +++ b/platform/diagnostic/startUpPerformanceReporter/BUILD.bazel @@ -26,6 +26,7 @@ jvm_library( "@lib//:opentelemetry", "@lib//:opentelemetry-semconv", "//platform/util", + "//platform/util/base", "//libraries/kotlinx/coroutines/core", "//libraries/kotlinx/serialization/core", "//libraries/kotlinx/serialization/protobuf", @@ -52,6 +53,7 @@ jvm_library( "//platform/util-class-loader:util-classLoader_test_lib", "//platform/platform-util-io-impl:ide-util-io-impl_test_lib", "//platform/util:util_test_lib", + "//platform/util/base:base_test_lib", "//libraries/kotlinx/coroutines/core:core_test_lib", "//libraries/kotlinx/serialization/core:core_test_lib", "//libraries/kotlinx/serialization/protobuf:protobuf_test_lib", diff --git a/platform/diagnostic/startUpPerformanceReporter/intellij.platform.diagnostic.startUpPerformanceReporter.iml b/platform/diagnostic/startUpPerformanceReporter/intellij.platform.diagnostic.startUpPerformanceReporter.iml index 113327301c91..027eda6a430b 100644 --- a/platform/diagnostic/startUpPerformanceReporter/intellij.platform.diagnostic.startUpPerformanceReporter.iml +++ b/platform/diagnostic/startUpPerformanceReporter/intellij.platform.diagnostic.startUpPerformanceReporter.iml @@ -41,6 +41,7 @@ + diff --git a/platform/diagnostic/telemetry-impl/BUILD.bazel b/platform/diagnostic/telemetry-impl/BUILD.bazel index 3dc01cfa7741..6448e1ec1f7e 100644 --- a/platform/diagnostic/telemetry-impl/BUILD.bazel +++ b/platform/diagnostic/telemetry-impl/BUILD.bazel @@ -42,6 +42,7 @@ jvm_library( "//platform/diagnostic", "//platform/diagnostic/telemetry.exporters", "//platform/util/coroutines", + "//platform/util/base", "//platform/diagnostic/telemetry/rt", "//libraries/guava", ], @@ -78,6 +79,7 @@ jvm_library( "//platform/diagnostic:diagnostic_test_lib", "//platform/diagnostic/telemetry.exporters:telemetry.exporters_test_lib", "//platform/util/coroutines:coroutines_test_lib", + "//platform/util/base:base_test_lib", "//platform/diagnostic/telemetry/rt:rt_test_lib", "//libraries/guava:guava_test_lib", ] diff --git a/platform/diagnostic/telemetry-impl/intellij.platform.diagnostic.telemetry.impl.iml b/platform/diagnostic/telemetry-impl/intellij.platform.diagnostic.telemetry.impl.iml index 95dd1725c849..20815890c27f 100644 --- a/platform/diagnostic/telemetry-impl/intellij.platform.diagnostic.telemetry.impl.iml +++ b/platform/diagnostic/telemetry-impl/intellij.platform.diagnostic.telemetry.impl.iml @@ -48,6 +48,7 @@ + diff --git a/platform/diagnostic/telemetry.exporters/BUILD.bazel b/platform/diagnostic/telemetry.exporters/BUILD.bazel index 2baf84035a9a..ba2e881735c0 100644 --- a/platform/diagnostic/telemetry.exporters/BUILD.bazel +++ b/platform/diagnostic/telemetry.exporters/BUILD.bazel @@ -33,6 +33,7 @@ jvm_library( "//platform/util/http", "//libraries/kotlinx/coroutines/core", "//platform/util", + "//platform/util/base", "//libraries/jackson3/jackson:libraries-jackson3", "//libraries/jackson3/databind", "//libraries/jackson3/module-kotlin:libraries-jackson3-module-kotlin", @@ -53,6 +54,7 @@ jvm_library( "//platform/util/http:http_test_lib", "//libraries/kotlinx/coroutines/core:core_test_lib", "//platform/util:util_test_lib", + "//platform/util/base:base_test_lib", "//libraries/jackson3/jackson:libraries-jackson3_test_lib", "//libraries/jackson3/databind:databind_test_lib", "//libraries/jackson3/module-kotlin:libraries-jackson3-module-kotlin_test_lib", diff --git a/platform/diagnostic/telemetry.exporters/intellij.platform.diagnostic.telemetry.exporters.iml b/platform/diagnostic/telemetry.exporters/intellij.platform.diagnostic.telemetry.exporters.iml index c110282fc3b8..6a3833b3d2f3 100644 --- a/platform/diagnostic/telemetry.exporters/intellij.platform.diagnostic.telemetry.exporters.iml +++ b/platform/diagnostic/telemetry.exporters/intellij.platform.diagnostic.telemetry.exporters.iml @@ -39,6 +39,7 @@ + diff --git a/platform/diagnostic/telemetry/BUILD.bazel b/platform/diagnostic/telemetry/BUILD.bazel index 279512260e9b..942e5f6ba8ab 100644 --- a/platform/diagnostic/telemetry/BUILD.bazel +++ b/platform/diagnostic/telemetry/BUILD.bazel @@ -25,6 +25,7 @@ jvm_library( "@lib//:opentelemetry-semconv-provided", "@lib//:opentelemetry-extension-kotlin-provided", "//platform/util", + "//platform/util/base", "//platform/diagnostic", ":libraries_kotlinx_coroutines_core_provided", ], @@ -50,6 +51,7 @@ jvm_library( "@lib//:opentelemetry-semconv-provided", "@lib//:opentelemetry-extension-kotlin-provided", "//platform/util:util_test_lib", + "//platform/util/base:base_test_lib", "//platform/diagnostic:diagnostic_test_lib", "@lib//:junit5", "//libraries/kotlin/test-assertions-core-jvm:libraries-kotlinTestAssertionsCoreJvm", diff --git a/platform/diagnostic/telemetry/intellij.platform.diagnostic.telemetry.iml b/platform/diagnostic/telemetry/intellij.platform.diagnostic.telemetry.iml index 01f4621ce253..6291fb05a607 100644 --- a/platform/diagnostic/telemetry/intellij.platform.diagnostic.telemetry.iml +++ b/platform/diagnostic/telemetry/intellij.platform.diagnostic.telemetry.iml @@ -30,6 +30,7 @@ + diff --git a/platform/diff-api/BUILD.bazel b/platform/diff-api/BUILD.bazel index 4eea04e7e6f5..73dbc79f0f0b 100644 --- a/platform/diff-api/BUILD.bazel +++ b/platform/diff-api/BUILD.bazel @@ -20,6 +20,8 @@ jvm_library( "//platform/core-ui", "//platform/core-api:core", "//platform/util", + "//platform/util/multiplatform", + "//platform/util/base", "//platform/editor-ui-api:editor-ui", "//platform/analysis-api:analysis", "//platform/projectModel-api:projectModel", @@ -41,6 +43,8 @@ jvm_library( "//platform/core-ui:core-ui_test_lib", "//platform/core-api:core_test_lib", "//platform/util:util_test_lib", + "//platform/util/multiplatform:multiplatform_test_lib", + "//platform/util/base:base_test_lib", "//platform/editor-ui-api:editor-ui_test_lib", "//platform/analysis-api:analysis_test_lib", "//platform/projectModel-api:projectModel_test_lib", diff --git a/platform/diff-api/intellij.platform.diff.iml b/platform/diff-api/intellij.platform.diff.iml index 4600bc3da865..75e948203d61 100644 --- a/platform/diff-api/intellij.platform.diff.iml +++ b/platform/diff-api/intellij.platform.diff.iml @@ -14,6 +14,8 @@ + + diff --git a/platform/diff-impl/BUILD.bazel b/platform/diff-impl/BUILD.bazel index c432f35d3268..0c72d7e08c03 100644 --- a/platform/diff-impl/BUILD.bazel +++ b/platform/diff-impl/BUILD.bazel @@ -28,10 +28,12 @@ jvm_library( "//platform/lang-api:lang", "//libraries/guava", "//platform/ide-core-impl", + "//platform/ide-core", "//platform/projectModel-api:projectModel", "//platform/statistics", "//platform/boot", "//platform/core-ui", + "//platform/util:util-ui", "//platform/forms_rt:java-guiForms-rt", "//libraries/fastutil", "//platform/platform-util-io-impl:ide-util-io-impl", @@ -41,6 +43,8 @@ jvm_library( "//platform/util/jdom", "//libraries/kotlinx/serialization/core", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", + "//platform/platform-util-io:ide-util-io", + "//platform/progress/shared:ide-progress", ] ) @@ -65,10 +69,12 @@ jvm_library( "//platform/lang-api:lang_test_lib", "//libraries/guava:guava_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/projectModel-api:projectModel_test_lib", "//platform/statistics:statistics_test_lib", "//platform/boot:boot_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/util:util-ui_test_lib", "//platform/forms_rt:java-guiForms-rt_test_lib", "//libraries/fastutil:fastutil_test_lib", "//platform/platform-util-io-impl:ide-util-io-impl_test_lib", @@ -78,6 +84,8 @@ jvm_library( "//platform/util/jdom:jdom_test_lib", "//libraries/kotlinx/serialization/core:core_test_lib", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", + "//platform/platform-util-io:ide-util-io_test_lib", + "//platform/progress/shared:ide-progress_test_lib", ] ) ### auto-generated section `build intellij.platform.diff.impl` end diff --git a/platform/diff-impl/intellij.platform.diff.impl.iml b/platform/diff-impl/intellij.platform.diff.impl.iml index e26c0c2495c5..78883b4e9f9b 100644 --- a/platform/diff-impl/intellij.platform.diff.impl.iml +++ b/platform/diff-impl/intellij.platform.diff.impl.iml @@ -19,7 +19,6 @@ $MAVEN_REPOSITORY$/com/jetbrains/fleet/rpc-compiler-plugin/2.3.20-0.1/rpc-compiler-plugin-2.3.20-0.1.jar - @@ -47,10 +46,12 @@ + + @@ -60,5 +61,7 @@ + + \ No newline at end of file diff --git a/platform/diff-impl/tests/BUILD.bazel b/platform/diff-impl/tests/BUILD.bazel index 92ba8b6619a9..2f6608021fe2 100644 --- a/platform/diff-impl/tests/BUILD.bazel +++ b/platform/diff-impl/tests/BUILD.bazel @@ -42,8 +42,11 @@ jvm_library( "//platform/platform-api:ide", "//platform/platform-api:ide_test_lib", "//platform/platform-impl:ide-impl", + "//platform/ide-core", "//platform/util/diff", "//platform/util/diff:diff_test_lib", + "//platform/util:util-ui", + "//platform/util:util-ui_test_lib", "//platform/diff-impl", "//platform/diff-impl:diff-impl_test_lib", "//libraries/mockito", @@ -63,6 +66,7 @@ jvm_library( runtime_deps = [ ":tests", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", ] ) ### auto-generated section `build intellij.platform.diff.tests` end diff --git a/platform/diff-impl/tests/intellij.platform.diff.tests.iml b/platform/diff-impl/tests/intellij.platform.diff.tests.iml index e08d7aa289cb..d8520f05bdc6 100644 --- a/platform/diff-impl/tests/intellij.platform.diff.tests.iml +++ b/platform/diff-impl/tests/intellij.platform.diff.tests.iml @@ -14,7 +14,9 @@ + + diff --git a/platform/dvcs-api/BUILD.bazel b/platform/dvcs-api/BUILD.bazel index c9add46b5ef5..da7228854595 100644 --- a/platform/dvcs-api/BUILD.bazel +++ b/platform/dvcs-api/BUILD.bazel @@ -21,6 +21,7 @@ jvm_library( "//platform/vcs-api:vcs", "//platform/extensions", "//platform/platform-api:ide", + "//platform/ide-core", "//platform/vcs-log/api:vcs-log", "@lib//:kotlin-stdlib", "//platform/dvcs-impl/shared", @@ -41,6 +42,7 @@ jvm_library( "//platform/vcs-api:vcs_test_lib", "//platform/extensions:extensions_test_lib", "//platform/platform-api:ide_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/vcs-log/api:vcs-log_test_lib", "//platform/dvcs-impl/shared:shared_test_lib", ] diff --git a/platform/dvcs-api/intellij.platform.vcs.dvcs.iml b/platform/dvcs-api/intellij.platform.vcs.dvcs.iml index 9d1878f8a287..1aec6da849f5 100644 --- a/platform/dvcs-api/intellij.platform.vcs.dvcs.iml +++ b/platform/dvcs-api/intellij.platform.vcs.dvcs.iml @@ -15,6 +15,7 @@ + diff --git a/platform/dvcs-impl/BUILD.bazel b/platform/dvcs-impl/BUILD.bazel index 64e4dc9dbdf5..73b6246833a6 100644 --- a/platform/dvcs-impl/BUILD.bazel +++ b/platform/dvcs-impl/BUILD.bazel @@ -33,6 +33,8 @@ jvm_library( "//platform/lang-impl", "//platform/vcs-api:vcs", "//platform/ide-core-impl", + "//platform/ide-core", + "//platform/progress/shared:ide-progress", "//platform/dvcs-api:vcs-dvcs", "//libraries/miglayout-swing", "//libraries/stream", @@ -77,6 +79,8 @@ jvm_library( "//platform/lang-impl:lang-impl_test_lib", "//platform/vcs-api:vcs_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", + "//platform/progress/shared:ide-progress_test_lib", "//platform/dvcs-api:vcs-dvcs_test_lib", "//platform/testFramework", "//platform/testFramework:testFramework_test_lib", diff --git a/platform/dvcs-impl/intellij.platform.vcs.dvcs.impl.iml b/platform/dvcs-impl/intellij.platform.vcs.dvcs.impl.iml index bef8e07a2ec1..6d804af0e201 100644 --- a/platform/dvcs-impl/intellij.platform.vcs.dvcs.impl.iml +++ b/platform/dvcs-impl/intellij.platform.vcs.dvcs.impl.iml @@ -52,6 +52,8 @@ + + diff --git a/platform/editor-ui-api/BUILD.bazel b/platform/editor-ui-api/BUILD.bazel index 34d1d45a977f..9880df7e4edb 100644 --- a/platform/editor-ui-api/BUILD.bazel +++ b/platform/editor-ui-api/BUILD.bazel @@ -24,6 +24,8 @@ jvm_library( "@lib//:jetbrains-annotations", "//platform/util/concurrency", "//platform/util:util-ui", + "//platform/util/multiplatform", + "//platform/util/base", "//platform/core-ui", "//platform/diagnostic", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", @@ -45,6 +47,8 @@ jvm_library( "//platform/util/jdom:jdom_test_lib", "//platform/util/concurrency:concurrency_test_lib", "//platform/util:util-ui_test_lib", + "//platform/util/multiplatform:multiplatform_test_lib", + "//platform/util/base:base_test_lib", "//platform/core-ui:core-ui_test_lib", "//platform/diagnostic:diagnostic_test_lib", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", diff --git a/platform/editor-ui-api/intellij.platform.editor.ui.iml b/platform/editor-ui-api/intellij.platform.editor.ui.iml index 85fae4aac9ad..1b1abf4df1e4 100644 --- a/platform/editor-ui-api/intellij.platform.editor.ui.iml +++ b/platform/editor-ui-api/intellij.platform.editor.ui.iml @@ -18,6 +18,8 @@ + + diff --git a/platform/editor-ui-ex/BUILD.bazel b/platform/editor-ui-ex/BUILD.bazel index 2508cc1a0ae4..f47bc7d2e865 100644 --- a/platform/editor-ui-ex/BUILD.bazel +++ b/platform/editor-ui-ex/BUILD.bazel @@ -26,6 +26,9 @@ jvm_library( "//libraries/fastutil", "//platform/core-ui", "//platform/util/jdom", + "//platform/util/multiplatform", + "//platform/util/base", + "//platform/util-ex", "//platform/statistics", "//libraries/jbr", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", @@ -51,6 +54,9 @@ jvm_library( "//libraries/fastutil:fastutil_test_lib", "//platform/core-ui:core-ui_test_lib", "//platform/util/jdom:jdom_test_lib", + "//platform/util/multiplatform:multiplatform_test_lib", + "//platform/util/base:base_test_lib", + "//platform/util-ex:util-ex_test_lib", "//platform/statistics:statistics_test_lib", "//libraries/jbr:jbr_test_lib", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", diff --git a/platform/editor-ui-ex/intellij.platform.editor.ex.iml b/platform/editor-ui-ex/intellij.platform.editor.ex.iml index baf083716a69..82cfef5c251d 100644 --- a/platform/editor-ui-ex/intellij.platform.editor.ex.iml +++ b/platform/editor-ui-ex/intellij.platform.editor.ex.iml @@ -20,6 +20,9 @@ + + + diff --git a/platform/eel-impl/BUILD.bazel b/platform/eel-impl/BUILD.bazel index 47ee4832d4ec..7af29db12895 100644 --- a/platform/eel-impl/BUILD.bazel +++ b/platform/eel-impl/BUILD.bazel @@ -22,6 +22,7 @@ jvm_library( "//platform/util", "//platform/platform-util-io:ide-util-io", "//platform/util/coroutines", + "//platform/util/multiplatform", "//platform/core-api:core", "@lib//:jna", "//libraries/pty4j", @@ -48,6 +49,7 @@ jvm_library( "//platform/util:util_test_lib", "//platform/platform-util-io:ide-util-io_test_lib", "//platform/util/coroutines:coroutines_test_lib", + "//platform/util/multiplatform:multiplatform_test_lib", "//platform/core-api:core_test_lib", "//libraries/pty4j:pty4j_test_lib", "//platform/ide-core:ide-core_test_lib", diff --git a/platform/eel-impl/intellij.platform.eel.impl.iml b/platform/eel-impl/intellij.platform.eel.impl.iml index 6b9fc41a2d5b..0255c5f2d9d0 100644 --- a/platform/eel-impl/intellij.platform.eel.impl.iml +++ b/platform/eel-impl/intellij.platform.eel.impl.iml @@ -16,6 +16,7 @@ + diff --git a/platform/eel-provider/BUILD.bazel b/platform/eel-provider/BUILD.bazel index 05823f39d63f..65c77f1bb55c 100644 --- a/platform/eel-provider/BUILD.bazel +++ b/platform/eel-provider/BUILD.bazel @@ -20,6 +20,7 @@ jvm_library( "//libraries/kotlinx/coroutines/core", "@lib//:kotlin-stdlib", "//platform/util/coroutines", + "//platform/util/base", "//libraries/hash4j", "//platform/core-nio-fs", "//platform/external-process-auth-helper/rt", @@ -43,6 +44,7 @@ jvm_library( "//platform/core-api:core_test_lib", "//libraries/kotlinx/coroutines/core:core_test_lib", "//platform/util/coroutines:coroutines_test_lib", + "//platform/util/base:base_test_lib", "//libraries/hash4j:hash4j_test_lib", "//platform/core-nio-fs:core-nio-fs_test_lib", "//platform/external-process-auth-helper/rt:rt_test_lib", diff --git a/platform/eel-provider/intellij.platform.eel.provider.iml b/platform/eel-provider/intellij.platform.eel.provider.iml index 356c50ea6214..ea3f58c00435 100644 --- a/platform/eel-provider/intellij.platform.eel.provider.iml +++ b/platform/eel-provider/intellij.platform.eel.provider.iml @@ -14,6 +14,7 @@ + diff --git a/platform/eel/BUILD.bazel b/platform/eel/BUILD.bazel index 30e2ed7e720f..b4ea3058af31 100644 --- a/platform/eel/BUILD.bazel +++ b/platform/eel/BUILD.bazel @@ -45,6 +45,7 @@ jvm_library( "//plugins/copyright", "//java/openapi:java", "//java/java-impl:impl", + "//java/java-psi-api:psi", "//platform/testFramework", "//platform/testFramework/junit5", "//platform/util/jdom", @@ -70,10 +71,14 @@ jvm_library( "//java/openapi:java_test_lib", "//java/java-impl:impl", "//java/java-impl:impl_test_lib", + "//java/java-psi-api:psi", + "//java/java-psi-api:psi_test_lib", "//platform/analysis-api:analysis", "//platform/analysis-api:analysis_test_lib", "//platform/core-api:core", "//platform/core-api:core_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", "//platform/indexing-api:indexing", "//platform/indexing-api:indexing_test_lib", "//jps/model-api:model", @@ -88,16 +93,20 @@ jvm_library( "//platform/testFramework/junit5:junit5_test_lib", "//platform/util/jdom", "//platform/util/jdom:jdom_test_lib", + "//platform/util-ex", + "//platform/util-ex:util-ex_test_lib", "//plugins/kotlin/base/test", "//plugins/kotlin/base/test:test_test_lib", "//plugins/kotlin/base/indices", "//plugins/kotlin/base/indices:indices_test_lib", "//platform/execution", "//platform/execution:execution_test_lib", + "//platform/ide-core", ], runtime_deps = [ ":eel-codegen", "//plugins/kotlin:kotlin-plugin-community-main_test_lib", + "//platform/ide-core:ide-core_test_lib", ] ) ### auto-generated section `build intellij.platform.eel.codegen` end diff --git a/platform/eel/intellij.platform.eel.codegen.iml b/platform/eel/intellij.platform.eel.codegen.iml index cb9412447191..82ffa2050437 100644 --- a/platform/eel/intellij.platform.eel.codegen.iml +++ b/platform/eel/intellij.platform.eel.codegen.iml @@ -14,8 +14,10 @@ + + @@ -23,9 +25,11 @@ + + \ No newline at end of file diff --git a/platform/execution-impl/BUILD.bazel b/platform/execution-impl/BUILD.bazel index 405f42a43b06..5b5a017adf3c 100644 --- a/platform/execution-impl/BUILD.bazel +++ b/platform/execution-impl/BUILD.bazel @@ -18,6 +18,7 @@ jvm_library( "//platform/analysis-api:analysis", "//platform/core-impl", "//platform/core-api:core", + "//platform/platform-util-io:ide-util-io", "//platform/editor-ui-api:editor-ui", "//platform/platform-api:ide", "//platform/indexing-api:indexing", @@ -36,6 +37,7 @@ jvm_library( "//platform/refactoring", "//platform/ide-core-impl", "//platform/ide-core/plugins", + "//platform/ide-core", "//libraries/stream", "//platform/util/concurrency", "//platform/observable", @@ -43,6 +45,7 @@ jvm_library( "//platform/projectModel-impl", "//libraries/fastutil", "//platform/core-ui", + "//platform/util:util-ui", "//platform/platform-util-io-impl:ide-util-io-impl", "//libraries/jediterm-core", "//libraries/jediterm-ui", @@ -70,6 +73,7 @@ jvm_library( "//platform/kernel/shared:kernel", "//platform/project/shared:project", "//platform/platform-impl/rpc", + "//platform/progress/shared:ide-progress", "//platform/remote-topics/shared:rpc-topics", ] ) @@ -84,6 +88,7 @@ jvm_library( "//platform/analysis-api:analysis_test_lib", "//platform/core-impl:core-impl_test_lib", "//platform/core-api:core_test_lib", + "//platform/platform-util-io:ide-util-io_test_lib", "//platform/editor-ui-api:editor-ui_test_lib", "//platform/platform-api:ide_test_lib", "//platform/indexing-api:indexing_test_lib", @@ -102,6 +107,7 @@ jvm_library( "//platform/refactoring:refactoring_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", "//platform/ide-core/plugins:plugins_test_lib", + "//platform/ide-core:ide-core_test_lib", "//libraries/stream:stream_test_lib", "//platform/util/concurrency:concurrency_test_lib", "//platform/observable:observable_test_lib", @@ -109,6 +115,7 @@ jvm_library( "//platform/projectModel-impl:projectModel-impl_test_lib", "//libraries/fastutil:fastutil_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/util:util-ui_test_lib", "//platform/platform-util-io-impl:ide-util-io-impl_test_lib", "//libraries/jediterm-core:jediterm-core_test_lib", "//libraries/jediterm-ui:jediterm-ui_test_lib", @@ -136,6 +143,7 @@ jvm_library( "//platform/kernel/shared:kernel_test_lib", "//platform/project/shared:project_test_lib", "//platform/platform-impl/rpc:rpc_test_lib", + "//platform/progress/shared:ide-progress_test_lib", "//platform/remote-topics/shared:rpc-topics_test_lib", ] ) @@ -169,6 +177,7 @@ jvm_library( "//platform/core-api:core", "//platform/core-api:core_test_lib", "//platform/platform-util-io:ide-util-io", + "//platform/ide-core", "//jps/model-api:model", "//jps/model-api:model_test_lib", "//platform/projectModel-api:projectModel", @@ -193,6 +202,8 @@ jvm_library( "//platform/eel:eel_test_lib", "//platform/eel-provider", "//platform/eel-provider:eel-provider_test_lib", + "//platform/util:util-ui", + "//platform/util:util-ui_test_lib", "//platform/forms_rt:java-guiForms-rt", "//platform/forms_rt:java-guiForms-rt_test_lib", "//libraries/pty4j", @@ -201,6 +212,7 @@ jvm_library( runtime_deps = [ ":execution-tests", "//platform/platform-util-io:ide-util-io_test_lib", + "//platform/ide-core:ide-core_test_lib", ] ) ### auto-generated section `build intellij.platform.execution.tests` end diff --git a/platform/execution-impl/frontend/BUILD.bazel b/platform/execution-impl/frontend/BUILD.bazel index 3bf9c5932b87..dc9e5c915f52 100644 --- a/platform/execution-impl/frontend/BUILD.bazel +++ b/platform/execution-impl/frontend/BUILD.bazel @@ -25,6 +25,7 @@ jvm_library( "//platform/platform-util-io:ide-util-io", "//platform/platform-api:ide", "//platform/platform-impl/rpc", + "//platform/ide-core", "//platform/editor-ui-api:editor-ui", "//platform/execution", "//platform/core-ui", @@ -50,6 +51,7 @@ jvm_library( "//platform/platform-util-io:ide-util-io_test_lib", "//platform/platform-api:ide_test_lib", "//platform/platform-impl/rpc:rpc_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/editor-ui-api:editor-ui_test_lib", "//platform/execution:execution_test_lib", "//platform/core-ui:core-ui_test_lib", diff --git a/platform/execution-impl/frontend/intellij.platform.execution.impl.frontend.iml b/platform/execution-impl/frontend/intellij.platform.execution.impl.frontend.iml index 6c809ab7255c..ca0d5d6c6259 100644 --- a/platform/execution-impl/frontend/intellij.platform.execution.impl.frontend.iml +++ b/platform/execution-impl/frontend/intellij.platform.execution.impl.frontend.iml @@ -44,6 +44,7 @@ + diff --git a/platform/execution-impl/intellij.platform.execution.impl.iml b/platform/execution-impl/intellij.platform.execution.impl.iml index 3c05c3aaba14..79c1a8007551 100644 --- a/platform/execution-impl/intellij.platform.execution.impl.iml +++ b/platform/execution-impl/intellij.platform.execution.impl.iml @@ -37,6 +37,7 @@ + @@ -55,6 +56,7 @@ + @@ -62,6 +64,7 @@ + @@ -90,6 +93,7 @@ + \ No newline at end of file diff --git a/platform/execution-impl/intellij.platform.execution.tests.iml b/platform/execution-impl/intellij.platform.execution.tests.iml index be39bdb77c4c..71c3527123cb 100644 --- a/platform/execution-impl/intellij.platform.execution.tests.iml +++ b/platform/execution-impl/intellij.platform.execution.tests.iml @@ -9,6 +9,7 @@ + @@ -22,6 +23,7 @@ + diff --git a/platform/execution-process-elevation/BUILD.bazel b/platform/execution-process-elevation/BUILD.bazel index a495b301ac07..d9d750d7195c 100644 --- a/platform/execution-process-elevation/BUILD.bazel +++ b/platform/execution-process-elevation/BUILD.bazel @@ -23,9 +23,11 @@ jvm_library( "//platform/platform-impl:ide-impl", "//platform/platform-util-io:ide-util-io", "//platform/ide-core-impl", + "//platform/ide-core", "@lib//:jna", "//platform/projectModel-api:projectModel", "//libraries/grpc", + "//platform/util:util-ui", ] ) @@ -44,8 +46,10 @@ jvm_library( "//platform/platform-impl:ide-impl_test_lib", "//platform/platform-util-io:ide-util-io_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/projectModel-api:projectModel_test_lib", "//libraries/grpc:grpc_test_lib", + "//platform/util:util-ui_test_lib", ] ) ### auto-generated section `build intellij.execution.process.elevation` end diff --git a/platform/execution-process-elevation/intellij.execution.process.elevation.iml b/platform/execution-process-elevation/intellij.execution.process.elevation.iml index 5ff16d6e1828..42b46470a8d9 100644 --- a/platform/execution-process-elevation/intellij.execution.process.elevation.iml +++ b/platform/execution-process-elevation/intellij.execution.process.elevation.iml @@ -17,8 +17,10 @@ + + \ No newline at end of file diff --git a/platform/execution.dashboard/BUILD.bazel b/platform/execution.dashboard/BUILD.bazel index 55531f37d54d..856ebe647cb4 100644 --- a/platform/execution.dashboard/BUILD.bazel +++ b/platform/execution.dashboard/BUILD.bazel @@ -29,6 +29,7 @@ jvm_library( "//libraries/fastutil", "//libraries/guava", "//platform/ide-core-impl", + "//platform/ide-core", "//platform/execution.serviceView", "//platform/platform-impl/rpc", "//platform/kernel/rpc", @@ -43,6 +44,7 @@ jvm_library( "//platform/remote-topics/shared:rpc-topics", "//platform/lang-api:lang", "//platform/util/concurrency", + "//platform/util:util-ui", ] ) @@ -68,6 +70,7 @@ jvm_library( "//libraries/fastutil:fastutil_test_lib", "//libraries/guava:guava_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/execution.serviceView:execution.serviceView_test_lib", "//platform/platform-impl/rpc:rpc_test_lib", "//platform/kernel/rpc:rpc_test_lib", @@ -82,6 +85,7 @@ jvm_library( "//platform/remote-topics/shared:rpc-topics_test_lib", "//platform/lang-api:lang_test_lib", "//platform/util/concurrency:concurrency_test_lib", + "//platform/util:util-ui_test_lib", ] ) ### auto-generated section `build intellij.platform.execution.dashboard` end diff --git a/platform/execution.dashboard/backend/BUILD.bazel b/platform/execution.dashboard/backend/BUILD.bazel index d1599f13004e..36385a93412c 100644 --- a/platform/execution.dashboard/backend/BUILD.bazel +++ b/platform/execution.dashboard/backend/BUILD.bazel @@ -34,8 +34,10 @@ jvm_library( "//platform/util/jdom", "//platform/platform-impl:ide-impl", "//platform/platform-impl/rpc", + "//platform/ide-core", "//platform/util/coroutines", "//platform/execution.serviceView", + "//platform/util:util-ui", ] ) @@ -65,8 +67,10 @@ jvm_library( "//platform/util/jdom:jdom_test_lib", "//platform/platform-impl:ide-impl_test_lib", "//platform/platform-impl/rpc:rpc_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/util/coroutines:coroutines_test_lib", "//platform/execution.serviceView:execution.serviceView_test_lib", + "//platform/util:util-ui_test_lib", ] ) ### auto-generated section `build intellij.platform.execution.dashboard.backend` end diff --git a/platform/execution.dashboard/backend/intellij.platform.execution.dashboard.backend.iml b/platform/execution.dashboard/backend/intellij.platform.execution.dashboard.backend.iml index d71607fa8b75..e1f481b8dac8 100644 --- a/platform/execution.dashboard/backend/intellij.platform.execution.dashboard.backend.iml +++ b/platform/execution.dashboard/backend/intellij.platform.execution.dashboard.backend.iml @@ -53,7 +53,9 @@ + + \ No newline at end of file diff --git a/platform/execution.dashboard/intellij.platform.execution.dashboard.iml b/platform/execution.dashboard/intellij.platform.execution.dashboard.iml index 1740dee0a11c..ea54c61f8534 100644 --- a/platform/execution.dashboard/intellij.platform.execution.dashboard.iml +++ b/platform/execution.dashboard/intellij.platform.execution.dashboard.iml @@ -48,6 +48,7 @@ + @@ -62,5 +63,6 @@ + \ No newline at end of file diff --git a/platform/execution.serviceView/BUILD.bazel b/platform/execution.serviceView/BUILD.bazel index f055e93c796c..b6e3d3477211 100644 --- a/platform/execution.serviceView/BUILD.bazel +++ b/platform/execution.serviceView/BUILD.bazel @@ -33,6 +33,7 @@ jvm_library( "//fleet/rpc", "//platform/kernel/rpc", "//platform/platform-impl/rpc", + "//platform/ide-core", "//platform/project/shared:project", "//platform/object-serializer", "//libraries/kotlinx/serialization/core", @@ -41,6 +42,7 @@ jvm_library( "//platform/kernel/shared:kernel", "//platform/execution", "//libraries/fastutil", + "//platform/util:util-ui", ] ) @@ -70,6 +72,7 @@ jvm_library( "//fleet/rpc:rpc_test_lib", "//platform/kernel/rpc:rpc_test_lib", "//platform/platform-impl/rpc:rpc_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/project/shared:project_test_lib", "//platform/object-serializer:object-serializer_test_lib", "//libraries/kotlinx/serialization/core:core_test_lib", @@ -78,6 +81,7 @@ jvm_library( "//platform/kernel/shared:kernel_test_lib", "//platform/execution:execution_test_lib", "//libraries/fastutil:fastutil_test_lib", + "//platform/util:util-ui_test_lib", ] ) ### auto-generated section `build intellij.platform.execution.serviceView` end diff --git a/platform/execution.serviceView/frontend/BUILD.bazel b/platform/execution.serviceView/frontend/BUILD.bazel index a6aba225a81a..735522cf82c2 100644 --- a/platform/execution.serviceView/frontend/BUILD.bazel +++ b/platform/execution.serviceView/frontend/BUILD.bazel @@ -19,10 +19,12 @@ jvm_library( "//platform/execution.serviceView", "//platform/core-impl", "//platform/core-ui", + "//platform/editor-ui-api:editor-ui", "//platform/kernel/rpc", "//platform/platform-impl/rpc", "//platform/core-api:core", "//platform/lang-api:lang", + "//platform/util:util-ui", ] ) @@ -37,10 +39,12 @@ jvm_library( "//platform/execution.serviceView:execution.serviceView_test_lib", "//platform/core-impl:core-impl_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/editor-ui-api:editor-ui_test_lib", "//platform/kernel/rpc:rpc_test_lib", "//platform/platform-impl/rpc:rpc_test_lib", "//platform/core-api:core_test_lib", "//platform/lang-api:lang_test_lib", + "//platform/util:util-ui_test_lib", ] ) ### auto-generated section `build intellij.platform.execution.serviceView.frontend` end diff --git a/platform/execution.serviceView/frontend/intellij.platform.execution.serviceView.frontend.iml b/platform/execution.serviceView/frontend/intellij.platform.execution.serviceView.frontend.iml index 197eb73b4d58..eb9b9d111006 100644 --- a/platform/execution.serviceView/frontend/intellij.platform.execution.serviceView.frontend.iml +++ b/platform/execution.serviceView/frontend/intellij.platform.execution.serviceView.frontend.iml @@ -38,9 +38,11 @@ + + \ No newline at end of file diff --git a/platform/execution.serviceView/intellij.platform.execution.serviceView.iml b/platform/execution.serviceView/intellij.platform.execution.serviceView.iml index 25dd3d550c6f..c87a96dbcad6 100644 --- a/platform/execution.serviceView/intellij.platform.execution.serviceView.iml +++ b/platform/execution.serviceView/intellij.platform.execution.serviceView.iml @@ -52,6 +52,7 @@ + @@ -60,5 +61,6 @@ + \ No newline at end of file diff --git a/platform/execution/BUILD.bazel b/platform/execution/BUILD.bazel index f64e70d72375..80dd6314d149 100644 --- a/platform/execution/BUILD.bazel +++ b/platform/execution/BUILD.bazel @@ -31,6 +31,8 @@ jvm_library( "//platform/analysis-api:analysis", "//libraries/kotlinx/coroutines/core", "//platform/util/coroutines", + "//platform/util/multiplatform", + "//platform/util/base", "//platform/kernel/shared:kernel", "//platform/eel", "//platform/eel-provider", @@ -61,6 +63,8 @@ jvm_library( "//platform/analysis-api:analysis_test_lib", "//libraries/kotlinx/coroutines/core:core_test_lib", "//platform/util/coroutines:coroutines_test_lib", + "//platform/util/multiplatform:multiplatform_test_lib", + "//platform/util/base:base_test_lib", "//platform/kernel/shared:kernel_test_lib", "//platform/eel:eel_test_lib", "//platform/eel-provider:eel-provider_test_lib", diff --git a/platform/execution/intellij.platform.execution.iml b/platform/execution/intellij.platform.execution.iml index 91f3e577321d..040f3546c28e 100644 --- a/platform/execution/intellij.platform.execution.iml +++ b/platform/execution/intellij.platform.execution.iml @@ -48,6 +48,8 @@ + + diff --git a/platform/extensions/BUILD.bazel b/platform/extensions/BUILD.bazel index 170c67444a92..ee651344de11 100644 --- a/platform/extensions/BUILD.bazel +++ b/platform/extensions/BUILD.bazel @@ -13,6 +13,9 @@ jvm_library( "//libraries/fastutil", "@lib//:kotlin-stdlib", "//platform/util/xmlDom", + "//platform/util/multiplatform", + "//platform/util/base/multiplatform", + "//platform/util/base", "//libraries/kotlinx/coroutines/core", "//platform/diagnostic", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", @@ -41,6 +44,9 @@ jvm_library( "@lib//:assert_j", "//libraries/fastutil:fastutil_test_lib", "//platform/util/xmlDom:xmlDom_test_lib", + "//platform/util/multiplatform:multiplatform_test_lib", + "//platform/util/base/multiplatform:multiplatform_test_lib", + "//platform/util/base:base_test_lib", "//libraries/kotlinx/coroutines/core:core_test_lib", "//platform/diagnostic:diagnostic_test_lib", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", diff --git a/platform/extensions/intellij.platform.extensions.iml b/platform/extensions/intellij.platform.extensions.iml index 3bb49e982bf3..129b076850b2 100644 --- a/platform/extensions/intellij.platform.extensions.iml +++ b/platform/extensions/intellij.platform.extensions.iml @@ -35,6 +35,9 @@ + + + diff --git a/platform/external-system-api/BUILD.bazel b/platform/external-system-api/BUILD.bazel index ec9adbc0ce73..6178c7ab6f04 100644 --- a/platform/external-system-api/BUILD.bazel +++ b/platform/external-system-api/BUILD.bazel @@ -32,6 +32,7 @@ jvm_library( "//platform/util:util-ui", "//platform/util/concurrency", "//platform/platform-util-io:ide-util-io", + "//platform/ide-core", "//platform/external-system-api/dependency-updater", "//platform/core-ui", "//platform/backend/observation", @@ -71,6 +72,7 @@ jvm_library( "//platform/util:util-ui_test_lib", "//platform/util/concurrency:concurrency_test_lib", "//platform/platform-util-io:ide-util-io_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/external-system-api/dependency-updater:dependency-updater_test_lib", "//platform/core-ui:core-ui_test_lib", "//platform/backend/observation:observation_test_lib", diff --git a/platform/external-system-api/intellij.platform.externalSystem.iml b/platform/external-system-api/intellij.platform.externalSystem.iml index c35dc124527b..17ed708e6239 100644 --- a/platform/external-system-api/intellij.platform.externalSystem.iml +++ b/platform/external-system-api/intellij.platform.externalSystem.iml @@ -27,6 +27,7 @@ + diff --git a/platform/external-system-api/testFramework/BUILD.bazel b/platform/external-system-api/testFramework/BUILD.bazel index 7e195927bdf3..2744ac4e5189 100644 --- a/platform/external-system-api/testFramework/BUILD.bazel +++ b/platform/external-system-api/testFramework/BUILD.bazel @@ -10,6 +10,7 @@ jvm_library( "//platform/analysis-api:analysis", "//platform/core-api:core", "//platform/core-ui", + "//platform/core-impl", "//platform/external-system-api:externalSystem", "//platform/external-system-impl:externalSystem-impl", "//jps/model-api:model", @@ -18,11 +19,14 @@ jvm_library( "//platform/refactoring", "//platform/testFramework", "//platform/platform-util-io:ide-util-io", + "//platform/ide-core", + "//platform/progress/shared:ide-progress", "@lib//:assert_j", "//platform/execution", "//java/java-impl:impl", "//platform/workspace/storage", "//platform/workspace/jps", + "//platform/util-ex", "//libraries/fastutil", ] ) @@ -37,6 +41,7 @@ jvm_library( "//platform/analysis-api:analysis_test_lib", "//platform/core-api:core_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl:core-impl_test_lib", "//platform/external-system-api:externalSystem_test_lib", "//platform/external-system-impl:externalSystem-impl_test_lib", "//jps/model-api:model_test_lib", @@ -45,10 +50,13 @@ jvm_library( "//platform/refactoring:refactoring_test_lib", "//platform/testFramework:testFramework_test_lib", "//platform/platform-util-io:ide-util-io_test_lib", + "//platform/ide-core:ide-core_test_lib", + "//platform/progress/shared:ide-progress_test_lib", "//platform/execution:execution_test_lib", "//java/java-impl:impl_test_lib", "//platform/workspace/storage:storage_test_lib", "//platform/workspace/jps:jps_test_lib", + "//platform/util-ex:util-ex_test_lib", "//libraries/fastutil:fastutil_test_lib", ] ) diff --git a/platform/external-system-api/testFramework/intellij.platform.externalSystem.testFramework.iml b/platform/external-system-api/testFramework/intellij.platform.externalSystem.testFramework.iml index e58391735b80..c9be54bebd4e 100644 --- a/platform/external-system-api/testFramework/intellij.platform.externalSystem.testFramework.iml +++ b/platform/external-system-api/testFramework/intellij.platform.externalSystem.testFramework.iml @@ -10,6 +10,7 @@ + @@ -18,11 +19,14 @@ + + + \ No newline at end of file diff --git a/platform/external-system-impl/BUILD.bazel b/platform/external-system-impl/BUILD.bazel index fa5af395be65..67e901b6b13d 100644 --- a/platform/external-system-impl/BUILD.bazel +++ b/platform/external-system-impl/BUILD.bazel @@ -44,11 +44,16 @@ jvm_library( "//libraries/commons/cli", "//platform/core-ui", "//platform/platform-util-io-impl:ide-util-io-impl", + "//platform/platform-util-io:ide-util-io", "//platform/core-impl", "//platform/util/jdom", + "//platform/util:util-ui", + "//platform/util-ex", "//libraries/kotlinx/coroutines/core", "//platform/diagnostic/telemetry", "//platform/ide-core-impl", + "//platform/ide-core", + "//platform/progress/shared:ide-progress", "@lib//:opentelemetry", "@lib//:opentelemetry-semconv", "//platform/backend/workspace", @@ -100,11 +105,16 @@ jvm_library( "//libraries/commons/cli:cli_test_lib", "//platform/core-ui:core-ui_test_lib", "//platform/platform-util-io-impl:ide-util-io-impl_test_lib", + "//platform/platform-util-io:ide-util-io_test_lib", "//platform/core-impl:core-impl_test_lib", "//platform/util/jdom:jdom_test_lib", + "//platform/util:util-ui_test_lib", + "//platform/util-ex:util-ex_test_lib", "//libraries/kotlinx/coroutines/core:core_test_lib", "//platform/diagnostic/telemetry:telemetry_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", + "//platform/progress/shared:ide-progress_test_lib", "//platform/backend/workspace:workspace_test_lib", "//platform/diagnostic:diagnostic_test_lib", "//platform/backend/observation:observation_test_lib", @@ -157,6 +167,8 @@ jvm_library( "//platform/analysis-api:analysis_test_lib", "//platform/core-api:core", "//platform/core-api:core_test_lib", + "//java/java-syntax:syntax", + "//java/java-syntax:syntax_test_lib", "//platform/editor-ui-api:editor-ui", "//platform/editor-ui-api:editor-ui_test_lib", "//platform/external-system-api:externalSystem", @@ -199,13 +211,20 @@ jvm_library( "//libraries/kotlinx/coroutines/core:core_test_lib", "//platform/core-ui", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", "//platform/workspace/storage", "//platform/workspace/storage:storage_test_lib", "//platform/platform-util-io:ide-util-io", + "//platform/ide-core", "//platform/external-system-api/testFramework", "//platform/external-system-api/testFramework:testFramework_test_lib", "//platform/util/jdom", "//platform/util/jdom:jdom_test_lib", + "//platform/util:util-ui", + "//platform/util:util-ui_test_lib", + "//platform/util-ex", + "//platform/util-ex:util-ex_test_lib", "//platform/testFramework/junit5", "//platform/testFramework/junit5:junit5_test_lib", "//platform/workspace/jps", @@ -222,6 +241,8 @@ jvm_library( "//platform/execution:execution_test_lib", "//platform/forms_rt:java-guiForms-rt", "//platform/forms_rt:java-guiForms-rt_test_lib", + "//java/java-frontback-psi-api:frontback-psi", + "//java/java-frontback-psi-api:frontback-psi_test_lib", ], exports = [ "//platform/lang-impl:lang-tests", @@ -231,6 +252,7 @@ jvm_library( ":externalSystem-tests", "//platform/observable:observable_test_lib", "//platform/platform-util-io:ide-util-io_test_lib", + "//platform/ide-core:ide-core_test_lib", ] ) ### auto-generated section `build intellij.platform.externalSystem.tests` end diff --git a/platform/external-system-impl/intellij.platform.externalSystem.impl.iml b/platform/external-system-impl/intellij.platform.externalSystem.impl.iml index a98d538f101f..0e481f700a20 100644 --- a/platform/external-system-impl/intellij.platform.externalSystem.impl.iml +++ b/platform/external-system-impl/intellij.platform.externalSystem.impl.iml @@ -61,11 +61,16 @@ + + + + + diff --git a/platform/external-system-impl/intellij.platform.externalSystem.tests.iml b/platform/external-system-impl/intellij.platform.externalSystem.tests.iml index 21bdaebe4724..e3923e568b97 100644 --- a/platform/external-system-impl/intellij.platform.externalSystem.tests.iml +++ b/platform/external-system-impl/intellij.platform.externalSystem.tests.iml @@ -12,6 +12,7 @@ + @@ -35,10 +36,14 @@ + + + + @@ -47,5 +52,6 @@ + \ No newline at end of file diff --git a/platform/feedback/BUILD.bazel b/platform/feedback/BUILD.bazel index 48f1f035fe6e..f1fdc090021c 100644 --- a/platform/feedback/BUILD.bazel +++ b/platform/feedback/BUILD.bazel @@ -21,6 +21,7 @@ jvm_library( "//platform/lang-api:lang", "//platform/core-impl", "//platform/ide-core-impl", + "//platform/ide-core", "//libraries/kotlinx/serialization/core", "//platform/observable", "//libraries/kotlinx/serialization/json", @@ -29,7 +30,9 @@ jvm_library( "//platform/util/xmlDom", "//platform/statistics", "//platform/core-ui", + "//platform/util:util-ui", "//platform/platform-impl/internal", + "//platform/progress/shared:ide-progress", "@lib//:jna", ] ) @@ -48,6 +51,7 @@ jvm_library( "//platform/lang-api:lang_test_lib", "//platform/core-impl:core-impl_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//libraries/kotlinx/serialization/core:core_test_lib", "//platform/observable:observable_test_lib", "//libraries/kotlinx/serialization/json:json_test_lib", @@ -56,7 +60,9 @@ jvm_library( "//platform/util/xmlDom:xmlDom_test_lib", "//platform/statistics:statistics_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/util:util-ui_test_lib", "//platform/platform-impl/internal:internal_test_lib", + "//platform/progress/shared:ide-progress_test_lib", ] ) ### auto-generated section `build intellij.platform.feedback` end diff --git a/platform/feedback/intellij.platform.feedback.iml b/platform/feedback/intellij.platform.feedback.iml index 3784acf75a87..ddcceaeaa23c 100644 --- a/platform/feedback/intellij.platform.feedback.iml +++ b/platform/feedback/intellij.platform.feedback.iml @@ -36,6 +36,7 @@ + @@ -44,7 +45,9 @@ + + \ No newline at end of file diff --git a/platform/find/BUILD.bazel b/platform/find/BUILD.bazel index 40195d95f135..57a506205049 100644 --- a/platform/find/BUILD.bazel +++ b/platform/find/BUILD.bazel @@ -27,6 +27,7 @@ jvm_library( "//platform/usageView", "//platform/core-ui", "//platform/platform-impl:ide-impl", + "//platform/ide-core", "//platform/editor-ui-api:editor-ui", "//platform/util/coroutines", "//platform/scopes", @@ -52,6 +53,7 @@ jvm_library( "//platform/usageView:usageView_test_lib", "//platform/core-ui:core-ui_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/editor-ui-api:editor-ui_test_lib", "//platform/util/coroutines:coroutines_test_lib", "//platform/scopes:scopes_test_lib", diff --git a/platform/find/backend/BUILD.bazel b/platform/find/backend/BUILD.bazel index 00999c4fa1e3..481ed6fa1962 100644 --- a/platform/find/backend/BUILD.bazel +++ b/platform/find/backend/BUILD.bazel @@ -26,6 +26,7 @@ jvm_library( "//platform/core-ui", "//platform/platform-impl:ide-impl", "//platform/editor-ui-api:editor-ui", + "//platform/util:util-ui", ] ) @@ -47,6 +48,7 @@ jvm_library( "//platform/core-ui:core-ui_test_lib", "//platform/platform-impl:ide-impl_test_lib", "//platform/editor-ui-api:editor-ui_test_lib", + "//platform/util:util-ui_test_lib", ] ) ### auto-generated section `build intellij.platform.find.backend` end diff --git a/platform/find/backend/intellij.platform.find.backend.iml b/platform/find/backend/intellij.platform.find.backend.iml index 3413c38237f6..9c0de94c0dca 100644 --- a/platform/find/backend/intellij.platform.find.backend.iml +++ b/platform/find/backend/intellij.platform.find.backend.iml @@ -45,5 +45,6 @@ + \ No newline at end of file diff --git a/platform/find/intellij.platform.find.iml b/platform/find/intellij.platform.find.iml index 26d92da2b940..f421e5d74484 100644 --- a/platform/find/intellij.platform.find.iml +++ b/platform/find/intellij.platform.find.iml @@ -46,6 +46,7 @@ + diff --git a/platform/ide-core/BUILD.bazel b/platform/ide-core/BUILD.bazel index 82aef826ba8e..0b262350ee49 100644 --- a/platform/ide-core/BUILD.bazel +++ b/platform/ide-core/BUILD.bazel @@ -33,6 +33,8 @@ jvm_library( "//platform/util", "//platform/settings", "//platform/util/coroutines", + "//platform/util/multiplatform", + "//platform/util/base", "//platform/workspace/storage", "//platform/workspace/jps", "//platform/backend/workspace", @@ -65,6 +67,8 @@ jvm_library( "//platform/util:util_test_lib", "//platform/settings:settings_test_lib", "//platform/util/coroutines:coroutines_test_lib", + "//platform/util/multiplatform:multiplatform_test_lib", + "//platform/util/base:base_test_lib", "//platform/workspace/storage:storage_test_lib", "//platform/workspace/jps:jps_test_lib", "//platform/backend/workspace:workspace_test_lib", diff --git a/platform/ide-core/intellij.platform.ide.core.iml b/platform/ide-core/intellij.platform.ide.core.iml index b21244657f6b..ed59b013aea4 100644 --- a/platform/ide-core/intellij.platform.ide.core.iml +++ b/platform/ide-core/intellij.platform.ide.core.iml @@ -49,6 +49,8 @@ + + diff --git a/platform/indexing-api/BUILD.bazel b/platform/indexing-api/BUILD.bazel index 22d5173ca668..dee199cc04f1 100644 --- a/platform/indexing-api/BUILD.bazel +++ b/platform/indexing-api/BUILD.bazel @@ -27,6 +27,8 @@ jvm_library( "//platform/projectModel-api:projectModel", "//platform/util/jdom", "//platform/util", + "//platform/util/multiplatform", + "//platform/util/base", "//platform/util/concurrency", "@lib//:kotlin-stdlib", "//libraries/kotlinx/serialization/core", @@ -51,6 +53,8 @@ jvm_library( "//platform/projectModel-api:projectModel_test_lib", "//platform/util/jdom:jdom_test_lib", "//platform/util:util_test_lib", + "//platform/util/multiplatform:multiplatform_test_lib", + "//platform/util/base:base_test_lib", "//platform/util/concurrency:concurrency_test_lib", "//libraries/kotlinx/serialization/core:core_test_lib", "//libraries/kotlinx/serialization/json:json_test_lib", diff --git a/platform/indexing-api/intellij.platform.indexing.iml b/platform/indexing-api/intellij.platform.indexing.iml index eed26ecf825e..0d521ef52d99 100644 --- a/platform/indexing-api/intellij.platform.indexing.iml +++ b/platform/indexing-api/intellij.platform.indexing.iml @@ -36,6 +36,8 @@ + + diff --git a/platform/indexing-impl/BUILD.bazel b/platform/indexing-impl/BUILD.bazel index 63e74d4dd55e..ddccc17c2578 100644 --- a/platform/indexing-impl/BUILD.bazel +++ b/platform/indexing-impl/BUILD.bazel @@ -34,6 +34,9 @@ jvm_library( "//platform/workspace/storage", "//platform/util/storages", "//platform/util", + "//platform/util/multiplatform", + "//platform/util/base", + "//platform/util-ex", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", "//jps/model-api:model", ] @@ -70,6 +73,9 @@ jvm_library( "//platform/workspace/storage:storage_test_lib", "//platform/util/storages:storages_test_lib", "//platform/util:util_test_lib", + "//platform/util/multiplatform:multiplatform_test_lib", + "//platform/util/base:base_test_lib", + "//platform/util-ex:util-ex_test_lib", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", "//jps/model-api:model_test_lib", ] diff --git a/platform/indexing-impl/intellij.platform.indexing.impl.iml b/platform/indexing-impl/intellij.platform.indexing.impl.iml index a04f9c08c7a9..7050d01d1902 100644 --- a/platform/indexing-impl/intellij.platform.indexing.impl.iml +++ b/platform/indexing-impl/intellij.platform.indexing.impl.iml @@ -34,6 +34,9 @@ + + + diff --git a/platform/inline-completion/shared/BUILD.bazel b/platform/inline-completion/shared/BUILD.bazel index 27c0e48ce4db..5723cff612f1 100644 --- a/platform/inline-completion/shared/BUILD.bazel +++ b/platform/inline-completion/shared/BUILD.bazel @@ -21,7 +21,9 @@ jvm_library( "//platform/projectModel-api:projectModel", "//platform/util", "//platform/ide-core-impl", + "//platform/ide-core", "//platform/platform-impl/codeinsight-inline:ide-codeinsight-inline", + "//platform/util:util-ui", "//platform/editor-ui-api:editor-ui", "//platform/platform-impl:ide-impl", "//platform/lang-api:lang", @@ -43,7 +45,9 @@ jvm_library( "//platform/projectModel-api:projectModel_test_lib", "//platform/util:util_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/platform-impl/codeinsight-inline:ide-codeinsight-inline_test_lib", + "//platform/util:util-ui_test_lib", "//platform/editor-ui-api:editor-ui_test_lib", "//platform/platform-impl:ide-impl_test_lib", "//platform/lang-api:lang_test_lib", diff --git a/platform/inline-completion/shared/intellij.platform.inline.completion.iml b/platform/inline-completion/shared/intellij.platform.inline.completion.iml index 40bc4e792637..0d69dec73795 100644 --- a/platform/inline-completion/shared/intellij.platform.inline.completion.iml +++ b/platform/inline-completion/shared/intellij.platform.inline.completion.iml @@ -15,7 +15,9 @@ + + diff --git a/platform/inspect/BUILD.bazel b/platform/inspect/BUILD.bazel index 858d8dbdc917..a2a8260ecedd 100644 --- a/platform/inspect/BUILD.bazel +++ b/platform/inspect/BUILD.bazel @@ -18,6 +18,7 @@ jvm_library( "//platform/core-api:core", "//platform/editor-ui-api:editor-ui", "//platform/lang-impl", + "//platform/util:util-ui", "//platform/extensions", "//platform/analysis-api:analysis", "//platform/projectModel-api:projectModel", @@ -37,6 +38,7 @@ jvm_library( "//platform/platform-util-io:ide-util-io", "//libraries/snakeyaml", "//platform/ide-core-impl", + "//platform/ide-core", "//libraries/kotlinx/coroutines/core", "//libraries/jackson3/databind", "//libraries/jsoup", @@ -67,6 +69,7 @@ jvm_library( "//platform/editor-ui-api:editor-ui_test_lib", "//platform/lang-impl:lang-impl_test_lib", "@lib//:junit4", + "//platform/util:util-ui_test_lib", "//platform/extensions:extensions_test_lib", "//platform/analysis-api:analysis_test_lib", "//platform/projectModel-api:projectModel_test_lib", @@ -87,6 +90,7 @@ jvm_library( "//platform/platform-util-io:ide-util-io_test_lib", "//libraries/snakeyaml:snakeyaml_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//libraries/kotlinx/coroutines/core:core_test_lib", "//libraries/jackson3/databind:databind_test_lib", "//libraries/jsoup:jsoup_test_lib", diff --git a/platform/inspect/intellij.platform.inspect.iml b/platform/inspect/intellij.platform.inspect.iml index 6af21ad81451..36b45e4952f9 100644 --- a/platform/inspect/intellij.platform.inspect.iml +++ b/platform/inspect/intellij.platform.inspect.iml @@ -36,6 +36,7 @@ + @@ -56,6 +57,7 @@ + diff --git a/platform/instanceContainer/BUILD.bazel b/platform/instanceContainer/BUILD.bazel index 79ded9a7b9f3..f2f8a940c2fb 100644 --- a/platform/instanceContainer/BUILD.bazel +++ b/platform/instanceContainer/BUILD.bazel @@ -12,6 +12,7 @@ jvm_library( "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", "//platform/util", "//platform/util/coroutines", + "//platform/util/base", ] ) @@ -26,6 +27,7 @@ jvm_library( "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", "//platform/util:util_test_lib", "//platform/util/coroutines:coroutines_test_lib", + "//platform/util/base:base_test_lib", ] ) ### auto-generated section `build intellij.platform.instanceContainer` end diff --git a/platform/instanceContainer/intellij.platform.instanceContainer.iml b/platform/instanceContainer/intellij.platform.instanceContainer.iml index 5c1e883b64db..55fc59432dcf 100644 --- a/platform/instanceContainer/intellij.platform.instanceContainer.iml +++ b/platform/instanceContainer/intellij.platform.instanceContainer.iml @@ -12,5 +12,6 @@ + \ No newline at end of file diff --git a/platform/jewel/ide-laf-bridge/BUILD.bazel b/platform/jewel/ide-laf-bridge/BUILD.bazel index 48535834649d..9327f65288d7 100644 --- a/platform/jewel/ide-laf-bridge/BUILD.bazel +++ b/platform/jewel/ide-laf-bridge/BUILD.bazel @@ -40,9 +40,11 @@ jvm_library( "//libraries/compose-runtime-desktop", "//platform/platform-api:ide", "//platform/platform-impl:ide-impl", + "//platform/ide-core", "@lib//:jna", "//libraries/skiko", "//platform/core-ui", + "//platform/util:util-ui", "//libraries/compose-foundation-desktop", "//platform/editor-ui-ex:editor-ex", ], @@ -80,8 +82,10 @@ jvm_library( "//libraries/compose-runtime-desktop:compose-runtime-desktop_test_lib", "//platform/platform-api:ide_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//libraries/skiko:skiko_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/util:util-ui_test_lib", "//libraries/compose-foundation-desktop:compose-foundation-desktop_test_lib", "//platform/editor-ui-ex:editor-ex_test_lib", "//libraries/compose-foundation-desktop-junit", @@ -183,6 +187,8 @@ jvm_library( "//plugins/textmate/plugin", "//plugins/textmate/plugin:plugin_test_lib", "@lib//:io-mockk-jvm", + "//platform/util:util-ui", + "//platform/util:util-ui_test_lib", ], exports = [ "//platform/jewel/foundation", diff --git a/platform/jewel/ide-laf-bridge/intellij.platform.jewel.ideLafBridge.iml b/platform/jewel/ide-laf-bridge/intellij.platform.jewel.ideLafBridge.iml index 6f7c096d2aa5..657f2a04716e 100644 --- a/platform/jewel/ide-laf-bridge/intellij.platform.jewel.ideLafBridge.iml +++ b/platform/jewel/ide-laf-bridge/intellij.platform.jewel.ideLafBridge.iml @@ -43,9 +43,11 @@ + + diff --git a/platform/jewel/ide-laf-bridge/intellij.platform.jewel.ideLafBridge.tests.iml b/platform/jewel/ide-laf-bridge/intellij.platform.jewel.ideLafBridge.tests.iml index b8e749984ddb..2cb79c393cf8 100644 --- a/platform/jewel/ide-laf-bridge/intellij.platform.jewel.ideLafBridge.tests.iml +++ b/platform/jewel/ide-laf-bridge/intellij.platform.jewel.ideLafBridge.tests.iml @@ -55,6 +55,7 @@ + \ No newline at end of file diff --git a/platform/jewel/markdown/ide-laf-bridge-styling/BUILD.bazel b/platform/jewel/markdown/ide-laf-bridge-styling/BUILD.bazel index 364035bc2657..497eabc34665 100644 --- a/platform/jewel/markdown/ide-laf-bridge-styling/BUILD.bazel +++ b/platform/jewel/markdown/ide-laf-bridge-styling/BUILD.bazel @@ -52,6 +52,7 @@ jvm_library( "//platform/platform-impl:ide-impl", "//libraries/compose-foundation-desktop", "//platform/platform-api:ide", + "//platform/util:util-ui", ":platform_jewel_markdown_extensions_gfm-alerts_provided", ":platform_jewel_markdown_extensions_gfm-tables_provided", ], @@ -97,6 +98,7 @@ jvm_library( "//libraries/compose-foundation-desktop-junit", "//libraries/compose-foundation-desktop-junit:compose-foundation-desktop-junit_test_lib", "//platform/platform-api:ide_test_lib", + "//platform/util:util-ui_test_lib", ], plugins = ["@lib//:compose-plugin"] ) diff --git a/platform/jewel/markdown/ide-laf-bridge-styling/intellij.platform.jewel.markdown.ideLafBridgeStyling.iml b/platform/jewel/markdown/ide-laf-bridge-styling/intellij.platform.jewel.markdown.ideLafBridgeStyling.iml index a71ea1a373e3..62ee63593522 100644 --- a/platform/jewel/markdown/ide-laf-bridge-styling/intellij.platform.jewel.markdown.ideLafBridgeStyling.iml +++ b/platform/jewel/markdown/ide-laf-bridge-styling/intellij.platform.jewel.markdown.ideLafBridgeStyling.iml @@ -48,5 +48,6 @@ + \ No newline at end of file diff --git a/platform/lang-api/BUILD.bazel b/platform/lang-api/BUILD.bazel index dfee63257186..fdf821ad64c1 100644 --- a/platform/lang-api/BUILD.bazel +++ b/platform/lang-api/BUILD.bazel @@ -32,6 +32,7 @@ jvm_library( "//platform/core-ui", "//platform/code-style-api:codeStyle", "//platform/platform-util-io:ide-util-io", + "//platform/ide-core", "//platform/execution", "//platform/refactoring", "//platform/forms_rt:java-guiForms-rt", @@ -41,7 +42,10 @@ jvm_library( "//libraries/fastutil", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", ], - exports = ["//platform/platform-api:ide"] + exports = [ + "//platform/platform-api:ide", + "@lib//:kotlin-stdlib", + ] ) jvm_library( @@ -52,6 +56,7 @@ jvm_library( exports = [ "//platform/platform-api:ide", "//platform/platform-api:ide_test_lib", + "@lib//:kotlin-stdlib", ], runtime_deps = [ ":lang", @@ -76,6 +81,7 @@ jvm_library( "//platform/core-ui:core-ui_test_lib", "//platform/code-style-api:codeStyle_test_lib", "//platform/platform-util-io:ide-util-io_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/execution:execution_test_lib", "//platform/refactoring:refactoring_test_lib", "//platform/forms_rt:java-guiForms-rt_test_lib", diff --git a/platform/lang-api/intellij.platform.lang.iml b/platform/lang-api/intellij.platform.lang.iml index 22e6caa203e3..52da69586f05 100644 --- a/platform/lang-api/intellij.platform.lang.iml +++ b/platform/lang-api/intellij.platform.lang.iml @@ -17,7 +17,7 @@ - + @@ -29,6 +29,7 @@ + diff --git a/platform/lang-impl/BUILD.bazel b/platform/lang-impl/BUILD.bazel index b088ee86796f..2725de3eaca6 100644 --- a/platform/lang-impl/BUILD.bazel +++ b/platform/lang-impl/BUILD.bazel @@ -36,6 +36,7 @@ jvm_library( "//libraries/oro-matcher", "//libraries/velocity", "//platform/platform-impl:ide-impl", + "//platform/platform-util-io:ide-util-io", "//platform/welcome-screen-impl:welcomeScreen-impl", "//platform/lang-core", "//platform/lvcs-api:lvcs", @@ -76,11 +77,13 @@ jvm_library( "//libraries/stream", "//platform/statistics", "//platform/ide-core-impl", + "//platform/ide-core", "//platform/core-impl", "//libraries/kotlinx/coroutines/core", "//libraries/fastutil", "//libraries/pty4j", "//platform/core-ui", + "//platform/util:util-ui", "//platform/code-style-api:codeStyle", "//platform/code-style-impl:codeStyle-impl", "//libraries/caffeine", @@ -118,6 +121,7 @@ jvm_library( "//platform/backend/observation", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", "//platform/util/storages", + "//platform/util-ex", "//platform/platform-impl/internal", "//platform/util/concurrency", "//platform/platform-impl/ui", @@ -132,6 +136,7 @@ jvm_library( "//platform/project/shared:project", "//platform/kernel/shared:kernel", "//platform/platform-impl/rpc", + "//platform/progress/shared:ide-progress", "//platform/execution", "//platform/forms_rt:java-guiForms-rt", "//platform/locking-impl", @@ -166,6 +171,7 @@ jvm_library( "//libraries/oro-matcher:oro-matcher_test_lib", "//libraries/velocity:velocity_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/platform-util-io:ide-util-io_test_lib", "//platform/welcome-screen-impl:welcomeScreen-impl_test_lib", "//platform/lang-core:lang-core_test_lib", "//platform/lvcs-api:lvcs_test_lib", @@ -205,11 +211,13 @@ jvm_library( "//libraries/stream:stream_test_lib", "//platform/statistics:statistics_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/core-impl:core-impl_test_lib", "//libraries/kotlinx/coroutines/core:core_test_lib", "//libraries/fastutil:fastutil_test_lib", "//libraries/pty4j:pty4j_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/util:util-ui_test_lib", "//platform/code-style-api:codeStyle_test_lib", "//platform/code-style-impl:codeStyle-impl_test_lib", "//libraries/caffeine:caffeine_test_lib", @@ -244,6 +252,7 @@ jvm_library( "//platform/backend/observation:observation_test_lib", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", "//platform/util/storages:storages_test_lib", + "//platform/util-ex:util-ex_test_lib", "//platform/platform-impl/internal:internal_test_lib", "//platform/util/concurrency:concurrency_test_lib", "//platform/platform-impl/ui:ui_test_lib", @@ -258,6 +267,7 @@ jvm_library( "//platform/project/shared:project_test_lib", "//platform/kernel/shared:kernel_test_lib", "//platform/platform-impl/rpc:rpc_test_lib", + "//platform/progress/shared:ide-progress_test_lib", "//platform/execution:execution_test_lib", "//platform/forms_rt:java-guiForms-rt_test_lib", "//platform/locking-impl:locking-impl_test_lib", @@ -376,6 +386,7 @@ jvm_library( "//platform/projectModel-impl", "//platform/projectModel-impl:projectModel-impl_test_lib", "//platform/ide-core-impl", + "//platform/ide-core", "//libraries/guava", "//libraries/guava:guava_test_lib", "//platform/editor-ui-ex:editor-ex", @@ -452,6 +463,10 @@ jvm_library( "//libraries/kotlinx/coroutines/test:test_test_lib", "//platform/util/coroutines", "//platform/util/coroutines:coroutines_test_lib", + "//platform/util:util-ui", + "//platform/util:util-ui_test_lib", + "//platform/util-ex", + "//platform/util-ex:util-ex_test_lib", "@lib//:mockito-kotlin", "@lib//:mockito-junit-jupiter", "@lib//:mockito", @@ -488,6 +503,7 @@ jvm_library( ":lang-tests", "//platform/platform-impl:ide-impl_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/platform-util-io:ide-util-io_test_lib", ] ) diff --git a/platform/lang-impl/intellij.platform.lang.impl.iml b/platform/lang-impl/intellij.platform.lang.impl.iml index 8c80d3f4c2ea..f150724d0263 100644 --- a/platform/lang-impl/intellij.platform.lang.impl.iml +++ b/platform/lang-impl/intellij.platform.lang.impl.iml @@ -19,7 +19,6 @@ $MAVEN_REPOSITORY$/com/jetbrains/fleet/rpc-compiler-plugin/2.3.20-0.1/rpc-compiler-plugin-2.3.20-0.1.jar - @@ -44,6 +43,7 @@ + @@ -84,11 +84,13 @@ + + @@ -126,6 +128,7 @@ + @@ -140,6 +143,7 @@ + diff --git a/platform/lang-impl/intellij.platform.lang.tests.iml b/platform/lang-impl/intellij.platform.lang.tests.iml index 62928a27f74a..7405185dfc3b 100644 --- a/platform/lang-impl/intellij.platform.lang.tests.iml +++ b/platform/lang-impl/intellij.platform.lang.tests.iml @@ -55,6 +55,7 @@ + @@ -96,6 +97,8 @@ + + diff --git a/platform/lang-impl/testEntities/BUILD.bazel b/platform/lang-impl/testEntities/BUILD.bazel index f27b6589b033..b5f2ca584c44 100644 --- a/platform/lang-impl/testEntities/BUILD.bazel +++ b/platform/lang-impl/testEntities/BUILD.bazel @@ -25,6 +25,8 @@ jvm_library( "//platform/workspace/storage:storage_test_lib", "//platform/projectModel-impl", "//platform/projectModel-impl:projectModel-impl_test_lib", + "//platform/util/base/multiplatform", + "//platform/util/base/multiplatform:multiplatform_test_lib", ], runtime_deps = [":testEntities"] ) diff --git a/platform/lang-impl/testEntities/intellij.platform.lang.testEntities.iml b/platform/lang-impl/testEntities/intellij.platform.lang.testEntities.iml index 8f11fd0d010d..3ba72dc4a17c 100644 --- a/platform/lang-impl/testEntities/intellij.platform.lang.testEntities.iml +++ b/platform/lang-impl/testEntities/intellij.platform.lang.testEntities.iml @@ -12,5 +12,6 @@ + \ No newline at end of file diff --git a/platform/lvcs-api/BUILD.bazel b/platform/lvcs-api/BUILD.bazel index 06446cfd6ff5..f54a28823857 100644 --- a/platform/lvcs-api/BUILD.bazel +++ b/platform/lvcs-api/BUILD.bazel @@ -9,6 +9,7 @@ jvm_library( deps = [ "//platform/core-api:core", "//platform/util", + "//platform/util/multiplatform", "@lib//:kotlin-stdlib", "@lib//:jetbrains-annotations", ] @@ -23,6 +24,7 @@ jvm_library( ":lvcs", "//platform/core-api:core_test_lib", "//platform/util:util_test_lib", + "//platform/util/multiplatform:multiplatform_test_lib", ] ) ### auto-generated section `build intellij.platform.lvcs` end diff --git a/platform/lvcs-api/intellij.platform.lvcs.iml b/platform/lvcs-api/intellij.platform.lvcs.iml index 2ced7d41cee8..40d4f52de06b 100644 --- a/platform/lvcs-api/intellij.platform.lvcs.iml +++ b/platform/lvcs-api/intellij.platform.lvcs.iml @@ -9,6 +9,7 @@ + diff --git a/platform/lvcs-impl/BUILD.bazel b/platform/lvcs-impl/BUILD.bazel index 746921e867b4..ec5a622e296c 100644 --- a/platform/lvcs-impl/BUILD.bazel +++ b/platform/lvcs-impl/BUILD.bazel @@ -29,6 +29,7 @@ jvm_library( "//platform/lang-api:lang", "//platform/lang-impl", "//platform/ide-core-impl", + "//platform/ide-core", "//platform/platform-impl:ide-impl", "//platform/diff-api:diff", "//platform/diff-impl", @@ -41,6 +42,7 @@ jvm_library( "//platform/vcs-impl/shared", "@lib//:jetbrains-annotations", "//platform/projectModel-impl", + "//platform/util:util-ui", ] ) @@ -65,6 +67,7 @@ jvm_library( "//platform/lang-api:lang_test_lib", "//platform/lang-impl:lang-impl_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/platform-impl:ide-impl_test_lib", "//platform/diff-api:diff_test_lib", "//platform/diff-impl:diff-impl_test_lib", @@ -84,6 +87,7 @@ jvm_library( "//platform/projectModel-impl:projectModel-impl_test_lib", "//platform/lang-core", "//platform/lang-core:lang-core_test_lib", + "//platform/util:util-ui_test_lib", ] ) ### auto-generated section `build intellij.platform.lvcs.impl` end @@ -139,6 +143,7 @@ jvm_library( "//platform/lang-impl", "//platform/lang-impl:lang-impl_test_lib", "//platform/ide-core-impl", + "//platform/ide-core", "//platform/platform-impl:ide-impl", "//platform/diff-api:diff", "//platform/diff-api:diff_test_lib", @@ -173,6 +178,7 @@ jvm_library( runtime_deps = [ ":lvcs-impl-tests", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/platform-impl:ide-impl_test_lib", ] ) diff --git a/platform/lvcs-impl/intellij.platform.lvcs.impl.iml b/platform/lvcs-impl/intellij.platform.lvcs.impl.iml index 0e8de7a36b6f..7192358f3972 100644 --- a/platform/lvcs-impl/intellij.platform.lvcs.impl.iml +++ b/platform/lvcs-impl/intellij.platform.lvcs.impl.iml @@ -23,6 +23,7 @@ + @@ -40,6 +41,7 @@ + diff --git a/platform/lvcs-impl/intellij.platform.lvcs.impl.tests.iml b/platform/lvcs-impl/intellij.platform.lvcs.impl.tests.iml index 802bb9d11ad6..5b63d11cb432 100644 --- a/platform/lvcs-impl/intellij.platform.lvcs.impl.tests.iml +++ b/platform/lvcs-impl/intellij.platform.lvcs.impl.tests.iml @@ -22,6 +22,7 @@ + diff --git a/platform/navbar/backend/BUILD.bazel b/platform/navbar/backend/BUILD.bazel index a3724e0eeae8..b57860011fbe 100644 --- a/platform/navbar/backend/BUILD.bazel +++ b/platform/navbar/backend/BUILD.bazel @@ -26,6 +26,7 @@ jvm_library( "//platform/platform-api:ide", "//platform/editor-ui-api:editor-ui", "//platform/ide-core-impl", + "//platform/ide-core", "//platform/analysis-api:analysis", "//platform/lang-api:lang", "//platform/lang-impl", @@ -56,6 +57,7 @@ jvm_library( "//platform/platform-api:ide_test_lib", "//platform/editor-ui-api:editor-ui_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/analysis-api:analysis_test_lib", "//platform/lang-api:lang_test_lib", "//platform/lang-impl:lang-impl_test_lib", diff --git a/platform/navbar/backend/intellij.platform.navbar.backend.iml b/platform/navbar/backend/intellij.platform.navbar.backend.iml index 0bf5b8924f83..c32ab17edfa9 100644 --- a/platform/navbar/backend/intellij.platform.navbar.backend.iml +++ b/platform/navbar/backend/intellij.platform.navbar.backend.iml @@ -20,6 +20,7 @@ + diff --git a/platform/navbar/testFramework/BUILD.bazel b/platform/navbar/testFramework/BUILD.bazel index e1c8fa1a4f6d..8ab8ff624648 100644 --- a/platform/navbar/testFramework/BUILD.bazel +++ b/platform/navbar/testFramework/BUILD.bazel @@ -20,6 +20,7 @@ jvm_library( "//platform/editor-ui-api:editor-ui", "//platform/lang-impl", "//platform/ide-core-impl", + "//platform/ide-core", "//platform/navbar/backend", "//platform/navbar/frontend", "//platform/platform-impl:ide-impl", @@ -38,6 +39,7 @@ jvm_library( "//platform/editor-ui-api:editor-ui_test_lib", "//platform/lang-impl:lang-impl_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/navbar/backend:backend_test_lib", "//platform/navbar/frontend:frontend_test_lib", "//platform/platform-impl:ide-impl_test_lib", diff --git a/platform/navbar/testFramework/intellij.platform.navbar.testFramework.iml b/platform/navbar/testFramework/intellij.platform.navbar.testFramework.iml index 707a1c9e96dc..8fb695c85ee1 100644 --- a/platform/navbar/testFramework/intellij.platform.navbar.testFramework.iml +++ b/platform/navbar/testFramework/intellij.platform.navbar.testFramework.iml @@ -14,6 +14,7 @@ + diff --git a/platform/new-ui-onboarding/BUILD.bazel b/platform/new-ui-onboarding/BUILD.bazel index 0a9e61f6d04a..f6cab1f567b1 100644 --- a/platform/new-ui-onboarding/BUILD.bazel +++ b/platform/new-ui-onboarding/BUILD.bazel @@ -20,6 +20,7 @@ jvm_library( "//platform/editor-ui-api:editor-ui", "//platform/platform-impl:ide-impl", "//platform/platform-impl/ui", + "//platform/ide-core", "//platform/core-ui", "//platform/execution", "//platform/execution-impl", @@ -28,6 +29,7 @@ jvm_library( "//platform/projectModel-api:projectModel", "//platform/statistics", "//libraries/jcef", + "//platform/util:util-ui", ] ) @@ -43,6 +45,7 @@ jvm_library( "//platform/editor-ui-api:editor-ui_test_lib", "//platform/platform-impl:ide-impl_test_lib", "//platform/platform-impl/ui:ui_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/core-ui:core-ui_test_lib", "//platform/execution:execution_test_lib", "//platform/execution-impl:execution-impl_test_lib", @@ -51,6 +54,7 @@ jvm_library( "//platform/projectModel-api:projectModel_test_lib", "//platform/statistics:statistics_test_lib", "//libraries/jcef:jcef_test_lib", + "//platform/util:util-ui_test_lib", ] ) ### auto-generated section `build intellij.platform.ide.newUiOnboarding` end diff --git a/platform/new-ui-onboarding/intellij.platform.ide.newUiOnboarding.iml b/platform/new-ui-onboarding/intellij.platform.ide.newUiOnboarding.iml index 301109cfc876..08cc4e3c333b 100644 --- a/platform/new-ui-onboarding/intellij.platform.ide.newUiOnboarding.iml +++ b/platform/new-ui-onboarding/intellij.platform.ide.newUiOnboarding.iml @@ -35,6 +35,7 @@ + @@ -43,5 +44,6 @@ + \ No newline at end of file diff --git a/platform/new-users-onboarding/BUILD.bazel b/platform/new-users-onboarding/BUILD.bazel index ea967c1563ae..08af1e1d86f5 100644 --- a/platform/new-users-onboarding/BUILD.bazel +++ b/platform/new-users-onboarding/BUILD.bazel @@ -19,9 +19,11 @@ jvm_library( "//platform/editor-ui-api:editor-ui", "//platform/platform-impl:ide-impl", "//platform/new-ui-onboarding", + "//platform/ide-core", "//platform/core-ui", "//platform/projectModel-api:projectModel", "@lib//:kotlin-stdlib", + "//platform/util:util-ui", "//platform/util/coroutines", "//platform/statistics", "//platform/lang-impl", @@ -41,8 +43,10 @@ jvm_library( "//platform/editor-ui-api:editor-ui_test_lib", "//platform/platform-impl:ide-impl_test_lib", "//platform/new-ui-onboarding:new-ui-onboarding_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/core-ui:core-ui_test_lib", "//platform/projectModel-api:projectModel_test_lib", + "//platform/util:util-ui_test_lib", "//platform/util/coroutines:coroutines_test_lib", "//platform/statistics:statistics_test_lib", "//platform/lang-impl:lang-impl_test_lib", diff --git a/platform/new-users-onboarding/intellij.platform.ide.newUsersOnboarding.iml b/platform/new-users-onboarding/intellij.platform.ide.newUsersOnboarding.iml index 07a7dd71741a..0512cc41f410 100644 --- a/platform/new-users-onboarding/intellij.platform.ide.newUsersOnboarding.iml +++ b/platform/new-users-onboarding/intellij.platform.ide.newUsersOnboarding.iml @@ -13,9 +13,11 @@ + + diff --git a/platform/non-modal-welcome-screen/BUILD.bazel b/platform/non-modal-welcome-screen/BUILD.bazel index 8724396486d3..92dcc92e640b 100644 --- a/platform/non-modal-welcome-screen/BUILD.bazel +++ b/platform/non-modal-welcome-screen/BUILD.bazel @@ -26,13 +26,16 @@ jvm_library( "//platform/util:util-ui", "//platform/platform-api:ide", "//platform/lang-impl", + "//platform/welcome-screen", "//platform/core-ui", "//platform/ide-core-impl", + "//platform/ide-core", "//platform/platform-impl:ide-impl", "//platform/statistics", "//libraries/kotlinx/serialization/core", "//platform/kernel/shared:kernel", "//platform/platform-impl/rpc", + "//platform/progress/shared:ide-progress", "//platform/project/shared:project", ], plugins = ["@lib//:compose-plugin"] @@ -59,14 +62,17 @@ jvm_library( "//platform/util:util-ui_test_lib", "//platform/platform-api:ide_test_lib", "//platform/lang-impl:lang-impl_test_lib", + "//platform/welcome-screen:welcome-screen_test_lib", "//platform/core-ui:core-ui_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/platform-impl:ide-impl_test_lib", "@lib//:junit5", "//platform/statistics:statistics_test_lib", "//libraries/kotlinx/serialization/core:core_test_lib", "//platform/kernel/shared:kernel_test_lib", "//platform/platform-impl/rpc:rpc_test_lib", + "//platform/progress/shared:ide-progress_test_lib", "//platform/project/shared:project_test_lib", ], plugins = ["@lib//:compose-plugin"] diff --git a/platform/non-modal-welcome-screen/backend/BUILD.bazel b/platform/non-modal-welcome-screen/backend/BUILD.bazel index 9aa1643ae431..abe5fa04c84a 100644 --- a/platform/non-modal-welcome-screen/backend/BUILD.bazel +++ b/platform/non-modal-welcome-screen/backend/BUILD.bazel @@ -21,6 +21,7 @@ jvm_library( "//platform/kernel/rpc.backend", "//platform/project/shared:project", "//platform/platform-api:ide", + "//platform/ide-core", "//platform/core-ui", ] ) @@ -38,6 +39,7 @@ jvm_library( "//platform/kernel/rpc.backend:rpc.backend_test_lib", "//platform/project/shared:project_test_lib", "//platform/platform-api:ide_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/core-ui:core-ui_test_lib", ] ) diff --git a/platform/non-modal-welcome-screen/backend/intellij.platform.ide.nonModalWelcomeScreen.backend.iml b/platform/non-modal-welcome-screen/backend/intellij.platform.ide.nonModalWelcomeScreen.backend.iml index 2213396e16c0..b669fa0e79e1 100644 --- a/platform/non-modal-welcome-screen/backend/intellij.platform.ide.nonModalWelcomeScreen.backend.iml +++ b/platform/non-modal-welcome-screen/backend/intellij.platform.ide.nonModalWelcomeScreen.backend.iml @@ -39,6 +39,7 @@ + \ No newline at end of file diff --git a/platform/non-modal-welcome-screen/frontend/BUILD.bazel b/platform/non-modal-welcome-screen/frontend/BUILD.bazel index 13d1499796ab..541a7f58b6ae 100644 --- a/platform/non-modal-welcome-screen/frontend/BUILD.bazel +++ b/platform/non-modal-welcome-screen/frontend/BUILD.bazel @@ -25,6 +25,7 @@ jvm_library( "//platform/project/shared:project", "//fleet/rpc", "//platform/platform-impl:ide-impl", + "//platform/ide-core", ], plugins = ["@lib//:compose-plugin"] ) @@ -46,6 +47,7 @@ jvm_library( "//platform/project/shared:project_test_lib", "//fleet/rpc:rpc_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", ], plugins = ["@lib//:compose-plugin"] ) diff --git a/platform/non-modal-welcome-screen/frontend/intellij.platform.ide.nonModalWelcomeScreen.frontend.iml b/platform/non-modal-welcome-screen/frontend/intellij.platform.ide.nonModalWelcomeScreen.frontend.iml index b26703ab2138..f0498220abda 100644 --- a/platform/non-modal-welcome-screen/frontend/intellij.platform.ide.nonModalWelcomeScreen.frontend.iml +++ b/platform/non-modal-welcome-screen/frontend/intellij.platform.ide.nonModalWelcomeScreen.frontend.iml @@ -44,5 +44,6 @@ + \ No newline at end of file diff --git a/platform/non-modal-welcome-screen/intellij.platform.ide.nonModalWelcomeScreen.iml b/platform/non-modal-welcome-screen/intellij.platform.ide.nonModalWelcomeScreen.iml index ea061c2f0748..6d447562844b 100644 --- a/platform/non-modal-welcome-screen/intellij.platform.ide.nonModalWelcomeScreen.iml +++ b/platform/non-modal-welcome-screen/intellij.platform.ide.nonModalWelcomeScreen.iml @@ -46,14 +46,17 @@ + + + \ No newline at end of file diff --git a/platform/object-serializer/BUILD.bazel b/platform/object-serializer/BUILD.bazel index 05d75fec88eb..5e423e4e9222 100644 --- a/platform/object-serializer/BUILD.bazel +++ b/platform/object-serializer/BUILD.bazel @@ -21,6 +21,7 @@ jvm_library( "//libraries/kotlinx/serialization/core", "//libraries/kotlinx/serialization/json", "//platform/util/xmlDom", + "//platform/util/base", "//platform/settings", ] ) @@ -59,6 +60,8 @@ jvm_library( "//libraries/kotlinx/serialization/json:json_test_lib", "//platform/util/xmlDom", "//platform/util/xmlDom:xmlDom_test_lib", + "//platform/util/base", + "//platform/util/base:base_test_lib", "//platform/settings", "//platform/settings:settings_test_lib", ] @@ -136,6 +139,8 @@ jvm_library( "//platform/object-serializer:object-serializer_test_lib", "//platform/util-ex", "//platform/util-ex:util-ex_test_lib", + "//platform/util/base", + "//platform/util/base:base_test_lib", "//platform/object-serializer:objectSerializer-annotations", "//platform/object-serializer:objectSerializer-annotations_test_lib", "//libraries/ion", diff --git a/platform/object-serializer/intellij.platform.objectSerializer.iml b/platform/object-serializer/intellij.platform.objectSerializer.iml index 1583eac6bb27..37262aec0d42 100644 --- a/platform/object-serializer/intellij.platform.objectSerializer.iml +++ b/platform/object-serializer/intellij.platform.objectSerializer.iml @@ -24,6 +24,7 @@ + \ No newline at end of file diff --git a/platform/object-serializer/intellij.platform.objectSerializer.tests.iml b/platform/object-serializer/intellij.platform.objectSerializer.tests.iml index 793b69e9d62b..ebacc4a6f239 100644 --- a/platform/object-serializer/intellij.platform.objectSerializer.tests.iml +++ b/platform/object-serializer/intellij.platform.objectSerializer.tests.iml @@ -14,6 +14,7 @@ + diff --git a/platform/observable/BUILD.bazel b/platform/observable/BUILD.bazel index 60ae76eac4b5..69d375529b8d 100644 --- a/platform/observable/BUILD.bazel +++ b/platform/observable/BUILD.bazel @@ -10,6 +10,7 @@ jvm_library( "//platform/util-ex", "//platform/util:util-ui", "//platform/util", + "//platform/util/base", "//platform/core-api:core", "//libraries/kotlinx/coroutines/core", "//platform/util/concurrency", @@ -28,6 +29,7 @@ jvm_library( "//platform/util-ex:util-ex_test_lib", "//platform/util:util-ui_test_lib", "//platform/util:util_test_lib", + "//platform/util/base:base_test_lib", "//platform/core-api:core_test_lib", "//libraries/kotlinx/coroutines/core:core_test_lib", "//platform/util/concurrency:concurrency_test_lib", diff --git a/platform/observable/intellij.platform.ide.observable.iml b/platform/observable/intellij.platform.ide.observable.iml index 739010777a67..c126dd55467e 100644 --- a/platform/observable/intellij.platform.ide.observable.iml +++ b/platform/observable/intellij.platform.ide.observable.iml @@ -10,6 +10,7 @@ + diff --git a/platform/platform-api/BUILD.bazel b/platform/platform-api/BUILD.bazel index 80db9d91db12..f5608394be1f 100644 --- a/platform/platform-api/BUILD.bazel +++ b/platform/platform-api/BUILD.bazel @@ -62,14 +62,7 @@ jvm_library( "//libraries/fastutil", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", ], - exports = [ - "//platform/util", - "//platform/editor-ui-api:editor-ui", - "//platform/util:util-ui", - "//platform/ide-core", - "//platform/welcome-screen", - "//platform/progress/shared:ide-progress", - ] + exports = ["//platform/util"] ) jvm_library( @@ -81,16 +74,6 @@ jvm_library( exports = [ "//platform/util", "//platform/util:util_test_lib", - "//platform/editor-ui-api:editor-ui", - "//platform/editor-ui-api:editor-ui_test_lib", - "//platform/util:util-ui", - "//platform/util:util-ui_test_lib", - "//platform/ide-core", - "//platform/ide-core:ide-core_test_lib", - "//platform/welcome-screen", - "//platform/welcome-screen:welcome-screen_test_lib", - "//platform/progress/shared:ide-progress", - "//platform/progress/shared:ide-progress_test_lib", ], runtime_deps = [ ":ide", diff --git a/platform/platform-api/intellij.platform.ide.iml b/platform/platform-api/intellij.platform.ide.iml index c529e599abe9..78aec01213b7 100644 --- a/platform/platform-api/intellij.platform.ide.iml +++ b/platform/platform-api/intellij.platform.ide.iml @@ -16,7 +16,7 @@ - + @@ -24,20 +24,20 @@ - + - + - + - + diff --git a/platform/platform-impl/BUILD.bazel b/platform/platform-impl/BUILD.bazel index 801e6dbfc469..82b1dce3c544 100644 --- a/platform/platform-impl/BUILD.bazel +++ b/platform/platform-impl/BUILD.bazel @@ -39,6 +39,7 @@ jvm_library( "//platform/credential-store", "//platform/editor-ui-api:editor-ui", "//platform/platform-api:ide", + "//platform/welcome-screen", "//platform/welcome-screen-impl:welcomeScreen-impl", "//libraries/oro-matcher", "//jps/model-api:model", @@ -103,6 +104,7 @@ jvm_library( "//platform/util/xmlDom", "//platform/ide-core-impl", "//platform/ide-core/plugins", + "//platform/ide-core", "//platform/platform-util-netty:ide-util-netty", "//libraries/aalto-xml", "//libraries/jbr", @@ -162,10 +164,7 @@ jvm_library( "//libraries/rd/core", "//platform/forms_rt:java-guiForms-rt", ], - exports = [ - "//platform/platform-api:ide", - "//platform/util:util-ui", - ], + exports = ["//platform/platform-api:ide"], runtime_deps = [ "@lib//:slf4j-api", "@lib//:slf4j-jdk14", @@ -198,8 +197,6 @@ jvm_library( exports = [ "//platform/platform-api:ide", "//platform/platform-api:ide_test_lib", - "//platform/util:util-ui", - "//platform/util:util-ui_test_lib", ], runtime_deps = [ ":ide-impl", @@ -210,6 +207,7 @@ jvm_library( "//platform/credential-store:credential-store_test_lib", "//platform/editor-ui-api:editor-ui_test_lib", "//platform/platform-api:ide_test_lib", + "//platform/welcome-screen:welcome-screen_test_lib", "//platform/welcome-screen-impl:welcomeScreen-impl_test_lib", "//libraries/oro-matcher:oro-matcher_test_lib", "//jps/model-api:model_test_lib", @@ -272,6 +270,7 @@ jvm_library( "//platform/util/xmlDom:xmlDom_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", "//platform/ide-core/plugins:plugins_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/platform-util-netty:ide-util-netty_test_lib", "//libraries/aalto-xml:aalto-xml_test_lib", "//libraries/jgoodies/common:common_test_lib", @@ -354,10 +353,7 @@ jvm_library( module_name = "intellij.platform.ide.impl.tests", visibility = ["//visibility:public"], srcs = glob([], allow_empty = True), - exports = [ - "//platform/platform-api:ide", - "//platform/util:util-ui", - ], + exports = ["//platform/platform-api:ide"], runtime_deps = [ "@lib//:slf4j-api", "@lib//:slf4j-jdk14", @@ -520,6 +516,7 @@ jvm_library( "//platform/util/xmlDom:xmlDom_test_lib", "//platform/ide-core-impl", "//platform/ide-core/plugins", + "//platform/ide-core", "//platform/platform-util-netty:ide-util-netty", "//libraries/aalto-xml", "//libraries/aalto-xml:aalto-xml_test_lib", @@ -630,8 +627,6 @@ jvm_library( exports = [ "//platform/platform-api:ide", "//platform/platform-api:ide_test_lib", - "//platform/util:util-ui", - "//platform/util:util-ui_test_lib", ], runtime_deps = [ ":ide-impl-tests", @@ -641,6 +636,7 @@ jvm_library( "//libraries/protobuf:protobuf_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", "//platform/ide-core/plugins:plugins_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/platform-util-netty:ide-util-netty_test_lib", "//libraries/jgoodies/common:common_test_lib", "//libraries/jgoodies/forms:forms_test_lib", diff --git a/platform/platform-impl/bootstrap/BUILD.bazel b/platform/platform-impl/bootstrap/BUILD.bazel index d2538791f8de..7669096fb38e 100644 --- a/platform/platform-impl/bootstrap/BUILD.bazel +++ b/platform/platform-impl/bootstrap/BUILD.bazel @@ -24,6 +24,7 @@ jvm_library( "//platform/settings", "//platform/util-ex", "//platform/ide-core-impl", + "//platform/ide-core", "//platform/core-ui", "//platform/platform-util-io:ide-util-io", "//platform/projectModel-impl", @@ -45,7 +46,9 @@ jvm_library( "//libraries/netty/codec-http:libraries-netty-codec-http", "//platform/eel-impl", "//platform/platform-impl/initial-config-import", + "//platform/progress/shared:ide-progress", "//platform/eel-provider", + "//platform/welcome-screen", ] ) @@ -72,6 +75,7 @@ jvm_library( "//platform/settings:settings_test_lib", "//platform/util-ex:util-ex_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/core-ui:core-ui_test_lib", "//platform/platform-util-io:ide-util-io_test_lib", "//platform/projectModel-impl:projectModel-impl_test_lib", @@ -91,7 +95,9 @@ jvm_library( "//libraries/netty/codec-http:libraries-netty-codec-http_test_lib", "//platform/eel-impl:eel-impl_test_lib", "//platform/platform-impl/initial-config-import:initial-config-import_test_lib", + "//platform/progress/shared:ide-progress_test_lib", "//platform/eel-provider:eel-provider_test_lib", + "//platform/welcome-screen:welcome-screen_test_lib", ] ) ### auto-generated section `build intellij.platform.ide.bootstrap` end diff --git a/platform/platform-impl/bootstrap/intellij.platform.ide.bootstrap.iml b/platform/platform-impl/bootstrap/intellij.platform.ide.bootstrap.iml index f86862f009fc..b932bed4c33e 100644 --- a/platform/platform-impl/bootstrap/intellij.platform.ide.bootstrap.iml +++ b/platform/platform-impl/bootstrap/intellij.platform.ide.bootstrap.iml @@ -24,6 +24,7 @@ + @@ -45,6 +46,8 @@ + + \ No newline at end of file diff --git a/platform/platform-impl/codeinsight-inline/BUILD.bazel b/platform/platform-impl/codeinsight-inline/BUILD.bazel index 81d68dba25fd..ced4c58b952e 100644 --- a/platform/platform-impl/codeinsight-inline/BUILD.bazel +++ b/platform/platform-impl/codeinsight-inline/BUILD.bazel @@ -19,9 +19,11 @@ jvm_library( "//platform/statistics", "//platform/editor-ui-ex:editor-ex", "//platform/core-ui", + "//platform/util:util-ui", "//platform/util/coroutines", "//platform/analysis-impl", "//platform/platform-impl/ui", + "//platform/ide-core", "//platform/lang-api:lang", "//fleet/util/core", "//libraries/kotlinx/serialization/core", @@ -47,9 +49,11 @@ jvm_library( "//platform/statistics:statistics_test_lib", "//platform/editor-ui-ex:editor-ex_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/util:util-ui_test_lib", "//platform/util/coroutines:coroutines_test_lib", "//platform/analysis-impl:analysis-impl_test_lib", "//platform/platform-impl/ui:ui_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/lang-api:lang_test_lib", "//fleet/util/core:core_test_lib", "//libraries/kotlinx/serialization/core:core_test_lib", diff --git a/platform/platform-impl/codeinsight-inline/intellij.platform.ide.codeinsight.inline.iml b/platform/platform-impl/codeinsight-inline/intellij.platform.ide.codeinsight.inline.iml index 9a94ad153a84..18b118ba1829 100644 --- a/platform/platform-impl/codeinsight-inline/intellij.platform.ide.codeinsight.inline.iml +++ b/platform/platform-impl/codeinsight-inline/intellij.platform.ide.codeinsight.inline.iml @@ -41,9 +41,11 @@ + + diff --git a/platform/platform-impl/designer/BUILD.bazel b/platform/platform-impl/designer/BUILD.bazel index 226419628823..054c320354a1 100644 --- a/platform/platform-impl/designer/BUILD.bazel +++ b/platform/platform-impl/designer/BUILD.bazel @@ -11,7 +11,9 @@ jvm_library( "//platform/core-api:core", "//platform/editor-ui-api:editor-ui", "//platform/platform-impl:ide-impl", + "//platform/ide-core", "//platform/core-ui", + "//platform/util:util-ui", "//platform/statistics", "//platform/util/concurrency", ] @@ -28,7 +30,9 @@ jvm_library( "//platform/core-api:core_test_lib", "//platform/editor-ui-api:editor-ui_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/util:util-ui_test_lib", "//platform/statistics:statistics_test_lib", "//platform/util/concurrency:concurrency_test_lib", ] diff --git a/platform/platform-impl/designer/intellij.platform.ide.designer.iml b/platform/platform-impl/designer/intellij.platform.ide.designer.iml index d09823ddc1c3..65c3aca91b32 100644 --- a/platform/platform-impl/designer/intellij.platform.ide.designer.iml +++ b/platform/platform-impl/designer/intellij.platform.ide.designer.iml @@ -11,7 +11,9 @@ + + diff --git a/platform/platform-impl/initial-config-import/BUILD.bazel b/platform/platform-impl/initial-config-import/BUILD.bazel index 0f4d71226c3f..ed25a9a7f617 100644 --- a/platform/platform-impl/initial-config-import/BUILD.bazel +++ b/platform/platform-impl/initial-config-import/BUILD.bazel @@ -17,7 +17,10 @@ jvm_library( "//libraries/jackson3/jackson:libraries-jackson3", "//platform/statistics", "//platform/core-ui", + "//platform/editor-ui-api:editor-ui", + "//platform/util:util-ui", "//platform/ide-core/plugins", + "//platform/ide-core", "//platform/platform-util-io-impl:ide-util-io-impl", "//libraries/fastutil", "//platform/util/concurrency", @@ -41,7 +44,10 @@ jvm_library( "//libraries/jackson3/jackson:libraries-jackson3_test_lib", "//platform/statistics:statistics_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/editor-ui-api:editor-ui_test_lib", + "//platform/util:util-ui_test_lib", "//platform/ide-core/plugins:plugins_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/platform-util-io-impl:ide-util-io-impl_test_lib", "//libraries/fastutil:fastutil_test_lib", "//platform/util/concurrency:concurrency_test_lib", diff --git a/platform/platform-impl/initial-config-import/intellij.platform.ide.initialConfigImport.iml b/platform/platform-impl/initial-config-import/intellij.platform.ide.initialConfigImport.iml index 8c75ffbf6bb6..dd8ae368e4c4 100644 --- a/platform/platform-impl/initial-config-import/intellij.platform.ide.initialConfigImport.iml +++ b/platform/platform-impl/initial-config-import/intellij.platform.ide.initialConfigImport.iml @@ -17,7 +17,10 @@ + + + diff --git a/platform/platform-impl/intellij.platform.ide.impl.iml b/platform/platform-impl/intellij.platform.ide.impl.iml index 35c2e2714f97..735d82093f23 100644 --- a/platform/platform-impl/intellij.platform.ide.impl.iml +++ b/platform/platform-impl/intellij.platform.ide.impl.iml @@ -37,6 +37,7 @@ + @@ -79,7 +80,7 @@ - + @@ -109,6 +110,7 @@ + diff --git a/platform/platform-impl/intellij.platform.ide.impl.tests.iml b/platform/platform-impl/intellij.platform.ide.impl.tests.iml index 331340789176..de2f735e6156 100644 --- a/platform/platform-impl/intellij.platform.ide.impl.tests.iml +++ b/platform/platform-impl/intellij.platform.ide.impl.tests.iml @@ -78,7 +78,7 @@ - + @@ -108,6 +108,7 @@ + diff --git a/platform/platform-impl/internal/BUILD.bazel b/platform/platform-impl/internal/BUILD.bazel index 1e80638068dc..3f2e90a53445 100644 --- a/platform/platform-impl/internal/BUILD.bazel +++ b/platform/platform-impl/internal/BUILD.bazel @@ -30,6 +30,7 @@ jvm_library( "//platform/platform-impl:ide-impl", "//platform/platform-impl/ui", "//platform/core-ui", + "//platform/util:util-ui", "//platform/statistics", "//platform/editor-ui-ex:editor-ex", "//platform/analysis-impl", @@ -41,6 +42,7 @@ jvm_library( "//platform/workspace/jps", "//platform/jbr", "//platform/ide-core-impl", + "//platform/ide-core", "//platform/util/coroutines", "//platform/forms_rt:java-guiForms-rt", "//platform/statistics/uploader", @@ -58,6 +60,7 @@ jvm_library( "//platform/workspace/storage", "//platform/platform-impl/concurrency", "//platform/platform-impl/update-checker", + "//platform/progress/shared:ide-progress", "//libraries/jbr", "//platform/projectModel-impl", "//platform/execution", @@ -90,6 +93,7 @@ jvm_library( "//platform/platform-impl:ide-impl_test_lib", "//platform/platform-impl/ui:ui_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/util:util-ui_test_lib", "//platform/statistics:statistics_test_lib", "//platform/editor-ui-ex:editor-ex_test_lib", "//platform/analysis-impl:analysis-impl_test_lib", @@ -101,6 +105,7 @@ jvm_library( "//platform/workspace/jps:jps_test_lib", "//platform/jbr:jbr_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/util/coroutines:coroutines_test_lib", "//platform/forms_rt:java-guiForms-rt_test_lib", "//platform/statistics/uploader:uploader_test_lib", @@ -117,6 +122,7 @@ jvm_library( "//platform/workspace/storage:storage_test_lib", "//platform/platform-impl/concurrency:concurrency_test_lib", "//platform/platform-impl/update-checker:update-checker_test_lib", + "//platform/progress/shared:ide-progress_test_lib", "//libraries/jbr:jbr_test_lib", "//platform/projectModel-impl:projectModel-impl_test_lib", "//platform/execution:execution_test_lib", diff --git a/platform/platform-impl/internal/intellij.platform.ide.internal.iml b/platform/platform-impl/internal/intellij.platform.ide.internal.iml index 909af0a38595..adc34e63f55f 100644 --- a/platform/platform-impl/internal/intellij.platform.ide.internal.iml +++ b/platform/platform-impl/internal/intellij.platform.ide.internal.iml @@ -45,6 +45,7 @@ + @@ -56,6 +57,7 @@ + @@ -73,6 +75,7 @@ + diff --git a/platform/platform-impl/remote/BUILD.bazel b/platform/platform-impl/remote/BUILD.bazel index c52d548d3811..fcc09984b519 100644 --- a/platform/platform-impl/remote/BUILD.bazel +++ b/platform/platform-impl/remote/BUILD.bazel @@ -17,9 +17,11 @@ jvm_library( "//platform/lang-core", "//platform/execution", "//platform/platform-impl:ide-impl", + "//platform/ide-core", "//platform/util/concurrency", "//libraries/guava", "//platform/core-ui", + "//platform/util:util-ui", ] ) @@ -39,9 +41,11 @@ jvm_library( "//platform/lang-core:lang-core_test_lib", "//platform/execution:execution_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/util/concurrency:concurrency_test_lib", "//libraries/guava:guava_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/util:util-ui_test_lib", ] ) ### auto-generated section `build intellij.platform.ide.remote` end diff --git a/platform/platform-impl/remote/intellij.platform.ide.remote.iml b/platform/platform-impl/remote/intellij.platform.ide.remote.iml index 63f64f65fbd3..a32420c0416f 100644 --- a/platform/platform-impl/remote/intellij.platform.ide.remote.iml +++ b/platform/platform-impl/remote/intellij.platform.ide.remote.iml @@ -17,8 +17,10 @@ + + \ No newline at end of file diff --git a/platform/platform-impl/ui-inspector/BUILD.bazel b/platform/platform-impl/ui-inspector/BUILD.bazel index b10c5c219865..b83ae064831f 100644 --- a/platform/platform-impl/ui-inspector/BUILD.bazel +++ b/platform/platform-impl/ui-inspector/BUILD.bazel @@ -22,8 +22,10 @@ jvm_library( "//platform/analysis-impl", "//platform/lang-api:lang", "//platform/core-ui", + "//platform/util:util-ui", "//platform/core-impl", "//platform/ide-core-impl", + "//platform/ide-core", "//libraries/miglayout-swing", "//libraries/guava", "//platform/projectModel-api:projectModel", @@ -49,8 +51,10 @@ jvm_library( "//platform/analysis-impl:analysis-impl_test_lib", "//platform/lang-api:lang_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/util:util-ui_test_lib", "//platform/core-impl:core-impl_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//libraries/miglayout-swing:miglayout-swing_test_lib", "//libraries/guava:guava_test_lib", "//platform/projectModel-api:projectModel_test_lib", diff --git a/platform/platform-impl/ui-inspector/intellij.platform.ide.ui.inspector.iml b/platform/platform-impl/ui-inspector/intellij.platform.ide.ui.inspector.iml index 699880115c3f..e5d965aec654 100644 --- a/platform/platform-impl/ui-inspector/intellij.platform.ide.ui.inspector.iml +++ b/platform/platform-impl/ui-inspector/intellij.platform.ide.ui.inspector.iml @@ -16,8 +16,10 @@ + + diff --git a/platform/platform-impl/update-checker/BUILD.bazel b/platform/platform-impl/update-checker/BUILD.bazel index 9f0da8230e3f..29874aedd6ee 100644 --- a/platform/platform-impl/update-checker/BUILD.bazel +++ b/platform/platform-impl/update-checker/BUILD.bazel @@ -29,6 +29,7 @@ jvm_library( "//platform/util/jdom", "//libraries/jackson3/jackson:libraries-jackson3", "//platform/ide-core-impl", + "//platform/ide-core", "//libraries/jackson3/databind", "//libraries/kotlinx/coroutines/core", "//platform/platform-impl/initial-config-import", @@ -36,6 +37,8 @@ jvm_library( "//libraries/kotlinx/serialization/json", "//platform/forms_rt:java-guiForms-rt", "//platform/util/concurrency", + "//platform/util:util-ui", + "//platform/editor-ui-api:editor-ui", ] ) @@ -59,6 +62,7 @@ jvm_library( "//platform/util/jdom:jdom_test_lib", "//libraries/jackson3/jackson:libraries-jackson3_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//libraries/jackson3/databind:databind_test_lib", "//libraries/kotlinx/coroutines/core:core_test_lib", "//platform/platform-impl/initial-config-import:initial-config-import_test_lib", @@ -66,6 +70,8 @@ jvm_library( "//libraries/kotlinx/serialization/json:json_test_lib", "//platform/forms_rt:java-guiForms-rt_test_lib", "//platform/util/concurrency:concurrency_test_lib", + "//platform/util:util-ui_test_lib", + "//platform/editor-ui-api:editor-ui_test_lib", ] ) ### auto-generated section `build intellij.platform.ide.updateChecker` end diff --git a/platform/platform-impl/update-checker/intellij.platform.ide.updateChecker.iml b/platform/platform-impl/update-checker/intellij.platform.ide.updateChecker.iml index c03b7745130f..6865015d002e 100644 --- a/platform/platform-impl/update-checker/intellij.platform.ide.updateChecker.iml +++ b/platform/platform-impl/update-checker/intellij.platform.ide.updateChecker.iml @@ -45,6 +45,7 @@ + @@ -52,5 +53,7 @@ + + \ No newline at end of file diff --git a/platform/platform-tests/BUILD.bazel b/platform/platform-tests/BUILD.bazel index 2a5b1e8b5db7..a028268ffa77 100644 --- a/platform/platform-tests/BUILD.bazel +++ b/platform/platform-tests/BUILD.bazel @@ -112,6 +112,7 @@ jvm_library( "//platform/usageView:usageView_test_lib", "//platform/ide-core-impl", "//platform/ide-core/plugins", + "//platform/ide-core", "//platform/workspace/storage", "//platform/workspace/storage:storage_test_lib", "//platform/platform-impl/codeinsight-inline:ide-codeinsight-inline", @@ -179,6 +180,8 @@ jvm_library( "//libraries/jackson3/jackson:libraries-jackson3_test_lib", "//platform/core-ui", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", "//platform/code-style-impl:codeStyle-impl", "//platform/code-style-impl:codeStyle-impl_test_lib", "//platform/statistics/uploader", @@ -255,6 +258,8 @@ jvm_library( "//platform/platform-impl/internal", "//platform/util/storages", "//platform/util/storages:storages_test_lib", + "//platform/util-ex", + "//platform/util-ex:util-ex_test_lib", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", "//platform/buildData", @@ -284,6 +289,8 @@ jvm_library( "//platform/pluginSystem/testFramework:testFramework_test_lib", "//platform/statistics/testFramework", "//platform/statistics/testFramework:testFramework_test_lib", + "//platform/statistics/config", + "//platform/statistics/config:config_test_lib", "//platform/platform-impl/bootstrap/eel", "//platform/testFramework/junit5/projectStructure", "//platform/testFramework/junit5/projectStructure:projectStructure_test_lib", @@ -293,10 +300,13 @@ jvm_library( "@lib//:com-jetbrains-fus-reporting-fus-api", "@lib//:com-jetbrains-fus-reporting-ap-validation-all", "//platform/platform-impl/eel:ide-impl-wsl", + "//platform/progress/shared:ide-progress", "//platform/syntax/syntax-psi-tests:psi-tests", "//platform/syntax/syntax-psi-tests:psi-tests_test_lib", "//xml/xml-psi-api:psi", "//xml/xml-psi-api:psi_test_lib", + "//xml/xml-parser:parser", + "//xml/xml-parser:parser_test_lib", "//platform/runtime/product", "//platform/runtime/product:product_test_lib", "//platform/locking-impl", @@ -327,6 +337,7 @@ jvm_library( "//platform/platform-impl:ide-impl_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", "//platform/ide-core/plugins:plugins_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/platform-impl/codeinsight-inline:ide-codeinsight-inline_test_lib", "//platform/platform-impl/bootstrap:bootstrap_test_lib", "//xml/dom-impl:dom-impl_test_lib", @@ -342,6 +353,7 @@ jvm_library( "//platform/platform-impl/bootstrap/eel:eel_test_lib", "//platform/platform-impl/update-checker:update-checker_test_lib", "//platform/platform-impl/eel:ide-impl-wsl_test_lib", + "//platform/progress/shared:ide-progress_test_lib", ] ) ### auto-generated section `build intellij.platform.tests` end diff --git a/platform/platform-tests/intellij.platform.tests.iml b/platform/platform-tests/intellij.platform.tests.iml index d1efd1a61ac1..92938c406870 100644 --- a/platform/platform-tests/intellij.platform.tests.iml +++ b/platform/platform-tests/intellij.platform.tests.iml @@ -45,6 +45,7 @@ + @@ -86,6 +87,7 @@ + @@ -129,6 +131,7 @@ + @@ -146,6 +149,7 @@ + @@ -153,8 +157,10 @@ + + diff --git a/platform/platform-util-io-impl/BUILD.bazel b/platform/platform-util-io-impl/BUILD.bazel index cd831b4aa492..575d330a43de 100644 --- a/platform/platform-util-io-impl/BUILD.bazel +++ b/platform/platform-util-io-impl/BUILD.bazel @@ -18,7 +18,6 @@ jvm_library( "@lib//:jna", "//libraries/jackson3/jackson:libraries-jackson3", ], - exports = ["//platform/platform-util-io:ide-util-io"], runtime_deps = ["//libraries/rhino"] ) @@ -27,10 +26,6 @@ jvm_library( module_name = "intellij.platform.ide.util.io.impl", visibility = ["//visibility:public"], srcs = glob([], allow_empty = True), - exports = [ - "//platform/platform-util-io:ide-util-io", - "//platform/platform-util-io:ide-util-io_test_lib", - ], runtime_deps = [ ":ide-util-io-impl", "//platform/core-api:core_test_lib", diff --git a/platform/platform-util-io-impl/intellij.platform.ide.util.io.impl.iml b/platform/platform-util-io-impl/intellij.platform.ide.util.io.impl.iml index 45ced83fdc9a..f76421c2dbe2 100644 --- a/platform/platform-util-io-impl/intellij.platform.ide.util.io.impl.iml +++ b/platform/platform-util-io-impl/intellij.platform.ide.util.io.impl.iml @@ -10,7 +10,7 @@ - + diff --git a/platform/platform-util-io/BUILD.bazel b/platform/platform-util-io/BUILD.bazel index 9e0cab58c80c..ba3faf3736ab 100644 --- a/platform/platform-util-io/BUILD.bazel +++ b/platform/platform-util-io/BUILD.bazel @@ -20,6 +20,7 @@ jvm_library( "//libraries/fastutil", "//platform/util/base", "//platform/util", + "//platform/util/multiplatform", "@lib//:jna", "//platform/diagnostic", "//platform/eel-provider", @@ -38,6 +39,7 @@ jvm_library( "//libraries/fastutil:fastutil_test_lib", "//platform/util/base:base_test_lib", "//platform/util:util_test_lib", + "//platform/util/multiplatform:multiplatform_test_lib", "//platform/diagnostic:diagnostic_test_lib", "//platform/eel-provider:eel-provider_test_lib", ] diff --git a/platform/platform-util-io/intellij.platform.ide.util.io.iml b/platform/platform-util-io/intellij.platform.ide.util.io.iml index 635446618a84..d3b722459e27 100644 --- a/platform/platform-util-io/intellij.platform.ide.util.io.iml +++ b/platform/platform-util-io/intellij.platform.ide.util.io.iml @@ -14,6 +14,7 @@ + diff --git a/platform/platform-util-netty/BUILD.bazel b/platform/platform-util-netty/BUILD.bazel index b5210f7282a1..39b4584b2ca4 100644 --- a/platform/platform-util-netty/BUILD.bazel +++ b/platform/platform-util-netty/BUILD.bazel @@ -13,6 +13,7 @@ jvm_library( "//libraries/fastutil", "//libraries/netty/buffer", "//platform/util", + "//platform/util/base", "//libraries/netty/codec-http:libraries-netty-codec-http", "//platform/platform-util-io:ide-util-io", "//libraries/kotlinx/coroutines/core", @@ -31,6 +32,7 @@ jvm_library( "//libraries/fastutil:fastutil_test_lib", "//libraries/netty/buffer:buffer_test_lib", "//platform/util:util_test_lib", + "//platform/util/base:base_test_lib", "//libraries/netty/codec-http:libraries-netty-codec-http_test_lib", "//platform/platform-util-io:ide-util-io_test_lib", "//libraries/kotlinx/coroutines/core:core_test_lib", diff --git a/platform/platform-util-netty/intellij.platform.ide.util.netty.iml b/platform/platform-util-netty/intellij.platform.ide.util.netty.iml index 363356c8f813..a6389c021d67 100644 --- a/platform/platform-util-netty/intellij.platform.ide.util.netty.iml +++ b/platform/platform-util-netty/intellij.platform.ide.util.netty.iml @@ -13,6 +13,7 @@ + diff --git a/platform/pluginManager/backend/BUILD.bazel b/platform/pluginManager/backend/BUILD.bazel index e8ba59fea3bf..a6fe00c2e607 100644 --- a/platform/pluginManager/backend/BUILD.bazel +++ b/platform/pluginManager/backend/BUILD.bazel @@ -27,6 +27,7 @@ jvm_library( "//platform/pluginManager/shared", "//platform/project/shared:project", "//platform/platform-impl/update-checker", + "//platform/ide-core", ] ) @@ -49,6 +50,7 @@ jvm_library( "//platform/pluginManager/shared:shared_test_lib", "//platform/project/shared:project_test_lib", "//platform/platform-impl/update-checker:update-checker_test_lib", + "//platform/ide-core:ide-core_test_lib", ] ) ### auto-generated section `build intellij.platform.pluginManager.backend` end diff --git a/platform/pluginManager/backend/intellij.platform.pluginManager.backend.iml b/platform/pluginManager/backend/intellij.platform.pluginManager.backend.iml index c5af3d7ce173..806f5248881d 100644 --- a/platform/pluginManager/backend/intellij.platform.pluginManager.backend.iml +++ b/platform/pluginManager/backend/intellij.platform.pluginManager.backend.iml @@ -46,5 +46,6 @@ + \ No newline at end of file diff --git a/platform/pluginSystem/parser/impl/BUILD.bazel b/platform/pluginSystem/parser/impl/BUILD.bazel index 68aade0f1aea..91e5f99d0271 100644 --- a/platform/pluginSystem/parser/impl/BUILD.bazel +++ b/platform/pluginSystem/parser/impl/BUILD.bazel @@ -12,6 +12,7 @@ jvm_library( "//platform/util/xmlDom", "//libraries/aalto-xml", "//platform/util", + "//platform/util/base/multiplatform", ] ) @@ -26,6 +27,7 @@ jvm_library( "//platform/util/xmlDom:xmlDom_test_lib", "//libraries/aalto-xml:aalto-xml_test_lib", "//platform/util:util_test_lib", + "//platform/util/base/multiplatform:multiplatform_test_lib", "@lib//:junit5", "@lib//:assert_j", ] diff --git a/platform/pluginSystem/parser/impl/intellij.platform.pluginSystem.parser.impl.iml b/platform/pluginSystem/parser/impl/intellij.platform.pluginSystem.parser.impl.iml index e310ab0f7145..cebefdd43fea 100644 --- a/platform/pluginSystem/parser/impl/intellij.platform.pluginSystem.parser.impl.iml +++ b/platform/pluginSystem/parser/impl/intellij.platform.pluginSystem.parser.impl.iml @@ -27,6 +27,7 @@ + diff --git a/platform/polySymbols/BUILD.bazel b/platform/polySymbols/BUILD.bazel index 44e97b8fc1ff..e812977b0980 100644 --- a/platform/polySymbols/BUILD.bazel +++ b/platform/polySymbols/BUILD.bazel @@ -19,6 +19,7 @@ jvm_library( "//platform/indexing-api:indexing", "//platform/lang-impl", "//platform/platform-impl:ide-impl", + "//platform/ide-core", "//platform/core-ui", "//platform/util-ex", "//platform/editor-ui-ex:editor-ex", @@ -34,6 +35,7 @@ jvm_library( "//platform/markdown-utils", "//platform/indexing-impl", "//platform/core-impl", + "//platform/util:util-ui", ] ) @@ -49,6 +51,7 @@ jvm_library( "//platform/indexing-api:indexing_test_lib", "//platform/lang-impl:lang-impl_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/core-ui:core-ui_test_lib", "//platform/util-ex:util-ex_test_lib", "//platform/editor-ui-ex:editor-ex_test_lib", @@ -65,6 +68,7 @@ jvm_library( "//platform/markdown-utils:markdown-utils_test_lib", "//platform/indexing-impl:indexing-impl_test_lib", "//platform/core-impl:core-impl_test_lib", + "//platform/util:util-ui_test_lib", ] ) ### auto-generated section `build intellij.platform.polySymbols` end diff --git a/platform/polySymbols/intellij.platform.polySymbols.iml b/platform/polySymbols/intellij.platform.polySymbols.iml index 4f2dbc9e1c74..b89f351bf35d 100644 --- a/platform/polySymbols/intellij.platform.polySymbols.iml +++ b/platform/polySymbols/intellij.platform.polySymbols.iml @@ -15,6 +15,7 @@ + @@ -31,5 +32,6 @@ + \ No newline at end of file diff --git a/platform/pratt/BUILD.bazel b/platform/pratt/BUILD.bazel index 3401bcd3b533..8de8162e75b9 100644 --- a/platform/pratt/BUILD.bazel +++ b/platform/pratt/BUILD.bazel @@ -17,6 +17,8 @@ jvm_library( "//platform/core-api:core", "@lib//:jetbrains-annotations", "//platform/util", + "//platform/util/multiplatform", + "//platform/util/base", "@lib//:kotlin-stdlib", "//platform/core-impl", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", @@ -32,6 +34,8 @@ jvm_library( ":pratt", "//platform/core-api:core_test_lib", "//platform/util:util_test_lib", + "//platform/util/multiplatform:multiplatform_test_lib", + "//platform/util/base:base_test_lib", "//platform/core-impl:core-impl_test_lib", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", ] diff --git a/platform/pratt/intellij.platform.pratt.iml b/platform/pratt/intellij.platform.pratt.iml index ca0beab4e425..d53758a109b8 100644 --- a/platform/pratt/intellij.platform.pratt.iml +++ b/platform/pratt/intellij.platform.pratt.iml @@ -11,6 +11,8 @@ + + diff --git a/platform/projectModel-api/BUILD.bazel b/platform/projectModel-api/BUILD.bazel index d7a3e49967ee..d2b60ad8d4ed 100644 --- a/platform/projectModel-api/BUILD.bazel +++ b/platform/projectModel-api/BUILD.bazel @@ -24,6 +24,8 @@ jvm_library( "//platform/workspace/jps", "//platform/backend/workspace", "//platform/util/xmlDom", + "//platform/util/multiplatform", + "//platform/util/base", "//platform/eel", "//platform/eel-provider", ] @@ -45,6 +47,8 @@ jvm_library( "//platform/workspace/jps:jps_test_lib", "//platform/backend/workspace:workspace_test_lib", "//platform/util/xmlDom:xmlDom_test_lib", + "//platform/util/multiplatform:multiplatform_test_lib", + "//platform/util/base:base_test_lib", "//platform/eel:eel_test_lib", "//platform/eel-provider:eel-provider_test_lib", ] diff --git a/platform/projectModel-api/intellij.platform.projectModel.iml b/platform/projectModel-api/intellij.platform.projectModel.iml index 786f7ce865d7..59959c19188d 100644 --- a/platform/projectModel-api/intellij.platform.projectModel.iml +++ b/platform/projectModel-api/intellij.platform.projectModel.iml @@ -19,6 +19,8 @@ + + diff --git a/platform/projectModel-impl/BUILD.bazel b/platform/projectModel-impl/BUILD.bazel index 80793b1111bd..7ce8f3cd997f 100644 --- a/platform/projectModel-impl/BUILD.bazel +++ b/platform/projectModel-impl/BUILD.bazel @@ -39,12 +39,10 @@ jvm_library( "//platform/diagnostic", "//platform/eel-provider", "//platform/util/coroutines", + "//platform/util/multiplatform", + "//platform/util/base", "//platform/diagnostic/telemetry-impl", "//platform/analysis-api:analysis", - ], - exports = [ - "//jps/model-serialization", - "//platform/util-ex", ] ) @@ -53,12 +51,6 @@ jvm_library( module_name = "intellij.platform.projectModel.impl", visibility = ["//visibility:public"], srcs = glob([], allow_empty = True), - exports = [ - "//jps/model-serialization", - "//jps/model-serialization:model-serialization_test_lib", - "//platform/util-ex", - "//platform/util-ex:util-ex_test_lib", - ], runtime_deps = [ ":projectModel-impl", "//platform/core-api:core_test_lib", @@ -83,6 +75,8 @@ jvm_library( "//platform/diagnostic:diagnostic_test_lib", "//platform/eel-provider:eel-provider_test_lib", "//platform/util/coroutines:coroutines_test_lib", + "//platform/util/multiplatform:multiplatform_test_lib", + "//platform/util/base:base_test_lib", "//platform/diagnostic/telemetry-impl:telemetry-impl_test_lib", "//platform/analysis-api:analysis_test_lib", ] diff --git a/platform/projectModel-impl/intellij.platform.projectModel.impl.iml b/platform/projectModel-impl/intellij.platform.projectModel.impl.iml index 3b65628326b7..e52a2d330f91 100644 --- a/platform/projectModel-impl/intellij.platform.projectModel.impl.iml +++ b/platform/projectModel-impl/intellij.platform.projectModel.impl.iml @@ -15,10 +15,10 @@ - + - + @@ -34,6 +34,8 @@ + + diff --git a/platform/rd-platform-community/BUILD.bazel b/platform/rd-platform-community/BUILD.bazel index b5b1c40b2aa0..8106ecf1f25e 100644 --- a/platform/rd-platform-community/BUILD.bazel +++ b/platform/rd-platform-community/BUILD.bazel @@ -10,6 +10,7 @@ jvm_library( "@lib//:kotlin-stdlib", "//libraries/kotlinx/coroutines/core", "//platform/platform-api:ide", + "//platform/progress/shared:ide-progress", "//libraries/rd/core", "//libraries/rd/text", "//libraries/rd/swing", @@ -30,6 +31,7 @@ jvm_library( ":rd-community", "//libraries/kotlinx/coroutines/core:core_test_lib", "//platform/platform-api:ide_test_lib", + "//platform/progress/shared:ide-progress_test_lib", "//libraries/rd/core:core_test_lib", "//libraries/rd/text:text_test_lib", "//libraries/rd/swing:swing_test_lib", diff --git a/platform/rd-platform-community/intellij.platform.rd.community.iml b/platform/rd-platform-community/intellij.platform.rd.community.iml index 796026b31799..225852f3a0bf 100644 --- a/platform/rd-platform-community/intellij.platform.rd.community.iml +++ b/platform/rd-platform-community/intellij.platform.rd.community.iml @@ -10,6 +10,7 @@ + diff --git a/platform/recentFiles/backend/BUILD.bazel b/platform/recentFiles/backend/BUILD.bazel index ad4bf4e0935c..0c975c7168c0 100644 --- a/platform/recentFiles/backend/BUILD.bazel +++ b/platform/recentFiles/backend/BUILD.bazel @@ -31,6 +31,7 @@ jvm_library( "//platform/analysis-impl", "//platform/util/jdom", "//platform/ide-core-impl", + "//platform/ide-core", "//platform/kernel/backend", "//platform/statistics", "//platform/platform-impl/rpc", @@ -63,6 +64,7 @@ jvm_library( "//platform/analysis-impl:analysis-impl_test_lib", "//platform/util/jdom:jdom_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/kernel/backend:backend_test_lib", "//platform/statistics:statistics_test_lib", "//platform/platform-impl/rpc:rpc_test_lib", diff --git a/platform/recentFiles/backend/intellij.platform.recentFiles.backend.iml b/platform/recentFiles/backend/intellij.platform.recentFiles.backend.iml index 1479214c6ab1..ffe2d43b5d20 100644 --- a/platform/recentFiles/backend/intellij.platform.recentFiles.backend.iml +++ b/platform/recentFiles/backend/intellij.platform.recentFiles.backend.iml @@ -50,6 +50,7 @@ + diff --git a/platform/remote-core/BUILD.bazel b/platform/remote-core/BUILD.bazel index af90c87c3b26..318dd0b751fa 100644 --- a/platform/remote-core/BUILD.bazel +++ b/platform/remote-core/BUILD.bazel @@ -20,6 +20,7 @@ jvm_library( "//platform/util/jdom", "//platform/platform-util-io:ide-util-io", "//platform/util", + "//platform/util/multiplatform", "//platform/projectModel-api:projectModel", "@lib//:kotlin-stdlib", "//libraries/kotlin/reflect", @@ -44,6 +45,7 @@ jvm_library( "//platform/util/jdom:jdom_test_lib", "//platform/platform-util-io:ide-util-io_test_lib", "//platform/util:util_test_lib", + "//platform/util/multiplatform:multiplatform_test_lib", "//platform/projectModel-api:projectModel_test_lib", "//libraries/kotlin/reflect:reflect_test_lib", "//libraries/guava:guava_test_lib", diff --git a/platform/remote-core/intellij.platform.remote.core.iml b/platform/remote-core/intellij.platform.remote.core.iml index b4568d0acd66..643746d52491 100644 --- a/platform/remote-core/intellij.platform.remote.core.iml +++ b/platform/remote-core/intellij.platform.remote.core.iml @@ -14,6 +14,7 @@ + diff --git a/platform/remote-driver/core/BUILD.bazel b/platform/remote-driver/core/BUILD.bazel index 8628e29cb7fb..e150a8d430db 100644 --- a/platform/remote-driver/core/BUILD.bazel +++ b/platform/remote-driver/core/BUILD.bazel @@ -20,6 +20,7 @@ jvm_library( "//platform/core-impl", "//platform/diagnostic/telemetry", "//platform/util", + "//platform/util/base", "@lib//:opentelemetry", "@lib//:opentelemetry-semconv", "//libraries/commons/lang3", @@ -38,6 +39,7 @@ jvm_library( "//platform/core-impl:core-impl_test_lib", "//platform/diagnostic/telemetry:telemetry_test_lib", "//platform/util:util_test_lib", + "//platform/util/base:base_test_lib", "//libraries/commons/lang3:lang3_test_lib", ] ) diff --git a/platform/remote-driver/core/intellij.driver.impl.iml b/platform/remote-driver/core/intellij.driver.impl.iml index 0b2cac00a9e2..5c8692064673 100644 --- a/platform/remote-driver/core/intellij.driver.impl.iml +++ b/platform/remote-driver/core/intellij.driver.impl.iml @@ -14,6 +14,7 @@ + diff --git a/platform/remote-servers/impl/BUILD.bazel b/platform/remote-servers/impl/BUILD.bazel index 92a48b1779b7..9d59ae894d29 100644 --- a/platform/remote-servers/impl/BUILD.bazel +++ b/platform/remote-servers/impl/BUILD.bazel @@ -22,6 +22,7 @@ jvm_library( "//jps/model-api:model", "//platform/lang-core", "//platform/projectModel-api:projectModel", + "//platform/platform-util-io:ide-util-io", "//platform/remote-servers/api:remoteServers", "//platform/core-impl", "//platform/forms_rt:java-guiForms-rt", @@ -32,9 +33,11 @@ jvm_library( "//libraries/fastutil", "//platform/core-ui", "//platform/platform-util-io-impl:ide-util-io-impl", + "//platform/ide-core", "//platform/util/jdom", "//platform/util-ex", "//platform/execution", + "//platform/util:util-ui", ] ) @@ -53,6 +56,7 @@ jvm_library( "//jps/model-api:model_test_lib", "//platform/lang-core:lang-core_test_lib", "//platform/projectModel-api:projectModel_test_lib", + "//platform/platform-util-io:ide-util-io_test_lib", "//platform/remote-servers/api:remoteServers_test_lib", "//platform/core-impl:core-impl_test_lib", "//platform/forms_rt:java-guiForms-rt_test_lib", @@ -63,9 +67,11 @@ jvm_library( "//libraries/fastutil:fastutil_test_lib", "//platform/core-ui:core-ui_test_lib", "//platform/platform-util-io-impl:ide-util-io-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/util/jdom:jdom_test_lib", "//platform/util-ex:util-ex_test_lib", "//platform/execution:execution_test_lib", + "//platform/util:util-ui_test_lib", ] ) ### auto-generated section `build intellij.platform.remoteServers.impl` end diff --git a/platform/remote-servers/impl/intellij.platform.remoteServers.impl.iml b/platform/remote-servers/impl/intellij.platform.remoteServers.impl.iml index 99f8909a8cf7..662864023731 100644 --- a/platform/remote-servers/impl/intellij.platform.remoteServers.impl.iml +++ b/platform/remote-servers/impl/intellij.platform.remoteServers.impl.iml @@ -16,6 +16,7 @@ + @@ -26,8 +27,10 @@ + + \ No newline at end of file diff --git a/platform/remote-servers/target-integration-tests/BUILD.bazel b/platform/remote-servers/target-integration-tests/BUILD.bazel index 2a02eb09a328..9066c22b808d 100644 --- a/platform/remote-servers/target-integration-tests/BUILD.bazel +++ b/platform/remote-servers/target-integration-tests/BUILD.bazel @@ -41,6 +41,8 @@ jvm_library( "//jps/model-api:model_test_lib", "//platform/lang-core", "//platform/lang-core:lang-core_test_lib", + "//platform/lang-api:lang", + "//platform/lang-api:lang_test_lib", "//platform/projectModel-api:projectModel", "//platform/projectModel-api:projectModel_test_lib", "//platform/testFramework", @@ -56,6 +58,10 @@ jvm_library( "//java/testFramework:testFramework_test_lib", "//platform/core-ui", "//platform/core-ui:core-ui_test_lib", + "//java/java-syntax:syntax", + "//java/java-syntax:syntax_test_lib", + "//java/java-psi-api:psi", + "//java/java-psi-api:psi_test_lib", "//platform/smRunner", "//platform/smRunner:smRunner_test_lib", "//plugins/junit", @@ -64,10 +70,18 @@ jvm_library( "//java/java-tests:tests_test_lib", "//platform/util/jdom", "//platform/util/jdom:jdom_test_lib", + "//platform/util-ex", + "//platform/util-ex:util-ex_test_lib", "//platform/execution", "//platform/execution:execution_test_lib", + "//platform/ide-core", + "//platform/testRunner", + "//platform/testRunner:testRunner_test_lib", ], - runtime_deps = [":remoteServers-targetsIntegrationTests"] + runtime_deps = [ + ":remoteServers-targetsIntegrationTests", + "//platform/ide-core:ide-core_test_lib", + ] ) ### auto-generated section `build intellij.platform.remoteServers.targetsIntegrationTests` end diff --git a/platform/remote-servers/target-integration-tests/intellij.platform.remoteServers.targetsIntegrationTests.iml b/platform/remote-servers/target-integration-tests/intellij.platform.remoteServers.targetsIntegrationTests.iml index f2595e3c2aae..ef72825391e5 100644 --- a/platform/remote-servers/target-integration-tests/intellij.platform.remoteServers.targetsIntegrationTests.iml +++ b/platform/remote-servers/target-integration-tests/intellij.platform.remoteServers.targetsIntegrationTests.iml @@ -17,6 +17,7 @@ + @@ -25,10 +26,15 @@ + + + + + \ No newline at end of file diff --git a/platform/remoteDev-util/BUILD.bazel b/platform/remoteDev-util/BUILD.bazel index 616e01189f72..a22d0622d336 100644 --- a/platform/remoteDev-util/BUILD.bazel +++ b/platform/remoteDev-util/BUILD.bazel @@ -20,6 +20,7 @@ jvm_library( "//platform/editor-ui-api:editor-ui", "//platform/projectModel-api:projectModel", "//platform/util", + "//platform/util:util-ui", "//platform/core-api:core", "//platform/platform-api:ide", "//platform/platform-util-io:ide-util-io", @@ -41,6 +42,7 @@ jvm_library( "//platform/core-ui", "//libraries/kotlin/reflect", "//platform/ide-core-impl", + "//platform/ide-core", "@lib//:rd-gen", "@lib//:opentelemetry", "@lib//:opentelemetry-semconv", @@ -50,6 +52,7 @@ jvm_library( "//platform/diagnostic", "//platform/bootstrap", "//platform/platform-impl/ui", + "//platform/progress/shared:ide-progress", "//platform/welcome-screen-impl:welcomeScreen-impl", "//platform/lang-core", "//platform/runtime/repository", @@ -72,6 +75,7 @@ jvm_library( "//platform/editor-ui-api:editor-ui_test_lib", "//platform/projectModel-api:projectModel_test_lib", "//platform/util:util_test_lib", + "//platform/util:util-ui_test_lib", "//platform/core-api:core_test_lib", "//platform/platform-api:ide_test_lib", "//platform/platform-util-io:ide-util-io_test_lib", @@ -95,12 +99,14 @@ jvm_library( "//platform/core-ui:core-ui_test_lib", "//libraries/kotlin/reflect:reflect_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/diagnostic/telemetry:telemetry_test_lib", "//platform/diagnostic/telemetry.exporters:telemetry.exporters_test_lib", "//platform/diagnostic/telemetry-impl:telemetry-impl_test_lib", "//platform/diagnostic:diagnostic_test_lib", "//platform/bootstrap:bootstrap_test_lib", "//platform/platform-impl/ui:ui_test_lib", + "//platform/progress/shared:ide-progress_test_lib", "//platform/welcome-screen-impl:welcomeScreen-impl_test_lib", "//platform/lang-core:lang-core_test_lib", "//platform/runtime/repository:repository_test_lib", diff --git a/platform/remoteDev-util/intellij.remoteDev.util.iml b/platform/remoteDev-util/intellij.remoteDev.util.iml index 5b83dd338fd2..4f78961efead 100644 --- a/platform/remoteDev-util/intellij.remoteDev.util.iml +++ b/platform/remoteDev-util/intellij.remoteDev.util.iml @@ -37,6 +37,7 @@ + @@ -61,6 +62,7 @@ + @@ -70,6 +72,7 @@ + diff --git a/platform/script-debugger/debugger-ui/BUILD.bazel b/platform/script-debugger/debugger-ui/BUILD.bazel index 00f84480a346..70bb3cde3b6f 100644 --- a/platform/script-debugger/debugger-ui/BUILD.bazel +++ b/platform/script-debugger/debugger-ui/BUILD.bazel @@ -33,6 +33,7 @@ jvm_library( "//platform/projectModel-api:projectModel", "//platform/platform-util-io:ide-util-io", "//platform/platform-util-netty:ide-util-netty", + "//platform/ide-core", "//platform/util/jdom", "//platform/execution", ] @@ -65,6 +66,7 @@ jvm_library( "//platform/projectModel-api:projectModel_test_lib", "//platform/platform-util-io:ide-util-io_test_lib", "//platform/platform-util-netty:ide-util-netty_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/util/jdom:jdom_test_lib", "//platform/execution:execution_test_lib", ] diff --git a/platform/script-debugger/debugger-ui/intellij.platform.scriptDebugger.ui.iml b/platform/script-debugger/debugger-ui/intellij.platform.scriptDebugger.ui.iml index 1f66fd84fe17..a96194e9a131 100644 --- a/platform/script-debugger/debugger-ui/intellij.platform.scriptDebugger.ui.iml +++ b/platform/script-debugger/debugger-ui/intellij.platform.scriptDebugger.ui.iml @@ -28,6 +28,7 @@ + diff --git a/platform/searchEverywhere/backend/BUILD.bazel b/platform/searchEverywhere/backend/BUILD.bazel index a9aba47ddd9e..bf65fc62bacf 100644 --- a/platform/searchEverywhere/backend/BUILD.bazel +++ b/platform/searchEverywhere/backend/BUILD.bazel @@ -26,6 +26,7 @@ jvm_library( "//platform/core-impl", "//platform/platform-impl/rpc", "//platform/core-ui", + "//platform/util:util-ui", "//platform/editor-ui-api:editor-ui", "//platform/usageView", "//platform/util/text-matching", @@ -36,6 +37,8 @@ jvm_library( "//platform/scopes", "//platform/projectModel-api:projectModel", "//platform/platform-api:ide", + "//platform/ide-core", + "//platform/progress/shared:ide-progress", "//platform/lang-api:lang", ], runtime_deps = ["//platform/backend"] @@ -59,6 +62,7 @@ jvm_library( "//platform/backend:backend_test_lib", "//platform/platform-impl/rpc:rpc_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/util:util-ui_test_lib", "//platform/editor-ui-api:editor-ui_test_lib", "//platform/usageView:usageView_test_lib", "//platform/util/text-matching:text-matching_test_lib", @@ -69,6 +73,8 @@ jvm_library( "//platform/scopes:scopes_test_lib", "//platform/projectModel-api:projectModel_test_lib", "//platform/platform-api:ide_test_lib", + "//platform/ide-core:ide-core_test_lib", + "//platform/progress/shared:ide-progress_test_lib", "//platform/lang-api:lang_test_lib", ] ) diff --git a/platform/searchEverywhere/backend/intellij.platform.searchEverywhere.backend.iml b/platform/searchEverywhere/backend/intellij.platform.searchEverywhere.backend.iml index d79757c25c31..eb1e65a575f1 100644 --- a/platform/searchEverywhere/backend/intellij.platform.searchEverywhere.backend.iml +++ b/platform/searchEverywhere/backend/intellij.platform.searchEverywhere.backend.iml @@ -46,6 +46,7 @@ + @@ -56,6 +57,8 @@ + + \ No newline at end of file diff --git a/platform/searchEverywhere/frontend/BUILD.bazel b/platform/searchEverywhere/frontend/BUILD.bazel index f0708de7f6ec..1c63fdde7e9a 100644 --- a/platform/searchEverywhere/frontend/BUILD.bazel +++ b/platform/searchEverywhere/frontend/BUILD.bazel @@ -38,6 +38,8 @@ jvm_library( "//platform/observable", "//platform/usageView-impl", "//platform/analysis-api:analysis", + "//platform/util:util-ui", + "//platform/statistics", ], exports = ["//platform/searchEverywhere/shared:searchEverywhere"] ) @@ -75,6 +77,8 @@ jvm_library( "//platform/observable:observable_test_lib", "//platform/usageView-impl:usageView-impl_test_lib", "//platform/analysis-api:analysis_test_lib", + "//platform/util:util-ui_test_lib", + "//platform/statistics:statistics_test_lib", ] ) ### auto-generated section `build intellij.platform.searchEverywhere.frontend` end diff --git a/platform/searchEverywhere/frontend/intellij.platform.searchEverywhere.frontend.iml b/platform/searchEverywhere/frontend/intellij.platform.searchEverywhere.frontend.iml index e3eeff1b38bf..dabea2b33fb7 100644 --- a/platform/searchEverywhere/frontend/intellij.platform.searchEverywhere.frontend.iml +++ b/platform/searchEverywhere/frontend/intellij.platform.searchEverywhere.frontend.iml @@ -57,5 +57,7 @@ + + \ No newline at end of file diff --git a/platform/searchEverywhere/shared/BUILD.bazel b/platform/searchEverywhere/shared/BUILD.bazel index 9a97045cdd60..f7d7e22acf53 100644 --- a/platform/searchEverywhere/shared/BUILD.bazel +++ b/platform/searchEverywhere/shared/BUILD.bazel @@ -27,6 +27,8 @@ jvm_library( "//platform/core-ui", "//platform/editor-ui-api:editor-ui", "//platform/platform-impl/rpc", + "//platform/ide-core", + "//platform/util:util-ui", "//platform/util/text-matching", "//platform/usageView", "//platform/execution-impl", @@ -35,10 +37,7 @@ jvm_library( "//platform/execution", "//platform/lang-api:lang", ], - exports = [ - "//platform/lang-impl", - "//platform/statistics", - ] + exports = ["//platform/lang-impl"] ) jvm_library( @@ -49,8 +48,6 @@ jvm_library( exports = [ "//platform/lang-impl", "//platform/lang-impl:lang-impl_test_lib", - "//platform/statistics", - "//platform/statistics:statistics_test_lib", ], runtime_deps = [ ":searchEverywhere", @@ -65,6 +62,8 @@ jvm_library( "//platform/core-ui:core-ui_test_lib", "//platform/editor-ui-api:editor-ui_test_lib", "//platform/platform-impl/rpc:rpc_test_lib", + "//platform/ide-core:ide-core_test_lib", + "//platform/util:util-ui_test_lib", "//platform/util/text-matching:text-matching_test_lib", "//platform/usageView:usageView_test_lib", "//platform/execution-impl:execution-impl_test_lib", diff --git a/platform/searchEverywhere/shared/intellij.platform.searchEverywhere.iml b/platform/searchEverywhere/shared/intellij.platform.searchEverywhere.iml index c291675c6ce8..ad616b7c2ec1 100644 --- a/platform/searchEverywhere/shared/intellij.platform.searchEverywhere.iml +++ b/platform/searchEverywhere/shared/intellij.platform.searchEverywhere.iml @@ -46,10 +46,12 @@ + + - + diff --git a/platform/service-container/BUILD.bazel b/platform/service-container/BUILD.bazel index b09eff5dcf21..cb2f0dfc82f6 100644 --- a/platform/service-container/BUILD.bazel +++ b/platform/service-container/BUILD.bazel @@ -28,6 +28,8 @@ jvm_library( "//platform/util/coroutines", "//libraries/asm", "//platform/util-class-loader:util-classLoader", + "//platform/util/multiplatform", + "//platform/util/base", ] ) @@ -55,6 +57,8 @@ jvm_library( "//libraries/junit5:junit5_test_lib", "//libraries/asm:asm_test_lib", "//platform/util-class-loader:util-classLoader_test_lib", + "//platform/util/multiplatform:multiplatform_test_lib", + "//platform/util/base:base_test_lib", ] ) ### auto-generated section `build intellij.platform.serviceContainer` end diff --git a/platform/service-container/intellij.platform.serviceContainer.iml b/platform/service-container/intellij.platform.serviceContainer.iml index 458a379e8af2..0ad894c8f307 100644 --- a/platform/service-container/intellij.platform.serviceContainer.iml +++ b/platform/service-container/intellij.platform.serviceContainer.iml @@ -25,5 +25,7 @@ + + \ No newline at end of file diff --git a/platform/settings-local/BUILD.bazel b/platform/settings-local/BUILD.bazel index f7471767558e..8c2d76f93913 100644 --- a/platform/settings-local/BUILD.bazel +++ b/platform/settings-local/BUILD.bazel @@ -43,6 +43,7 @@ jvm_library( "//platform/util/jdom", "//platform/util/xmlDom", "//platform/util", + "//platform/util-ex", "//platform/object-serializer", "//libraries/kotlinx/serialization/json", "//libraries/aalto-xml", @@ -72,6 +73,7 @@ jvm_library( "//platform/util/jdom:jdom_test_lib", "//platform/util/xmlDom:xmlDom_test_lib", "//platform/util:util_test_lib", + "//platform/util-ex:util-ex_test_lib", "//platform/object-serializer:object-serializer_test_lib", "//libraries/kotlinx/serialization/json:json_test_lib", "//libraries/aalto-xml:aalto-xml_test_lib", diff --git a/platform/settings-local/intellij.platform.settings.local.iml b/platform/settings-local/intellij.platform.settings.local.iml index bcf0a2f2fe45..ba933ec6834a 100644 --- a/platform/settings-local/intellij.platform.settings.local.iml +++ b/platform/settings-local/intellij.platform.settings.local.iml @@ -66,6 +66,7 @@ + diff --git a/platform/settings-sync-core/BUILD.bazel b/platform/settings-sync-core/BUILD.bazel index e882ffc10c57..10f3ef355e3a 100644 --- a/platform/settings-sync-core/BUILD.bazel +++ b/platform/settings-sync-core/BUILD.bazel @@ -33,8 +33,11 @@ jvm_library( "//platform/util/progress", "//platform/lang-impl", "//platform/util/jdom", + "//platform/util:util-ui", + "//platform/util-ex", "//platform/core-ui", "//platform/ide-core-impl", + "//platform/ide-core", "//libraries/jackson3/jackson:libraries-jackson3", "//libraries/jackson3/databind", "//libraries/jackson3/module-kotlin:libraries-jackson3-module-kotlin", @@ -44,6 +47,7 @@ jvm_library( "//platform/workspace/jps", "//platform/editor-ui-ex:editor-ex", "//platform/observable", + "//platform/progress/shared:ide-progress", "//plugins/git4idea:vcs-git", "//platform/vcs-api:vcs", "//platform/dvcs-impl:vcs-dvcs-impl", @@ -85,8 +89,11 @@ jvm_library( "//platform/util/progress:progress_test_lib", "//platform/lang-impl:lang-impl_test_lib", "//platform/util/jdom:jdom_test_lib", + "//platform/util:util-ui_test_lib", + "//platform/util-ex:util-ex_test_lib", "//platform/core-ui:core-ui_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//libraries/jackson3/jackson:libraries-jackson3_test_lib", "//libraries/jackson3/databind:databind_test_lib", "//libraries/jackson3/module-kotlin:libraries-jackson3-module-kotlin_test_lib", @@ -104,6 +111,7 @@ jvm_library( "//libraries/mockito", "//libraries/mockito:mockito_test_lib", "//platform/observable:observable_test_lib", + "//platform/progress/shared:ide-progress_test_lib", "//plugins/git4idea:vcs-git_test_lib", "//platform/vcs-api:vcs_test_lib", "//platform/dvcs-impl:vcs-dvcs-impl_test_lib", @@ -192,9 +200,12 @@ jvm_library( "//platform/lang-impl:lang-impl_test_lib", "//platform/util/jdom", "//platform/util/jdom:jdom_test_lib", + "//platform/util-ex", + "//platform/util-ex:util-ex_test_lib", "//platform/core-ui", "//platform/core-ui:core-ui_test_lib", "//platform/ide-core-impl", + "//platform/ide-core", "//libraries/jackson3/jackson:libraries-jackson3", "//libraries/jackson3/jackson:libraries-jackson3_test_lib", "//libraries/jackson3/databind", @@ -253,6 +264,7 @@ jvm_library( ":settingsSync-core-tests", "//platform/platform-impl:ide-impl_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/observable:observable_test_lib", ] ) diff --git a/platform/settings-sync-core/intellij.settingsSync.core.iml b/platform/settings-sync-core/intellij.settingsSync.core.iml index f973b30e7d17..64a332051253 100644 --- a/platform/settings-sync-core/intellij.settingsSync.core.iml +++ b/platform/settings-sync-core/intellij.settingsSync.core.iml @@ -51,8 +51,11 @@ + + + @@ -66,6 +69,7 @@ + diff --git a/platform/settings-sync-core/intellij.settingsSync.core.tests.iml b/platform/settings-sync-core/intellij.settingsSync.core.tests.iml index c4af565d39b2..8f9fba1ee9ba 100644 --- a/platform/settings-sync-core/intellij.settingsSync.core.tests.iml +++ b/platform/settings-sync-core/intellij.settingsSync.core.tests.iml @@ -50,8 +50,10 @@ + + diff --git a/platform/smRunner/BUILD.bazel b/platform/smRunner/BUILD.bazel index 9fde1691ec55..c4c6e332cc02 100644 --- a/platform/smRunner/BUILD.bazel +++ b/platform/smRunner/BUILD.bazel @@ -31,15 +31,14 @@ jvm_library( "//libraries/fastutil", "//platform/core-ui", "//platform/ide-core-impl", + "//platform/ide-core", "//platform/platform-util-io:ide-util-io", "//platform/util/jdom", + "//platform/util:util-ui", "//platform/execution", "//platform/code-style-api:codeStyle", ], - exports = [ - "//platform/testRunner", - "@lib//:tc_service_messages", - ] + exports = ["@lib//:tc_service_messages"] ) jvm_library( @@ -47,11 +46,7 @@ jvm_library( module_name = "intellij.platform.smRunner", visibility = ["//visibility:public"], srcs = glob([], allow_empty = True), - exports = [ - "//platform/testRunner", - "//platform/testRunner:testRunner_test_lib", - "@lib//:tc_service_messages", - ], + exports = ["@lib//:tc_service_messages"], runtime_deps = [ ":smRunner", "//platform/analysis-api:analysis_test_lib", @@ -77,8 +72,10 @@ jvm_library( "//libraries/fastutil:fastutil_test_lib", "//platform/core-ui:core-ui_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/platform-util-io:ide-util-io_test_lib", "//platform/util/jdom:jdom_test_lib", + "//platform/util:util-ui_test_lib", "//platform/diff-api:diff", "//platform/diff-api:diff_test_lib", "//tools/intellij.tools.ide.metrics.benchmark:ide-metrics-benchmark", @@ -101,10 +98,7 @@ jvm_library( module_name = "intellij.platform.smRunner.tests", visibility = ["//visibility:public"], srcs = glob([], allow_empty = True), - exports = [ - "//platform/testRunner", - "@lib//:tc_service_messages", - ] + exports = ["@lib//:tc_service_messages"] ) jvm_library( @@ -153,9 +147,12 @@ jvm_library( "//platform/core-ui", "//platform/core-ui:core-ui_test_lib", "//platform/ide-core-impl", + "//platform/ide-core", "//platform/platform-util-io:ide-util-io", "//platform/util/jdom", "//platform/util/jdom:jdom_test_lib", + "//platform/util:util-ui", + "//platform/util:util-ui_test_lib", "//platform/diff-api:diff", "//platform/diff-api:diff_test_lib", "//tools/intellij.tools.ide.metrics.benchmark:ide-metrics-benchmark", @@ -165,16 +162,13 @@ jvm_library( "//platform/code-style-api:codeStyle", "//platform/code-style-api:codeStyle_test_lib", ], - exports = [ - "//platform/testRunner", - "//platform/testRunner:testRunner_test_lib", - "@lib//:tc_service_messages", - ], + exports = ["@lib//:tc_service_messages"], runtime_deps = [ ":smRunner-tests", "//platform/platform-impl:ide-impl_test_lib", "//platform/platform-impl/concurrency:concurrency_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/platform-util-io:ide-util-io_test_lib", ] ) diff --git a/platform/smRunner/intellij.platform.smRunner.iml b/platform/smRunner/intellij.platform.smRunner.iml index a5931b5888c9..5cb1056ec4ab 100644 --- a/platform/smRunner/intellij.platform.smRunner.iml +++ b/platform/smRunner/intellij.platform.smRunner.iml @@ -18,7 +18,7 @@ - + @@ -30,8 +30,10 @@ + + diff --git a/platform/smRunner/intellij.platform.smRunner.tests.iml b/platform/smRunner/intellij.platform.smRunner.tests.iml index 9b0f73de9d26..7992beba43f7 100644 --- a/platform/smRunner/intellij.platform.smRunner.tests.iml +++ b/platform/smRunner/intellij.platform.smRunner.tests.iml @@ -17,7 +17,7 @@ - + @@ -29,8 +29,10 @@ + + diff --git a/platform/smRunner/vcs/BUILD.bazel b/platform/smRunner/vcs/BUILD.bazel index 18d6f006f244..3c8f26c3b5ba 100644 --- a/platform/smRunner/vcs/BUILD.bazel +++ b/platform/smRunner/vcs/BUILD.bazel @@ -29,9 +29,12 @@ jvm_library( "//platform/vcs-impl", "//libraries/kotlinx/coroutines/core", "//platform/ide-core-impl", + "//platform/ide-core", "//platform/util/progress", + "//platform/util:util-ui", "//platform/lang-impl", "//platform/execution", + "//platform/testRunner", ] ) @@ -56,9 +59,12 @@ jvm_library( "//platform/vcs-impl:vcs-impl_test_lib", "//libraries/kotlinx/coroutines/core:core_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/util/progress:progress_test_lib", + "//platform/util:util-ui_test_lib", "//platform/lang-impl:lang-impl_test_lib", "//platform/execution:execution_test_lib", + "//platform/testRunner:testRunner_test_lib", ] ) ### auto-generated section `build intellij.platform.smRunner.vcs` end diff --git a/platform/smRunner/vcs/intellij.platform.smRunner.vcs.iml b/platform/smRunner/vcs/intellij.platform.smRunner.vcs.iml index 57d029644ca0..6d3e2a4ffaa5 100644 --- a/platform/smRunner/vcs/intellij.platform.smRunner.vcs.iml +++ b/platform/smRunner/vcs/intellij.platform.smRunner.vcs.iml @@ -23,8 +23,11 @@ + + + \ No newline at end of file diff --git a/platform/smart-update/BUILD.bazel b/platform/smart-update/BUILD.bazel index 134e833f7cee..34ce68770c14 100644 --- a/platform/smart-update/BUILD.bazel +++ b/platform/smart-update/BUILD.bazel @@ -19,6 +19,7 @@ jvm_library( "//platform/lang-api:lang", "//platform/editor-ui-api:editor-ui", "//platform/ide-core-impl", + "//platform/ide-core", "//platform/projectModel-api:projectModel", "//platform/core-impl", "//platform/vcs-impl", @@ -30,6 +31,7 @@ jvm_library( "//platform/statistics", "//platform/platform-impl/update-checker", "//platform/platform-impl/ui", + "//platform/util:util-ui", ] ) @@ -44,6 +46,7 @@ jvm_library( "//platform/lang-api:lang_test_lib", "//platform/editor-ui-api:editor-ui_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/projectModel-api:projectModel_test_lib", "//platform/core-impl:core-impl_test_lib", "//platform/vcs-impl:vcs-impl_test_lib", @@ -55,6 +58,7 @@ jvm_library( "//platform/statistics:statistics_test_lib", "//platform/platform-impl/update-checker:update-checker_test_lib", "//platform/platform-impl/ui:ui_test_lib", + "//platform/util:util-ui_test_lib", ] ) ### auto-generated section `build intellij.smart.update` end diff --git a/platform/smart-update/intellij.smart.update.iml b/platform/smart-update/intellij.smart.update.iml index bb2ea8458bd3..99da9598f29a 100644 --- a/platform/smart-update/intellij.smart.update.iml +++ b/platform/smart-update/intellij.smart.update.iml @@ -13,6 +13,7 @@ + @@ -24,5 +25,6 @@ + \ No newline at end of file diff --git a/platform/statistics/BUILD.bazel b/platform/statistics/BUILD.bazel index d9ecffdc3396..6dfe9b947800 100644 --- a/platform/statistics/BUILD.bazel +++ b/platform/statistics/BUILD.bazel @@ -20,6 +20,7 @@ jvm_library( "@lib//:jetbrains-annotations", "//platform/util/jdom", "//platform/statistics/uploader", + "//platform/statistics/config", "//libraries/fastutil", "//platform/util/concurrency", "//platform/core-ui", @@ -28,6 +29,8 @@ jvm_library( "//platform/runtime/product", "//platform/platform-util-io:ide-util-io", "//platform/util-ex", + "//platform/util/multiplatform", + "//platform/util/base", "//libraries/caffeine", "//platform/editor-ui-api:editor-ui", "//platform/ide-core", @@ -69,6 +72,7 @@ jvm_library( "//platform/core-impl:core-impl_test_lib", "//platform/util/jdom:jdom_test_lib", "//platform/statistics/uploader:uploader_test_lib", + "//platform/statistics/config:config_test_lib", "//libraries/fastutil:fastutil_test_lib", "//platform/util/concurrency:concurrency_test_lib", "//platform/core-ui:core-ui_test_lib", @@ -76,6 +80,8 @@ jvm_library( "//platform/runtime/product:product_test_lib", "//platform/platform-util-io:ide-util-io_test_lib", "//platform/util-ex:util-ex_test_lib", + "//platform/util/multiplatform:multiplatform_test_lib", + "//platform/util/base:base_test_lib", "//libraries/caffeine:caffeine_test_lib", "//platform/editor-ui-api:editor-ui_test_lib", "//platform/ide-core:ide-core_test_lib", diff --git a/platform/statistics/devkit/BUILD.bazel b/platform/statistics/devkit/BUILD.bazel index f6e68e1fc969..8640fdf24a53 100644 --- a/platform/statistics/devkit/BUILD.bazel +++ b/platform/statistics/devkit/BUILD.bazel @@ -21,6 +21,8 @@ jvm_library( "//platform/editor-ui-api:editor-ui", "//platform/platform-api:ide", "//platform/platform-impl:ide-impl", + "//platform/ide-core", + "//platform/progress/shared:ide-progress", "//platform/lang-api:lang", "//platform/lang-impl", "//platform/execution-impl", @@ -31,6 +33,7 @@ jvm_library( "//json/backend", "//platform/core-ui", "//platform/statistics/uploader", + "//platform/statistics/config", "//libraries/kotlinx/coroutines/core", "//platform/core-impl", "//libraries/jackson/jackson", @@ -38,6 +41,7 @@ jvm_library( "//libraries/jackson3/jackson:libraries-jackson3", "//libraries/jackson3/databind", "//platform/util/jdom", + "//platform/util:util-ui", "//platform/execution", "//platform/forms_rt:java-guiForms-rt", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", @@ -58,6 +62,8 @@ jvm_library( "//platform/editor-ui-api:editor-ui_test_lib", "//platform/platform-api:ide_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", + "//platform/progress/shared:ide-progress_test_lib", "//platform/lang-api:lang_test_lib", "//platform/lang-impl:lang-impl_test_lib", "//platform/execution-impl:execution-impl_test_lib", @@ -70,6 +76,7 @@ jvm_library( "//json/backend:backend_test_lib", "//platform/core-ui:core-ui_test_lib", "//platform/statistics/uploader:uploader_test_lib", + "//platform/statistics/config:config_test_lib", "//libraries/kotlinx/coroutines/core:core_test_lib", "//platform/core-impl:core-impl_test_lib", "//libraries/jackson/jackson:jackson_test_lib", @@ -77,6 +84,7 @@ jvm_library( "//libraries/jackson3/jackson:libraries-jackson3_test_lib", "//libraries/jackson3/databind:databind_test_lib", "//platform/util/jdom:jdom_test_lib", + "//platform/util:util-ui_test_lib", "//platform/execution:execution_test_lib", "//platform/forms_rt:java-guiForms-rt_test_lib", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", @@ -120,6 +128,7 @@ jvm_library( "//platform/platform-api:ide", "//platform/platform-api:ide_test_lib", "//platform/platform-impl:ide-impl", + "//platform/ide-core", "//platform/lang-api:lang", "//platform/lang-api:lang_test_lib", "//platform/lang-impl", @@ -168,6 +177,7 @@ jvm_library( runtime_deps = [ ":devkit-tests", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", ] ) ### auto-generated section `build intellij.platform.statistics.devkit.tests` end diff --git a/platform/statistics/devkit/intellij.platform.statistics.devkit.iml b/platform/statistics/devkit/intellij.platform.statistics.devkit.iml index 1e18b550b73b..c4252918874d 100644 --- a/platform/statistics/devkit/intellij.platform.statistics.devkit.iml +++ b/platform/statistics/devkit/intellij.platform.statistics.devkit.iml @@ -15,6 +15,8 @@ + + @@ -26,6 +28,7 @@ + @@ -33,6 +36,7 @@ + diff --git a/platform/statistics/devkit/intellij.platform.statistics.devkit.tests.iml b/platform/statistics/devkit/intellij.platform.statistics.devkit.tests.iml index 5300ad5d0e96..ae8b5a3f4c2d 100644 --- a/platform/statistics/devkit/intellij.platform.statistics.devkit.tests.iml +++ b/platform/statistics/devkit/intellij.platform.statistics.devkit.tests.iml @@ -14,6 +14,7 @@ + diff --git a/platform/statistics/envTests/BUILD.bazel b/platform/statistics/envTests/BUILD.bazel index 8895ee389eeb..a5f115df4e73 100644 --- a/platform/statistics/envTests/BUILD.bazel +++ b/platform/statistics/envTests/BUILD.bazel @@ -43,6 +43,8 @@ jvm_library( "//platform/core-ui:core-ui_test_lib", "//platform/statistics/uploader", "//platform/statistics/uploader:uploader_test_lib", + "//platform/statistics/config", + "//platform/statistics/config:config_test_lib", "//libraries/jackson/jackson", "//libraries/jackson/jackson:jackson_test_lib", "//libraries/jackson/databind", diff --git a/platform/statistics/envTests/intellij.platform.statistics.envTests.iml b/platform/statistics/envTests/intellij.platform.statistics.envTests.iml index 370a19420d22..331778a14fcb 100644 --- a/platform/statistics/envTests/intellij.platform.statistics.envTests.iml +++ b/platform/statistics/envTests/intellij.platform.statistics.envTests.iml @@ -17,6 +17,7 @@ + diff --git a/platform/statistics/intellij.platform.statistics.iml b/platform/statistics/intellij.platform.statistics.iml index f45ebdfe96c1..a3a619b4f3c9 100644 --- a/platform/statistics/intellij.platform.statistics.iml +++ b/platform/statistics/intellij.platform.statistics.iml @@ -14,6 +14,7 @@ + @@ -22,6 +23,8 @@ + + diff --git a/platform/statistics/uploader/BUILD.bazel b/platform/statistics/uploader/BUILD.bazel index 3edc79c48507..79f510b80d64 100644 --- a/platform/statistics/uploader/BUILD.bazel +++ b/platform/statistics/uploader/BUILD.bazel @@ -25,8 +25,7 @@ jvm_library( "//libraries/jackson3/module-kotlin:libraries-jackson3-module-kotlin", "@lib//:com-jetbrains-fus-reporting-fus-api", "@lib//:com-jetbrains-fus-reporting-ap-validation-all", - ], - exports = ["//platform/statistics/config"] + ] ) jvm_library( @@ -34,10 +33,6 @@ jvm_library( module_name = "intellij.platform.statistics.uploader", visibility = ["//visibility:public"], srcs = glob([], allow_empty = True), - exports = [ - "//platform/statistics/config", - "//platform/statistics/config:config_test_lib", - ], runtime_deps = [ ":uploader", "//platform/statistics/config:config_test_lib", diff --git a/platform/statistics/uploader/intellij.platform.statistics.uploader.iml b/platform/statistics/uploader/intellij.platform.statistics.uploader.iml index cb1de627eb17..83d5f5a82764 100644 --- a/platform/statistics/uploader/intellij.platform.statistics.uploader.iml +++ b/platform/statistics/uploader/intellij.platform.statistics.uploader.iml @@ -10,7 +10,7 @@ - + diff --git a/platform/structuralsearch/BUILD.bazel b/platform/structuralsearch/BUILD.bazel index 5de71be37089..4165e9ca35c8 100644 --- a/platform/structuralsearch/BUILD.bazel +++ b/platform/structuralsearch/BUILD.bazel @@ -29,6 +29,7 @@ jvm_library( "//platform/usageView", "//platform/lang-api:lang", "//platform/platform-impl:ide-impl", + "//platform/ide-core", "//xml/xml-parser:parser", "//RegExpSupport:regexp", "//platform/refactoring", @@ -40,6 +41,7 @@ jvm_library( "//platform/core-impl", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", "//platform/util/concurrency", + "//platform/util:util-ui", ] ) @@ -64,6 +66,7 @@ jvm_library( "//platform/usageView:usageView_test_lib", "//platform/lang-api:lang_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//xml/xml-parser:parser_test_lib", "//RegExpSupport:regexp_test_lib", "//platform/refactoring:refactoring_test_lib", @@ -75,6 +78,7 @@ jvm_library( "//platform/core-impl:core-impl_test_lib", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", "//platform/util/concurrency:concurrency_test_lib", + "//platform/util:util-ui_test_lib", ] ) ### auto-generated section `build intellij.platform.structuralSearch` end @@ -131,8 +135,12 @@ jvm_library( "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", "//platform/lang-api:lang", "//platform/lang-api:lang_test_lib", + "//platform/ide-core", ], - runtime_deps = [":structuralSearch-tests"] + runtime_deps = [ + ":structuralSearch-tests", + "//platform/ide-core:ide-core_test_lib", + ] ) ### auto-generated section `build intellij.platform.structuralSearch.tests` end diff --git a/platform/structuralsearch/intellij.platform.structuralSearch.iml b/platform/structuralsearch/intellij.platform.structuralSearch.iml index 6d2b5739fd88..8523a9cfe915 100644 --- a/platform/structuralsearch/intellij.platform.structuralSearch.iml +++ b/platform/structuralsearch/intellij.platform.structuralSearch.iml @@ -23,6 +23,7 @@ + @@ -34,6 +35,7 @@ + diff --git a/platform/structuralsearch/intellij.platform.structuralSearch.tests.iml b/platform/structuralsearch/intellij.platform.structuralSearch.tests.iml index eb3d25310d23..32699fd4692d 100644 --- a/platform/structuralsearch/intellij.platform.structuralSearch.tests.iml +++ b/platform/structuralsearch/intellij.platform.structuralSearch.tests.iml @@ -21,5 +21,6 @@ + \ No newline at end of file diff --git a/platform/structure-view-impl/BUILD.bazel b/platform/structure-view-impl/BUILD.bazel index 8b8a6d4646d5..5bc2a7017b46 100644 --- a/platform/structure-view-impl/BUILD.bazel +++ b/platform/structure-view-impl/BUILD.bazel @@ -37,6 +37,7 @@ jvm_library( "//platform/util/concurrency", "//platform/lang-core", "//platform/platform-impl/concurrency", + "//platform/ide-core", "//platform/util/coroutines", "//platform/remote-topics/shared:rpc-topics", "//platform/lang-impl", @@ -79,6 +80,7 @@ jvm_library( "//platform/util/concurrency:concurrency_test_lib", "//platform/lang-core:lang-core_test_lib", "//platform/platform-impl/concurrency:concurrency_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/util/coroutines:coroutines_test_lib", "//platform/remote-topics/shared:rpc-topics_test_lib", "//platform/lang-impl:lang-impl_test_lib", diff --git a/platform/structure-view-impl/backend/BUILD.bazel b/platform/structure-view-impl/backend/BUILD.bazel index 93c2660df309..962ef41e12ee 100644 --- a/platform/structure-view-impl/backend/BUILD.bazel +++ b/platform/structure-view-impl/backend/BUILD.bazel @@ -28,11 +28,13 @@ jvm_library( "//platform/lang-impl", "//platform/core-ui", "//platform/platform-impl/concurrency", + "//platform/ide-core", "//platform/util/concurrency", "//platform/util", "//platform/statistics", "//platform/lang-api:lang", "//platform/remote-topics/shared:rpc-topics", + "//platform/util:util-ui", ] ) @@ -56,11 +58,13 @@ jvm_library( "//platform/lang-impl:lang-impl_test_lib", "//platform/core-ui:core-ui_test_lib", "//platform/platform-impl/concurrency:concurrency_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/util/concurrency:concurrency_test_lib", "//platform/util:util_test_lib", "//platform/statistics:statistics_test_lib", "//platform/lang-api:lang_test_lib", "//platform/remote-topics/shared:rpc-topics_test_lib", + "//platform/util:util-ui_test_lib", ] ) ### auto-generated section `build intellij.platform.structureView.backend` end diff --git a/platform/structure-view-impl/backend/intellij.platform.structureView.backend.iml b/platform/structure-view-impl/backend/intellij.platform.structureView.backend.iml index 65d548e7547f..56364b98af1c 100644 --- a/platform/structure-view-impl/backend/intellij.platform.structureView.backend.iml +++ b/platform/structure-view-impl/backend/intellij.platform.structureView.backend.iml @@ -47,10 +47,12 @@ + + \ No newline at end of file diff --git a/platform/structure-view-impl/frontend/BUILD.bazel b/platform/structure-view-impl/frontend/BUILD.bazel index 51ee3af9f697..9dfdb94daaa3 100644 --- a/platform/structure-view-impl/frontend/BUILD.bazel +++ b/platform/structure-view-impl/frontend/BUILD.bazel @@ -19,6 +19,7 @@ jvm_library( "//platform/ide-core", "//platform/analysis-api:analysis", "//platform/util:util-ui", + "//platform/editor-ui-api:editor-ui", "//platform/platform-impl:ide-impl", "//platform/statistics", "//platform/lang-api:lang", @@ -48,6 +49,7 @@ jvm_library( "//platform/ide-core:ide-core_test_lib", "//platform/analysis-api:analysis_test_lib", "//platform/util:util-ui_test_lib", + "//platform/editor-ui-api:editor-ui_test_lib", "//platform/platform-impl:ide-impl_test_lib", "//platform/statistics:statistics_test_lib", "//platform/lang-api:lang_test_lib", diff --git a/platform/structure-view-impl/frontend/intellij.platform.structureView.frontend.iml b/platform/structure-view-impl/frontend/intellij.platform.structureView.frontend.iml index 6d8c7e7f865b..2f81b34f2bc1 100644 --- a/platform/structure-view-impl/frontend/intellij.platform.structureView.frontend.iml +++ b/platform/structure-view-impl/frontend/intellij.platform.structureView.frontend.iml @@ -38,6 +38,7 @@ + diff --git a/platform/structure-view-impl/intellij.platform.structureView.impl.iml b/platform/structure-view-impl/intellij.platform.structureView.impl.iml index 3a7aca9a6c59..f7475d452796 100644 --- a/platform/structure-view-impl/intellij.platform.structureView.impl.iml +++ b/platform/structure-view-impl/intellij.platform.structureView.impl.iml @@ -56,6 +56,7 @@ + diff --git a/platform/syntax/syntax-psi/BUILD.bazel b/platform/syntax/syntax-psi/BUILD.bazel index e4ae3f96a0f9..345e034b86d3 100644 --- a/platform/syntax/syntax-psi/BUILD.bazel +++ b/platform/syntax/syntax-psi/BUILD.bazel @@ -25,6 +25,8 @@ jvm_library( deps = [ "//platform/util", "//platform/util-rt", + "//platform/util/multiplatform", + "//platform/util/base", "//platform/syntax/syntax-api:syntax", "//platform/core-api:core", "@lib//:kotlin-stdlib", @@ -50,6 +52,8 @@ jvm_library( ":psi", "//platform/util:util_test_lib", "//platform/util-rt:util-rt_test_lib", + "//platform/util/multiplatform:multiplatform_test_lib", + "//platform/util/base:base_test_lib", "//platform/syntax/syntax-api:syntax_test_lib", "//platform/core-api:core_test_lib", "//platform/core-impl:core-impl_test_lib", diff --git a/platform/syntax/syntax-psi/intellij.platform.syntax.psi.iml b/platform/syntax/syntax-psi/intellij.platform.syntax.psi.iml index 0a397e178d2b..e64f0534cf66 100644 --- a/platform/syntax/syntax-psi/intellij.platform.syntax.psi.iml +++ b/platform/syntax/syntax-psi/intellij.platform.syntax.psi.iml @@ -26,6 +26,8 @@ + + diff --git a/platform/tasks-platform-impl/BUILD.bazel b/platform/tasks-platform-impl/BUILD.bazel index c61848b6be7a..c0fb1f72071a 100644 --- a/platform/tasks-platform-impl/BUILD.bazel +++ b/platform/tasks-platform-impl/BUILD.bazel @@ -26,6 +26,7 @@ jvm_library( "@lib//:kotlin-stdlib", "//libraries/gson", "//platform/platform-impl:ide-impl", + "//platform/ide-core", "//platform/lang-impl", "//platform/forms_rt:java-guiForms-rt", "//platform/execution", @@ -37,6 +38,7 @@ jvm_library( "//platform/util/jdom", "//libraries/kotlinx/coroutines/core", "//platform/util/text-matching", + "//platform/util:util-ui", "//platform/statistics", "//platform/bookmarks", "//platform/lang-api:lang", @@ -64,6 +66,7 @@ jvm_library( "//platform/vcs-api:vcs_test_lib", "//libraries/gson:gson_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/lang-impl:lang-impl_test_lib", "//platform/forms_rt:java-guiForms-rt_test_lib", "//platform/execution:execution_test_lib", @@ -75,6 +78,7 @@ jvm_library( "//platform/util/jdom:jdom_test_lib", "//libraries/kotlinx/coroutines/core:core_test_lib", "//platform/util/text-matching:text-matching_test_lib", + "//platform/util:util-ui_test_lib", "//platform/statistics:statistics_test_lib", "//platform/bookmarks:bookmarks_test_lib", "//platform/lang-api:lang_test_lib", diff --git a/platform/tasks-platform-impl/intellij.platform.tasks.impl.iml b/platform/tasks-platform-impl/intellij.platform.tasks.impl.iml index d360b07e23ee..4ddd8b8b3eb2 100644 --- a/platform/tasks-platform-impl/intellij.platform.tasks.impl.iml +++ b/platform/tasks-platform-impl/intellij.platform.tasks.impl.iml @@ -20,6 +20,7 @@ + @@ -31,6 +32,7 @@ + diff --git a/platform/testFramework/BUILD.bazel b/platform/testFramework/BUILD.bazel index fdeca2b47634..d1b5daf3500b 100644 --- a/platform/testFramework/BUILD.bazel +++ b/platform/testFramework/BUILD.bazel @@ -56,11 +56,13 @@ jvm_library( "//platform/foldings", "//platform/platform-impl/codeinsight-inline:ide-codeinsight-inline", "//platform/ide-core-impl", + "//platform/ide-core", "//platform/platform-impl:ide-impl", "//platform/observable", "//platform/platform-util-io:ide-util-io", "//platform/platform-util-io-impl:ide-util-io-impl", "//platform/platform-util-netty:ide-util-netty", + "//platform/progress/shared:ide-progress", "//platform/indexing-api:indexing", "//platform/indexing-impl", "//jps/model-api:model", @@ -93,6 +95,8 @@ jvm_library( "//libraries/fastutil", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", "//jps/model-impl", + "//platform/util:util-ui", + "//platform/util-ex", ":libraries_junit4_provided", ":libraries_junit5-launcher_provided", ], @@ -175,11 +179,13 @@ jvm_library( "//platform/foldings:foldings_test_lib", "//platform/platform-impl/codeinsight-inline:ide-codeinsight-inline_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/platform-impl:ide-impl_test_lib", "//platform/observable:observable_test_lib", "//platform/platform-util-io:ide-util-io_test_lib", "//platform/platform-util-io-impl:ide-util-io-impl_test_lib", "//platform/platform-util-netty:ide-util-netty_test_lib", + "//platform/progress/shared:ide-progress_test_lib", "//images:images_test_lib", "//platform/indexing-api:indexing_test_lib", "//platform/indexing-impl:indexing-impl_test_lib", @@ -222,6 +228,8 @@ jvm_library( "//libraries/fastutil:fastutil_test_lib", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", "//jps/model-impl:model-impl_test_lib", + "//platform/util:util-ui_test_lib", + "//platform/util-ex:util-ex_test_lib", ] ) ### auto-generated section `build intellij.platform.testFramework` end diff --git a/platform/testFramework/common/BUILD.bazel b/platform/testFramework/common/BUILD.bazel index 6e0a99f4bf83..b85f33440007 100644 --- a/platform/testFramework/common/BUILD.bazel +++ b/platform/testFramework/common/BUILD.bazel @@ -37,6 +37,8 @@ jvm_library( "//platform/util", "//platform/core-api:core", "//platform/ide-core-impl", + "//platform/ide-core", + "//platform/util:util-ui", "//platform/analysis-impl", "//platform/service-container", "//platform/indexing-api:indexing", @@ -50,6 +52,7 @@ jvm_library( "//platform/diagnostic/telemetry", "@lib//:jetbrains-annotations", "//platform/platform-impl/bootstrap/kernel", + "//platform/progress/shared:ide-progress", "//platform/build-scripts/downloader", ] ) @@ -75,6 +78,8 @@ jvm_library( "//platform/util:util_test_lib", "//platform/core-api:core_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", + "//platform/util:util-ui_test_lib", "//platform/analysis-impl:analysis-impl_test_lib", "//platform/service-container:service-container_test_lib", "//platform/indexing-api:indexing_test_lib", @@ -87,6 +92,7 @@ jvm_library( "//platform/diagnostic:diagnostic_test_lib", "//platform/diagnostic/telemetry:telemetry_test_lib", "//platform/platform-impl/bootstrap/kernel:kernel_test_lib", + "//platform/progress/shared:ide-progress_test_lib", "//platform/build-scripts/downloader:downloader_test_lib", ] ) diff --git a/platform/testFramework/common/intellij.platform.testFramework.common.iml b/platform/testFramework/common/intellij.platform.testFramework.common.iml index 40b7ef6b7b45..4651f3cbb4aa 100644 --- a/platform/testFramework/common/intellij.platform.testFramework.common.iml +++ b/platform/testFramework/common/intellij.platform.testFramework.common.iml @@ -22,6 +22,8 @@ + + @@ -35,6 +37,7 @@ + \ No newline at end of file diff --git a/platform/testFramework/core/BUILD.bazel b/platform/testFramework/core/BUILD.bazel index b35b68d2c1b0..6858c6b5ccdc 100644 --- a/platform/testFramework/core/BUILD.bazel +++ b/platform/testFramework/core/BUILD.bazel @@ -21,6 +21,8 @@ jvm_library( deps = [ "//platform/util", "//platform/util-class-loader:util-classLoader", + "//platform/util/base/multiplatform", + "//platform/util/base", "//platform/boot", "//platform/testFramework/bootstrap:tools-testsBootstrap", "@lib//:opentest4j", @@ -48,6 +50,8 @@ jvm_library( ":core", "//platform/util:util_test_lib", "//platform/util-class-loader:util-classLoader_test_lib", + "//platform/util/base/multiplatform:multiplatform_test_lib", + "//platform/util/base:base_test_lib", "//platform/boot:boot_test_lib", "//platform/testFramework/bootstrap:tools-testsBootstrap_test_lib", "//libraries/junit4", diff --git a/platform/testFramework/core/intellij.platform.testFramework.core.iml b/platform/testFramework/core/intellij.platform.testFramework.core.iml index a9fb24254696..800d354abb48 100644 --- a/platform/testFramework/core/intellij.platform.testFramework.core.iml +++ b/platform/testFramework/core/intellij.platform.testFramework.core.iml @@ -10,6 +10,8 @@ + + diff --git a/platform/testFramework/extensions/BUILD.bazel b/platform/testFramework/extensions/BUILD.bazel index bf9a300ec5a4..886a9ebd4773 100644 --- a/platform/testFramework/extensions/BUILD.bazel +++ b/platform/testFramework/extensions/BUILD.bazel @@ -33,6 +33,7 @@ jvm_library( "//libraries/snakeyaml", "//libraries/fastutil", "//platform/core-ui", + "//platform/ide-core", "@lib//:junit5", "//java/java-runtime:rt", ] @@ -60,6 +61,7 @@ jvm_library( "//libraries/snakeyaml:snakeyaml_test_lib", "//libraries/fastutil:fastutil_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/ide-core:ide-core_test_lib", "//java/java-runtime:rt_test_lib", ] ) diff --git a/platform/testFramework/extensions/intellij.platform.testExtensions.iml b/platform/testFramework/extensions/intellij.platform.testExtensions.iml index d9a79c0a48b1..c3757a840bb0 100644 --- a/platform/testFramework/extensions/intellij.platform.testExtensions.iml +++ b/platform/testFramework/extensions/intellij.platform.testExtensions.iml @@ -27,6 +27,7 @@ + diff --git a/platform/testFramework/intellij.platform.testFramework.iml b/platform/testFramework/intellij.platform.testFramework.iml index 99dbb97081c4..1c34ad701873 100644 --- a/platform/testFramework/intellij.platform.testFramework.iml +++ b/platform/testFramework/intellij.platform.testFramework.iml @@ -45,11 +45,13 @@ + + @@ -122,5 +124,7 @@ + + \ No newline at end of file diff --git a/platform/testFramework/junit5/BUILD.bazel b/platform/testFramework/junit5/BUILD.bazel index 41668f07f864..0d53d81db32e 100644 --- a/platform/testFramework/junit5/BUILD.bazel +++ b/platform/testFramework/junit5/BUILD.bazel @@ -43,6 +43,7 @@ jvm_library( "//platform/eel-provider", "//platform/execution", "//platform/ide-core-impl", + "//platform/ide-core", "//platform/platform-impl:ide-impl", "//jps/model-api:model", "//platform/projectModel-api:projectModel", @@ -86,6 +87,7 @@ jvm_library( "//platform/eel-provider:eel-provider_test_lib", "//platform/execution:execution_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/platform-impl:ide-impl_test_lib", "//jps/model-api:model_test_lib", "//platform/main/intellij.platform.monolith.main:monolith-main", diff --git a/platform/testFramework/junit5/codeInsight/BUILD.bazel b/platform/testFramework/junit5/codeInsight/BUILD.bazel index e42699f75d7a..75d061bb1955 100644 --- a/platform/testFramework/junit5/codeInsight/BUILD.bazel +++ b/platform/testFramework/junit5/codeInsight/BUILD.bazel @@ -19,9 +19,11 @@ jvm_library( "//platform/testFramework/junit5", "//platform/core-api:core", "//platform/core-ui", + "//platform/editor-ui-api:editor-ui", "//platform/lang-impl", "//platform/lang-api:lang", "//platform/projectModel-api:projectModel", + "//platform/ide-core", ] ) @@ -36,9 +38,11 @@ jvm_library( "//platform/testFramework/junit5:junit5_test_lib", "//platform/core-api:core_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/editor-ui-api:editor-ui_test_lib", "//platform/lang-impl:lang-impl_test_lib", "//platform/lang-api:lang_test_lib", "//platform/projectModel-api:projectModel_test_lib", + "//platform/ide-core:ide-core_test_lib", ] ) ### auto-generated section `build intellij.platform.testFramework.junit5.codeInsight` end diff --git a/platform/testFramework/junit5/codeInsight/intellij.platform.testFramework.junit5.codeInsight.iml b/platform/testFramework/junit5/codeInsight/intellij.platform.testFramework.junit5.codeInsight.iml index 782255db65b2..4ebc4b911613 100644 --- a/platform/testFramework/junit5/codeInsight/intellij.platform.testFramework.junit5.codeInsight.iml +++ b/platform/testFramework/junit5/codeInsight/intellij.platform.testFramework.junit5.codeInsight.iml @@ -13,8 +13,10 @@ + + \ No newline at end of file diff --git a/platform/testFramework/junit5/intellij.platform.testFramework.junit5.iml b/platform/testFramework/junit5/intellij.platform.testFramework.junit5.iml index ad98497b9b58..24bedef7c3b1 100644 --- a/platform/testFramework/junit5/intellij.platform.testFramework.junit5.iml +++ b/platform/testFramework/junit5/intellij.platform.testFramework.junit5.iml @@ -27,6 +27,7 @@ + diff --git a/platform/testRunner/BUILD.bazel b/platform/testRunner/BUILD.bazel index 2e4a76025489..7b9cfea9a1f3 100644 --- a/platform/testRunner/BUILD.bazel +++ b/platform/testRunner/BUILD.bazel @@ -30,8 +30,10 @@ jvm_library( "//platform/core-ui", "//platform/platform-util-io:ide-util-io", "//platform/ide-core-impl", + "//platform/ide-core", "//platform/projectModel-api:projectModel", "//platform/util/jdom", + "//platform/util:util-ui", "//platform/analysis-impl", "//platform/xdebugger-impl:debugger-impl", "//platform/core-impl", @@ -65,8 +67,10 @@ jvm_library( "//platform/core-ui:core-ui_test_lib", "//platform/platform-util-io:ide-util-io_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/projectModel-api:projectModel_test_lib", "//platform/util/jdom:jdom_test_lib", + "//platform/util:util-ui_test_lib", "//platform/analysis-impl:analysis-impl_test_lib", "//platform/testFramework", "//platform/testFramework:testFramework_test_lib", @@ -136,6 +140,8 @@ jvm_library( "//platform/projectModel-api:projectModel_test_lib", "//platform/util/jdom", "//platform/util/jdom:jdom_test_lib", + "//platform/util:util-ui", + "//platform/util:util-ui_test_lib", "//platform/analysis-impl", "//platform/analysis-impl:analysis-impl_test_lib", "//platform/testFramework", diff --git a/platform/testRunner/intellij.platform.testRunner.iml b/platform/testRunner/intellij.platform.testRunner.iml index b5ba3bef14e8..6c7c8bef3051 100644 --- a/platform/testRunner/intellij.platform.testRunner.iml +++ b/platform/testRunner/intellij.platform.testRunner.iml @@ -25,8 +25,10 @@ + + diff --git a/platform/testRunner/intellij.platform.testRunner.tests.iml b/platform/testRunner/intellij.platform.testRunner.tests.iml index 9e3260abadd2..fffff83a9e8e 100644 --- a/platform/testRunner/intellij.platform.testRunner.tests.iml +++ b/platform/testRunner/intellij.platform.testRunner.tests.iml @@ -26,6 +26,7 @@ + diff --git a/platform/threadDumpParser/BUILD.bazel b/platform/threadDumpParser/BUILD.bazel index ed356835416f..5101412c03d1 100644 --- a/platform/threadDumpParser/BUILD.bazel +++ b/platform/threadDumpParser/BUILD.bazel @@ -9,6 +9,8 @@ jvm_library( deps = [ "@lib//:kotlin-stdlib", "//platform/util", + "//platform/util/base/multiplatform", + "//platform/util/base", "//platform/platform-impl:ide-impl", "//libraries/jackson3/jackson:libraries-jackson3", "//libraries/jackson3/databind", @@ -23,6 +25,8 @@ jvm_library( runtime_deps = [ ":threadDumpParser", "//platform/util:util_test_lib", + "//platform/util/base/multiplatform:multiplatform_test_lib", + "//platform/util/base:base_test_lib", "//platform/platform-impl:ide-impl_test_lib", "//tools/intellij.tools.ide.metrics.benchmark:ide-metrics-benchmark", "//tools/intellij.tools.ide.metrics.benchmark:ide-metrics-benchmark_test_lib", @@ -61,6 +65,8 @@ jvm_library( "@lib//:kotlin-stdlib", "//platform/util", "//platform/util:util_test_lib", + "//platform/util/base", + "//platform/util/base:base_test_lib", "//platform/platform-impl:ide-impl", "//tools/intellij.tools.ide.metrics.benchmark:ide-metrics-benchmark", "//tools/intellij.tools.ide.metrics.benchmark:ide-metrics-benchmark_test_lib", diff --git a/platform/threadDumpParser/intellij.platform.threadDumpParser.iml b/platform/threadDumpParser/intellij.platform.threadDumpParser.iml index ca4bda2d3401..5f6a1018c916 100644 --- a/platform/threadDumpParser/intellij.platform.threadDumpParser.iml +++ b/platform/threadDumpParser/intellij.platform.threadDumpParser.iml @@ -9,6 +9,8 @@ + + diff --git a/platform/threadDumpParser/intellij.platform.threadDumpParser.tests.iml b/platform/threadDumpParser/intellij.platform.threadDumpParser.tests.iml index 0d49dc56ba9d..89b1341f783b 100644 --- a/platform/threadDumpParser/intellij.platform.threadDumpParser.tests.iml +++ b/platform/threadDumpParser/intellij.platform.threadDumpParser.tests.iml @@ -9,6 +9,7 @@ + diff --git a/platform/tips-of-the-day/BUILD.bazel b/platform/tips-of-the-day/BUILD.bazel index c2a654e00be1..d77b54afe100 100644 --- a/platform/tips-of-the-day/BUILD.bazel +++ b/platform/tips-of-the-day/BUILD.bazel @@ -23,11 +23,14 @@ jvm_library( "//platform/statistics", "//platform/analysis-impl", "//platform/core-ui", + "//platform/util:util-ui", "//libraries/jsoup", "//libraries/fastutil", "//libraries/jackson/jackson", "//libraries/jackson/databind", "//platform/ide-core-impl", + "//platform/ide-core", + "//platform/progress/shared:ide-progress", "//platform/core-impl", "//libraries/kotlinx/coroutines/core", "//libraries/kotlinx/serialization/core", @@ -54,11 +57,14 @@ jvm_library( "//platform/statistics:statistics_test_lib", "//platform/analysis-impl:analysis-impl_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/util:util-ui_test_lib", "//libraries/jsoup:jsoup_test_lib", "//libraries/fastutil:fastutil_test_lib", "//libraries/jackson/jackson:jackson_test_lib", "//libraries/jackson/databind:databind_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", + "//platform/progress/shared:ide-progress_test_lib", "//platform/core-impl:core-impl_test_lib", "//libraries/kotlinx/coroutines/core:core_test_lib", "//libraries/kotlinx/serialization/core:core_test_lib", diff --git a/platform/tips-of-the-day/intellij.platform.tips.iml b/platform/tips-of-the-day/intellij.platform.tips.iml index f414091fdb48..12205e9c221e 100644 --- a/platform/tips-of-the-day/intellij.platform.tips.iml +++ b/platform/tips-of-the-day/intellij.platform.tips.iml @@ -39,11 +39,14 @@ + + + diff --git a/platform/todo/BUILD.bazel b/platform/todo/BUILD.bazel index 835e6dbb184b..906eeb2e6991 100644 --- a/platform/todo/BUILD.bazel +++ b/platform/todo/BUILD.bazel @@ -29,6 +29,7 @@ jvm_library( "//platform/platform-impl/concurrency", "//platform/platform-impl:ide-impl", "//platform/platform-impl/rpc", + "//platform/ide-core", "//platform/project/shared:project", "//platform/projectModel-api:projectModel", "//platform/structure-view-impl:structureView-impl", @@ -42,6 +43,7 @@ jvm_library( "//platform/lang-api:lang", "//platform/util/jdom", "//libraries/fastutil", + "//platform/util:util-ui", ] ) @@ -66,6 +68,7 @@ jvm_library( "//platform/platform-impl/concurrency:concurrency_test_lib", "//platform/platform-impl:ide-impl_test_lib", "//platform/platform-impl/rpc:rpc_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/project/shared:project_test_lib", "//platform/projectModel-api:projectModel_test_lib", "//platform/structure-view-impl:structureView-impl_test_lib", @@ -79,6 +82,7 @@ jvm_library( "//platform/lang-api:lang_test_lib", "//platform/util/jdom:jdom_test_lib", "//libraries/fastutil:fastutil_test_lib", + "//platform/util:util-ui_test_lib", ] ) ### auto-generated section `build intellij.platform.todo` end diff --git a/platform/todo/intellij.platform.todo.iml b/platform/todo/intellij.platform.todo.iml index a5a645a2c7da..e6e59bfae923 100644 --- a/platform/todo/intellij.platform.todo.iml +++ b/platform/todo/intellij.platform.todo.iml @@ -48,6 +48,7 @@ + @@ -61,5 +62,6 @@ + \ No newline at end of file diff --git a/platform/tracing-ide/BUILD.bazel b/platform/tracing-ide/BUILD.bazel index 42dbabc5e19d..12f0c4392a0d 100644 --- a/platform/tracing-ide/BUILD.bazel +++ b/platform/tracing-ide/BUILD.bazel @@ -18,6 +18,7 @@ jvm_library( "//platform/core-api:core", "//platform/editor-ui-api:editor-ui", "//platform/platform-api:ide", + "//platform/ide-core", "//platform/projectModel-api:projectModel", "//platform/tracing:tracing-rt", "//platform/lang-api:lang", @@ -35,6 +36,7 @@ jvm_library( "//platform/core-api:core_test_lib", "//platform/editor-ui-api:editor-ui_test_lib", "//platform/platform-api:ide_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/projectModel-api:projectModel_test_lib", "//platform/tracing:tracing-rt_test_lib", "//platform/lang-api:lang_test_lib", diff --git a/platform/tracing-ide/intellij.platform.tracing.ide.iml b/platform/tracing-ide/intellij.platform.tracing.ide.iml index 8518b3fd4fe2..44be2270ce17 100644 --- a/platform/tracing-ide/intellij.platform.tracing.ide.iml +++ b/platform/tracing-ide/intellij.platform.tracing.ide.iml @@ -12,6 +12,7 @@ + diff --git a/platform/util-ex/BUILD.bazel b/platform/util-ex/BUILD.bazel index f013467682ff..75b7a0add3b7 100644 --- a/platform/util-ex/BUILD.bazel +++ b/platform/util-ex/BUILD.bazel @@ -24,6 +24,7 @@ jvm_library( "//libraries/netty/buffer", "//libraries/caffeine", "//platform/util/base", + "//platform/util/base/multiplatform", "//platform/util-class-loader:util-classLoader", "//libraries/lz4", "//platform/diagnostic", @@ -49,6 +50,7 @@ jvm_library( "//libraries/netty/buffer:buffer_test_lib", "//libraries/caffeine:caffeine_test_lib", "//platform/util/base:base_test_lib", + "//platform/util/base/multiplatform:multiplatform_test_lib", "//platform/util-class-loader:util-classLoader_test_lib", "//libraries/lz4:lz4_test_lib", "//platform/diagnostic:diagnostic_test_lib", diff --git a/platform/util-ex/intellij.platform.util.ex.iml b/platform/util-ex/intellij.platform.util.ex.iml index 785c9f47af75..81985f3a3484 100644 --- a/platform/util-ex/intellij.platform.util.ex.iml +++ b/platform/util-ex/intellij.platform.util.ex.iml @@ -18,6 +18,7 @@ + diff --git a/platform/util/BUILD.bazel b/platform/util/BUILD.bazel index e0b86de7b2e7..f1242910f4ef 100644 --- a/platform/util/BUILD.bazel +++ b/platform/util/BUILD.bazel @@ -32,6 +32,7 @@ jvm_library( "//libraries/fastutil", "@lib//:kotlin-stdlib", "//platform/util/base", + "//platform/util/base/multiplatform", "//libraries/aalto-xml", "//platform/util/xmlDom", "//libraries/kotlinx/coroutines/core", @@ -45,8 +46,6 @@ jvm_library( exports = [ "@lib//:jetbrains-annotations", "//platform/util-rt", - "//platform/util/base", - "//platform/util/multiplatform", ], runtime_deps = [ "//libraries/commons/io", @@ -65,10 +64,6 @@ jvm_library( "@lib//:jetbrains-annotations", "//platform/util-rt", "//platform/util-rt:util-rt_test_lib", - "//platform/util/base", - "//platform/util/base:base_test_lib", - "//platform/util/multiplatform", - "//platform/util/multiplatform:multiplatform_test_lib", ], runtime_deps = [ ":util", @@ -83,6 +78,7 @@ jvm_library( "//libraries/commons/lang3:lang3_test_lib", "//libraries/fastutil:fastutil_test_lib", "//platform/util/base:base_test_lib", + "//platform/util/base/multiplatform:multiplatform_test_lib", "//libraries/aalto-xml:aalto-xml_test_lib", "//platform/util/xmlDom:xmlDom_test_lib", "//libraries/kotlinx/coroutines/core:core_test_lib", @@ -199,6 +195,8 @@ jvm_library( "//tools/intellij.tools.ide.metrics.benchmark:ide-metrics-benchmark_test_lib", "//platform/util/coroutines", "//platform/util/coroutines:coroutines_test_lib", + "//platform/util:util-ui", + "//platform/util:util-ui_test_lib", "@lib//:jetbrains-kotlinx-lincheck-jvm", "//libraries/mockito", "//libraries/mockito:mockito_test_lib", @@ -284,6 +282,9 @@ jvm_library( "//libraries/jbr", "//libraries/jsvg", "//platform/util/rt-java8", + "//platform/util/multiplatform", + "//platform/util/base/multiplatform", + "//platform/util/base", "//libraries/hash4j", "//libraries/kotlinx/coroutines/core", "//platform/diagnostic", @@ -314,6 +315,9 @@ jvm_library( "//libraries/jbr:jbr_test_lib", "//libraries/jsvg:jsvg_test_lib", "//platform/util/rt-java8:rt-java8_test_lib", + "//platform/util/multiplatform:multiplatform_test_lib", + "//platform/util/base/multiplatform:multiplatform_test_lib", + "//platform/util/base:base_test_lib", "//libraries/hash4j:hash4j_test_lib", "//libraries/kotlinx/coroutines/core:core_test_lib", "//platform/diagnostic:diagnostic_test_lib", diff --git a/platform/util/base/BUILD.bazel b/platform/util/base/BUILD.bazel index ed8590c5673e..d804fd039e09 100644 --- a/platform/util/base/BUILD.bazel +++ b/platform/util/base/BUILD.bazel @@ -15,8 +15,7 @@ jvm_library( "//libraries/kotlinx/coroutines/core", "//libraries/kotlinx/coroutines/debug", "//platform/util/base/multiplatform", - ], - exports = ["//platform/util/base/multiplatform"] + ] ) jvm_library( @@ -25,10 +24,6 @@ jvm_library( visibility = ["//visibility:public"], srcs = glob([], allow_empty = True), kotlinc_opts = "@community//:k8", - exports = [ - "//platform/util/base/multiplatform", - "//platform/util/base/multiplatform:multiplatform_test_lib", - ], runtime_deps = [ ":base", "//platform/util-rt:util-rt_test_lib", diff --git a/platform/util/base/intellij.platform.util.base.iml b/platform/util/base/intellij.platform.util.base.iml index dc75211ef178..e92395324985 100644 --- a/platform/util/base/intellij.platform.util.base.iml +++ b/platform/util/base/intellij.platform.util.base.iml @@ -29,6 +29,6 @@ - + \ No newline at end of file diff --git a/platform/util/concurrency/BUILD.bazel b/platform/util/concurrency/BUILD.bazel index ce50b5b2d5e8..023d9fa72d2f 100644 --- a/platform/util/concurrency/BUILD.bazel +++ b/platform/util/concurrency/BUILD.bazel @@ -14,6 +14,8 @@ jvm_library( "//libraries/fastutil", "//platform/diagnostic", "//platform/util/coroutines", + "//platform/util/multiplatform", + "//platform/util/base", ] ) @@ -30,6 +32,8 @@ jvm_library( "//libraries/fastutil:fastutil_test_lib", "//platform/diagnostic:diagnostic_test_lib", "//platform/util/coroutines:coroutines_test_lib", + "//platform/util/multiplatform:multiplatform_test_lib", + "//platform/util/base:base_test_lib", "@lib//:assert_j", "@lib//:junit5", ] diff --git a/platform/util/concurrency/intellij.platform.concurrency.iml b/platform/util/concurrency/intellij.platform.concurrency.iml index 2b5f261c625b..d75c019415cd 100644 --- a/platform/util/concurrency/intellij.platform.concurrency.iml +++ b/platform/util/concurrency/intellij.platform.concurrency.iml @@ -14,6 +14,8 @@ + + diff --git a/platform/util/intellij.platform.util.iml b/platform/util/intellij.platform.util.iml index 29aa589b6501..20f836831a55 100644 --- a/platform/util/intellij.platform.util.iml +++ b/platform/util/intellij.platform.util.iml @@ -16,7 +16,6 @@ $KOTLIN_BUNDLED$/lib/kotlinx-serialization-compiler-plugin.jar - @@ -44,7 +43,8 @@ - + + @@ -52,7 +52,7 @@ - + diff --git a/platform/util/intellij.platform.util.tests.iml b/platform/util/intellij.platform.util.tests.iml index 990eac0619e4..42813126aaf0 100644 --- a/platform/util/intellij.platform.util.tests.iml +++ b/platform/util/intellij.platform.util.tests.iml @@ -47,6 +47,7 @@ + diff --git a/platform/util/intellij.platform.util.ui.iml b/platform/util/intellij.platform.util.ui.iml index 820bc834f62b..76575d54dbb9 100644 --- a/platform/util/intellij.platform.util.ui.iml +++ b/platform/util/intellij.platform.util.ui.iml @@ -46,6 +46,9 @@ + + + diff --git a/platform/util/progress/BUILD.bazel b/platform/util/progress/BUILD.bazel index aa569448ca81..382d9e81099b 100644 --- a/platform/util/progress/BUILD.bazel +++ b/platform/util/progress/BUILD.bazel @@ -25,6 +25,7 @@ jvm_library( "//libraries/guava", "//platform/util", "//platform/util/coroutines", + "//platform/util/multiplatform", "//libraries/fastutil", "//libraries/kotlinx/serialization/core", "//libraries/kotlinx/serialization/json", @@ -44,6 +45,7 @@ jvm_library( "//libraries/guava:guava_test_lib", "//platform/util:util_test_lib", "//platform/util/coroutines:coroutines_test_lib", + "//platform/util/multiplatform:multiplatform_test_lib", "//libraries/fastutil:fastutil_test_lib", "//libraries/kotlinx/serialization/core:core_test_lib", "//libraries/kotlinx/serialization/json:json_test_lib", @@ -81,6 +83,8 @@ jvm_library( "//platform/testFramework/common:common_test_lib", "//platform/util", "//platform/util:util_test_lib", + "//platform/util/multiplatform", + "//platform/util/multiplatform:multiplatform_test_lib", "@lib//:junit4", "//platform/testFramework", "//platform/testFramework:testFramework_test_lib", diff --git a/platform/util/progress/intellij.platform.util.progress.iml b/platform/util/progress/intellij.platform.util.progress.iml index 6e82b102e871..2b8d857d6188 100644 --- a/platform/util/progress/intellij.platform.util.progress.iml +++ b/platform/util/progress/intellij.platform.util.progress.iml @@ -36,6 +36,7 @@ + diff --git a/platform/util/progress/intellij.platform.util.progress.tests.iml b/platform/util/progress/intellij.platform.util.progress.tests.iml index 57a6885b9f11..da7e4bb05d7b 100644 --- a/platform/util/progress/intellij.platform.util.progress.tests.iml +++ b/platform/util/progress/intellij.platform.util.progress.tests.iml @@ -13,6 +13,7 @@ + diff --git a/platform/util/storages/BUILD.bazel b/platform/util/storages/BUILD.bazel index 889bab30068b..cc4f7bcca269 100644 --- a/platform/util/storages/BUILD.bazel +++ b/platform/util/storages/BUILD.bazel @@ -12,6 +12,7 @@ jvm_library( "//platform/util-class-loader:util-classLoader", "//platform/util/base", "//platform/util", + "//platform/util/multiplatform", "//libraries/fastutil", "@lib//:kotlin-stdlib", "//libraries/kotlinx/coroutines/core", @@ -31,6 +32,7 @@ jvm_library( "//platform/util-class-loader:util-classLoader_test_lib", "//platform/util/base:base_test_lib", "//platform/util:util_test_lib", + "//platform/util/multiplatform:multiplatform_test_lib", "//libraries/fastutil:fastutil_test_lib", "//libraries/kotlinx/coroutines/core:core_test_lib", "@lib//:junit4", diff --git a/platform/util/storages/intellij.platform.util.io.storages.iml b/platform/util/storages/intellij.platform.util.io.storages.iml index aecd14f19cf1..5ac2469087a2 100644 --- a/platform/util/storages/intellij.platform.util.io.storages.iml +++ b/platform/util/storages/intellij.platform.util.io.storages.iml @@ -12,6 +12,7 @@ + diff --git a/platform/util/text-matching/BUILD.bazel b/platform/util/text-matching/BUILD.bazel index 3a20e58aa547..71818e3dc811 100644 --- a/platform/util/text-matching/BUILD.bazel +++ b/platform/util/text-matching/BUILD.bazel @@ -9,6 +9,7 @@ jvm_library( deps = [ "@lib//:jetbrains-annotations", "//platform/util/base", + "//platform/util/base/multiplatform", "//platform/util-rt", "@lib//:kotlin-stdlib", ] @@ -22,6 +23,7 @@ jvm_library( runtime_deps = [ ":text-matching", "//platform/util/base:base_test_lib", + "//platform/util/base/multiplatform:multiplatform_test_lib", "//platform/util-rt:util-rt_test_lib", "@lib//:kotlin-test", "@lib//:kotlin-test-junit5", @@ -56,6 +58,8 @@ jvm_library( "@lib//:jetbrains-annotations", "//platform/util/base", "//platform/util/base:base_test_lib", + "//platform/util/base/multiplatform", + "//platform/util/base/multiplatform:multiplatform_test_lib", "//platform/util-rt", "//platform/util-rt:util-rt_test_lib", "@lib//:kotlin-stdlib", diff --git a/platform/util/text-matching/intellij.platform.util.text.matching.iml b/platform/util/text-matching/intellij.platform.util.text.matching.iml index 2ed15646feb1..4f262902e506 100644 --- a/platform/util/text-matching/intellij.platform.util.text.matching.iml +++ b/platform/util/text-matching/intellij.platform.util.text.matching.iml @@ -10,6 +10,7 @@ + diff --git a/platform/util/text-matching/intellij.platform.util.text.matching.tests.iml b/platform/util/text-matching/intellij.platform.util.text.matching.tests.iml index 63e088780fdb..36e558dee770 100644 --- a/platform/util/text-matching/intellij.platform.util.text.matching.tests.iml +++ b/platform/util/text-matching/intellij.platform.util.text.matching.tests.iml @@ -12,6 +12,7 @@ + diff --git a/platform/vcs-api/BUILD.bazel b/platform/vcs-api/BUILD.bazel index 5fc7f770b1d9..d0d55784c4ed 100644 --- a/platform/vcs-api/BUILD.bazel +++ b/platform/vcs-api/BUILD.bazel @@ -17,6 +17,7 @@ jvm_library( "//platform/analysis-api:analysis", "//platform/editor-ui-api:editor-ui", "//platform/platform-api:ide", + "//platform/ide-core", "//platform/lang-api:lang", "//platform/projectModel-api:projectModel", "//platform/vcs-api/vcs-api-core:vcs-core", @@ -57,6 +58,7 @@ jvm_library( "//platform/backend:backend_test_lib", "//platform/editor-ui-api:editor-ui_test_lib", "//platform/platform-api:ide_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/lang-api:lang_test_lib", "//platform/projectModel-api:projectModel_test_lib", "//platform/vcs-api/vcs-api-core:vcs-core_test_lib", diff --git a/platform/vcs-api/intellij.platform.vcs.iml b/platform/vcs-api/intellij.platform.vcs.iml index 9a01d9d85cf5..3deed081f54e 100644 --- a/platform/vcs-api/intellij.platform.vcs.iml +++ b/platform/vcs-api/intellij.platform.vcs.iml @@ -12,6 +12,7 @@ + diff --git a/platform/vcs-api/vcs-api-core/BUILD.bazel b/platform/vcs-api/vcs-api-core/BUILD.bazel index ec3688f8e000..a950b2ae4253 100644 --- a/platform/vcs-api/vcs-api-core/BUILD.bazel +++ b/platform/vcs-api/vcs-api-core/BUILD.bazel @@ -20,6 +20,8 @@ jvm_library( "//platform/ide-core", "//platform/diff-api:diff", "//platform/util/diff", + "//platform/util/multiplatform", + "//platform/util/base", "@lib//:kotlin-stdlib", "//libraries/kotlinx/serialization/core", ] @@ -38,6 +40,8 @@ jvm_library( "//platform/ide-core:ide-core_test_lib", "//platform/diff-api:diff_test_lib", "//platform/util/diff:diff_test_lib", + "//platform/util/multiplatform:multiplatform_test_lib", + "//platform/util/base:base_test_lib", "//libraries/junit5", "//libraries/junit5:junit5_test_lib", "//libraries/junit5-params", diff --git a/platform/vcs-api/vcs-api-core/intellij.platform.vcs.core.iml b/platform/vcs-api/vcs-api-core/intellij.platform.vcs.core.iml index fdf1b691f67f..0a0788807002 100644 --- a/platform/vcs-api/vcs-api-core/intellij.platform.vcs.core.iml +++ b/platform/vcs-api/vcs-api-core/intellij.platform.vcs.core.iml @@ -39,6 +39,8 @@ + + diff --git a/platform/vcs-impl/BUILD.bazel b/platform/vcs-impl/BUILD.bazel index 5be5894cbde0..adceca990e79 100644 --- a/platform/vcs-impl/BUILD.bazel +++ b/platform/vcs-impl/BUILD.bazel @@ -46,12 +46,14 @@ jvm_library( "//libraries/fastutil", "//platform/core-ui", "//platform/built-in-server:builtInServer-impl", + "//platform/built-in-server-api:builtInServer", "//platform/editor-ui-ex:editor-ex", "//platform/core-impl", "//platform/projectModel-impl", "//libraries/kotlinx/coroutines/core", "//platform/code-style-impl:codeStyle-impl", "//platform/platform-util-io-impl:ide-util-io-impl", + "//platform/platform-util-io:ide-util-io", "//platform/util/progress", "//libraries/caffeine", "//platform/workspace/storage", @@ -64,9 +66,11 @@ jvm_library( "//platform/workspace/jps", "//platform/backend/workspace", "//platform/ide-core/plugins", + "//platform/ide-core", "//platform/diagnostic", "//platform/util:util-ui", "//platform/util/coroutines", + "//platform/util-ex", "//libraries/kotlinx/serialization/core", "//libraries/kotlinx/serialization/json", "//platform/forms_rt:java-guiForms-rt", @@ -80,6 +84,7 @@ jvm_library( "//platform/project/shared:project", "//platform/kernel/backend", "//platform/platform-impl/rpc", + "//platform/progress/shared:ide-progress", "//platform/polySymbols", "//platform/execution", "//platform/eel", @@ -125,12 +130,14 @@ jvm_library( "//libraries/fastutil:fastutil_test_lib", "//platform/core-ui:core-ui_test_lib", "//platform/built-in-server:builtInServer-impl_test_lib", + "//platform/built-in-server-api:builtInServer_test_lib", "//platform/editor-ui-ex:editor-ex_test_lib", "//platform/core-impl:core-impl_test_lib", "//platform/projectModel-impl:projectModel-impl_test_lib", "//libraries/kotlinx/coroutines/core:core_test_lib", "//platform/code-style-impl:codeStyle-impl_test_lib", "//platform/platform-util-io-impl:ide-util-io-impl_test_lib", + "//platform/platform-util-io:ide-util-io_test_lib", "//platform/util/progress:progress_test_lib", "//libraries/caffeine:caffeine_test_lib", "//platform/workspace/storage:storage_test_lib", @@ -141,9 +148,11 @@ jvm_library( "//platform/workspace/jps:jps_test_lib", "//platform/backend/workspace:workspace_test_lib", "//platform/ide-core/plugins:plugins_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/diagnostic:diagnostic_test_lib", "//platform/util:util-ui_test_lib", "//platform/util/coroutines:coroutines_test_lib", + "//platform/util-ex:util-ex_test_lib", "//libraries/kotlinx/serialization/core:core_test_lib", "//libraries/kotlinx/serialization/json:json_test_lib", "//platform/forms_rt:java-guiForms-rt_test_lib", @@ -157,6 +166,7 @@ jvm_library( "//platform/project/shared:project_test_lib", "//platform/kernel/backend:backend_test_lib", "//platform/platform-impl/rpc:rpc_test_lib", + "//platform/progress/shared:ide-progress_test_lib", "//platform/polySymbols:polySymbols_test_lib", "//platform/execution:execution_test_lib", "//platform/eel:eel_test_lib", @@ -285,6 +295,7 @@ jvm_library( "//platform/backend/workspace", "//platform/backend/workspace:workspace_test_lib", "//platform/ide-core/plugins", + "//platform/ide-core", "//platform/diagnostic", "//platform/diagnostic:diagnostic_test_lib", "//platform/util:util-ui", @@ -333,6 +344,7 @@ jvm_library( "//platform/platform-util-io-impl:ide-util-io-impl_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", "//platform/ide-core/plugins:plugins_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/observable:observable_test_lib", "//platform/platform-impl/concurrency:concurrency_test_lib", "//platform/platform-impl/rpc:rpc_test_lib", diff --git a/platform/vcs-impl/frontend/BUILD.bazel b/platform/vcs-impl/frontend/BUILD.bazel index e9e787492302..41745161587d 100644 --- a/platform/vcs-impl/frontend/BUILD.bazel +++ b/platform/vcs-impl/frontend/BUILD.bazel @@ -23,6 +23,7 @@ jvm_library( "//platform/diagnostic", "//platform/core-ui", "//platform/platform-impl:ide-impl", + "//platform/ide-core", "//platform/diff-impl", "//platform/util/jdom", "//platform/kernel/shared:kernel", @@ -55,6 +56,7 @@ jvm_library( "//platform/diagnostic:diagnostic_test_lib", "//platform/core-ui:core-ui_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/diff-impl:diff-impl_test_lib", "//platform/util/jdom:jdom_test_lib", "//platform/kernel/shared:kernel_test_lib", @@ -112,6 +114,7 @@ jvm_library( "//platform/core-ui", "//platform/core-ui:core-ui_test_lib", "//platform/platform-impl:ide-impl", + "//platform/ide-core", "//platform/diff-impl", "//platform/diff-impl:diff-impl_test_lib", "//platform/util/jdom", @@ -146,6 +149,7 @@ jvm_library( runtime_deps = [ ":vcs-impl-frontend-tests", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", ] ) ### auto-generated section `build intellij.platform.vcs.impl.frontend.tests` end diff --git a/platform/vcs-impl/frontend/intellij.platform.vcs.impl.frontend.iml b/platform/vcs-impl/frontend/intellij.platform.vcs.impl.frontend.iml index 2845f476bf4c..794ce5317040 100644 --- a/platform/vcs-impl/frontend/intellij.platform.vcs.impl.frontend.iml +++ b/platform/vcs-impl/frontend/intellij.platform.vcs.impl.frontend.iml @@ -42,6 +42,7 @@ + diff --git a/platform/vcs-impl/frontend/intellij.platform.vcs.impl.frontend.tests.iml b/platform/vcs-impl/frontend/intellij.platform.vcs.impl.frontend.tests.iml index e8feb0a3cf82..a878f10f243c 100644 --- a/platform/vcs-impl/frontend/intellij.platform.vcs.impl.frontend.tests.iml +++ b/platform/vcs-impl/frontend/intellij.platform.vcs.impl.frontend.tests.iml @@ -41,6 +41,7 @@ + diff --git a/platform/vcs-impl/intellij.platform.vcs.impl.iml b/platform/vcs-impl/intellij.platform.vcs.impl.iml index 0c46275a9761..6730635e1560 100644 --- a/platform/vcs-impl/intellij.platform.vcs.impl.iml +++ b/platform/vcs-impl/intellij.platform.vcs.impl.iml @@ -66,12 +66,14 @@ + + @@ -84,9 +86,11 @@ + + @@ -100,6 +104,7 @@ + diff --git a/platform/vcs-impl/intellij.platform.vcs.impl.tests.iml b/platform/vcs-impl/intellij.platform.vcs.impl.tests.iml index 6b37ca10c71b..dd04644c7ad9 100644 --- a/platform/vcs-impl/intellij.platform.vcs.impl.tests.iml +++ b/platform/vcs-impl/intellij.platform.vcs.impl.tests.iml @@ -84,6 +84,7 @@ + diff --git a/platform/vcs-impl/lang/BUILD.bazel b/platform/vcs-impl/lang/BUILD.bazel index 31c79f0eb2c8..ceb07d5d86d2 100644 --- a/platform/vcs-impl/lang/BUILD.bazel +++ b/platform/vcs-impl/lang/BUILD.bazel @@ -21,6 +21,7 @@ jvm_library( "//platform/diff-api:diff", "//platform/editor-ui-api:editor-ui", "//platform/ide-core-impl", + "//platform/ide-core", "//platform/indexing-api:indexing", "//platform/core-impl", "//platform/indexing-impl", @@ -43,6 +44,7 @@ jvm_library( "//platform/vcs-impl/shared", "//platform/lang-api:lang", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", + "//platform/util:util-ui", ] ) @@ -60,6 +62,7 @@ jvm_library( "//platform/diff-api:diff_test_lib", "//platform/editor-ui-api:editor-ui_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/indexing-api:indexing_test_lib", "//platform/core-impl:core-impl_test_lib", "//platform/indexing-impl:indexing-impl_test_lib", @@ -82,6 +85,7 @@ jvm_library( "//platform/vcs-impl/shared:shared_test_lib", "//platform/lang-api:lang_test_lib", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", + "//platform/util:util-ui_test_lib", ] ) ### auto-generated section `build intellij.platform.vcs.impl.lang` end diff --git a/platform/vcs-impl/lang/intellij.platform.vcs.impl.lang.iml b/platform/vcs-impl/lang/intellij.platform.vcs.impl.lang.iml index f4354f6f541d..b5f0f0861d2b 100644 --- a/platform/vcs-impl/lang/intellij.platform.vcs.impl.lang.iml +++ b/platform/vcs-impl/lang/intellij.platform.vcs.impl.lang.iml @@ -15,6 +15,7 @@ + @@ -37,5 +38,6 @@ + \ No newline at end of file diff --git a/platform/vcs-impl/shared/BUILD.bazel b/platform/vcs-impl/shared/BUILD.bazel index 6a72c8f405be..bd48bb8ce7b3 100644 --- a/platform/vcs-impl/shared/BUILD.bazel +++ b/platform/vcs-impl/shared/BUILD.bazel @@ -38,6 +38,7 @@ jvm_library( "//libraries/fastutil", "//platform/util/jdom", "//platform/ide-core-impl", + "//platform/ide-core", "//platform/diagnostic/telemetry", "//platform/core-impl", "//platform/diff-api:diff", @@ -73,6 +74,7 @@ jvm_library( "//libraries/fastutil:fastutil_test_lib", "//platform/util/jdom:jdom_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/diagnostic/telemetry:telemetry_test_lib", "//platform/core-impl:core-impl_test_lib", "//platform/diff-api:diff_test_lib", @@ -146,6 +148,7 @@ jvm_library( "//platform/util/jdom", "//platform/util/jdom:jdom_test_lib", "//platform/ide-core-impl", + "//platform/ide-core", "//platform/diagnostic/telemetry", "//platform/diagnostic/telemetry:telemetry_test_lib", "//platform/testFramework", @@ -159,6 +162,7 @@ jvm_library( "//platform/platform-impl/rpc:rpc_test_lib", "//platform/platform-impl:ide-impl_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", ] ) ### auto-generated section `build intellij.platform.vcs.impl.shared.tests` end diff --git a/platform/vcs-impl/shared/intellij.platform.vcs.impl.shared.iml b/platform/vcs-impl/shared/intellij.platform.vcs.impl.shared.iml index 6f5766e8d634..6e51216640d5 100644 --- a/platform/vcs-impl/shared/intellij.platform.vcs.impl.shared.iml +++ b/platform/vcs-impl/shared/intellij.platform.vcs.impl.shared.iml @@ -57,6 +57,7 @@ + diff --git a/platform/vcs-impl/shared/intellij.platform.vcs.impl.shared.tests.iml b/platform/vcs-impl/shared/intellij.platform.vcs.impl.shared.tests.iml index 37c0efd1f98d..17900cae542f 100644 --- a/platform/vcs-impl/shared/intellij.platform.vcs.impl.shared.tests.iml +++ b/platform/vcs-impl/shared/intellij.platform.vcs.impl.shared.tests.iml @@ -56,6 +56,7 @@ + diff --git a/platform/vcs-log/graph/BUILD.bazel b/platform/vcs-log/graph/BUILD.bazel index e01a3d4cef0a..00eb138ebde8 100644 --- a/platform/vcs-log/graph/BUILD.bazel +++ b/platform/vcs-log/graph/BUILD.bazel @@ -15,6 +15,8 @@ jvm_library( resources = [":vcs-log-graph-impl_resources"], deps = [ "//platform/util", + "//platform/util/base/multiplatform", + "//platform/util/base", "//platform/vcs-log/graph-api:vcs-log-graph", "@lib//:kotlin-stdlib", "//libraries/guava", @@ -40,6 +42,8 @@ jvm_library( runtime_deps = [ ":vcs-log-graph-impl", "//platform/util:util_test_lib", + "//platform/util/base/multiplatform:multiplatform_test_lib", + "//platform/util/base:base_test_lib", "//platform/vcs-log/graph-api:vcs-log-graph_test_lib", "//platform/testFramework", "//platform/testFramework:testFramework_test_lib", @@ -82,6 +86,8 @@ jvm_library( deps = [ "//platform/util", "//platform/util:util_test_lib", + "//platform/util/base", + "//platform/util/base:base_test_lib", "//platform/vcs-log/graph-api:vcs-log-graph", "//platform/vcs-log/graph-api:vcs-log-graph_test_lib", "//platform/testFramework", diff --git a/platform/vcs-log/graph/intellij.platform.vcs.log.graph.impl.iml b/platform/vcs-log/graph/intellij.platform.vcs.log.graph.impl.iml index 12cd2a834893..4ba55d1eff35 100644 --- a/platform/vcs-log/graph/intellij.platform.vcs.log.graph.impl.iml +++ b/platform/vcs-log/graph/intellij.platform.vcs.log.graph.impl.iml @@ -9,6 +9,8 @@ + + diff --git a/platform/vcs-log/graph/intellij.platform.vcs.log.graph.impl.tests.iml b/platform/vcs-log/graph/intellij.platform.vcs.log.graph.impl.tests.iml index e7cd8d284ff9..4667b871b46f 100644 --- a/platform/vcs-log/graph/intellij.platform.vcs.log.graph.impl.tests.iml +++ b/platform/vcs-log/graph/intellij.platform.vcs.log.graph.impl.tests.iml @@ -8,6 +8,7 @@ + diff --git a/platform/vcs-log/impl/BUILD.bazel b/platform/vcs-log/impl/BUILD.bazel index b50165a8639a..2ad2eb838b1d 100644 --- a/platform/vcs-log/impl/BUILD.bazel +++ b/platform/vcs-log/impl/BUILD.bazel @@ -31,6 +31,8 @@ jvm_library( "//platform/vcs-log/graph:vcs-log-graph-impl", "//platform/platform-impl:ide-impl", "//platform/ide-core-impl", + "//platform/ide-core", + "//platform/progress/shared:ide-progress", "//platform/analysis-impl", "//platform/vcs-impl", "//libraries/guava", @@ -58,6 +60,7 @@ jvm_library( "//platform/vcs-impl/shared", "//platform/bookmarks", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", + "//platform/util:util-ui", ] ) @@ -85,6 +88,8 @@ jvm_library( "//platform/vcs-log/graph:vcs-log-graph-impl_test_lib", "//platform/platform-impl:ide-impl_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", + "//platform/progress/shared:ide-progress_test_lib", "//platform/analysis-impl:analysis-impl_test_lib", "//platform/vcs-impl:vcs-impl_test_lib", "//libraries/guava:guava_test_lib", @@ -119,6 +124,7 @@ jvm_library( "//libraries/mockito:mockito_test_lib", "//platform/bookmarks:bookmarks_test_lib", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", + "//platform/util:util-ui_test_lib", ] ) ### auto-generated section `build intellij.platform.vcs.log.impl` end @@ -178,6 +184,7 @@ jvm_library( "//platform/vcs-log/graph:vcs-log-graph-impl_test_lib", "//platform/platform-impl:ide-impl", "//platform/ide-core-impl", + "//platform/ide-core", "//platform/analysis-impl", "//platform/analysis-impl:analysis-impl_test_lib", "//platform/vcs-impl", @@ -231,6 +238,8 @@ jvm_library( "//platform/util/coroutines:coroutines_test_lib", "//platform/util/storages", "//platform/util/storages:storages_test_lib", + "//platform/util:util-ui", + "//platform/util:util-ui_test_lib", "//platform/vcs-impl/shared", "//platform/vcs-impl/shared:shared_test_lib", "//libraries/mockito", @@ -246,6 +255,7 @@ jvm_library( ":vcs-log-impl-tests", "//platform/platform-impl:ide-impl_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", ] ) ### auto-generated section `build intellij.platform.vcs.log.impl.tests` end diff --git a/platform/vcs-log/impl/intellij.platform.vcs.log.impl.iml b/platform/vcs-log/impl/intellij.platform.vcs.log.impl.iml index bd341fc76553..babf8bbfcdaf 100644 --- a/platform/vcs-log/impl/intellij.platform.vcs.log.impl.iml +++ b/platform/vcs-log/impl/intellij.platform.vcs.log.impl.iml @@ -26,6 +26,8 @@ + + @@ -59,5 +61,6 @@ + \ No newline at end of file diff --git a/platform/vcs-log/impl/intellij.platform.vcs.log.impl.tests.iml b/platform/vcs-log/impl/intellij.platform.vcs.log.impl.tests.iml index 82da0553db2d..c1132cdba826 100644 --- a/platform/vcs-log/impl/intellij.platform.vcs.log.impl.tests.iml +++ b/platform/vcs-log/impl/intellij.platform.vcs.log.impl.tests.iml @@ -24,6 +24,7 @@ + @@ -53,6 +54,7 @@ + diff --git a/platform/vcs-tests/BUILD.bazel b/platform/vcs-tests/BUILD.bazel index 33a0866d65c4..2147af1ffa6b 100644 --- a/platform/vcs-tests/BUILD.bazel +++ b/platform/vcs-tests/BUILD.bazel @@ -16,6 +16,7 @@ jvm_library( "//platform/vcs-impl", "//platform/projectModel-impl", "//platform/ide-core-impl", + "//platform/ide-core", "//platform/diff-api:diff", "//platform/analysis-api:analysis", "@lib//:junit4", @@ -26,6 +27,7 @@ jvm_library( "//platform/testFramework/junit5/eel", "//platform/lang-api:lang", "//platform/lang-core", + "//platform/util-ex", ] ) @@ -44,6 +46,7 @@ jvm_library( "//platform/vcs-impl:vcs-impl_test_lib", "//platform/projectModel-impl:projectModel-impl_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/diff-api:diff_test_lib", "//platform/analysis-api:analysis_test_lib", "//platform/indexing-impl:indexing-impl_test_lib", @@ -53,6 +56,7 @@ jvm_library( "//platform/testFramework/junit5/eel:eel_test_lib", "//platform/lang-api:lang_test_lib", "//platform/lang-core:lang-core_test_lib", + "//platform/util-ex:util-ex_test_lib", ] ) ### auto-generated section `build intellij.platform.vcs.testFramework` end @@ -107,6 +111,8 @@ jvm_library( "//platform/indexing-api:indexing_test_lib", "//jps/model-api:model", "//jps/model-api:model_test_lib", + "//jps/model-serialization", + "//jps/model-serialization:model-serialization_test_lib", "//platform/lang-core", "//platform/lang-core:lang-core_test_lib", "//platform/projectModel-api:projectModel", @@ -128,6 +134,7 @@ jvm_library( "//platform/core-api:core", "//platform/core-api:core_test_lib", "//platform/ide-core-impl", + "//platform/ide-core", "//platform/projectModel-impl", "//platform/projectModel-impl:projectModel-impl_test_lib", "@lib//:junit4", @@ -154,6 +161,8 @@ jvm_library( "//libraries/fastutil:fastutil_test_lib", "//platform/util/jdom", "//platform/util/jdom:jdom_test_lib", + "//platform/util:util-ui", + "//platform/util:util-ui_test_lib", "//xml/xml-psi-api:psi", "//xml/xml-psi-api:psi_test_lib", "//tools/intellij.tools.ide.metrics.benchmark:ide-metrics-benchmark", @@ -178,6 +187,7 @@ jvm_library( runtime_deps = [ ":vcs-tests", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", ] ) ### auto-generated section `build intellij.platform.vcs.tests` end diff --git a/platform/vcs-tests/intellij.platform.vcs.testFramework.iml b/platform/vcs-tests/intellij.platform.vcs.testFramework.iml index 1afece750014..d1349af6960e 100644 --- a/platform/vcs-tests/intellij.platform.vcs.testFramework.iml +++ b/platform/vcs-tests/intellij.platform.vcs.testFramework.iml @@ -16,6 +16,7 @@ + @@ -26,5 +27,6 @@ + \ No newline at end of file diff --git a/platform/vcs-tests/intellij.platform.vcs.tests.iml b/platform/vcs-tests/intellij.platform.vcs.tests.iml index d6ca0b1f5589..607a28dd7cf9 100644 --- a/platform/vcs-tests/intellij.platform.vcs.tests.iml +++ b/platform/vcs-tests/intellij.platform.vcs.tests.iml @@ -12,6 +12,7 @@ + @@ -23,6 +24,7 @@ + @@ -37,6 +39,7 @@ + diff --git a/platform/whatsNew/BUILD.bazel b/platform/whatsNew/BUILD.bazel index b61f6b967122..e5fd86f64807 100644 --- a/platform/whatsNew/BUILD.bazel +++ b/platform/whatsNew/BUILD.bazel @@ -32,8 +32,10 @@ jvm_library( "//platform/statistics", "//platform/platform-impl:ide-impl", "//platform/core-ui", + "//platform/util:util-ui", "//platform/platform-util-io:ide-util-io", "//platform/ide-core-impl", + "//platform/ide-core", "//libraries/miglayout-swing", "@lib//:kotlinc-kotlinx-serialization-compiler-plugin-provided", "//libraries/kotlinx/serialization/json", @@ -60,8 +62,10 @@ jvm_library( "//platform/statistics:statistics_test_lib", "//platform/platform-impl:ide-impl_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/util:util-ui_test_lib", "//platform/platform-util-io:ide-util-io_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//libraries/miglayout-swing:miglayout-swing_test_lib", "@lib//:kotlinc-kotlinx-serialization-compiler-plugin-provided", "//libraries/kotlinx/serialization/json:json_test_lib", diff --git a/platform/whatsNew/intellij.platform.whatsNew.iml b/platform/whatsNew/intellij.platform.whatsNew.iml index 1d7104925415..554c2223dc19 100644 --- a/platform/whatsNew/intellij.platform.whatsNew.iml +++ b/platform/whatsNew/intellij.platform.whatsNew.iml @@ -37,8 +37,10 @@ + + diff --git a/platform/workspace/jps/BUILD.bazel b/platform/workspace/jps/BUILD.bazel index 872fa45e3857..77e236df9e3a 100644 --- a/platform/workspace/jps/BUILD.bazel +++ b/platform/workspace/jps/BUILD.bazel @@ -39,6 +39,8 @@ jvm_library( "@lib//:opentelemetry-semconv", "//platform/diagnostic/telemetry", "//platform/util/coroutines", + "//platform/util/base/multiplatform", + "//platform/util/base", ] ) @@ -61,6 +63,8 @@ jvm_library( "//libraries/kotlinx/coroutines/core:core_test_lib", "//platform/diagnostic/telemetry:telemetry_test_lib", "//platform/util/coroutines:coroutines_test_lib", + "//platform/util/base/multiplatform:multiplatform_test_lib", + "//platform/util/base:base_test_lib", ] ) ### auto-generated section `build intellij.platform.workspace.jps` end diff --git a/platform/workspace/jps/intellij.platform.workspace.jps.iml b/platform/workspace/jps/intellij.platform.workspace.jps.iml index 3f0ccc92bd6f..a16d04c24c61 100644 --- a/platform/workspace/jps/intellij.platform.workspace.jps.iml +++ b/platform/workspace/jps/intellij.platform.workspace.jps.iml @@ -39,5 +39,7 @@ + + \ No newline at end of file diff --git a/platform/workspace/jps/tests/BUILD.bazel b/platform/workspace/jps/tests/BUILD.bazel index 048a0f543cf7..4f582ecbdae7 100644 --- a/platform/workspace/jps/tests/BUILD.bazel +++ b/platform/workspace/jps/tests/BUILD.bazel @@ -59,6 +59,8 @@ jvm_library( "@lib//:assert_j", "//platform/core-ui", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", "//libraries/commons/lang3", "//libraries/commons/lang3:lang3_test_lib", "//platform/util/jdom", @@ -76,6 +78,10 @@ jvm_library( "//tools/intellij.tools.ide.metrics.benchmark:ide-metrics-benchmark_test_lib", "//platform/util/coroutines", "//platform/util/coroutines:coroutines_test_lib", + "//platform/util:util-ui", + "//platform/util:util-ui_test_lib", + "//platform/util-ex", + "//platform/util-ex:util-ex_test_lib", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", "//java/java-impl:impl", @@ -87,8 +93,12 @@ jvm_library( "@lib//:jet_check", "//platform/testFramework/junit5/projectStructure", "//platform/testFramework/junit5/projectStructure:projectStructure_test_lib", + "//platform/ide-core", ], - runtime_deps = [":tests"] + runtime_deps = [ + ":tests", + "//platform/ide-core:ide-core_test_lib", + ] ) ### auto-generated section `build intellij.platform.workspace.jps.tests` end diff --git a/platform/workspace/jps/tests/intellij.platform.workspace.jps.tests.iml b/platform/workspace/jps/tests/intellij.platform.workspace.jps.tests.iml index 1ec525baad2a..3563650c5aa9 100644 --- a/platform/workspace/jps/tests/intellij.platform.workspace.jps.tests.iml +++ b/platform/workspace/jps/tests/intellij.platform.workspace.jps.tests.iml @@ -24,6 +24,7 @@ + @@ -33,12 +34,15 @@ + + + \ No newline at end of file diff --git a/platform/workspace/storage/BUILD.bazel b/platform/workspace/storage/BUILD.bazel index ad78c78ca7a4..c692a6dfb0b5 100644 --- a/platform/workspace/storage/BUILD.bazel +++ b/platform/workspace/storage/BUILD.bazel @@ -31,6 +31,8 @@ jvm_library( "//libraries/guava", "//libraries/kotlin/reflect", "//platform/util", + "//platform/util/base/multiplatform", + "//platform/util/base", "//libraries/fastutil", "//libraries/caffeine", "//libraries/kryo5", @@ -53,6 +55,8 @@ jvm_library( "//libraries/guava:guava_test_lib", "//libraries/kotlin/reflect:reflect_test_lib", "//platform/util:util_test_lib", + "//platform/util/base/multiplatform:multiplatform_test_lib", + "//platform/util/base:base_test_lib", "@lib//:junit4", "//libraries/fastutil:fastutil_test_lib", "//libraries/caffeine:caffeine_test_lib", diff --git a/platform/workspace/storage/intellij.platform.workspace.storage.iml b/platform/workspace/storage/intellij.platform.workspace.storage.iml index 18760932060c..e6e0e7444990 100644 --- a/platform/workspace/storage/intellij.platform.workspace.storage.iml +++ b/platform/workspace/storage/intellij.platform.workspace.storage.iml @@ -29,6 +29,8 @@ + + diff --git a/platform/workspace/storage/testEntities/BUILD.bazel b/platform/workspace/storage/testEntities/BUILD.bazel index b9353f466d51..84e9d44a5627 100644 --- a/platform/workspace/storage/testEntities/BUILD.bazel +++ b/platform/workspace/storage/testEntities/BUILD.bazel @@ -23,6 +23,8 @@ jvm_library( "//platform/workspace/storage:storage_test_lib", "//platform/testFramework", "//platform/testFramework:testFramework_test_lib", + "//platform/util/base/multiplatform", + "//platform/util/base/multiplatform:multiplatform_test_lib", "//libraries/kotlin/reflect", "//libraries/kotlin/reflect:reflect_test_lib", ], diff --git a/platform/workspace/storage/testEntities/intellij.platform.workspace.storage.testEntities.iml b/platform/workspace/storage/testEntities/intellij.platform.workspace.storage.testEntities.iml index e01bd9d3e610..cc55280fff1a 100644 --- a/platform/workspace/storage/testEntities/intellij.platform.workspace.storage.testEntities.iml +++ b/platform/workspace/storage/testEntities/intellij.platform.workspace.storage.testEntities.iml @@ -11,6 +11,7 @@ + \ No newline at end of file diff --git a/platform/xdebugger-api/BUILD.bazel b/platform/xdebugger-api/BUILD.bazel index 6be40dee7c83..cf279cf5b7ae 100644 --- a/platform/xdebugger-api/BUILD.bazel +++ b/platform/xdebugger-api/BUILD.bazel @@ -22,6 +22,7 @@ jvm_library( "//platform/util/concurrency", "//platform/core-ui", "//platform/platform-util-io:ide-util-io", + "//platform/ide-core", "//libraries/kotlinx/serialization/core", "//libraries/kotlinx/serialization/json", "@lib//:kotlin-stdlib", @@ -46,6 +47,7 @@ jvm_library( "//platform/util/concurrency:concurrency_test_lib", "//platform/core-ui:core-ui_test_lib", "//platform/platform-util-io:ide-util-io_test_lib", + "//platform/ide-core:ide-core_test_lib", "//libraries/kotlinx/serialization/core:core_test_lib", "//libraries/kotlinx/serialization/json:json_test_lib", "//platform/core-api:core_test_lib", diff --git a/platform/xdebugger-api/intellij.platform.debugger.iml b/platform/xdebugger-api/intellij.platform.debugger.iml index bfbb96c60796..a4a7023ae818 100644 --- a/platform/xdebugger-api/intellij.platform.debugger.iml +++ b/platform/xdebugger-api/intellij.platform.debugger.iml @@ -38,6 +38,7 @@ + diff --git a/platform/xdebugger-impl/BUILD.bazel b/platform/xdebugger-impl/BUILD.bazel index 08983860a2b3..067147924eab 100644 --- a/platform/xdebugger-impl/BUILD.bazel +++ b/platform/xdebugger-impl/BUILD.bazel @@ -51,6 +51,7 @@ jvm_library( "//libraries/fastutil", "//platform/core-ui", "//platform/platform-util-io-impl:ide-util-io-impl", + "//platform/platform-util-io:ide-util-io", "//platform/util-ex", "//platform/platform-impl:ide-impl", "//platform/core-impl", @@ -80,6 +81,7 @@ jvm_library( "//platform/remote-topics/shared:rpc-topics", "//platform/execution", "//platform/ide-core", + "//platform/util:util-ui", ] ) @@ -112,6 +114,7 @@ jvm_library( "//libraries/fastutil:fastutil_test_lib", "//platform/core-ui:core-ui_test_lib", "//platform/platform-util-io-impl:ide-util-io-impl_test_lib", + "//platform/platform-util-io:ide-util-io_test_lib", "//platform/util-ex:util-ex_test_lib", "//platform/platform-impl:ide-impl_test_lib", "//platform/core-impl:core-impl_test_lib", @@ -141,6 +144,7 @@ jvm_library( "//platform/remote-topics/shared:rpc-topics_test_lib", "//platform/execution:execution_test_lib", "//platform/ide-core:ide-core_test_lib", + "//platform/util:util-ui_test_lib", ] ) ### auto-generated section `build intellij.platform.debugger.impl` end @@ -222,6 +226,7 @@ jvm_library( "//platform/core-ui", "//platform/core-ui:core-ui_test_lib", "//platform/platform-util-io-impl:ide-util-io-impl", + "//platform/platform-util-io:ide-util-io", "//platform/util-ex", "//platform/util-ex:util-ex_test_lib", "//platform/platform-impl:ide-impl", @@ -239,6 +244,8 @@ jvm_library( "//platform/util/text-matching:text-matching_test_lib", "//platform/util/coroutines", "//platform/util/coroutines:coroutines_test_lib", + "//platform/util:util-ui", + "//platform/util:util-ui_test_lib", "//platform/ide-core-impl", "//platform/platform-impl/rpc", "//platform/editor-ui-ex:editor-ex", @@ -278,6 +285,7 @@ jvm_library( ":debugger-impl-tests", "//platform/observable:observable_test_lib", "//platform/platform-util-io-impl:ide-util-io-impl_test_lib", + "//platform/platform-util-io:ide-util-io_test_lib", "//platform/platform-impl:ide-impl_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", "//platform/platform-impl/rpc:rpc_test_lib", diff --git a/platform/xdebugger-impl/frontend/BUILD.bazel b/platform/xdebugger-impl/frontend/BUILD.bazel index a7f2f80d67f9..442a8ad1147e 100644 --- a/platform/xdebugger-impl/frontend/BUILD.bazel +++ b/platform/xdebugger-impl/frontend/BUILD.bazel @@ -38,6 +38,7 @@ jvm_library( "//platform/platform-frontend:frontend", "//platform/execution-impl", "//platform/platform-util-io:ide-util-io", + "//platform/ide-core", "//platform/execution-impl/frontend", "//platform/xdebugger-impl/shared", "//platform/xdebugger-impl/rpc", @@ -77,6 +78,7 @@ jvm_library( "//platform/platform-frontend:frontend_test_lib", "//platform/execution-impl:execution-impl_test_lib", "//platform/platform-util-io:ide-util-io_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/execution-impl/frontend:frontend_test_lib", "//platform/xdebugger-impl/shared:shared_test_lib", "//platform/xdebugger-impl/rpc:rpc_test_lib", diff --git a/platform/xdebugger-impl/frontend/intellij.platform.debugger.impl.frontend.iml b/platform/xdebugger-impl/frontend/intellij.platform.debugger.impl.frontend.iml index 1af2a99d5f5f..d92c1b74a20f 100644 --- a/platform/xdebugger-impl/frontend/intellij.platform.debugger.impl.frontend.iml +++ b/platform/xdebugger-impl/frontend/intellij.platform.debugger.impl.frontend.iml @@ -57,6 +57,7 @@ + diff --git a/platform/xdebugger-impl/intellij.platform.debugger.impl.iml b/platform/xdebugger-impl/intellij.platform.debugger.impl.iml index 3c4ccca8c97e..99eafad248c0 100644 --- a/platform/xdebugger-impl/intellij.platform.debugger.impl.iml +++ b/platform/xdebugger-impl/intellij.platform.debugger.impl.iml @@ -56,6 +56,7 @@ + @@ -85,5 +86,6 @@ + \ No newline at end of file diff --git a/platform/xdebugger-impl/intellij.platform.debugger.impl.tests.iml b/platform/xdebugger-impl/intellij.platform.debugger.impl.tests.iml index e984258c9b97..1b893e803710 100644 --- a/platform/xdebugger-impl/intellij.platform.debugger.impl.tests.iml +++ b/platform/xdebugger-impl/intellij.platform.debugger.impl.tests.iml @@ -57,6 +57,7 @@ + @@ -66,6 +67,7 @@ + diff --git a/platform/xdebugger-impl/shared/BUILD.bazel b/platform/xdebugger-impl/shared/BUILD.bazel index b94400234144..49f80ad30be4 100644 --- a/platform/xdebugger-impl/shared/BUILD.bazel +++ b/platform/xdebugger-impl/shared/BUILD.bazel @@ -19,6 +19,7 @@ jvm_library( "//platform/core-api:core", "//platform/core-impl", "//platform/core-ui", + "//platform/util:util-ui", "//platform/platform-api:ide", "//platform/kernel/shared:kernel", "//platform/util/concurrency", @@ -40,6 +41,7 @@ jvm_library( "//platform/execution", "//platform/statistics", "//platform/platform-impl/internal", + "//platform/ide-core", ] ) @@ -54,6 +56,7 @@ jvm_library( "//platform/core-api:core_test_lib", "//platform/core-impl:core-impl_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/util:util-ui_test_lib", "//platform/platform-api:ide_test_lib", "//platform/kernel/shared:kernel_test_lib", "//platform/util/concurrency:concurrency_test_lib", @@ -75,6 +78,7 @@ jvm_library( "//platform/execution:execution_test_lib", "//platform/statistics:statistics_test_lib", "//platform/platform-impl/internal:internal_test_lib", + "//platform/ide-core:ide-core_test_lib", ] ) ### auto-generated section `build intellij.platform.debugger.impl.shared` end diff --git a/platform/xdebugger-impl/shared/intellij.platform.debugger.impl.shared.iml b/platform/xdebugger-impl/shared/intellij.platform.debugger.impl.shared.iml index 41bab508a75c..1632484c7893 100644 --- a/platform/xdebugger-impl/shared/intellij.platform.debugger.impl.shared.iml +++ b/platform/xdebugger-impl/shared/intellij.platform.debugger.impl.shared.iml @@ -38,6 +38,7 @@ + @@ -59,5 +60,6 @@ + \ No newline at end of file diff --git a/platform/xdebugger-impl/ui/BUILD.bazel b/platform/xdebugger-impl/ui/BUILD.bazel index a8d0d77329a7..0fc2b24c241d 100644 --- a/platform/xdebugger-impl/ui/BUILD.bazel +++ b/platform/xdebugger-impl/ui/BUILD.bazel @@ -65,6 +65,9 @@ jvm_library( "//platform/util/jdom", "//libraries/fastutil", "//platform/forms_rt:java-guiForms-rt", + "//platform/util:util-ui", + "//platform/editor-ui-api:editor-ui", + "//jps/model-serialization", ] ) @@ -118,6 +121,9 @@ jvm_library( "//platform/util/jdom:jdom_test_lib", "//libraries/fastutil:fastutil_test_lib", "//platform/forms_rt:java-guiForms-rt_test_lib", + "//platform/util:util-ui_test_lib", + "//platform/editor-ui-api:editor-ui_test_lib", + "//jps/model-serialization:model-serialization_test_lib", ] ) ### auto-generated section `build intellij.platform.debugger.impl.ui` end diff --git a/platform/xdebugger-impl/ui/intellij.platform.debugger.impl.ui.iml b/platform/xdebugger-impl/ui/intellij.platform.debugger.impl.ui.iml index fc415b938696..74486a2bb4db 100644 --- a/platform/xdebugger-impl/ui/intellij.platform.debugger.impl.ui.iml +++ b/platform/xdebugger-impl/ui/intellij.platform.debugger.impl.ui.iml @@ -77,5 +77,8 @@ + + + \ No newline at end of file diff --git a/platform/xdebugger-testFramework/BUILD.bazel b/platform/xdebugger-testFramework/BUILD.bazel index 3026904adc06..470b8d8f2a3c 100644 --- a/platform/xdebugger-testFramework/BUILD.bazel +++ b/platform/xdebugger-testFramework/BUILD.bazel @@ -25,6 +25,8 @@ jvm_library( "//platform/xdebugger-impl/ui", "//platform/execution", "//platform/lang-api:lang", + "//platform/progress/shared:ide-progress", + "//platform/util:util-ui", ] ) @@ -52,6 +54,8 @@ jvm_library( "//platform/xdebugger-impl/ui:ui_test_lib", "//platform/execution:execution_test_lib", "//platform/lang-api:lang_test_lib", + "//platform/progress/shared:ide-progress_test_lib", + "//platform/util:util-ui_test_lib", ] ) ### auto-generated section `build intellij.platform.debugger.testFramework` end diff --git a/platform/xdebugger-testFramework/intellij.platform.debugger.testFramework.iml b/platform/xdebugger-testFramework/intellij.platform.debugger.testFramework.iml index 94987877e3a3..82db64e0cbe5 100644 --- a/platform/xdebugger-testFramework/intellij.platform.debugger.testFramework.iml +++ b/platform/xdebugger-testFramework/intellij.platform.debugger.testFramework.iml @@ -25,5 +25,7 @@ + + \ No newline at end of file diff --git a/plugins/ByteCodeViewer/BUILD.bazel b/plugins/ByteCodeViewer/BUILD.bazel index adc02ad58585..bdb499a98c97 100644 --- a/plugins/ByteCodeViewer/BUILD.bazel +++ b/plugins/ByteCodeViewer/BUILD.bazel @@ -26,9 +26,11 @@ jvm_library( "//platform/editor-ui-api:editor-ui", "//platform/projectModel-api:projectModel", "//platform/util", + "//platform/util:util-ui", "//platform/core-api:core", "//platform/platform-api:ide", "//platform/platform-impl:ide-impl", + "//platform/ide-core", "//platform/lang-api:lang", "//platform/lang-impl", "//java/java-psi-api:psi", @@ -36,6 +38,7 @@ jvm_library( "//java/openapi:java", "//java/compiler/impl", "//platform/core-ui", + "//platform/core-impl", "//java/java-frontback-psi-impl:frontback-psi-impl", ] ) @@ -53,9 +56,11 @@ jvm_library( "//platform/editor-ui-api:editor-ui_test_lib", "//platform/projectModel-api:projectModel_test_lib", "//platform/util:util_test_lib", + "//platform/util:util-ui_test_lib", "//platform/core-api:core_test_lib", "//platform/platform-api:ide_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/lang-api:lang_test_lib", "//platform/lang-impl:lang-impl_test_lib", "//java/java-psi-api:psi_test_lib", @@ -65,6 +70,7 @@ jvm_library( "//platform/testFramework", "//platform/testFramework:testFramework_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl:core-impl_test_lib", "//java/java-frontback-psi-impl:frontback-psi-impl_test_lib", ] ) @@ -130,6 +136,8 @@ jvm_library( "//platform/testFramework:testFramework_test_lib", "//platform/core-ui", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", "//java/java-frontback-psi-impl:frontback-psi-impl", "//java/java-frontback-psi-impl:frontback-psi-impl_test_lib", ], diff --git a/plugins/ByteCodeViewer/intellij.java.byteCodeViewer.iml b/plugins/ByteCodeViewer/intellij.java.byteCodeViewer.iml index 786dc216822a..9862b01ba6b5 100644 --- a/plugins/ByteCodeViewer/intellij.java.byteCodeViewer.iml +++ b/plugins/ByteCodeViewer/intellij.java.byteCodeViewer.iml @@ -29,9 +29,11 @@ + + @@ -40,6 +42,7 @@ + \ No newline at end of file diff --git a/plugins/ByteCodeViewer/intellij.java.byteCodeViewer.tests.iml b/plugins/ByteCodeViewer/intellij.java.byteCodeViewer.tests.iml index 6dbea228cc4f..17f4904254ee 100644 --- a/plugins/ByteCodeViewer/intellij.java.byteCodeViewer.tests.iml +++ b/plugins/ByteCodeViewer/intellij.java.byteCodeViewer.tests.iml @@ -39,6 +39,7 @@ + diff --git a/plugins/IntelliLang/BUILD.bazel b/plugins/IntelliLang/BUILD.bazel index 340b3db8518c..87ddb910321f 100644 --- a/plugins/IntelliLang/BUILD.bazel +++ b/plugins/IntelliLang/BUILD.bazel @@ -23,11 +23,13 @@ jvm_library( "//platform/projectModel-api:projectModel", "//RegExpSupport:regexp", "//platform/platform-api:ide", + "//platform/ide-core", "//libraries/stream", "//platform/core-api:core", "//platform/core-ui", "//platform/editor-ui-ex:editor-ex", "//xml/xml-parser:parser", + "//platform/util:util-ui", "//libraries/fastutil", "//platform/util/jdom", "//platform/analysis-impl", @@ -54,11 +56,13 @@ jvm_library( "//platform/projectModel-api:projectModel_test_lib", "//RegExpSupport:regexp_test_lib", "//platform/platform-api:ide_test_lib", + "//platform/ide-core:ide-core_test_lib", "//libraries/stream:stream_test_lib", "//platform/core-api:core_test_lib", "//platform/core-ui:core-ui_test_lib", "//platform/editor-ui-ex:editor-ex_test_lib", "//xml/xml-parser:parser_test_lib", + "//platform/util:util-ui_test_lib", "//libraries/fastutil:fastutil_test_lib", "//platform/util/jdom:jdom_test_lib", "//platform/analysis-impl:analysis-impl_test_lib", diff --git a/plugins/IntelliLang/backend/BUILD.bazel b/plugins/IntelliLang/backend/BUILD.bazel index acc7145dd966..910b48017d12 100644 --- a/plugins/IntelliLang/backend/BUILD.bazel +++ b/plugins/IntelliLang/backend/BUILD.bazel @@ -70,6 +70,7 @@ jvm_library( resources = [":backend_resources"], deps = [ "@lib//:jetbrains-annotations-provided", + "//platform/ide-core", "@lib//:kotlin-stdlib", "//platform/core-impl", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", @@ -113,6 +114,7 @@ jvm_library( "//platform/projectModel-api:projectModel_test_lib", "//platform/platform-api:ide", "//platform/platform-api:ide_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/editor-ui-api:editor-ui", "//platform/editor-ui-api:editor-ui_test_lib", "//platform/core-ui", diff --git a/plugins/IntelliLang/backend/intellij.platform.langInjection.backend.iml b/plugins/IntelliLang/backend/intellij.platform.langInjection.backend.iml index 220a4b67a66d..82c7e15d99ec 100644 --- a/plugins/IntelliLang/backend/intellij.platform.langInjection.backend.iml +++ b/plugins/IntelliLang/backend/intellij.platform.langInjection.backend.iml @@ -18,6 +18,7 @@ + diff --git a/plugins/IntelliLang/intellij.platform.langInjection.iml b/plugins/IntelliLang/intellij.platform.langInjection.iml index 407bdbea4379..7f9b46497c4d 100644 --- a/plugins/IntelliLang/intellij.platform.langInjection.iml +++ b/plugins/IntelliLang/intellij.platform.langInjection.iml @@ -17,11 +17,13 @@ + + diff --git a/plugins/IntelliLang/tests/BUILD.bazel b/plugins/IntelliLang/tests/BUILD.bazel index 264a9b95ec8f..19a526833995 100644 --- a/plugins/IntelliLang/tests/BUILD.bazel +++ b/plugins/IntelliLang/tests/BUILD.bazel @@ -27,6 +27,10 @@ jvm_library( "//platform/analysis-api:analysis_test_lib", "//platform/core-api:core", "//platform/core-api:core_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", + "//platform/lang-api:lang", + "//platform/lang-api:lang_test_lib", "//platform/editor-ui-api:editor-ui", "//platform/editor-ui-api:editor-ui_test_lib", "//plugins/IntelliLang:langInjection", @@ -41,6 +45,8 @@ jvm_library( "//plugins/yaml/backend:backend_test_lib", "//java/langInjection", "//java/langInjection:langInjection_test_lib", + "//java/java-psi-api:psi", + "//java/java-psi-api:psi_test_lib", "//platform/testFramework", "//platform/testFramework:testFramework_test_lib", "//jps/jps-builders:build", @@ -54,18 +60,28 @@ jvm_library( "@lib//:assert_j", "//java/langInjection/jps", "//java/langInjection/jps:jps_test_lib", + "//java/java-frontback-psi-api:frontback-psi", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//libraries/asm", "//libraries/asm:asm_test_lib", "//platform/util/jdom", "//platform/util/jdom:jdom_test_lib", + "//platform/util:util-ui", + "//platform/util:util-ui_test_lib", "//plugins/IntelliLang/backend", "//plugins/IntelliLang/backend:backend_test_lib", "//plugins/markdown/plugin:plugin-main", "//plugins/markdown/plugin:plugin-main_test_lib", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", + "//uast/uast-common-ide:ide", + "//uast/uast-common-ide:ide_test_lib", + "//platform/ide-core", ], - runtime_deps = [":tests"] + runtime_deps = [ + ":tests", + "//platform/ide-core:ide-core_test_lib", + ] ) ### auto-generated section `build intellij.platform.langInjection.tests` end diff --git a/plugins/IntelliLang/tests/intellij.platform.langInjection.tests.iml b/plugins/IntelliLang/tests/intellij.platform.langInjection.tests.iml index f34a23eb1962..edd351e417d1 100644 --- a/plugins/IntelliLang/tests/intellij.platform.langInjection.tests.iml +++ b/plugins/IntelliLang/tests/intellij.platform.langInjection.tests.iml @@ -11,6 +11,8 @@ + + @@ -18,6 +20,7 @@ + @@ -25,10 +28,14 @@ + + + + \ No newline at end of file diff --git a/plugins/agent-workbench/chat/BUILD.bazel b/plugins/agent-workbench/chat/BUILD.bazel index 892489efffad..01150a143a56 100644 --- a/plugins/agent-workbench/chat/BUILD.bazel +++ b/plugins/agent-workbench/chat/BUILD.bazel @@ -19,9 +19,11 @@ jvm_library( "//platform/analysis-api:analysis", "//platform/core-api:core", "//platform/core-ui", + "//platform/editor-ui-api:editor-ui", "//platform/platform-api:ide", "//platform/platform-impl:ide-impl", "//platform/ide-core-impl", + "//platform/ide-core", "//plugins/agent-workbench/common", "//plugins/agent-workbench/prompt/core", "//plugins/agent-workbench/sessions-core:agent-workbench-sessions-core", @@ -32,6 +34,7 @@ jvm_library( "//platform/execution-impl", "//plugins/terminal/frontend", "//plugins/terminal", + "//platform/util:util-ui", ] ) @@ -46,9 +49,11 @@ jvm_library( "//platform/analysis-api:analysis_test_lib", "//platform/core-api:core_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/editor-ui-api:editor-ui_test_lib", "//platform/platform-api:ide_test_lib", "//platform/platform-impl:ide-impl_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//plugins/agent-workbench/common:common_test_lib", "//plugins/agent-workbench/prompt/core:core_test_lib", "//plugins/agent-workbench/sessions-core:agent-workbench-sessions-core_test_lib", @@ -67,6 +72,7 @@ jvm_library( "//libraries/assertj-core", "//libraries/assertj-core:assertj-core_test_lib", "//plugins/terminal:terminal_test_lib", + "//platform/util:util-ui_test_lib", ] ) ### auto-generated section `build intellij.agent.workbench.chat` end @@ -107,6 +113,7 @@ jvm_library( "//platform/platform-api:ide_test_lib", "//platform/platform-impl:ide-impl", "//platform/ide-core-impl", + "//platform/ide-core", "//plugins/agent-workbench/common", "//plugins/agent-workbench/common:common_test_lib", "//plugins/agent-workbench/prompt/core", @@ -119,6 +126,8 @@ jvm_library( "//platform/projectModel-api:projectModel_test_lib", "//platform/util", "//platform/util:util_test_lib", + "//platform/util:util-ui", + "//platform/util:util-ui_test_lib", "//platform/platform-util-io:ide-util-io", "//platform/execution-impl", "//platform/execution-impl:execution-impl_test_lib", @@ -141,6 +150,7 @@ jvm_library( ":agent-workbench-chat-tests", "//platform/platform-impl:ide-impl_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/platform-util-io:ide-util-io_test_lib", ] ) diff --git a/plugins/agent-workbench/chat/intellij.agent.workbench.chat.iml b/plugins/agent-workbench/chat/intellij.agent.workbench.chat.iml index 7a61d6d6d80a..030f2e2da2c7 100644 --- a/plugins/agent-workbench/chat/intellij.agent.workbench.chat.iml +++ b/plugins/agent-workbench/chat/intellij.agent.workbench.chat.iml @@ -34,9 +34,11 @@ + + @@ -51,5 +53,6 @@ + \ No newline at end of file diff --git a/plugins/agent-workbench/chat/intellij.agent.workbench.chat.tests.iml b/plugins/agent-workbench/chat/intellij.agent.workbench.chat.tests.iml index 86317576a10a..f0a626add0d3 100644 --- a/plugins/agent-workbench/chat/intellij.agent.workbench.chat.tests.iml +++ b/plugins/agent-workbench/chat/intellij.agent.workbench.chat.tests.iml @@ -36,12 +36,14 @@ + + diff --git a/plugins/agent-workbench/claude/sessions/BUILD.bazel b/plugins/agent-workbench/claude/sessions/BUILD.bazel index cdd3f9580d80..52dbe45870da 100644 --- a/plugins/agent-workbench/claude/sessions/BUILD.bazel +++ b/plugins/agent-workbench/claude/sessions/BUILD.bazel @@ -18,11 +18,14 @@ jvm_library( "//libraries/kotlinx/serialization/core", "//platform/core-api:core", "//platform/core-ui", + "//platform/editor-ui-api:editor-ui", + "//platform/util:util-ui", "//platform/projectModel-api:projectModel", "//platform/util", "//platform/platform-api:ide", "//platform/platform-impl:ide-impl", "//platform/platform-util-io:ide-util-io", + "//platform/ide-core", "//plugins/agent-workbench/filewatch", "//plugins/agent-workbench/claude/common", "//plugins/agent-workbench/common", @@ -45,11 +48,14 @@ jvm_library( "//libraries/kotlinx/serialization/core:core_test_lib", "//platform/core-api:core_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/editor-ui-api:editor-ui_test_lib", + "//platform/util:util-ui_test_lib", "//platform/projectModel-api:projectModel_test_lib", "//platform/util:util_test_lib", "//platform/platform-api:ide_test_lib", "//platform/platform-impl:ide-impl_test_lib", "//platform/platform-util-io:ide-util-io_test_lib", + "//platform/ide-core:ide-core_test_lib", "//plugins/agent-workbench/filewatch:filewatch_test_lib", "//plugins/agent-workbench/claude/common:common_test_lib", "//plugins/agent-workbench/common:common_test_lib", @@ -101,6 +107,8 @@ jvm_library( "//platform/core-api:core_test_lib", "//platform/core-ui", "//platform/core-ui:core-ui_test_lib", + "//platform/editor-ui-api:editor-ui", + "//platform/editor-ui-api:editor-ui_test_lib", "//platform/projectModel-api:projectModel", "//platform/projectModel-api:projectModel_test_lib", "//platform/util", diff --git a/plugins/agent-workbench/claude/sessions/intellij.agent.workbench.claude.sessions.iml b/plugins/agent-workbench/claude/sessions/intellij.agent.workbench.claude.sessions.iml index 5ca530d8dc55..18fba7665c4d 100644 --- a/plugins/agent-workbench/claude/sessions/intellij.agent.workbench.claude.sessions.iml +++ b/plugins/agent-workbench/claude/sessions/intellij.agent.workbench.claude.sessions.iml @@ -35,11 +35,14 @@ + + + diff --git a/plugins/agent-workbench/claude/sessions/intellij.agent.workbench.claude.sessions.tests.iml b/plugins/agent-workbench/claude/sessions/intellij.agent.workbench.claude.sessions.tests.iml index 0e6d9a96a4af..9d4514c51e91 100644 --- a/plugins/agent-workbench/claude/sessions/intellij.agent.workbench.claude.sessions.tests.iml +++ b/plugins/agent-workbench/claude/sessions/intellij.agent.workbench.claude.sessions.tests.iml @@ -34,6 +34,7 @@ + diff --git a/plugins/agent-workbench/codex/sessions/BUILD.bazel b/plugins/agent-workbench/codex/sessions/BUILD.bazel index d42b3bb0f088..632993058266 100644 --- a/plugins/agent-workbench/codex/sessions/BUILD.bazel +++ b/plugins/agent-workbench/codex/sessions/BUILD.bazel @@ -21,6 +21,7 @@ jvm_library( "//platform/util", "//platform/platform-api:ide", "//platform/platform-util-io:ide-util-io", + "//platform/editor-ui-api:editor-ui", "//plugins/agent-workbench/chat", "//plugins/agent-workbench/filewatch", "//plugins/agent-workbench/codex/common", @@ -47,6 +48,7 @@ jvm_library( "//platform/util:util_test_lib", "//platform/platform-api:ide_test_lib", "//platform/platform-util-io:ide-util-io_test_lib", + "//platform/editor-ui-api:editor-ui_test_lib", "//plugins/agent-workbench/chat:chat_test_lib", "//plugins/agent-workbench/filewatch:filewatch_test_lib", "//plugins/agent-workbench/codex/common:common_test_lib", @@ -106,6 +108,8 @@ jvm_library( "//platform/platform-api:ide", "//platform/platform-api:ide_test_lib", "//platform/platform-util-io:ide-util-io", + "//platform/editor-ui-api:editor-ui", + "//platform/editor-ui-api:editor-ui_test_lib", "//plugins/agent-workbench/chat", "//plugins/agent-workbench/chat:chat_test_lib", "//plugins/agent-workbench/filewatch", diff --git a/plugins/agent-workbench/codex/sessions/intellij.agent.workbench.codex.sessions.iml b/plugins/agent-workbench/codex/sessions/intellij.agent.workbench.codex.sessions.iml index 5f43d44580e3..ae1820dbc12e 100644 --- a/plugins/agent-workbench/codex/sessions/intellij.agent.workbench.codex.sessions.iml +++ b/plugins/agent-workbench/codex/sessions/intellij.agent.workbench.codex.sessions.iml @@ -38,6 +38,7 @@ + diff --git a/plugins/agent-workbench/codex/sessions/intellij.agent.workbench.codex.sessions.tests.iml b/plugins/agent-workbench/codex/sessions/intellij.agent.workbench.codex.sessions.tests.iml index 4b596178920e..63aa69c9ca71 100644 --- a/plugins/agent-workbench/codex/sessions/intellij.agent.workbench.codex.sessions.tests.iml +++ b/plugins/agent-workbench/codex/sessions/intellij.agent.workbench.codex.sessions.tests.iml @@ -37,6 +37,7 @@ + diff --git a/plugins/agent-workbench/prompt/testrunner/BUILD.bazel b/plugins/agent-workbench/prompt/testrunner/BUILD.bazel index 72ca9aa0ebc7..6a2c9f4eec4d 100644 --- a/plugins/agent-workbench/prompt/testrunner/BUILD.bazel +++ b/plugins/agent-workbench/prompt/testrunner/BUILD.bazel @@ -89,6 +89,8 @@ jvm_library( "//platform/core-api:core_test_lib", "//platform/core-ui", "//platform/core-ui:core-ui_test_lib", + "//platform/editor-ui-api:editor-ui", + "//platform/editor-ui-api:editor-ui_test_lib", "//platform/platform-api:ide", "//platform/platform-api:ide_test_lib", "//platform/platform-impl:ide-impl", diff --git a/plugins/agent-workbench/prompt/testrunner/intellij.agent.workbench.prompt.testrunner.tests.iml b/plugins/agent-workbench/prompt/testrunner/intellij.agent.workbench.prompt.testrunner.tests.iml index 1dd2088b6e5d..ec24785da4e6 100644 --- a/plugins/agent-workbench/prompt/testrunner/intellij.agent.workbench.prompt.testrunner.tests.iml +++ b/plugins/agent-workbench/prompt/testrunner/intellij.agent.workbench.prompt.testrunner.tests.iml @@ -34,6 +34,7 @@ + diff --git a/plugins/agent-workbench/prompt/ui/BUILD.bazel b/plugins/agent-workbench/prompt/ui/BUILD.bazel index 474bf025f471..2f950b2d88bd 100644 --- a/plugins/agent-workbench/prompt/ui/BUILD.bazel +++ b/plugins/agent-workbench/prompt/ui/BUILD.bazel @@ -24,6 +24,7 @@ jvm_library( "//platform/platform-api:ide", "//platform/platform-impl:ide-impl", "//platform/platform-impl/concurrency", + "//platform/ide-core", "//platform/lang-api:lang", "//platform/lang-impl", "//platform/projectModel-api:projectModel", @@ -33,6 +34,8 @@ jvm_library( "//plugins/agent-workbench/sessions-core:agent-workbench-sessions-core", "//plugins/markdown/core:markdown", "//platform/markdown-utils", + "//platform/util:util-ui", + "//platform/editor-ui-api:editor-ui", ] ) @@ -52,6 +55,7 @@ jvm_library( "//platform/platform-api:ide_test_lib", "//platform/platform-impl:ide-impl_test_lib", "//platform/platform-impl/concurrency:concurrency_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/lang-api:lang_test_lib", "//platform/lang-impl:lang-impl_test_lib", "//platform/projectModel-api:projectModel_test_lib", @@ -71,6 +75,8 @@ jvm_library( "//platform/testFramework/junit5:junit5_test_lib", "//libraries/assertj-core", "//libraries/assertj-core:assertj-core_test_lib", + "//platform/util:util-ui_test_lib", + "//platform/editor-ui-api:editor-ui_test_lib", ] ) ### auto-generated section `build intellij.agent.workbench.prompt.ui` end @@ -114,7 +120,10 @@ jvm_library( "//platform/platform-api:ide", "//platform/platform-api:ide_test_lib", "//platform/platform-impl:ide-impl", + "//platform/editor-ui-api:editor-ui", + "//platform/editor-ui-api:editor-ui_test_lib", "//platform/platform-impl/concurrency", + "//platform/ide-core", "//platform/lang-api:lang", "//platform/lang-api:lang_test_lib", "//platform/lang-impl", @@ -123,6 +132,8 @@ jvm_library( "//platform/projectModel-api:projectModel_test_lib", "//platform/util", "//platform/util:util_test_lib", + "//platform/util:util-ui", + "//platform/util:util-ui_test_lib", "//plugins/agent-workbench/common", "//plugins/agent-workbench/common:common_test_lib", "//plugins/agent-workbench/prompt/core", @@ -148,6 +159,7 @@ jvm_library( ":agent-workbench-prompt-ui-tests", "//platform/platform-impl:ide-impl_test_lib", "//platform/platform-impl/concurrency:concurrency_test_lib", + "//platform/ide-core:ide-core_test_lib", ] ) ### auto-generated section `build intellij.agent.workbench.prompt.ui.tests` end diff --git a/plugins/agent-workbench/prompt/ui/intellij.agent.workbench.prompt.ui.iml b/plugins/agent-workbench/prompt/ui/intellij.agent.workbench.prompt.ui.iml index 29b7e8377098..064e13a79feb 100644 --- a/plugins/agent-workbench/prompt/ui/intellij.agent.workbench.prompt.ui.iml +++ b/plugins/agent-workbench/prompt/ui/intellij.agent.workbench.prompt.ui.iml @@ -39,6 +39,7 @@ + @@ -53,5 +54,7 @@ + + \ No newline at end of file diff --git a/plugins/agent-workbench/prompt/ui/intellij.agent.workbench.prompt.ui.tests.iml b/plugins/agent-workbench/prompt/ui/intellij.agent.workbench.prompt.ui.tests.iml index deeacae66a23..20b57af37394 100644 --- a/plugins/agent-workbench/prompt/ui/intellij.agent.workbench.prompt.ui.tests.iml +++ b/plugins/agent-workbench/prompt/ui/intellij.agent.workbench.prompt.ui.tests.iml @@ -37,11 +37,14 @@ + + + diff --git a/plugins/agent-workbench/prompt/vcs/BUILD.bazel b/plugins/agent-workbench/prompt/vcs/BUILD.bazel index b37bcfbfa8ff..7f80d7250903 100644 --- a/plugins/agent-workbench/prompt/vcs/BUILD.bazel +++ b/plugins/agent-workbench/prompt/vcs/BUILD.bazel @@ -20,6 +20,7 @@ jvm_library( "//platform/core-ui", "//platform/platform-api:ide", "//platform/platform-impl:ide-impl", + "//platform/ide-core", "//platform/projectModel-api:projectModel", "//platform/vcs-log/api:vcs-log", "//platform/vcs-log/impl", @@ -42,6 +43,7 @@ jvm_library( "//platform/core-ui:core-ui_test_lib", "//platform/platform-api:ide_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/projectModel-api:projectModel_test_lib", "//platform/vcs-log/api:vcs-log_test_lib", "//platform/vcs-log/impl:impl_test_lib", @@ -94,6 +96,8 @@ jvm_library( "//platform/platform-api:ide", "//platform/platform-api:ide_test_lib", "//platform/platform-impl:ide-impl", + "//platform/editor-ui-api:editor-ui", + "//platform/editor-ui-api:editor-ui_test_lib", "//platform/projectModel-api:projectModel", "//platform/projectModel-api:projectModel_test_lib", "//platform/vcs-log/api:vcs-log", diff --git a/plugins/agent-workbench/prompt/vcs/intellij.agent.workbench.prompt.vcs.iml b/plugins/agent-workbench/prompt/vcs/intellij.agent.workbench.prompt.vcs.iml index 8c6fd9dd2158..e90ae5830863 100644 --- a/plugins/agent-workbench/prompt/vcs/intellij.agent.workbench.prompt.vcs.iml +++ b/plugins/agent-workbench/prompt/vcs/intellij.agent.workbench.prompt.vcs.iml @@ -37,6 +37,7 @@ + diff --git a/plugins/agent-workbench/prompt/vcs/intellij.agent.workbench.prompt.vcs.tests.iml b/plugins/agent-workbench/prompt/vcs/intellij.agent.workbench.prompt.vcs.tests.iml index a8fcde7c7216..dea449b7ba3b 100644 --- a/plugins/agent-workbench/prompt/vcs/intellij.agent.workbench.prompt.vcs.tests.iml +++ b/plugins/agent-workbench/prompt/vcs/intellij.agent.workbench.prompt.vcs.tests.iml @@ -36,6 +36,7 @@ + diff --git a/plugins/agent-workbench/sessions-actions/BUILD.bazel b/plugins/agent-workbench/sessions-actions/BUILD.bazel index 1363c5403df4..3df460a4d8e7 100644 --- a/plugins/agent-workbench/sessions-actions/BUILD.bazel +++ b/plugins/agent-workbench/sessions-actions/BUILD.bazel @@ -21,10 +21,12 @@ jvm_library( "//platform/lang-api:lang", "//platform/core-api:core", "//platform/core-ui", + "//platform/editor-ui-api:editor-ui", "//platform/platform-api:ide", "//platform/platform-impl:ide-impl", "//platform/platform-impl/concurrency", "//platform/ide-core-impl", + "//platform/ide-core", "//plugins/agent-workbench/common", "//plugins/agent-workbench/prompt/core", "//plugins/agent-workbench/sessions-core:agent-workbench-sessions-core", @@ -51,10 +53,12 @@ jvm_library( "//platform/lang-api:lang_test_lib", "//platform/core-api:core_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/editor-ui-api:editor-ui_test_lib", "//platform/platform-api:ide_test_lib", "//platform/platform-impl:ide-impl_test_lib", "//platform/platform-impl/concurrency:concurrency_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//plugins/agent-workbench/common:common_test_lib", "//plugins/agent-workbench/prompt/core:core_test_lib", "//plugins/agent-workbench/sessions-core:agent-workbench-sessions-core_test_lib", @@ -124,6 +128,7 @@ jvm_library( "//platform/platform-impl:ide-impl", "//platform/platform-impl/concurrency", "//platform/ide-core-impl", + "//platform/ide-core", "//plugins/agent-workbench/common", "//plugins/agent-workbench/common:common_test_lib", "//plugins/agent-workbench/prompt/core", @@ -134,7 +139,11 @@ jvm_library( "//platform/projectModel-api:projectModel_test_lib", "//platform/util", "//platform/util:util_test_lib", + "//platform/util:util-ui", + "//platform/util:util-ui_test_lib", "//platform/platform-util-io:ide-util-io", + "//platform/editor-ui-api:editor-ui", + "//platform/editor-ui-api:editor-ui_test_lib", "//plugins/agent-workbench/codex/common", "//plugins/agent-workbench/codex/common:common_test_lib", "//plugins/agent-workbench/chat", @@ -165,6 +174,7 @@ jvm_library( "//platform/platform-impl:ide-impl_test_lib", "//platform/platform-impl/concurrency:concurrency_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/platform-util-io:ide-util-io_test_lib", ] ) diff --git a/plugins/agent-workbench/sessions-actions/intellij.agent.workbench.sessions.actions.iml b/plugins/agent-workbench/sessions-actions/intellij.agent.workbench.sessions.actions.iml index 505a2db91132..2ba7826e810e 100644 --- a/plugins/agent-workbench/sessions-actions/intellij.agent.workbench.sessions.actions.iml +++ b/plugins/agent-workbench/sessions-actions/intellij.agent.workbench.sessions.actions.iml @@ -38,10 +38,12 @@ + + diff --git a/plugins/agent-workbench/sessions-actions/intellij.agent.workbench.sessions.actions.tests.iml b/plugins/agent-workbench/sessions-actions/intellij.agent.workbench.sessions.actions.tests.iml index 671c69aa4b72..1234f51d3382 100644 --- a/plugins/agent-workbench/sessions-actions/intellij.agent.workbench.sessions.actions.tests.iml +++ b/plugins/agent-workbench/sessions-actions/intellij.agent.workbench.sessions.actions.tests.iml @@ -41,12 +41,15 @@ + + + diff --git a/plugins/agent-workbench/sessions-toolwindow/BUILD.bazel b/plugins/agent-workbench/sessions-toolwindow/BUILD.bazel index 779b9ef4b4e5..f61ffa87c279 100644 --- a/plugins/agent-workbench/sessions-toolwindow/BUILD.bazel +++ b/plugins/agent-workbench/sessions-toolwindow/BUILD.bazel @@ -25,12 +25,15 @@ jvm_library( "//platform/platform-impl:ide-impl", "//platform/platform-impl/concurrency", "//platform/ide-core-impl", + "//platform/ide-core", "//plugins/agent-workbench/common", "//plugins/agent-workbench/prompt/core", "//plugins/agent-workbench/sessions-core:agent-workbench-sessions-core", "//platform/projectModel-api:projectModel", "//platform/util", + "//platform/util:util-ui", "//platform/platform-util-io:ide-util-io", + "//platform/editor-ui-api:editor-ui", "//plugins/agent-workbench/chat", "//plugins/agent-workbench/sessions", "//plugins/agent-workbench/sessions-actions:agent-workbench-sessions-actions", @@ -58,12 +61,15 @@ jvm_library( "//platform/platform-impl:ide-impl_test_lib", "//platform/platform-impl/concurrency:concurrency_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//plugins/agent-workbench/common:common_test_lib", "//plugins/agent-workbench/prompt/core:core_test_lib", "//plugins/agent-workbench/sessions-core:agent-workbench-sessions-core_test_lib", "//platform/projectModel-api:projectModel_test_lib", "//platform/util:util_test_lib", + "//platform/util:util-ui_test_lib", "//platform/platform-util-io:ide-util-io_test_lib", + "//platform/editor-ui-api:editor-ui_test_lib", "//plugins/agent-workbench/codex/common", "//plugins/agent-workbench/codex/common:common_test_lib", "//plugins/agent-workbench/codex/sessions", @@ -133,6 +139,7 @@ jvm_library( "//platform/platform-impl:ide-impl", "//platform/platform-impl/concurrency", "//platform/ide-core-impl", + "//platform/ide-core", "//plugins/agent-workbench/common", "//plugins/agent-workbench/common:common_test_lib", "//plugins/agent-workbench/sessions-core:agent-workbench-sessions-core", @@ -141,7 +148,11 @@ jvm_library( "//platform/projectModel-api:projectModel_test_lib", "//platform/util", "//platform/util:util_test_lib", + "//platform/util:util-ui", + "//platform/util:util-ui_test_lib", "//platform/platform-util-io:ide-util-io", + "//platform/editor-ui-api:editor-ui", + "//platform/editor-ui-api:editor-ui_test_lib", "//plugins/agent-workbench/codex/common", "//plugins/agent-workbench/codex/common:common_test_lib", "//plugins/agent-workbench/codex/sessions", @@ -181,6 +192,7 @@ jvm_library( "//platform/platform-impl:ide-impl_test_lib", "//platform/platform-impl/concurrency:concurrency_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/platform-util-io:ide-util-io_test_lib", ] ) diff --git a/plugins/agent-workbench/sessions-toolwindow/intellij.agent.workbench.sessions.toolwindow.iml b/plugins/agent-workbench/sessions-toolwindow/intellij.agent.workbench.sessions.toolwindow.iml index 861eed1bbe57..c2ab991d687a 100644 --- a/plugins/agent-workbench/sessions-toolwindow/intellij.agent.workbench.sessions.toolwindow.iml +++ b/plugins/agent-workbench/sessions-toolwindow/intellij.agent.workbench.sessions.toolwindow.iml @@ -40,12 +40,15 @@ + + + diff --git a/plugins/agent-workbench/sessions-toolwindow/intellij.agent.workbench.sessions.toolwindow.tests.iml b/plugins/agent-workbench/sessions-toolwindow/intellij.agent.workbench.sessions.toolwindow.tests.iml index 7a5fbfd526b3..095f9e94039f 100644 --- a/plugins/agent-workbench/sessions-toolwindow/intellij.agent.workbench.sessions.toolwindow.tests.iml +++ b/plugins/agent-workbench/sessions-toolwindow/intellij.agent.workbench.sessions.toolwindow.tests.iml @@ -39,11 +39,14 @@ + + + diff --git a/plugins/agent-workbench/sessions/BUILD.bazel b/plugins/agent-workbench/sessions/BUILD.bazel index efc5c7bcff0f..11690203f6d8 100644 --- a/plugins/agent-workbench/sessions/BUILD.bazel +++ b/plugins/agent-workbench/sessions/BUILD.bazel @@ -23,14 +23,18 @@ jvm_library( "//platform/core-ui", "//platform/platform-api:ide", "//platform/platform-impl:ide-impl", + "//platform/editor-ui-api:editor-ui", "//platform/platform-impl/concurrency", "//platform/ide-core-impl", + "//platform/ide-core", "//plugins/agent-workbench/common", "//plugins/agent-workbench/prompt/core", "//plugins/agent-workbench/sessions-core:agent-workbench-sessions-core", "//platform/projectModel-api:projectModel", "//platform/util", + "//platform/util:util-ui", "//platform/platform-util-io:ide-util-io", + "//platform/progress/shared:ide-progress", "//plugins/agent-workbench/chat", "//plugins/terminal", "//libraries/jackson/jackson", @@ -55,14 +59,18 @@ jvm_library( "//platform/core-ui:core-ui_test_lib", "//platform/platform-api:ide_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/editor-ui-api:editor-ui_test_lib", "//platform/platform-impl/concurrency:concurrency_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//plugins/agent-workbench/common:common_test_lib", "//plugins/agent-workbench/prompt/core:core_test_lib", "//plugins/agent-workbench/sessions-core:agent-workbench-sessions-core_test_lib", "//platform/projectModel-api:projectModel_test_lib", "//platform/util:util_test_lib", + "//platform/util:util-ui_test_lib", "//platform/platform-util-io:ide-util-io_test_lib", + "//platform/progress/shared:ide-progress_test_lib", "//plugins/agent-workbench/codex/common", "//plugins/agent-workbench/codex/common:common_test_lib", "//plugins/agent-workbench/chat:chat_test_lib", @@ -122,11 +130,14 @@ jvm_library( "//platform/core-api:core_test_lib", "//platform/core-ui", "//platform/core-ui:core-ui_test_lib", + "//platform/editor-ui-api:editor-ui", + "//platform/editor-ui-api:editor-ui_test_lib", "//platform/platform-api:ide", "//platform/platform-api:ide_test_lib", "//platform/platform-impl:ide-impl", "//platform/platform-impl/concurrency", "//platform/ide-core-impl", + "//platform/ide-core", "//plugins/agent-workbench/common", "//plugins/agent-workbench/common:common_test_lib", "//plugins/agent-workbench/prompt/core", @@ -137,6 +148,10 @@ jvm_library( "//platform/projectModel-api:projectModel_test_lib", "//platform/util", "//platform/util:util_test_lib", + "//platform/util:util-ui", + "//platform/util:util-ui_test_lib", + "//platform/util-ex", + "//platform/util-ex:util-ex_test_lib", "//platform/platform-util-io:ide-util-io", "//plugins/agent-workbench/codex/common", "//plugins/agent-workbench/codex/common:common_test_lib", @@ -169,6 +184,7 @@ jvm_library( "//platform/platform-impl:ide-impl_test_lib", "//platform/platform-impl/concurrency:concurrency_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/platform-util-io:ide-util-io_test_lib", ] ) diff --git a/plugins/agent-workbench/sessions/intellij.agent.workbench.sessions.iml b/plugins/agent-workbench/sessions/intellij.agent.workbench.sessions.iml index e83797751fb3..74c16cbacf37 100644 --- a/plugins/agent-workbench/sessions/intellij.agent.workbench.sessions.iml +++ b/plugins/agent-workbench/sessions/intellij.agent.workbench.sessions.iml @@ -40,14 +40,18 @@ + + + + diff --git a/plugins/agent-workbench/sessions/intellij.agent.workbench.sessions.tests.iml b/plugins/agent-workbench/sessions/intellij.agent.workbench.sessions.tests.iml index 09983763f9ae..4d84fc46d7c6 100644 --- a/plugins/agent-workbench/sessions/intellij.agent.workbench.sessions.tests.iml +++ b/plugins/agent-workbench/sessions/intellij.agent.workbench.sessions.tests.iml @@ -37,15 +37,19 @@ + + + + diff --git a/plugins/ant/BUILD.bazel b/plugins/ant/BUILD.bazel index 28b1ac1fadbd..00848a7fcd0f 100644 --- a/plugins/ant/BUILD.bazel +++ b/plugins/ant/BUILD.bazel @@ -15,12 +15,14 @@ jvm_library( resources = [":ant_resources"], deps = [ "//java/openapi:java", + "//java/java-psi-api:psi", "@lib//ant/lib:ant", "//platform/analysis-api:analysis", "//xml/xml-analysis-api:analysis", "//platform/core-api:core", "//platform/editor-ui-api:editor-ui", "//platform/ide-core-impl", + "//platform/ide-core", "//platform/forms_rt:java-guiForms-rt", "//java/compiler/impl", "//platform/indexing-api:indexing", @@ -56,12 +58,15 @@ jvm_library( "//plugins/properties/properties-psi-impl:backend-psi", "//platform/platform-util-io:ide-util-io", "//platform/util/jdom", + "//platform/util:util-ui", "//xml/xml-psi-api:psi", "//platform/execution", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", "//platform/util/concurrency", "//jps/model-api:model", "//platform/code-style-api:codeStyle", + "//platform/lang-api:lang", + "//platform/testRunner", ] ) @@ -73,6 +78,7 @@ jvm_library( runtime_deps = [ ":ant", "//java/openapi:java_test_lib", + "//java/java-psi-api:psi_test_lib", "//java/testFramework", "//java/testFramework:testFramework_test_lib", "@lib//:junit4", @@ -81,6 +87,7 @@ jvm_library( "//platform/core-api:core_test_lib", "//platform/editor-ui-api:editor-ui_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/forms_rt:java-guiForms-rt_test_lib", "//java/compiler/impl:impl_test_lib", "//platform/indexing-api:indexing_test_lib", @@ -118,6 +125,7 @@ jvm_library( "//plugins/properties/properties-psi-impl:backend-psi_test_lib", "//platform/platform-util-io:ide-util-io_test_lib", "//platform/util/jdom:jdom_test_lib", + "//platform/util:util-ui_test_lib", "//tools/intellij.tools.ide.metrics.benchmark:ide-metrics-benchmark", "//tools/intellij.tools.ide.metrics.benchmark:ide-metrics-benchmark_test_lib", "//xml/xml-psi-api:psi_test_lib", @@ -128,6 +136,8 @@ jvm_library( "//platform/util/concurrency:concurrency_test_lib", "//jps/model-api:model_test_lib", "//platform/code-style-api:codeStyle_test_lib", + "//platform/lang-api:lang_test_lib", + "//platform/testRunner:testRunner_test_lib", ] ) ### auto-generated section `build intellij.ant` end @@ -170,6 +180,7 @@ jvm_library( "//platform/editor-ui-api:editor-ui", "//platform/editor-ui-api:editor-ui_test_lib", "//platform/ide-core-impl", + "//platform/ide-core", "//platform/forms_rt:java-guiForms-rt", "//platform/forms_rt:java-guiForms-rt_test_lib", "//java/compiler/impl", @@ -243,6 +254,8 @@ jvm_library( "//tools/intellij.tools.ide.metrics.benchmark:ide-metrics-benchmark_test_lib", "//xml/xml-psi-api:psi", "//xml/xml-psi-api:psi_test_lib", + "//xml/xml-parser:parser", + "//xml/xml-parser:parser_test_lib", "//xml/testFramework", "//xml/testFramework:testFramework_test_lib", "//platform/execution", @@ -255,10 +268,13 @@ jvm_library( "//jps/model-api:model_test_lib", "//platform/code-style-api:codeStyle", "//platform/code-style-api:codeStyle_test_lib", + "//platform/lang-api:lang", + "//platform/lang-api:lang_test_lib", ], runtime_deps = [ ":ant-tests", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/platform-impl/concurrency:concurrency_test_lib", "//platform/platform-impl:ide-impl_test_lib", "//platform/platform-util-io:ide-util-io_test_lib", diff --git a/plugins/ant/intellij.ant.iml b/plugins/ant/intellij.ant.iml index 5fb46fbdd392..74ae74e31b90 100644 --- a/plugins/ant/intellij.ant.iml +++ b/plugins/ant/intellij.ant.iml @@ -9,6 +9,7 @@ + @@ -17,6 +18,7 @@ + @@ -53,6 +55,7 @@ + @@ -61,6 +64,8 @@ + + diff --git a/plugins/ant/intellij.ant.tests.iml b/plugins/ant/intellij.ant.tests.iml index b8f4a3f1ffd0..668d92bd7061 100644 --- a/plugins/ant/intellij.ant.tests.iml +++ b/plugins/ant/intellij.ant.tests.iml @@ -16,6 +16,7 @@ + @@ -54,6 +55,7 @@ + @@ -61,6 +63,7 @@ + diff --git a/plugins/ant/jps-plugin/BUILD.bazel b/plugins/ant/jps-plugin/BUILD.bazel index e0ccbf5ce0e2..a4d0c58226a6 100644 --- a/plugins/ant/jps-plugin/BUILD.bazel +++ b/plugins/ant/jps-plugin/BUILD.bazel @@ -21,6 +21,8 @@ jvm_library( "//jps/jps-builders:build", "//java/java-runtime:rt", "//platform/util/jdom", + "//platform/util/base/multiplatform", + "//platform/util/base", ] ) @@ -38,6 +40,8 @@ jvm_library( "//jps/jps-builders:build_test_lib", "//java/java-runtime:rt_test_lib", "//platform/util/jdom:jdom_test_lib", + "//platform/util/base/multiplatform:multiplatform_test_lib", + "//platform/util/base:base_test_lib", ] ) ### auto-generated section `build intellij.ant.jps` end @@ -78,6 +82,8 @@ jvm_library( "//jps/jps-builders:build-tests_test_lib", "//platform/testFramework", "//platform/testFramework:testFramework_test_lib", + "//platform/util/base", + "//platform/util/base:base_test_lib", "@lib//:kotlin-stdlib", ], runtime_deps = [":jps-tests"] diff --git a/plugins/ant/jps-plugin/intellij.ant.jps.iml b/plugins/ant/jps-plugin/intellij.ant.jps.iml index dd225bdf0a02..50b83c8a0ea1 100644 --- a/plugins/ant/jps-plugin/intellij.ant.jps.iml +++ b/plugins/ant/jps-plugin/intellij.ant.jps.iml @@ -30,5 +30,7 @@ + + \ No newline at end of file diff --git a/plugins/ant/jps-plugin/intellij.ant.jps.tests.iml b/plugins/ant/jps-plugin/intellij.ant.jps.tests.iml index c92065d307d1..74dd034314e4 100644 --- a/plugins/ant/jps-plugin/intellij.ant.jps.tests.iml +++ b/plugins/ant/jps-plugin/intellij.ant.jps.tests.iml @@ -13,6 +13,7 @@ + \ No newline at end of file diff --git a/plugins/built-in-help/BUILD.bazel b/plugins/built-in-help/BUILD.bazel index 8b2b3370b415..11012e3c845f 100644 --- a/plugins/built-in-help/BUILD.bazel +++ b/plugins/built-in-help/BUILD.bazel @@ -39,6 +39,7 @@ jvm_library( "//libraries/netty/buffer", "//platform/platform-util-io:ide-util-io", "//platform/platform-util-netty:ide-util-netty", + "//platform/ide-core", "//libraries/jackson3/jackson:libraries-jackson3", "//libraries/jackson3/databind", "//libraries/jackson3/module-kotlin:libraries-jackson3-module-kotlin", @@ -68,6 +69,7 @@ jvm_library( "//libraries/netty/buffer:buffer_test_lib", "//platform/platform-util-io:ide-util-io_test_lib", "//platform/platform-util-netty:ide-util-netty_test_lib", + "//platform/ide-core:ide-core_test_lib", "//libraries/jackson3/jackson:libraries-jackson3_test_lib", "//libraries/jackson3/databind:databind_test_lib", "//libraries/jackson3/module-kotlin:libraries-jackson3-module-kotlin_test_lib", diff --git a/plugins/built-in-help/intellij.builtInHelp.iml b/plugins/built-in-help/intellij.builtInHelp.iml index eab993df9c80..0c9df2026fcc 100644 --- a/plugins/built-in-help/intellij.builtInHelp.iml +++ b/plugins/built-in-help/intellij.builtInHelp.iml @@ -33,6 +33,7 @@ + diff --git a/plugins/commander/BUILD.bazel b/plugins/commander/BUILD.bazel index 34f623304a62..514aafe232a5 100644 --- a/plugins/commander/BUILD.bazel +++ b/plugins/commander/BUILD.bazel @@ -15,19 +15,24 @@ jvm_library( resources = [":commander_resources"], deps = [ "//java/java-impl:impl", + "//java/java-psi-api:psi", "//platform/analysis-api:analysis", "//platform/lang-api:lang", "//platform/diff-api:diff", "//platform/diff-impl", "//platform/editor-ui-api:editor-ui", "//platform/platform-impl:ide-impl", + "//platform/ide-core", + "//java/java-frontback-psi-api:frontback-psi", "//platform/core-ui", "//platform/lang-core", "//platform/lvcs-api:lvcs", "//platform/projectModel-api:projectModel", "//platform/structure-view-impl:structureView-impl", "//platform/util/jdom", + "//platform/util:util-ui", "//platform/core-api:core", + "//platform/core-impl", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", ] ) @@ -40,25 +45,30 @@ jvm_library( runtime_deps = [ ":commander", "//java/java-impl:impl_test_lib", + "//java/java-psi-api:psi_test_lib", "//platform/analysis-api:analysis_test_lib", "//platform/lang-api:lang_test_lib", "//platform/diff-api:diff_test_lib", "//platform/diff-impl:diff-impl_test_lib", "//platform/editor-ui-api:editor-ui_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//java/testFramework", "//java/testFramework:testFramework_test_lib", "//plugins/ui-designer:java-guiForms-designer", "//plugins/ui-designer:java-guiForms-designer_test_lib", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//platform/core-ui:core-ui_test_lib", "//platform/lang-core:lang-core_test_lib", "//platform/lvcs-api:lvcs_test_lib", "//platform/projectModel-api:projectModel_test_lib", "//platform/structure-view-impl:structureView-impl_test_lib", "//platform/util/jdom:jdom_test_lib", + "//platform/util:util-ui_test_lib", "//platform/testFramework", "//platform/testFramework:testFramework_test_lib", "//platform/core-api:core_test_lib", + "//platform/core-impl:core-impl_test_lib", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", ] ) @@ -89,6 +99,8 @@ jvm_library( deps = [ "//java/java-impl:impl", "//java/java-impl:impl_test_lib", + "//java/java-psi-api:psi", + "//java/java-psi-api:psi_test_lib", "//platform/analysis-api:analysis", "//platform/analysis-api:analysis_test_lib", "//platform/lang-api:lang", diff --git a/plugins/commander/intellij.commander.iml b/plugins/commander/intellij.commander.iml index 19f09a1d1738..063c11802d14 100644 --- a/plugins/commander/intellij.commander.iml +++ b/plugins/commander/intellij.commander.iml @@ -9,22 +9,27 @@ + + + + + diff --git a/plugins/commander/intellij.commander.tests.iml b/plugins/commander/intellij.commander.tests.iml index 84613513be66..c2e939e5e1f2 100644 --- a/plugins/commander/intellij.commander.tests.iml +++ b/plugins/commander/intellij.commander.tests.iml @@ -8,6 +8,7 @@ + diff --git a/plugins/compilation-charts/BUILD.bazel b/plugins/compilation-charts/BUILD.bazel index 94100555b578..99c1c5945f37 100644 --- a/plugins/compilation-charts/BUILD.bazel +++ b/plugins/compilation-charts/BUILD.bazel @@ -20,6 +20,7 @@ jvm_library( "//jps/jps-builders:build", "//platform/extensions", "//platform/ide-core-impl", + "//platform/ide-core", "//libraries/rd/framework", "//platform/core-api:core", "//jps/model-api:model", @@ -42,6 +43,7 @@ jvm_library( "//java/idea-ui:ui", "//platform/platform-impl:ide-impl", "//platform/execution", + "//platform/util:util-ui", ] ) @@ -58,6 +60,7 @@ jvm_library( "//jps/jps-builders:build_test_lib", "//platform/extensions:extensions_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//libraries/rd/framework:framework_test_lib", "//platform/core-api:core_test_lib", "//jps/model-api:model_test_lib", @@ -79,6 +82,7 @@ jvm_library( "//java/idea-ui:ui_test_lib", "//platform/platform-impl:ide-impl_test_lib", "//platform/execution:execution_test_lib", + "//platform/util:util-ui_test_lib", ] ) ### auto-generated section `build intellij.compilation.charts` end diff --git a/plugins/compilation-charts/intellij.compilation.charts.iml b/plugins/compilation-charts/intellij.compilation.charts.iml index edebd4be9e82..d79cf6ab2752 100644 --- a/plugins/compilation-charts/intellij.compilation.charts.iml +++ b/plugins/compilation-charts/intellij.compilation.charts.iml @@ -14,6 +14,7 @@ + @@ -36,5 +37,6 @@ + \ No newline at end of file diff --git a/plugins/compilation-charts/jps-plugin/BUILD.bazel b/plugins/compilation-charts/jps-plugin/BUILD.bazel index 181c653964c6..b5e0fdf5eaf9 100644 --- a/plugins/compilation-charts/jps-plugin/BUILD.bazel +++ b/plugins/compilation-charts/jps-plugin/BUILD.bazel @@ -17,6 +17,8 @@ jvm_library( deps = [ "//jps/jps-builders:build", "//platform/util", + "//platform/util/base/multiplatform", + "//platform/util/base", "//libraries/gson", "//jps/model-api:model", ] @@ -32,6 +34,8 @@ jvm_library( ":compilation-charts-jps", "//jps/jps-builders:build_test_lib", "//platform/util:util_test_lib", + "//platform/util/base/multiplatform:multiplatform_test_lib", + "//platform/util/base:base_test_lib", "//libraries/gson:gson_test_lib", "//jps/model-api:model_test_lib", ] diff --git a/plugins/compilation-charts/jps-plugin/intellij.compilation.charts.jps.iml b/plugins/compilation-charts/jps-plugin/intellij.compilation.charts.jps.iml index b0923dd012fe..edd6a2f86d98 100644 --- a/plugins/compilation-charts/jps-plugin/intellij.compilation.charts.jps.iml +++ b/plugins/compilation-charts/jps-plugin/intellij.compilation.charts.jps.iml @@ -26,6 +26,8 @@ + + diff --git a/plugins/completion-ml-ranking-models/BUILD.bazel b/plugins/completion-ml-ranking-models/BUILD.bazel index d5aee714793f..506516faeec5 100644 --- a/plugins/completion-ml-ranking-models/BUILD.bazel +++ b/plugins/completion-ml-ranking-models/BUILD.bazel @@ -82,6 +82,8 @@ jvm_library( "//plugins/completion-ml-ranking", "//plugins/completion-ml-ranking:completion-ml-ranking_test_lib", "//platform/platform-impl/internal", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", ], runtime_deps = [ ":completionMlRankingModels-tests", diff --git a/plugins/completion-ml-ranking-models/intellij.completionMlRankingModels.tests.iml b/plugins/completion-ml-ranking-models/intellij.completionMlRankingModels.tests.iml index 101988f29664..274b6122fc47 100644 --- a/plugins/completion-ml-ranking-models/intellij.completionMlRankingModels.tests.iml +++ b/plugins/completion-ml-ranking-models/intellij.completionMlRankingModels.tests.iml @@ -12,5 +12,6 @@ + \ No newline at end of file diff --git a/plugins/completion-ml-ranking/BUILD.bazel b/plugins/completion-ml-ranking/BUILD.bazel index c9ca77a80d6c..a7a0c39af962 100644 --- a/plugins/completion-ml-ranking/BUILD.bazel +++ b/plugins/completion-ml-ranking/BUILD.bazel @@ -38,6 +38,7 @@ jvm_library( "@lib//:opentelemetry-semconv", "//platform/diagnostic/telemetry", "//platform/platform-impl/internal", + "//platform/ide-core", "//platform/diagnostic/telemetry-impl", "//platform/core-impl", "//platform/lang-api:lang", @@ -45,6 +46,7 @@ jvm_library( "//platform/vcs-impl", "//platform/diff-impl", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", + "//platform/util:util-ui", ] ) @@ -76,6 +78,7 @@ jvm_library( "//platform/ml-api:ml_test_lib", "//platform/diagnostic/telemetry:telemetry_test_lib", "//platform/platform-impl/internal:internal_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/diagnostic/telemetry-impl:telemetry-impl_test_lib", "//platform/core-impl:core-impl_test_lib", "//platform/lang-api:lang_test_lib", @@ -83,6 +86,7 @@ jvm_library( "//platform/vcs-impl:vcs-impl_test_lib", "//platform/diff-impl:diff-impl_test_lib", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", + "//platform/util:util-ui_test_lib", ] ) ### auto-generated section `build intellij.completionMlRanking` end @@ -110,6 +114,10 @@ jvm_library( deps = [ "//java/testFramework", "//java/testFramework:testFramework_test_lib", + "//java/java-psi-api:psi", + "//java/java-psi-api:psi_test_lib", + "//java/java-frontback-psi-api:frontback-psi", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "@lib//:assert_j", "//plugins/completion-ml-ranking", "//plugins/completion-ml-ranking:completion-ml-ranking_test_lib", @@ -119,6 +127,8 @@ jvm_library( "//platform/core-api:core_test_lib", "//platform/editor-ui-api:editor-ui", "//platform/editor-ui-api:editor-ui_test_lib", + "//platform/lang-api:lang", + "//platform/lang-api:lang_test_lib", "//platform/projectModel-api:projectModel", "//platform/projectModel-api:projectModel_test_lib", "//platform/testFramework", @@ -127,6 +137,8 @@ jvm_library( "//platform/ml-impl:ml-impl_test_lib", "//platform/core-ui", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", "//platform/platform-impl/internal", "//platform/ml-api:ml", "//platform/ml-api:ml_test_lib", diff --git a/plugins/completion-ml-ranking/intellij.completionMlRanking.iml b/plugins/completion-ml-ranking/intellij.completionMlRanking.iml index 5fcce88627b4..7b3c704df363 100644 --- a/plugins/completion-ml-ranking/intellij.completionMlRanking.iml +++ b/plugins/completion-ml-ranking/intellij.completionMlRanking.iml @@ -54,6 +54,7 @@ + @@ -61,5 +62,6 @@ + \ No newline at end of file diff --git a/plugins/completion-ml-ranking/intellij.completionMlRanking.tests.iml b/plugins/completion-ml-ranking/intellij.completionMlRanking.tests.iml index 54e272522dc7..59965aa78894 100644 --- a/plugins/completion-ml-ranking/intellij.completionMlRanking.tests.iml +++ b/plugins/completion-ml-ranking/intellij.completionMlRanking.tests.iml @@ -8,15 +8,19 @@ + + + + diff --git a/plugins/compose/intellij.compose.ide.plugin.k1/BUILD.bazel b/plugins/compose/intellij.compose.ide.plugin.k1/BUILD.bazel index 3eeeb569f17f..f143f350cf87 100644 --- a/plugins/compose/intellij.compose.ide.plugin.k1/BUILD.bazel +++ b/plugins/compose/intellij.compose.ide.plugin.k1/BUILD.bazel @@ -112,6 +112,8 @@ jvm_library( "//plugins/compose/intellij.compose.ide.plugin.shared:ide-plugin-shared_test_lib", "//platform/core-api:core", "//platform/core-api:core_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", "//platform/editor-ui-api:editor-ui", "//platform/editor-ui-api:editor-ui_test_lib", "//plugins/kotlin/base/fe10/analysis", diff --git a/plugins/compose/intellij.compose.ide.plugin.k1/intellij.compose.ide.plugin.k1.tests.iml b/plugins/compose/intellij.compose.ide.plugin.k1/intellij.compose.ide.plugin.k1.tests.iml index f3d18364763d..022748b6785b 100644 --- a/plugins/compose/intellij.compose.ide.plugin.k1/intellij.compose.ide.plugin.k1.tests.iml +++ b/plugins/compose/intellij.compose.ide.plugin.k1/intellij.compose.ide.plugin.k1.tests.iml @@ -27,6 +27,7 @@ + diff --git a/plugins/compose/intellij.compose.ide.plugin.k2/BUILD.bazel b/plugins/compose/intellij.compose.ide.plugin.k2/BUILD.bazel index 8796a3b93d7f..d46961c38432 100644 --- a/plugins/compose/intellij.compose.ide.plugin.k2/BUILD.bazel +++ b/plugins/compose/intellij.compose.ide.plugin.k2/BUILD.bazel @@ -30,6 +30,7 @@ jvm_library( "//plugins/kotlin/highlighting/highlighting-k2:kotlin-highlighting", "//platform/util", "//platform/analysis-impl", + "//platform/editor-ui-api:editor-ui", "//platform/core-impl", "//plugins/kotlin/refactorings/kotlin.refactorings.common:kotlin-refactorings-common", "//plugins/kotlin/refactorings/kotlin.refactorings.k2:kotlin-refactorings", @@ -60,6 +61,7 @@ jvm_library( "//plugins/kotlin/highlighting/highlighting-k2:kotlin-highlighting_test_lib", "//platform/util:util_test_lib", "//platform/analysis-impl:analysis-impl_test_lib", + "//platform/editor-ui-api:editor-ui_test_lib", "//platform/core-impl:core-impl_test_lib", "//plugins/kotlin/refactorings/kotlin.refactorings.common:kotlin-refactorings-common_test_lib", "//plugins/kotlin/refactorings/kotlin.refactorings.k2:kotlin-refactorings_test_lib", @@ -120,6 +122,8 @@ jvm_library( "//platform/core-api:core_test_lib", "//platform/core-ui", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", "//platform/editor-ui-api:editor-ui", "//platform/editor-ui-api:editor-ui_test_lib", "//plugins/kotlin/base/test", diff --git a/plugins/compose/intellij.compose.ide.plugin.k2/intellij.compose.ide.plugin.k2.iml b/plugins/compose/intellij.compose.ide.plugin.k2/intellij.compose.ide.plugin.k2.iml index d917a8bf0111..49d414827088 100644 --- a/plugins/compose/intellij.compose.ide.plugin.k2/intellij.compose.ide.plugin.k2.iml +++ b/plugins/compose/intellij.compose.ide.plugin.k2/intellij.compose.ide.plugin.k2.iml @@ -33,6 +33,7 @@ + diff --git a/plugins/compose/intellij.compose.ide.plugin.k2/intellij.compose.ide.plugin.k2.tests.iml b/plugins/compose/intellij.compose.ide.plugin.k2/intellij.compose.ide.plugin.k2.tests.iml index 4a44981bfd10..fe37894309a4 100644 --- a/plugins/compose/intellij.compose.ide.plugin.k2/intellij.compose.ide.plugin.k2.tests.iml +++ b/plugins/compose/intellij.compose.ide.plugin.k2/intellij.compose.ide.plugin.k2.tests.iml @@ -32,6 +32,7 @@ + diff --git a/plugins/compose/intellij.compose.ide.plugin.resources/BUILD.bazel b/plugins/compose/intellij.compose.ide.plugin.resources/BUILD.bazel index 40849a62c649..b621fa1093fe 100644 --- a/plugins/compose/intellij.compose.ide.plugin.resources/BUILD.bazel +++ b/plugins/compose/intellij.compose.ide.plugin.resources/BUILD.bazel @@ -35,6 +35,7 @@ jvm_library( "//platform/lang-api:lang", "//xml/impl", "//platform/util/coroutines", + "//platform/util:util-ui", "//platform/platform-util-io:ide-util-io", "//plugins/compose/intellij.compose.ide.plugin.gradleTooling:ide-plugin-gradleTooling-rt", "//plugins/compose/intellij.compose.ide.plugin.shared:ide-plugin-shared", @@ -44,6 +45,7 @@ jvm_library( "//plugins/kotlin/refactorings/kotlin.refactorings.common:kotlin-refactorings-common", "//platform/core-ui", "//platform/platform-impl:ide-impl", + "//platform/ide-core", "@lib//:kotlinc-kotlin-compiler-tests-provided", "//platform/statistics", ] @@ -86,6 +88,7 @@ jvm_library( "//platform/util:util-tests", "//platform/util:util-tests_test_lib", "//platform/util/coroutines:coroutines_test_lib", + "//platform/util:util-ui_test_lib", "//platform/platform-util-io:ide-util-io_test_lib", "//plugins/compose/intellij.compose.ide.plugin.gradleTooling:ide-plugin-gradleTooling-rt_test_lib", "//plugins/compose/intellij.compose.ide.plugin.shared:ide-plugin-shared_test_lib", @@ -95,6 +98,7 @@ jvm_library( "//plugins/kotlin/refactorings/kotlin.refactorings.common:kotlin-refactorings-common_test_lib", "//platform/core-ui:core-ui_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//plugins/kotlin/base/test", "//plugins/kotlin/base/test:test_test_lib", "//plugins/kotlin/gradle/gradle-java/tests.shared", diff --git a/plugins/compose/intellij.compose.ide.plugin.resources/intellij.compose.ide.plugin.resources.iml b/plugins/compose/intellij.compose.ide.plugin.resources/intellij.compose.ide.plugin.resources.iml index 736752d50875..2fcdbace567c 100644 --- a/plugins/compose/intellij.compose.ide.plugin.resources/intellij.compose.ide.plugin.resources.iml +++ b/plugins/compose/intellij.compose.ide.plugin.resources/intellij.compose.ide.plugin.resources.iml @@ -35,6 +35,7 @@ + @@ -44,6 +45,7 @@ + diff --git a/plugins/compose/intellij.compose.ide.plugin.shared/BUILD.bazel b/plugins/compose/intellij.compose.ide.plugin.shared/BUILD.bazel index 5df3053b0dd7..9e2011a91e7f 100644 --- a/plugins/compose/intellij.compose.ide.plugin.shared/BUILD.bazel +++ b/plugins/compose/intellij.compose.ide.plugin.shared/BUILD.bazel @@ -35,6 +35,7 @@ jvm_library( "//platform/projectModel-impl", "//uast/uast-common:uast", "//platform/util", + "//platform/util:util-ui", "//plugins/kotlin/base/indices", "//plugins/kotlin/refactorings/kotlin.refactorings.common:kotlin-refactorings-common", "@lib//:kotlinc-kotlin-compiler-common-provided", @@ -69,6 +70,7 @@ jvm_library( "//platform/projectModel-impl:projectModel-impl_test_lib", "//uast/uast-common:uast_test_lib", "//platform/util:util_test_lib", + "//platform/util:util-ui_test_lib", "//plugins/kotlin/base/indices:indices_test_lib", "//plugins/kotlin/refactorings/kotlin.refactorings.common:kotlin-refactorings-common_test_lib", "@lib//:kotlinc-kotlin-compiler-common-provided", diff --git a/plugins/compose/intellij.compose.ide.plugin.shared/intellij.compose.ide.plugin.shared.iml b/plugins/compose/intellij.compose.ide.plugin.shared/intellij.compose.ide.plugin.shared.iml index dc5f6e2044bd..f095a834b092 100644 --- a/plugins/compose/intellij.compose.ide.plugin.shared/intellij.compose.ide.plugin.shared.iml +++ b/plugins/compose/intellij.compose.ide.plugin.shared/intellij.compose.ide.plugin.shared.iml @@ -38,6 +38,7 @@ + diff --git a/plugins/configuration-script/BUILD.bazel b/plugins/configuration-script/BUILD.bazel index 41cc661af08a..33b646c6cbcc 100644 --- a/plugins/configuration-script/BUILD.bazel +++ b/plugins/configuration-script/BUILD.bazel @@ -26,6 +26,7 @@ jvm_library( "//json/backend", "//platform/lang-api:lang", "//platform/platform-impl:ide-impl", + "//platform/ide-core", "//platform/workspace/jps", "//platform/execution-impl", "//platform/configuration-store-impl:configurationStore-impl", @@ -58,6 +59,7 @@ jvm_library( "//json/backend:backend_test_lib", "//platform/lang-api:lang_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/workspace/jps:jps_test_lib", "//platform/execution-impl:execution-impl_test_lib", "//platform/testFramework", @@ -118,10 +120,14 @@ jvm_library( "@lib//:assert_j", "//platform/lang-impl", "//platform/lang-impl:lang-impl_test_lib", + "//platform/ide-core", "//plugins/configuration-script:configurationScript-tests", "//plugins/configuration-script:configurationScript-tests_test_lib", ], - runtime_deps = [":configurationScript-test-java"] + runtime_deps = [ + ":configurationScript-test-java", + "//platform/ide-core:ide-core_test_lib", + ] ) ### auto-generated section `build intellij.configurationScript.test.java` end diff --git a/plugins/configuration-script/intellij.configurationScript.iml b/plugins/configuration-script/intellij.configurationScript.iml index faa0e780eeea..2632c4b874ee 100644 --- a/plugins/configuration-script/intellij.configurationScript.iml +++ b/plugins/configuration-script/intellij.configurationScript.iml @@ -23,6 +23,7 @@ + diff --git a/plugins/configuration-script/intellij.configurationScript.test.java.iml b/plugins/configuration-script/intellij.configurationScript.test.java.iml index 68f43e4681e5..68ff78df9813 100644 --- a/plugins/configuration-script/intellij.configurationScript.test.java.iml +++ b/plugins/configuration-script/intellij.configurationScript.test.java.iml @@ -16,6 +16,7 @@ + \ No newline at end of file diff --git a/plugins/copyright/BUILD.bazel b/plugins/copyright/BUILD.bazel index b3ad88b4a119..234b527b1462 100644 --- a/plugins/copyright/BUILD.bazel +++ b/plugins/copyright/BUILD.bazel @@ -27,6 +27,7 @@ jvm_library( "//libraries/velocity", "//xml/impl", "//platform/ide-core-impl", + "//platform/ide-core", "@lib//:kotlin-stdlib", "//libraries/kotlinx/coroutines/core", "//platform/external-system-api:externalSystem", @@ -36,6 +37,7 @@ jvm_library( "//platform/core-impl", "//platform/forms_rt:java-guiForms-rt", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", + "//platform/util:util-ui", ] ) @@ -59,6 +61,7 @@ jvm_library( "//libraries/velocity:velocity_test_lib", "//xml/impl:impl_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//libraries/kotlinx/coroutines/core:core_test_lib", "//platform/testFramework/extensions:testExtensions", "//platform/testFramework/extensions:testExtensions_test_lib", @@ -79,6 +82,7 @@ jvm_library( "//platform/core-impl:core-impl_test_lib", "//platform/forms_rt:java-guiForms-rt_test_lib", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", + "//platform/util:util-ui_test_lib", ] ) ### auto-generated section `build intellij.copyright` end @@ -149,6 +153,8 @@ jvm_library( "//xml/xml-psi-api:psi_test_lib", "//platform/util/jdom", "//platform/util/jdom:jdom_test_lib", + "//platform/util-ex", + "//platform/util-ex:util-ex_test_lib", "//platform/testFramework/junit5", "//platform/testFramework/junit5:junit5_test_lib", "//platform/testFramework/junit5.jimfs", diff --git a/plugins/copyright/intellij.copyright.iml b/plugins/copyright/intellij.copyright.iml index c2e0c29cced7..95d9d62d7c0e 100644 --- a/plugins/copyright/intellij.copyright.iml +++ b/plugins/copyright/intellij.copyright.iml @@ -21,6 +21,7 @@ + @@ -37,5 +38,6 @@ + \ No newline at end of file diff --git a/plugins/copyright/intellij.copyright.tests.iml b/plugins/copyright/intellij.copyright.tests.iml index 1429d0adf41d..58dc06a85c51 100644 --- a/plugins/copyright/intellij.copyright.tests.iml +++ b/plugins/copyright/intellij.copyright.tests.iml @@ -31,6 +31,7 @@ + diff --git a/plugins/coverage-common/BUILD.bazel b/plugins/coverage-common/BUILD.bazel index 55747b21febe..652bd36eb89c 100644 --- a/plugins/coverage-common/BUILD.bazel +++ b/plugins/coverage-common/BUILD.bazel @@ -32,12 +32,14 @@ jvm_library( "//platform/execution-impl", "//platform/lvcs-api:lvcs", "//platform/platform-impl/concurrency", + "//platform/ide-core", "//platform/util/diff", "//platform/vcs-api:vcs", "//libraries/fastutil", "//platform/core-ui", "//platform/statistics", "//platform/util/jdom", + "//platform/util:util-ui", "//plugins/coverage-common/intellij.platform.coverage.agent:coverage-agent", "//platform/core-impl", "//platform/execution", @@ -71,12 +73,14 @@ jvm_library( "//platform/execution-impl:execution-impl_test_lib", "//platform/lvcs-api:lvcs_test_lib", "//platform/platform-impl/concurrency:concurrency_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/util/diff:diff_test_lib", "//platform/vcs-api:vcs_test_lib", "//libraries/fastutil:fastutil_test_lib", "//platform/core-ui:core-ui_test_lib", "//platform/statistics:statistics_test_lib", "//platform/util/jdom:jdom_test_lib", + "//platform/util:util-ui_test_lib", "//plugins/coverage-common/intellij.platform.coverage.agent:coverage-agent_test_lib", "//platform/core-impl:core-impl_test_lib", "//platform/execution:execution_test_lib", diff --git a/plugins/coverage-common/intellij.platform.coverage.iml b/plugins/coverage-common/intellij.platform.coverage.iml index 5d1d7c4b15a2..621e5061e76f 100644 --- a/plugins/coverage-common/intellij.platform.coverage.iml +++ b/plugins/coverage-common/intellij.platform.coverage.iml @@ -27,12 +27,14 @@ + + diff --git a/plugins/coverage/BUILD.bazel b/plugins/coverage/BUILD.bazel index c74203598eaa..c3a0d56bbd75 100644 --- a/plugins/coverage/BUILD.bazel +++ b/plugins/coverage/BUILD.bazel @@ -21,6 +21,7 @@ jvm_library( "//plugins/coverage-common:coverage", "//java/execution/openapi:java-execution", "//java/openapi:java", + "//java/java-syntax:syntax", "//java/execution/impl", "//platform/editor-ui-api:editor-ui", "//platform/execution-impl", @@ -32,23 +33,30 @@ jvm_library( "//plugins/testng_rt:testng-rt", "//plugins/junit_rt:junit-rt", "//platform/ide-core-impl", + "//platform/ide-core", "//java/compiler/openapi:java-compiler", "//plugins/coverage/coverage_rt:java-coverage-rt", "//java/java-psi-impl:psi-impl", + "//java/java-psi-api:psi", "//platform/lang-impl", "//java/java-impl:impl", "//platform/platform-impl/concurrency", "//platform/util-class-loader:util-classLoader", "//platform/core-ui", + "//platform/core-impl", "//platform/platform-util-io:ide-util-io", "@lib//:jetbrains-annotations", "@lib//:java-coverage-coverage-report", "//platform/util/jdom", + "//platform/util:util-ui", "//platform/platform-impl:ide-impl", "//plugins/coverage-common/intellij.platform.coverage.agent:coverage-agent", "//libraries/fastutil", + "//java/java-frontback-psi-api:frontback-psi", "//platform/execution", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", + "//platform/lang-api:lang", + "//platform/statistics", ], exports = [ "//plugins/coverage-common:coverage", @@ -80,6 +88,7 @@ jvm_library( "//plugins/coverage-common:coverage_test_lib", "//java/execution/openapi:java-execution_test_lib", "//java/openapi:java_test_lib", + "//java/java-syntax:syntax_test_lib", "//java/execution/impl:impl_test_lib", "//platform/editor-ui-api:editor-ui_test_lib", "//platform/execution-impl:execution-impl_test_lib", @@ -91,9 +100,11 @@ jvm_library( "//plugins/testng_rt:testng-rt_test_lib", "//plugins/junit_rt:junit-rt_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//java/compiler/openapi:java-compiler_test_lib", "//plugins/coverage/coverage_rt:java-coverage-rt_test_lib", "//java/java-psi-impl:psi-impl_test_lib", + "//java/java-psi-api:psi_test_lib", "//platform/lang-impl:lang-impl_test_lib", "//java/java-impl:impl_test_lib", "//platform/platform-impl/concurrency:concurrency_test_lib", @@ -103,15 +114,20 @@ jvm_library( "//java/testFramework:testFramework_test_lib", "//platform/util-class-loader:util-classLoader_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl:core-impl_test_lib", "//platform/platform-util-io:ide-util-io_test_lib", "//platform/util/jdom:jdom_test_lib", + "//platform/util:util-ui_test_lib", "//platform/platform-impl:ide-impl_test_lib", "//plugins/coverage-common/intellij.platform.coverage.agent:coverage-agent_test_lib", "//libraries/fastutil:fastutil_test_lib", "//java/java-runtime:rt", "//java/java-runtime:rt_test_lib", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//platform/execution:execution_test_lib", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", + "//platform/lang-api:lang_test_lib", + "//platform/statistics:statistics_test_lib", ] ) ### auto-generated section `build intellij.java.coverage` end @@ -161,6 +177,10 @@ jvm_library( "//java/openapi:java_test_lib", "//java/execution/impl", "//java/execution/impl:impl_test_lib", + "//java/java-syntax:syntax", + "//java/java-syntax:syntax_test_lib", + "//java/java-psi-api:psi", + "//java/java-psi-api:psi_test_lib", "//platform/editor-ui-api:editor-ui", "//platform/editor-ui-api:editor-ui_test_lib", "//platform/execution-impl", @@ -180,6 +200,7 @@ jvm_library( "//plugins/junit_rt:junit-rt", "//plugins/junit_rt:junit-rt_test_lib", "//platform/ide-core-impl", + "//platform/ide-core", "//java/compiler/openapi:java-compiler", "//java/compiler/openapi:java-compiler_test_lib", "//plugins/coverage/coverage_rt:java-coverage-rt", @@ -199,11 +220,15 @@ jvm_library( "//platform/util-class-loader:util-classLoader_test_lib", "//platform/core-ui", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", "//platform/platform-util-io:ide-util-io", "@lib//:jetbrains-annotations", "@lib//:java-coverage-tests-coverage-report", "//platform/util/jdom", "//platform/util/jdom:jdom_test_lib", + "//platform/util:util-ui", + "//platform/util:util-ui_test_lib", "//platform/platform-impl:ide-impl", "//plugins/coverage-common/intellij.platform.coverage.agent:coverage-agent", "//plugins/coverage-common/intellij.platform.coverage.agent:coverage-agent_test_lib", @@ -227,6 +252,7 @@ jvm_library( runtime_deps = [ ":java-coverage-tests", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/platform-impl/concurrency:concurrency_test_lib", "//platform/platform-util-io:ide-util-io_test_lib", "//platform/platform-impl:ide-impl_test_lib", diff --git a/plugins/coverage/intellij.java.coverage.iml b/plugins/coverage/intellij.java.coverage.iml index 2108bbe76dac..dae22525c35e 100644 --- a/plugins/coverage/intellij.java.coverage.iml +++ b/plugins/coverage/intellij.java.coverage.iml @@ -63,6 +63,7 @@ + @@ -74,9 +75,11 @@ + + @@ -84,6 +87,7 @@ + @@ -113,11 +117,15 @@ + + + + \ No newline at end of file diff --git a/plugins/coverage/intellij.java.coverage.tests.iml b/plugins/coverage/intellij.java.coverage.tests.iml index 9cd84418b798..891fb7188155 100644 --- a/plugins/coverage/intellij.java.coverage.tests.iml +++ b/plugins/coverage/intellij.java.coverage.tests.iml @@ -63,6 +63,8 @@ + + @@ -73,6 +75,7 @@ + @@ -83,6 +86,7 @@ + @@ -112,6 +116,7 @@ + diff --git a/plugins/dev/intellij.dev.psiViewer/BUILD.bazel b/plugins/dev/intellij.dev.psiViewer/BUILD.bazel index bf6b0f6fd3b5..72086a745a03 100644 --- a/plugins/dev/intellij.dev.psiViewer/BUILD.bazel +++ b/plugins/dev/intellij.dev.psiViewer/BUILD.bazel @@ -31,6 +31,7 @@ jvm_library( "//platform/platform-impl:ide-impl", "//platform/core-ui", "//platform/platform-impl/concurrency", + "//platform/ide-core", "//platform/util/coroutines", "//platform/core-impl", "//platform/forms_rt:java-guiForms-rt", @@ -63,6 +64,7 @@ jvm_library( "//platform/platform-impl:ide-impl_test_lib", "//platform/core-ui:core-ui_test_lib", "//platform/platform-impl/concurrency:concurrency_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/util/coroutines:coroutines_test_lib", "//platform/core-impl:core-impl_test_lib", "//platform/forms_rt:java-guiForms-rt_test_lib", diff --git a/plugins/dev/intellij.dev.psiViewer/intellij.dev.psiViewer.iml b/plugins/dev/intellij.dev.psiViewer/intellij.dev.psiViewer.iml index 42a8f0d03411..3de1d2d5ecf4 100644 --- a/plugins/dev/intellij.dev.psiViewer/intellij.dev.psiViewer.iml +++ b/plugins/dev/intellij.dev.psiViewer/intellij.dev.psiViewer.iml @@ -25,6 +25,7 @@ + diff --git a/plugins/dev/intellij.java.dev/BUILD.bazel b/plugins/dev/intellij.java.dev/BUILD.bazel index bfbc2aa9eb02..f90ab17c80c2 100644 --- a/plugins/dev/intellij.java.dev/BUILD.bazel +++ b/plugins/dev/intellij.java.dev/BUILD.bazel @@ -25,10 +25,12 @@ jvm_library( "//platform/lang-api:lang", "//platform/editor-ui-api:editor-ui", "//platform/core-ui", + "//platform/core-impl", "//platform/platform-impl/concurrency", "//platform/xdebugger-impl:debugger-impl", "//platform/xdebugger-impl/shared", "//platform/platform-impl:ide-impl", + "//platform/ide-core", "//platform/execution-impl", "//platform/projectModel-api:projectModel", "//platform/util:util-ui", @@ -59,10 +61,12 @@ jvm_library( "//platform/lang-api:lang_test_lib", "//platform/editor-ui-api:editor-ui_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl:core-impl_test_lib", "//platform/platform-impl/concurrency:concurrency_test_lib", "//platform/xdebugger-impl:debugger-impl_test_lib", "//platform/xdebugger-impl/shared:shared_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/execution-impl:execution-impl_test_lib", "//platform/projectModel-api:projectModel_test_lib", "//platform/util:util-ui_test_lib", diff --git a/plugins/dev/intellij.java.dev/intellij.java.dev.iml b/plugins/dev/intellij.java.dev/intellij.java.dev.iml index 918528215cd1..8cba5e701e40 100644 --- a/plugins/dev/intellij.java.dev/intellij.java.dev.iml +++ b/plugins/dev/intellij.java.dev/intellij.java.dev.iml @@ -19,10 +19,12 @@ + + diff --git a/plugins/devkit/api-dump-lang/BUILD.bazel b/plugins/devkit/api-dump-lang/BUILD.bazel index 4386dcdb4db3..310fcff3fb5b 100644 --- a/plugins/devkit/api-dump-lang/BUILD.bazel +++ b/plugins/devkit/api-dump-lang/BUILD.bazel @@ -31,6 +31,7 @@ jvm_library( "//platform/analysis-impl", "//plugins/devkit/api-dump", "//java/java-impl:impl", + "//java/java-psi-api:psi", ] ) @@ -56,6 +57,7 @@ jvm_library( "//platform/analysis-impl:analysis-impl_test_lib", "//plugins/devkit/api-dump:api-dump_test_lib", "//java/java-impl:impl_test_lib", + "//java/java-psi-api:psi_test_lib", "//platform/testFramework", "//platform/testFramework:testFramework_test_lib", ] diff --git a/plugins/devkit/api-dump-lang/intellij.devkit.apiDump.lang.iml b/plugins/devkit/api-dump-lang/intellij.devkit.apiDump.lang.iml index fe0ce8647a1a..ce8f6a7b057b 100644 --- a/plugins/devkit/api-dump-lang/intellij.devkit.apiDump.lang.iml +++ b/plugins/devkit/api-dump-lang/intellij.devkit.apiDump.lang.iml @@ -26,6 +26,7 @@ + \ No newline at end of file diff --git a/plugins/devkit/api-dump/BUILD.bazel b/plugins/devkit/api-dump/BUILD.bazel index 8c6a9aef6e1f..14cf2935707a 100644 --- a/plugins/devkit/api-dump/BUILD.bazel +++ b/plugins/devkit/api-dump/BUILD.bazel @@ -21,6 +21,7 @@ jvm_library( "//platform/ide-core", "//platform/analysis-api:analysis", "//platform/util", + "//platform/util/multiplatform", "//platform/workspace/storage", "//platform/projectModel-impl", ] @@ -38,6 +39,7 @@ jvm_library( "//platform/ide-core:ide-core_test_lib", "//platform/analysis-api:analysis_test_lib", "//platform/util:util_test_lib", + "//platform/util/multiplatform:multiplatform_test_lib", "//platform/workspace/storage:storage_test_lib", "//platform/projectModel-impl:projectModel-impl_test_lib", ] diff --git a/plugins/devkit/api-dump/intellij.devkit.apiDump.iml b/plugins/devkit/api-dump/intellij.devkit.apiDump.iml index 3c9c07976083..681760f1a261 100644 --- a/plugins/devkit/api-dump/intellij.devkit.apiDump.iml +++ b/plugins/devkit/api-dump/intellij.devkit.apiDump.iml @@ -16,6 +16,7 @@ + diff --git a/plugins/devkit/devkit-core/BUILD.bazel b/plugins/devkit/devkit-core/BUILD.bazel index 4c5bec0c6358..246b6c223adb 100644 --- a/plugins/devkit/devkit-core/BUILD.bazel +++ b/plugins/devkit/devkit-core/BUILD.bazel @@ -28,6 +28,7 @@ jvm_library( "@lib//:jetbrains-annotations", "//java/java-indexing-api:indexing", "//platform/analysis-api:analysis", + "//platform/lang-api:lang", "//platform/core-api:core", "//platform/editor-ui-api:editor-ui", "//platform/execution-impl", @@ -51,7 +52,9 @@ jvm_library( "//plugins/properties:properties-backend", "//xml/impl", "//java/openapi:java", + "//java/java-syntax:syntax", "//libraries/guava", + "//java/java-psi-api:psi", "//platform/observable", "//spellchecker", "//plugins/properties/properties-psi-api:psi", @@ -59,6 +62,7 @@ jvm_library( "//xml/dom-impl", "//xml/xml-psi-api:psi", "//xml/xml-structure-view-api:structureView", + "//xml/xml-parser:parser", "//uast/uast-common:uast", "//java/idea-ui:ui", "//platform/usageView", @@ -75,16 +79,20 @@ jvm_library( "//platform/util-class-loader:util-classLoader", "//libraries/netty/buffer", "//platform/core-ui", + "//platform/core-impl", "//libraries/fastutil", "//plugins/properties/properties-psi-impl:backend-psi", "//platform/platform-util-io:ide-util-io", "//platform/platform-util-netty:ide-util-netty", "//platform/boot", "//platform/util/text-matching", + "//platform/util:util-ui", "//java/java-impl-refactorings:impl-refactorings", "//platform/platform-impl:ide-impl", "//platform/backend/workspace", "//platform/ide-core-impl", + "//platform/ide-core", + "//platform/progress/shared:ide-progress", "//libraries/kotlinx/serialization/core", "//libraries/kotlinx/serialization/json", "//json/backend", @@ -101,7 +109,10 @@ jvm_library( "//platform/util/concurrency", "//platform/execution", "//platform/forms_rt:java-guiForms-rt", + "//java/java-frontback-psi-api:frontback-psi", "//platform/buildData", + "//platform/statistics", + "//platform/testRunner", "//libraries/jackson/jackson", "//libraries/jackson/databind", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", @@ -118,6 +129,7 @@ jvm_library( ":core", "//java/java-indexing-api:indexing_test_lib", "//platform/analysis-api:analysis_test_lib", + "//platform/lang-api:lang_test_lib", "//platform/core-api:core_test_lib", "//platform/editor-ui-api:editor-ui_test_lib", "//platform/execution-impl:execution-impl_test_lib", @@ -141,7 +153,9 @@ jvm_library( "//plugins/properties:properties-backend_test_lib", "//xml/impl:impl_test_lib", "//java/openapi:java_test_lib", + "//java/java-syntax:syntax_test_lib", "//libraries/guava:guava_test_lib", + "//java/java-psi-api:psi_test_lib", "//platform/observable:observable_test_lib", "//spellchecker:spellchecker_test_lib", "//plugins/properties/properties-psi-api:psi_test_lib", @@ -149,6 +163,7 @@ jvm_library( "//xml/dom-impl:dom-impl_test_lib", "//xml/xml-psi-api:psi_test_lib", "//xml/xml-structure-view-api:structureView_test_lib", + "//xml/xml-parser:parser_test_lib", "//uast/uast-common:uast_test_lib", "//java/idea-ui:ui_test_lib", "//platform/usageView:usageView_test_lib", @@ -165,16 +180,20 @@ jvm_library( "//platform/util-class-loader:util-classLoader_test_lib", "//libraries/netty/buffer:buffer_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl:core-impl_test_lib", "//libraries/fastutil:fastutil_test_lib", "//plugins/properties/properties-psi-impl:backend-psi_test_lib", "//platform/platform-util-io:ide-util-io_test_lib", "//platform/platform-util-netty:ide-util-netty_test_lib", "//platform/boot:boot_test_lib", "//platform/util/text-matching:text-matching_test_lib", + "//platform/util:util-ui_test_lib", "//java/java-impl-refactorings:impl-refactorings_test_lib", "//platform/platform-impl:ide-impl_test_lib", "//platform/backend/workspace:workspace_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", + "//platform/progress/shared:ide-progress_test_lib", "//libraries/kotlinx/serialization/core:core_test_lib", "//libraries/kotlinx/serialization/json:json_test_lib", "//json/backend:backend_test_lib", @@ -191,7 +210,10 @@ jvm_library( "//platform/util/concurrency:concurrency_test_lib", "//platform/execution:execution_test_lib", "//platform/forms_rt:java-guiForms-rt_test_lib", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//platform/buildData:buildData_test_lib", + "//platform/statistics:statistics_test_lib", + "//platform/testRunner:testRunner_test_lib", "//libraries/jackson/jackson:jackson_test_lib", "//libraries/jackson/databind:databind_test_lib", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", diff --git a/plugins/devkit/devkit-core/intellij.devkit.core.iml b/plugins/devkit/devkit-core/intellij.devkit.core.iml index 664adaecfb13..93e376c6e457 100644 --- a/plugins/devkit/devkit-core/intellij.devkit.core.iml +++ b/plugins/devkit/devkit-core/intellij.devkit.core.iml @@ -34,6 +34,7 @@ + @@ -57,7 +58,9 @@ + + @@ -65,6 +68,7 @@ + @@ -81,16 +85,20 @@ + + + + @@ -107,7 +115,10 @@ + + + diff --git a/plugins/devkit/devkit-java-tests/BUILD.bazel b/plugins/devkit/devkit-java-tests/BUILD.bazel index fc7f576fc708..b2edc6595340 100644 --- a/plugins/devkit/devkit-java-tests/BUILD.bazel +++ b/plugins/devkit/devkit-java-tests/BUILD.bazel @@ -51,6 +51,8 @@ jvm_library( "//jps/model-api:model_test_lib", "//platform/lang-core", "//platform/lang-core:lang-core_test_lib", + "//platform/lang-api:lang", + "//platform/lang-api:lang_test_lib", "//platform/projectModel-api:projectModel", "//platform/projectModel-api:projectModel_test_lib", "//platform/refactoring", @@ -68,14 +70,19 @@ jvm_library( "//xml/xml-analysis-impl:analysis-impl", "//xml/xml-analysis-impl:analysis-impl_test_lib", "//platform/ide-core-impl", + "//platform/ide-core", "//java/execution/openapi:java-execution", "//java/execution/openapi:java-execution_test_lib", "//platform/execution", "//platform/execution:execution_test_lib", "//java/idea-ui:ui", "//java/idea-ui:ui_test_lib", + "//java/java-syntax:syntax", + "//java/java-syntax:syntax_test_lib", "//java/openapi:java", "//java/openapi:java_test_lib", + "//java/java-psi-api:psi", + "//java/java-psi-api:psi_test_lib", "//java/java-backend:backend", "//java/java-backend:backend_test_lib", "@lib//:assert_j", @@ -101,6 +108,8 @@ jvm_library( "//plugins/properties:properties-backend_test_lib", "//platform/core-ui", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", "//plugins/properties/properties-psi-impl:backend-psi", "//plugins/properties/properties-psi-impl:backend-psi_test_lib", "//plugins/devkit/intellij.devkit.themes:themes", @@ -122,6 +131,8 @@ jvm_library( "//plugins/kotlin/base/plugin:plugin_test_lib", "//java/codeserver/highlighting", "//java/codeserver/highlighting:highlighting_test_lib", + "//java/java-frontback-psi-api:frontback-psi", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//json", "//json:json_test_lib", "//libraries/fastutil", @@ -142,6 +153,7 @@ jvm_library( runtime_deps = [ ":java-tests", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//plugins/devkit:devkit_test_lib", "//platform/platform-util-io:ide-util-io_test_lib", ] diff --git a/plugins/devkit/devkit-java-tests/intellij.devkit.java.tests.iml b/plugins/devkit/devkit-java-tests/intellij.devkit.java.tests.iml index de5346fd5320..9957ff82d48b 100644 --- a/plugins/devkit/devkit-java-tests/intellij.devkit.java.tests.iml +++ b/plugins/devkit/devkit-java-tests/intellij.devkit.java.tests.iml @@ -15,6 +15,7 @@ + @@ -24,11 +25,14 @@ + + + @@ -42,6 +46,7 @@ + @@ -54,6 +59,7 @@ + diff --git a/plugins/devkit/devkit-kotlin-fir-tests/BUILD.bazel b/plugins/devkit/devkit-kotlin-fir-tests/BUILD.bazel index 15d46b267c97..a5b1cee421f5 100644 --- a/plugins/devkit/devkit-kotlin-fir-tests/BUILD.bazel +++ b/plugins/devkit/devkit-kotlin-fir-tests/BUILD.bazel @@ -43,6 +43,8 @@ jvm_library( "//platform/core-api:core_test_lib", "//platform/editor-ui-api:editor-ui", "//platform/editor-ui-api:editor-ui_test_lib", + "//java/java-psi-api:psi", + "//java/java-psi-api:psi_test_lib", "//platform/indexing-api:indexing", "//platform/indexing-api:indexing_test_lib", "@lib//:kotlin-test", @@ -60,6 +62,8 @@ jvm_library( "//java/openapi:java_test_lib", "//plugins/devkit/devkit-tests:testFramework", "//plugins/devkit/devkit-tests:testFramework_test_lib", + "//java/java-syntax:syntax", + "//java/java-syntax:syntax_test_lib", "//java/testFramework", "//java/testFramework:testFramework_test_lib", "//platform/testFramework", @@ -79,12 +83,16 @@ jvm_library( "//platform/testFramework/junit5:junit5_test_lib", "//platform/core-ui", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", "//plugins/kotlin/test-framework", "//plugins/kotlin/test-framework:test-framework_test_lib", "//plugins/kotlin/intellij.kotlin.base.test:base-test", "//plugins/kotlin/intellij.kotlin.base.test:base-test_test_lib", "//platform/lang-core", "//platform/lang-core:lang-core_test_lib", + "//platform/lang-api:lang", + "//platform/lang-api:lang_test_lib", "//plugins/java-i18n", "//plugins/java-i18n:java-i18n_test_lib", "//plugins/properties/properties-psi-api:psi", @@ -99,6 +107,9 @@ jvm_library( "//jps/model-api:model_test_lib", "//platform/execution", "//platform/execution:execution_test_lib", + "//platform/ide-core", + "//platform/util:util-ui", + "//platform/util:util-ui_test_lib", "//plugins/kotlin/base/plugin:kotlin-base-plugin-tests", "//plugins/kotlin/base/plugin:kotlin-base-plugin-tests_test_lib", "//plugins/devkit/intellij.devkit.themes:themes-tests", @@ -108,6 +119,7 @@ jvm_library( ":kotlin-fir-tests", "//plugins/kotlin:kotlin-plugin-community-main_test_lib", "//plugins/devkit/intellij.kotlin.devkit/k2:k2_test_lib", + "//platform/ide-core:ide-core_test_lib", ] ) ### auto-generated section `build intellij.devkit.kotlin.fir.tests` end diff --git a/plugins/devkit/devkit-kotlin-fir-tests/intellij.devkit.kotlin.fir.tests.iml b/plugins/devkit/devkit-kotlin-fir-tests/intellij.devkit.kotlin.fir.tests.iml index d2c06860a585..414ccfae2c66 100644 --- a/plugins/devkit/devkit-kotlin-fir-tests/intellij.devkit.kotlin.fir.tests.iml +++ b/plugins/devkit/devkit-kotlin-fir-tests/intellij.devkit.kotlin.fir.tests.iml @@ -12,6 +12,7 @@ + @@ -21,6 +22,7 @@ + @@ -34,9 +36,11 @@ + + @@ -44,6 +48,8 @@ + + diff --git a/plugins/devkit/devkit-kotlin-tests/BUILD.bazel b/plugins/devkit/devkit-kotlin-tests/BUILD.bazel index 607d34e04679..65a068a155bd 100644 --- a/plugins/devkit/devkit-kotlin-tests/BUILD.bazel +++ b/plugins/devkit/devkit-kotlin-tests/BUILD.bazel @@ -58,6 +58,8 @@ jvm_library( "//plugins/java-i18n:java-i18n_test_lib", "//java/openapi:java", "//java/openapi:java_test_lib", + "//java/java-psi-api:psi", + "//java/java-psi-api:psi_test_lib", "//plugins/devkit/intellij.devkit.themes:themes", "//plugins/devkit/intellij.devkit.themes:themes_test_lib", "//xml/dom-openapi:dom", diff --git a/plugins/devkit/devkit-kotlin-tests/intellij.devkit.kotlin.tests.iml b/plugins/devkit/devkit-kotlin-tests/intellij.devkit.kotlin.tests.iml index e64a6f2f8ba8..c7fe27f605ad 100644 --- a/plugins/devkit/devkit-kotlin-tests/intellij.devkit.kotlin.tests.iml +++ b/plugins/devkit/devkit-kotlin-tests/intellij.devkit.kotlin.tests.iml @@ -25,6 +25,7 @@ + diff --git a/plugins/devkit/devkit-tests/BUILD.bazel b/plugins/devkit/devkit-tests/BUILD.bazel index 32215306e352..d2c766e2761d 100644 --- a/plugins/devkit/devkit-tests/BUILD.bazel +++ b/plugins/devkit/devkit-tests/BUILD.bazel @@ -16,6 +16,7 @@ jvm_library( "//xml/dom-openapi:dom", "//xml/dom-impl", "//java/compiler/openapi:java-compiler", + "//java/java-syntax:syntax", "//jvm/jvm-analysis-api:analysis", ] ) @@ -31,19 +32,27 @@ jvm_library( deps = [ "//java/testFramework", "//java/testFramework:testFramework_test_lib", + "//java/java-psi-api:psi", + "//java/java-psi-api:psi_test_lib", "@lib//:assert_j", "//platform/analysis-api:analysis", "//platform/analysis-api:analysis_test_lib", "//platform/core-api:core", "//platform/core-api:core_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", "//platform/lang-core", "//platform/lang-core:lang-core_test_lib", + "//platform/lang-api:lang", + "//platform/lang-api:lang_test_lib", "//platform/editor-ui-api:editor-ui", "//platform/editor-ui-api:editor-ui_test_lib", "//platform/projectModel-api:projectModel", "//platform/projectModel-api:projectModel_test_lib", "//platform/util", "//platform/util:util_test_lib", + "//platform/util:util-ui", + "//platform/util:util-ui_test_lib", "//platform/testFramework", "//platform/testFramework:testFramework_test_lib", "//xml/dom-tests", @@ -56,6 +65,8 @@ jvm_library( "//xml/dom-impl:dom-impl_test_lib", "//java/compiler/openapi:java-compiler", "//java/compiler/openapi:java-compiler_test_lib", + "//java/java-syntax:syntax", + "//java/java-syntax:syntax_test_lib", "//jvm/jvm-analysis-api:analysis", "//jvm/jvm-analysis-api:analysis_test_lib", "//xml/xml-analysis-api:analysis", @@ -72,8 +83,12 @@ jvm_library( "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", "//jps/model-api:model", "//jps/model-api:model_test_lib", + "//platform/ide-core", ], - runtime_deps = [":testFramework"] + runtime_deps = [ + ":testFramework", + "//platform/ide-core:ide-core_test_lib", + ] ) ### auto-generated section `build intellij.devkit.testFramework` end diff --git a/plugins/devkit/devkit-tests/intellij.devkit.testFramework.iml b/plugins/devkit/devkit-tests/intellij.devkit.testFramework.iml index 8f14704be6f4..3b285a521adb 100644 --- a/plugins/devkit/devkit-tests/intellij.devkit.testFramework.iml +++ b/plugins/devkit/devkit-tests/intellij.devkit.testFramework.iml @@ -9,19 +9,24 @@ + + + + + @@ -30,6 +35,7 @@ + \ No newline at end of file diff --git a/plugins/devkit/intellij.devkit.compose/BUILD.bazel b/plugins/devkit/intellij.devkit.compose/BUILD.bazel index c90810716539..a352e43bada8 100644 --- a/plugins/devkit/intellij.devkit.compose/BUILD.bazel +++ b/plugins/devkit/intellij.devkit.compose/BUILD.bazel @@ -31,6 +31,7 @@ jvm_library( "//platform/ide-core", "//platform/progress/shared:ide-progress", "//platform/core-api:core", + "//platform/lang-api:lang", "//xml/xml-psi-api:psi", "//xml/impl", "//platform/core-ui", @@ -61,6 +62,7 @@ jvm_library( "//platform/platform-util-io:ide-util-io", "//platform/execution-impl", "//platform/util/jdom", + "//platform/util:util-ui", "//platform/external-system-impl:externalSystem-impl", "//plugins/gradle", ], @@ -80,6 +82,7 @@ jvm_library( "//platform/ide-core:ide-core_test_lib", "//platform/progress/shared:ide-progress_test_lib", "//platform/core-api:core_test_lib", + "//platform/lang-api:lang_test_lib", "//xml/xml-psi-api:psi_test_lib", "//xml/impl:impl_test_lib", "//platform/core-ui:core-ui_test_lib", @@ -110,6 +113,7 @@ jvm_library( "//platform/platform-util-io:ide-util-io_test_lib", "//platform/execution-impl:execution-impl_test_lib", "//platform/util/jdom:jdom_test_lib", + "//platform/util:util-ui_test_lib", "//platform/external-system-impl:externalSystem-impl_test_lib", "//plugins/gradle:gradle_test_lib", ], diff --git a/plugins/devkit/intellij.devkit.compose/intellij.devkit.compose.iml b/plugins/devkit/intellij.devkit.compose/intellij.devkit.compose.iml index 17b60fd6d876..3fe1a87e9381 100644 --- a/plugins/devkit/intellij.devkit.compose/intellij.devkit.compose.iml +++ b/plugins/devkit/intellij.devkit.compose/intellij.devkit.compose.iml @@ -36,6 +36,7 @@ + @@ -66,6 +67,7 @@ + diff --git a/plugins/devkit/intellij.devkit.debugger/BUILD.bazel b/plugins/devkit/intellij.devkit.debugger/BUILD.bazel index 46c56ccfc54c..a72d682bbdc1 100644 --- a/plugins/devkit/intellij.devkit.debugger/BUILD.bazel +++ b/plugins/devkit/intellij.devkit.debugger/BUILD.bazel @@ -29,6 +29,7 @@ jvm_library( "//platform/util:util-ui", "//platform/core-ui", "//platform/platform-impl:ide-impl", + "//platform/ide-core", ] ) @@ -55,6 +56,7 @@ jvm_library( "//platform/testFramework", "//platform/testFramework:testFramework_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", ] ) ### auto-generated section `build intellij.devkit.debugger` end diff --git a/plugins/devkit/intellij.devkit.debugger/intellij.devkit.debugger.iml b/plugins/devkit/intellij.devkit.debugger/intellij.devkit.debugger.iml index b887b070e1a1..5063edc71edc 100644 --- a/plugins/devkit/intellij.devkit.debugger/intellij.devkit.debugger.iml +++ b/plugins/devkit/intellij.devkit.debugger/intellij.devkit.debugger.iml @@ -24,5 +24,6 @@ + \ No newline at end of file diff --git a/plugins/devkit/intellij.devkit.i18n/BUILD.bazel b/plugins/devkit/intellij.devkit.i18n/BUILD.bazel index 768e8b839ebd..617a5ebdf1a8 100644 --- a/plugins/devkit/intellij.devkit.i18n/BUILD.bazel +++ b/plugins/devkit/intellij.devkit.i18n/BUILD.bazel @@ -19,19 +19,24 @@ jvm_library( "//platform/analysis-api:analysis", "//platform/core-api:core", "//platform/ide-core-impl", + "//platform/ide-core", "//jps/model-api:model", "//platform/projectModel-api:projectModel", "//plugins/properties/properties-psi-api:psi", "//plugins/properties/properties-psi-impl:backend-psi", "//plugins/java-i18n", + "//java/java-syntax:syntax", + "//java/java-psi-api:psi", "//jvm/jvm-analysis-api:analysis", "//platform/platform-impl:ide-impl", "//xml/dom-openapi:dom", "//xml/xml-psi-api:psi", + "//xml/xml-parser:parser", "//xml/xml-analysis-api:analysis", "//xml/xml-psi-impl:psi-impl", "//plugins/devkit/devkit-core:core", "//platform/core-ui", + "//platform/core-impl", ] ) @@ -46,15 +51,19 @@ jvm_library( "//platform/analysis-api:analysis_test_lib", "//platform/core-api:core_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//jps/model-api:model_test_lib", "//platform/projectModel-api:projectModel_test_lib", "//plugins/properties/properties-psi-api:psi_test_lib", "//plugins/properties/properties-psi-impl:backend-psi_test_lib", "//plugins/java-i18n:java-i18n_test_lib", + "//java/java-syntax:syntax_test_lib", + "//java/java-psi-api:psi_test_lib", "//jvm/jvm-analysis-api:analysis_test_lib", "//platform/platform-impl:ide-impl_test_lib", "//xml/dom-openapi:dom_test_lib", "//xml/xml-psi-api:psi_test_lib", + "//xml/xml-parser:parser_test_lib", "//xml/xml-analysis-api:analysis_test_lib", "//xml/xml-psi-impl:psi-impl_test_lib", "//plugins/devkit/devkit-core:core_test_lib", @@ -67,6 +76,7 @@ jvm_library( "//plugins/grazie/src:core", "//plugins/grazie/src:core_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl:core-impl_test_lib", ] ) ### auto-generated section `build intellij.devkit.i18n` end @@ -109,6 +119,7 @@ jvm_library( "//platform/core-api:core", "//platform/core-api:core_test_lib", "//platform/ide-core-impl", + "//platform/ide-core", "//jps/model-api:model", "//jps/model-api:model_test_lib", "//platform/projectModel-api:projectModel", @@ -119,6 +130,8 @@ jvm_library( "//plugins/properties/properties-psi-impl:backend-psi_test_lib", "//plugins/java-i18n", "//plugins/java-i18n:java-i18n_test_lib", + "//java/java-psi-api:psi", + "//java/java-psi-api:psi_test_lib", "//jvm/jvm-analysis-api:analysis", "//jvm/jvm-analysis-api:analysis_test_lib", "//platform/platform-impl:ide-impl", @@ -146,6 +159,7 @@ jvm_library( runtime_deps = [ ":i18n-tests", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/platform-impl:ide-impl_test_lib", ] ) diff --git a/plugins/devkit/intellij.devkit.i18n/intellij.devkit.i18n.iml b/plugins/devkit/intellij.devkit.i18n/intellij.devkit.i18n.iml index 40bf0a36d1f9..7c0feb26854c 100644 --- a/plugins/devkit/intellij.devkit.i18n/intellij.devkit.i18n.iml +++ b/plugins/devkit/intellij.devkit.i18n/intellij.devkit.i18n.iml @@ -13,15 +13,19 @@ + + + + @@ -30,5 +34,6 @@ + \ No newline at end of file diff --git a/plugins/devkit/intellij.devkit.i18n/intellij.devkit.i18n.tests.iml b/plugins/devkit/intellij.devkit.i18n/intellij.devkit.i18n.tests.iml index 85c67cc752bf..45766c87cc8e 100644 --- a/plugins/devkit/intellij.devkit.i18n/intellij.devkit.i18n.tests.iml +++ b/plugins/devkit/intellij.devkit.i18n/intellij.devkit.i18n.tests.iml @@ -15,11 +15,13 @@ + + diff --git a/plugins/devkit/intellij.devkit.scaffolding/BUILD.bazel b/plugins/devkit/intellij.devkit.scaffolding/BUILD.bazel index 49617b8cdb07..8599bdb9e303 100644 --- a/plugins/devkit/intellij.devkit.scaffolding/BUILD.bazel +++ b/plugins/devkit/intellij.devkit.scaffolding/BUILD.bazel @@ -19,6 +19,7 @@ jvm_library( "//jps/model-api:model", "//platform/projectModel-api:projectModel", "//platform/util", + "//platform/util:util-ui", "//platform/core-api:core", "//platform/core-ui", "//platform/editor-ui-api:editor-ui", @@ -26,6 +27,7 @@ jvm_library( "//platform/lang-api:lang", "//platform/platform-api:ide", "//platform/platform-impl:ide-impl", + "//platform/ide-core", "//platform/service-container", "//platform/backend/workspace", "//platform/workspace/jps", @@ -45,6 +47,7 @@ jvm_library( "//jps/model-api:model_test_lib", "//platform/projectModel-api:projectModel_test_lib", "//platform/util:util_test_lib", + "//platform/util:util-ui_test_lib", "//platform/core-api:core_test_lib", "//platform/core-ui:core-ui_test_lib", "//platform/editor-ui-api:editor-ui_test_lib", @@ -52,6 +55,7 @@ jvm_library( "//platform/lang-api:lang_test_lib", "//platform/platform-api:ide_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/service-container:service-container_test_lib", "//platform/backend/workspace:workspace_test_lib", "//platform/workspace/jps:jps_test_lib", diff --git a/plugins/devkit/intellij.devkit.scaffolding/intellij.devkit.scaffolding.iml b/plugins/devkit/intellij.devkit.scaffolding/intellij.devkit.scaffolding.iml index 895b9a613b69..d11a381012e7 100644 --- a/plugins/devkit/intellij.devkit.scaffolding/intellij.devkit.scaffolding.iml +++ b/plugins/devkit/intellij.devkit.scaffolding/intellij.devkit.scaffolding.iml @@ -13,6 +13,7 @@ + @@ -20,6 +21,7 @@ + diff --git a/plugins/devkit/intellij.devkit.smartupdate/BUILD.bazel b/plugins/devkit/intellij.devkit.smartupdate/BUILD.bazel index bdb32ed4d5fa..efb932e4570f 100644 --- a/plugins/devkit/intellij.devkit.smartupdate/BUILD.bazel +++ b/plugins/devkit/intellij.devkit.smartupdate/BUILD.bazel @@ -22,6 +22,7 @@ jvm_library( "//platform/ide-core", "//platform/core-api:core", "//platform/platform-impl:ide-impl", + "//platform/util:util-ui", ] ) @@ -39,6 +40,7 @@ jvm_library( "//platform/ide-core:ide-core_test_lib", "//platform/core-api:core_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/util:util-ui_test_lib", ] ) ### auto-generated section `build intellij.devkit.smartupdate` end diff --git a/plugins/devkit/intellij.devkit.smartupdate/intellij.devkit.smartupdate.iml b/plugins/devkit/intellij.devkit.smartupdate/intellij.devkit.smartupdate.iml index 963d8a250595..c98f6502ae5e 100644 --- a/plugins/devkit/intellij.devkit.smartupdate/intellij.devkit.smartupdate.iml +++ b/plugins/devkit/intellij.devkit.smartupdate/intellij.devkit.smartupdate.iml @@ -16,5 +16,6 @@ + \ No newline at end of file diff --git a/plugins/devkit/intellij.devkit.stacktrace/BUILD.bazel b/plugins/devkit/intellij.devkit.stacktrace/BUILD.bazel index 213aaa1c55b0..1493467d921e 100644 --- a/plugins/devkit/intellij.devkit.stacktrace/BUILD.bazel +++ b/plugins/devkit/intellij.devkit.stacktrace/BUILD.bazel @@ -27,6 +27,7 @@ jvm_library( "//java/java-impl:impl", "//java/unscramble", "//platform/util/coroutines", + "//platform/util:util-ui", "//platform/threadDumpParser", "//platform/diagnostic/freezeAnalyzer", ] @@ -51,6 +52,7 @@ jvm_library( "//java/java-impl:impl_test_lib", "//java/unscramble:unscramble_test_lib", "//platform/util/coroutines:coroutines_test_lib", + "//platform/util:util-ui_test_lib", "//platform/threadDumpParser:threadDumpParser_test_lib", "//platform/diagnostic/freezeAnalyzer:freezeAnalyzer_test_lib", ] diff --git a/plugins/devkit/intellij.devkit.stacktrace/intellij.devkit.stacktrace.iml b/plugins/devkit/intellij.devkit.stacktrace/intellij.devkit.stacktrace.iml index fda17fc70c98..1d71b02034a9 100644 --- a/plugins/devkit/intellij.devkit.stacktrace/intellij.devkit.stacktrace.iml +++ b/plugins/devkit/intellij.devkit.stacktrace/intellij.devkit.stacktrace.iml @@ -21,6 +21,7 @@ + diff --git a/plugins/devkit/intellij.devkit.themes/BUILD.bazel b/plugins/devkit/intellij.devkit.themes/BUILD.bazel index bb4faa557207..3bf6b6a9d52b 100644 --- a/plugins/devkit/intellij.devkit.themes/BUILD.bazel +++ b/plugins/devkit/intellij.devkit.themes/BUILD.bazel @@ -26,6 +26,7 @@ jvm_library( "//platform/projectModel-api:projectModel", "//spellchecker", "//platform/ide-core-impl", + "//platform/ide-core", "//platform/indexing-api:indexing", "//platform/lang-impl", "//java/java-psi-api:psi", @@ -34,10 +35,12 @@ jvm_library( "//xml/xml-psi-api:psi", "//xml/dom-openapi:dom", "//platform/core-ui", + "//platform/core-impl", "//platform/lang-api:lang", "//xml/xml-psi-impl:psi-impl", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", "//platform/util/concurrency", + "//platform/util:util-ui", ] ) @@ -61,6 +64,7 @@ jvm_library( "//platform/testFramework:testFramework_test_lib", "//spellchecker:spellchecker_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/indexing-api:indexing_test_lib", "//platform/lang-impl:lang-impl_test_lib", "//java/java-psi-api:psi_test_lib", @@ -71,10 +75,12 @@ jvm_library( "//java/testFramework", "//java/testFramework:testFramework_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl:core-impl_test_lib", "//platform/lang-api:lang_test_lib", "//xml/xml-psi-impl:psi-impl_test_lib", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", "//platform/util/concurrency:concurrency_test_lib", + "//platform/util:util-ui_test_lib", ] ) ### auto-generated section `build intellij.devkit.themes` end diff --git a/plugins/devkit/intellij.devkit.themes/intellij.devkit.themes.iml b/plugins/devkit/intellij.devkit.themes/intellij.devkit.themes.iml index b6c85500ac9a..a95a033ca63a 100644 --- a/plugins/devkit/intellij.devkit.themes/intellij.devkit.themes.iml +++ b/plugins/devkit/intellij.devkit.themes/intellij.devkit.themes.iml @@ -21,6 +21,7 @@ + @@ -30,9 +31,11 @@ + + \ No newline at end of file diff --git a/plugins/devkit/intellij.devkit.threading/BUILD.bazel b/plugins/devkit/intellij.devkit.threading/BUILD.bazel index 2dd0ddc1a41f..9ebc09aa34a9 100644 --- a/plugins/devkit/intellij.devkit.threading/BUILD.bazel +++ b/plugins/devkit/intellij.devkit.threading/BUILD.bazel @@ -30,6 +30,8 @@ jvm_library( "//platform/core-api:core", "//platform/editor-ui-api:editor-ui", "//platform/platform-api:ide", + "//platform/ide-core", + "//platform/progress/shared:ide-progress", "//java/java-psi-api:psi", "//platform/core-ui", "//platform/compose", @@ -51,6 +53,8 @@ jvm_library( "//platform/core-api:core_test_lib", "//platform/editor-ui-api:editor-ui_test_lib", "//platform/platform-api:ide_test_lib", + "//platform/ide-core:ide-core_test_lib", + "//platform/progress/shared:ide-progress_test_lib", "//java/java-psi-api:psi_test_lib", "//platform/core-ui:core-ui_test_lib", "//platform/compose:compose_test_lib", diff --git a/plugins/devkit/intellij.devkit.threading/intellij.devkit.threading.iml b/plugins/devkit/intellij.devkit.threading/intellij.devkit.threading.iml index 53a119990183..3d7cec933f93 100644 --- a/plugins/devkit/intellij.devkit.threading/intellij.devkit.threading.iml +++ b/plugins/devkit/intellij.devkit.threading/intellij.devkit.threading.iml @@ -35,6 +35,8 @@ + + diff --git a/plugins/devkit/intellij.devkit.uiDesigner/BUILD.bazel b/plugins/devkit/intellij.devkit.uiDesigner/BUILD.bazel index 9952518f3cb5..db2d9039f22f 100644 --- a/plugins/devkit/intellij.devkit.uiDesigner/BUILD.bazel +++ b/plugins/devkit/intellij.devkit.uiDesigner/BUILD.bazel @@ -26,9 +26,13 @@ jvm_library( "//platform/indexing-api:indexing", "//platform/projectModel-api:projectModel", "//platform/util/text-matching", + "//platform/util:util-ui", "//platform/platform-impl/designer", + "//platform/ide-core", "//platform/lang-api:lang", "//platform/forms_rt:java-guiForms-rt", + "//java/java-psi-api:psi", + "//java/java-frontback-psi-api:frontback-psi", ] ) @@ -50,9 +54,13 @@ jvm_library( "//platform/indexing-api:indexing_test_lib", "//platform/projectModel-api:projectModel_test_lib", "//platform/util/text-matching:text-matching_test_lib", + "//platform/util:util-ui_test_lib", "//platform/platform-impl/designer:designer_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/lang-api:lang_test_lib", "//platform/forms_rt:java-guiForms-rt_test_lib", + "//java/java-psi-api:psi_test_lib", + "//java/java-frontback-psi-api:frontback-psi_test_lib", ] ) ### auto-generated section `build intellij.devkit.uiDesigner` end diff --git a/plugins/devkit/intellij.devkit.uiDesigner/intellij.devkit.uiDesigner.iml b/plugins/devkit/intellij.devkit.uiDesigner/intellij.devkit.uiDesigner.iml index 06618375d9e7..000cecaeb817 100644 --- a/plugins/devkit/intellij.devkit.uiDesigner/intellij.devkit.uiDesigner.iml +++ b/plugins/devkit/intellij.devkit.uiDesigner/intellij.devkit.uiDesigner.iml @@ -20,8 +20,12 @@ + + + + \ No newline at end of file diff --git a/plugins/devkit/intellij.devkit.workspaceModel/BUILD.bazel b/plugins/devkit/intellij.devkit.workspaceModel/BUILD.bazel index 4c159bd0cb4b..b08e5729ef44 100644 --- a/plugins/devkit/intellij.devkit.workspaceModel/BUILD.bazel +++ b/plugins/devkit/intellij.devkit.workspaceModel/BUILD.bazel @@ -40,6 +40,7 @@ jvm_library( "//platform/util", "//platform/projectModel-api:projectModel", "//platform/analysis-api:analysis", + "//java/java-psi-api:psi", "//java/java-psi-impl:psi-impl", "//platform/platform-impl:ide-impl", "//platform/platform-api:ide", @@ -64,6 +65,7 @@ jvm_library( "//platform/backend/workspace", "//platform/util/progress", "//platform/core-api:core", + "//platform/core-impl", "//platform/workspace/jps", "//java/java-impl:impl", "//plugins/kotlin/base/psi", @@ -90,6 +92,7 @@ jvm_library( "//platform/util:util_test_lib", "//platform/projectModel-api:projectModel_test_lib", "//platform/analysis-api:analysis_test_lib", + "//java/java-psi-api:psi_test_lib", "//java/java-psi-impl:psi-impl_test_lib", "//platform/platform-impl:ide-impl_test_lib", "//platform/platform-api:ide_test_lib", @@ -114,6 +117,7 @@ jvm_library( "//platform/backend/workspace:workspace_test_lib", "//platform/util/progress:progress_test_lib", "//platform/core-api:core_test_lib", + "//platform/core-impl:core-impl_test_lib", "//platform/workspace/jps:jps_test_lib", "//java/java-impl:impl_test_lib", "//plugins/kotlin/base/psi:psi_test_lib", diff --git a/plugins/devkit/intellij.devkit.workspaceModel/intellij.devkit.workspaceModel.iml b/plugins/devkit/intellij.devkit.workspaceModel/intellij.devkit.workspaceModel.iml index cf5bdf8ad43b..4edfff633076 100644 --- a/plugins/devkit/intellij.devkit.workspaceModel/intellij.devkit.workspaceModel.iml +++ b/plugins/devkit/intellij.devkit.workspaceModel/intellij.devkit.workspaceModel.iml @@ -37,6 +37,7 @@ + @@ -61,6 +62,7 @@ + diff --git a/plugins/devkit/intellij.devkit.workspaceModel/k1/BUILD.bazel b/plugins/devkit/intellij.devkit.workspaceModel/k1/BUILD.bazel index 4b0dec072def..dd73c0206bfb 100644 --- a/plugins/devkit/intellij.devkit.workspaceModel/k1/BUILD.bazel +++ b/plugins/devkit/intellij.devkit.workspaceModel/k1/BUILD.bazel @@ -39,6 +39,7 @@ jvm_library( "//java/java-psi-impl:psi-impl", "//platform/util", "//platform/core-api:core", + "//platform/core-impl", "//platform/analysis-api:analysis", "//plugins/kotlin/base/fe10/project-structure", ] @@ -63,6 +64,7 @@ jvm_library( "//java/java-psi-impl:psi-impl_test_lib", "//platform/util:util_test_lib", "//platform/core-api:core_test_lib", + "//platform/core-impl:core-impl_test_lib", "//plugins/kotlin/base/plugin", "//plugins/kotlin/base/plugin:plugin_test_lib", "//plugins/kotlin/plugin/k1", diff --git a/plugins/devkit/intellij.devkit.workspaceModel/k1/intellij.devkit.workspaceModel.k1.iml b/plugins/devkit/intellij.devkit.workspaceModel/k1/intellij.devkit.workspaceModel.k1.iml index c781f6464b3c..3bc494db89ef 100644 --- a/plugins/devkit/intellij.devkit.workspaceModel/k1/intellij.devkit.workspaceModel.k1.iml +++ b/plugins/devkit/intellij.devkit.workspaceModel/k1/intellij.devkit.workspaceModel.k1.iml @@ -37,6 +37,7 @@ + diff --git a/plugins/devkit/intellij.devkit.workspaceModel/k2/BUILD.bazel b/plugins/devkit/intellij.devkit.workspaceModel/k2/BUILD.bazel index 186e4bce6b65..c0881b8982d1 100644 --- a/plugins/devkit/intellij.devkit.workspaceModel/k2/BUILD.bazel +++ b/plugins/devkit/intellij.devkit.workspaceModel/k2/BUILD.bazel @@ -40,6 +40,7 @@ jvm_library( "@lib//:workspace-model-codegen", "//platform/core-impl", "//java/openapi:java", + "//java/java-psi-api:psi", "//plugins/kotlin/base/psi", "//platform/analysis-api:analysis", ] @@ -64,6 +65,7 @@ jvm_library( "@lib//:kotlinc-kotlin-compiler-common-provided", "//platform/core-impl:core-impl_test_lib", "//java/openapi:java_test_lib", + "//java/java-psi-api:psi_test_lib", "//plugins/kotlin/base/psi:psi_test_lib", "//plugins/devkit/intellij.devkit.workspaceModel/tests", "//plugins/devkit/intellij.devkit.workspaceModel/tests:tests_test_lib", diff --git a/plugins/devkit/intellij.devkit.workspaceModel/k2/intellij.devkit.workspaceModel.k2.iml b/plugins/devkit/intellij.devkit.workspaceModel/k2/intellij.devkit.workspaceModel.k2.iml index 2bfafa00ac99..2a11d0329c4a 100644 --- a/plugins/devkit/intellij.devkit.workspaceModel/k2/intellij.devkit.workspaceModel.k2.iml +++ b/plugins/devkit/intellij.devkit.workspaceModel/k2/intellij.devkit.workspaceModel.k2.iml @@ -37,6 +37,7 @@ + diff --git a/plugins/devkit/intellij.devkit.workspaceModel/tests/BUILD.bazel b/plugins/devkit/intellij.devkit.workspaceModel/tests/BUILD.bazel index 407e1ec0b77c..54bb2532f12e 100644 --- a/plugins/devkit/intellij.devkit.workspaceModel/tests/BUILD.bazel +++ b/plugins/devkit/intellij.devkit.workspaceModel/tests/BUILD.bazel @@ -32,8 +32,12 @@ jvm_library( "//platform/code-style-api:codeStyle_test_lib", "//platform/core-api:core", "//platform/core-api:core_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", "//jps/model-api:model", "//jps/model-api:model_test_lib", + "//jps/model-serialization", + "//jps/model-serialization:model-serialization_test_lib", "//platform/projectModel-api:projectModel", "//platform/projectModel-api:projectModel_test_lib", "//platform/testFramework", @@ -81,6 +85,7 @@ jvm_library( "//libraries/rd/framework:framework_test_lib", "//platform/util/jdom", "//platform/util/jdom:jdom_test_lib", + "//platform/ide-core", "@lib//:kotlinc-kotlin-scripting-common", "//plugins/editorconfig/backend", "//plugins/editorconfig/backend:backend_test_lib", @@ -93,6 +98,7 @@ jvm_library( runtime_deps = [ ":tests", "//plugins/devkit:devkit_test_lib", + "//platform/ide-core:ide-core_test_lib", ] ) ### auto-generated section `build intellij.devkit.workspaceModel.tests` end diff --git a/plugins/devkit/intellij.devkit.workspaceModel/tests/intellij.devkit.workspaceModel.tests.iml b/plugins/devkit/intellij.devkit.workspaceModel/tests/intellij.devkit.workspaceModel.tests.iml index d09705aa993c..ce9542c0c984 100644 --- a/plugins/devkit/intellij.devkit.workspaceModel/tests/intellij.devkit.workspaceModel.tests.iml +++ b/plugins/devkit/intellij.devkit.workspaceModel/tests/intellij.devkit.workspaceModel.tests.iml @@ -11,7 +11,9 @@ + + @@ -38,6 +40,7 @@ + diff --git a/plugins/devkit/intellij.kotlin.devkit/BUILD.bazel b/plugins/devkit/intellij.kotlin.devkit/BUILD.bazel index 257ee4264cf8..c50c7f678749 100644 --- a/plugins/devkit/intellij.kotlin.devkit/BUILD.bazel +++ b/plugins/devkit/intellij.kotlin.devkit/BUILD.bazel @@ -59,6 +59,7 @@ jvm_library( "//platform/eel", "//java/java-indexing-api:indexing", "//java/openapi:java", + "//java/java-frontback-psi-api:frontback-psi", "//platform/polySymbols", ] ) @@ -105,6 +106,7 @@ jvm_library( "//platform/eel:eel_test_lib", "//java/java-indexing-api:indexing_test_lib", "//java/openapi:java_test_lib", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//platform/polySymbols:polySymbols_test_lib", ] ) diff --git a/plugins/devkit/intellij.kotlin.devkit/intellij.kotlin.devkit.iml b/plugins/devkit/intellij.kotlin.devkit/intellij.kotlin.devkit.iml index b16976b778c1..9431107d1794 100644 --- a/plugins/devkit/intellij.kotlin.devkit/intellij.kotlin.devkit.iml +++ b/plugins/devkit/intellij.kotlin.devkit/intellij.kotlin.devkit.iml @@ -58,6 +58,7 @@ + \ No newline at end of file diff --git a/plugins/devkit/jps-plugin/BUILD.bazel b/plugins/devkit/jps-plugin/BUILD.bazel index d8f6d3359dad..b68e030961dc 100644 --- a/plugins/devkit/jps-plugin/BUILD.bazel +++ b/plugins/devkit/jps-plugin/BUILD.bazel @@ -23,6 +23,7 @@ jvm_library( "//platform/util/jdom", "@community//build:build-javac-rt", "//platform/util", + "//platform/util/base", "@lib//:jetbrains-annotations", ] ) @@ -43,6 +44,7 @@ jvm_library( "//platform/util/jdom:jdom_test_lib", "@community//build:build-javac-rt_test_lib", "//platform/util:util_test_lib", + "//platform/util/base:base_test_lib", ] ) ### auto-generated section `build intellij.devkit.jps` end @@ -75,6 +77,8 @@ jvm_library( "//plugins/devkit/jps-plugin:jps_test_lib", "//platform/core-api:core", "//platform/core-api:core_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", "//jps/model-api:model", "//jps/model-api:model_test_lib", "//jps/model-impl", diff --git a/plugins/devkit/jps-plugin/intellij.devkit.jps.iml b/plugins/devkit/jps-plugin/intellij.devkit.jps.iml index 2d4c30740514..fd71d7d218fb 100644 --- a/plugins/devkit/jps-plugin/intellij.devkit.jps.iml +++ b/plugins/devkit/jps-plugin/intellij.devkit.jps.iml @@ -32,6 +32,7 @@ + \ No newline at end of file diff --git a/plugins/devkit/jps-plugin/intellij.devkit.jps.tests.iml b/plugins/devkit/jps-plugin/intellij.devkit.jps.tests.iml index 5b3c3f31d9d8..130b3b0884a5 100644 --- a/plugins/devkit/jps-plugin/intellij.devkit.jps.tests.iml +++ b/plugins/devkit/jps-plugin/intellij.devkit.jps.tests.iml @@ -9,6 +9,7 @@ + diff --git a/plugins/eclipse/BUILD.bazel b/plugins/eclipse/BUILD.bazel index e8cad75d7670..b53be433e68f 100644 --- a/plugins/eclipse/BUILD.bazel +++ b/plugins/eclipse/BUILD.bazel @@ -24,17 +24,23 @@ jvm_library( "//platform/lang-core", "//platform/projectModel-api:projectModel", "//platform/util/jdom", + "//platform/util:util-ui", + "//platform/util-ex", "//java/openapi:java", "//platform/platform-impl:ide-impl", + "//java/java-syntax:syntax", + "//java/java-psi-api:psi", "//platform/diff-api:diff", "//java/compiler/openapi:java-compiler", "//platform/ide-core-impl", + "//platform/ide-core", "//java/idea-ui:ui", "//java/java-impl:impl", "//plugins/eclipse/jps-plugin:jps", "//plugins/eclipse/common-eclipse-util:common", "//platform/editor-ui-ex:editor-ex", "//platform/core-ui", + "//platform/core-impl", "//platform/workspace/jps", "//platform/workspace/storage", "//platform/statistics", @@ -43,6 +49,7 @@ jvm_library( "//xml/xml-psi-impl:psi-impl", "//platform/execution", "//platform/forms_rt:java-guiForms-rt", + "//java/java-frontback-psi-api:frontback-psi", "//platform/welcome-screen-impl:welcomeScreen-impl", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", ] @@ -65,8 +72,12 @@ jvm_library( "//platform/lang-core:lang-core_test_lib", "//platform/projectModel-api:projectModel_test_lib", "//platform/util/jdom:jdom_test_lib", + "//platform/util:util-ui_test_lib", + "//platform/util-ex:util-ex_test_lib", "//java/openapi:java_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//java/java-syntax:syntax_test_lib", + "//java/java-psi-api:psi_test_lib", "//platform/testFramework", "//platform/testFramework:testFramework_test_lib", "@lib//:junit4", @@ -75,6 +86,7 @@ jvm_library( "//platform/diff-api:diff_test_lib", "//java/compiler/openapi:java-compiler_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//java/idea-ui:ui_test_lib", "//java/java-impl:impl_test_lib", "//plugins/eclipse/jps-plugin:jps_test_lib", @@ -83,6 +95,7 @@ jvm_library( "//platform/testFramework/extensions:testExtensions_test_lib", "//platform/editor-ui-ex:editor-ex_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl:core-impl_test_lib", "//platform/workspace/jps:jps_test_lib", "//platform/workspace/storage:storage_test_lib", "//libraries/kotlinx/coroutines/core", @@ -96,6 +109,7 @@ jvm_library( "//xml/xml-psi-impl:psi-impl_test_lib", "//platform/execution:execution_test_lib", "//platform/forms_rt:java-guiForms-rt_test_lib", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//platform/welcome-screen-impl:welcomeScreen-impl_test_lib", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", ] @@ -145,6 +159,10 @@ jvm_library( "//platform/projectModel-api:projectModel_test_lib", "//platform/util/jdom", "//platform/util/jdom:jdom_test_lib", + "//platform/util:util-ui", + "//platform/util:util-ui_test_lib", + "//platform/util-ex", + "//platform/util-ex:util-ex_test_lib", "//java/openapi:java", "//java/openapi:java_test_lib", "//platform/platform-impl:ide-impl", @@ -158,6 +176,7 @@ jvm_library( "//java/compiler/openapi:java-compiler", "//java/compiler/openapi:java-compiler_test_lib", "//platform/ide-core-impl", + "//platform/ide-core", "//java/idea-ui:ui", "//java/idea-ui:ui_test_lib", "//java/java-impl:impl", @@ -172,6 +191,8 @@ jvm_library( "//platform/editor-ui-ex:editor-ex_test_lib", "//platform/core-ui", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", "//platform/workspace/jps", "//platform/workspace/jps:jps_test_lib", "//platform/workspace/storage", @@ -193,6 +214,8 @@ jvm_library( "//platform/execution:execution_test_lib", "//platform/forms_rt:java-guiForms-rt", "//platform/forms_rt:java-guiForms-rt_test_lib", + "//java/java-frontback-psi-api:frontback-psi", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//platform/welcome-screen-impl:welcomeScreen-impl", "//platform/welcome-screen-impl:welcomeScreen-impl_test_lib", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", @@ -202,6 +225,7 @@ jvm_library( ":eclipse-tests", "//platform/platform-impl:ide-impl_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", ] ) ### auto-generated section `build intellij.eclipse.tests` end diff --git a/plugins/eclipse/common-eclipse-util/BUILD.bazel b/plugins/eclipse/common-eclipse-util/BUILD.bazel index 3b49aa170b22..bb5760bb1da7 100644 --- a/plugins/eclipse/common-eclipse-util/BUILD.bazel +++ b/plugins/eclipse/common-eclipse-util/BUILD.bazel @@ -10,6 +10,7 @@ jvm_library( deps = [ "//platform/util", "//platform/util/jdom", + "//platform/util/base", "//jps/model-serialization", ] ) @@ -24,6 +25,7 @@ jvm_library( ":common", "//platform/util:util_test_lib", "//platform/util/jdom:jdom_test_lib", + "//platform/util/base:base_test_lib", "//jps/model-serialization:model-serialization_test_lib", ] ) diff --git a/plugins/eclipse/common-eclipse-util/intellij.eclipse.common.iml b/plugins/eclipse/common-eclipse-util/intellij.eclipse.common.iml index 15868d56091d..f4a551bad8e0 100644 --- a/plugins/eclipse/common-eclipse-util/intellij.eclipse.common.iml +++ b/plugins/eclipse/common-eclipse-util/intellij.eclipse.common.iml @@ -25,6 +25,7 @@ + \ No newline at end of file diff --git a/plugins/eclipse/intellij.eclipse.iml b/plugins/eclipse/intellij.eclipse.iml index f688b201fb1c..59c7335d2f97 100644 --- a/plugins/eclipse/intellij.eclipse.iml +++ b/plugins/eclipse/intellij.eclipse.iml @@ -20,14 +20,19 @@ + + + + + @@ -35,6 +40,7 @@ + @@ -46,6 +52,7 @@ + diff --git a/plugins/eclipse/intellij.eclipse.tests.iml b/plugins/eclipse/intellij.eclipse.tests.iml index 622c32236bd0..056cb3bea1e3 100644 --- a/plugins/eclipse/intellij.eclipse.tests.iml +++ b/plugins/eclipse/intellij.eclipse.tests.iml @@ -17,6 +17,8 @@ + + @@ -25,6 +27,7 @@ + @@ -32,6 +35,7 @@ + @@ -43,6 +47,7 @@ + diff --git a/plugins/editorconfig/backend/BUILD.bazel b/plugins/editorconfig/backend/BUILD.bazel index 571b7c246d80..a921118d92b5 100644 --- a/plugins/editorconfig/backend/BUILD.bazel +++ b/plugins/editorconfig/backend/BUILD.bazel @@ -38,6 +38,7 @@ jvm_library( "//platform/lang-core", "//platform/lang-impl", "//platform/ide-core-impl", + "//platform/ide-core", "//platform/projectModel-api:projectModel", "//platform/refactoring", "//libraries/kotlin/reflect", @@ -47,6 +48,7 @@ jvm_library( "//platform/core-ui", "//platform/code-style-impl:codeStyle-impl", "//platform/util/jdom", + "//platform/util:util-ui", "//platform/statistics", "//libraries/kotlinx/coroutines/core", "@lib//:ec4j-core", @@ -80,6 +82,7 @@ jvm_library( "//platform/lang-core:lang-core_test_lib", "//platform/lang-impl:lang-impl_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/projectModel-api:projectModel_test_lib", "//platform/refactoring:refactoring_test_lib", "//platform/structure-view-impl:structureView-impl", @@ -93,6 +96,7 @@ jvm_library( "//platform/core-ui:core-ui_test_lib", "//platform/code-style-impl:codeStyle-impl_test_lib", "//platform/util/jdom:jdom_test_lib", + "//platform/util:util-ui_test_lib", "//platform/statistics:statistics_test_lib", "//libraries/kotlinx/coroutines/core:core_test_lib", "//tools/intellij.tools.ide.metrics.benchmark:ide-metrics-benchmark", @@ -157,6 +161,7 @@ jvm_library( "//platform/lang-impl", "//platform/lang-impl:lang-impl_test_lib", "//platform/ide-core-impl", + "//platform/ide-core", "//platform/projectModel-api:projectModel", "//platform/projectModel-api:projectModel_test_lib", "//platform/refactoring", @@ -179,6 +184,8 @@ jvm_library( "//platform/code-style-impl:codeStyle-impl_test_lib", "//platform/util/jdom", "//platform/util/jdom:jdom_test_lib", + "//platform/util:util-ui", + "//platform/util:util-ui_test_lib", "//platform/statistics", "//platform/statistics:statistics_test_lib", "//libraries/kotlinx/coroutines/core", @@ -201,6 +208,7 @@ jvm_library( ":backend-tests", "//platform/platform-impl:ide-impl_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", ] ) ### auto-generated section `build intellij.editorconfig.backend.tests` end diff --git a/plugins/editorconfig/backend/intellij.editorconfig.backend.iml b/plugins/editorconfig/backend/intellij.editorconfig.backend.iml index d8911f50c232..bb7b4efea9ab 100644 --- a/plugins/editorconfig/backend/intellij.editorconfig.backend.iml +++ b/plugins/editorconfig/backend/intellij.editorconfig.backend.iml @@ -47,6 +47,7 @@ + @@ -58,6 +59,7 @@ + diff --git a/plugins/editorconfig/backend/intellij.editorconfig.backend.tests.iml b/plugins/editorconfig/backend/intellij.editorconfig.backend.tests.iml index 83b3352125b2..b66925931d19 100644 --- a/plugins/editorconfig/backend/intellij.editorconfig.backend.tests.iml +++ b/plugins/editorconfig/backend/intellij.editorconfig.backend.tests.iml @@ -44,6 +44,7 @@ + @@ -55,6 +56,7 @@ + diff --git a/plugins/editorconfig/frontend/BUILD.bazel b/plugins/editorconfig/frontend/BUILD.bazel index 7c7de428c458..ad901d991cd1 100644 --- a/plugins/editorconfig/frontend/BUILD.bazel +++ b/plugins/editorconfig/frontend/BUILD.bazel @@ -20,6 +20,8 @@ jvm_library( "//platform/editor-ui-api:editor-ui", "//platform/lang-api:lang", "//plugins/editorconfig/common", + "//platform/util:util-ui", + "//platform/util-ex", "//platform/analysis-impl", "//platform/platform-impl:ide-impl", "//platform/lang-impl", @@ -41,6 +43,8 @@ jvm_library( "//platform/editor-ui-api:editor-ui_test_lib", "//platform/lang-api:lang_test_lib", "//plugins/editorconfig/common:common_test_lib", + "//platform/util:util-ui_test_lib", + "//platform/util-ex:util-ex_test_lib", "//platform/analysis-impl:analysis-impl_test_lib", "//platform/platform-impl:ide-impl_test_lib", "//platform/lang-impl:lang-impl_test_lib", diff --git a/plugins/editorconfig/frontend/intellij.editorconfig.frontend.iml b/plugins/editorconfig/frontend/intellij.editorconfig.frontend.iml index aa5c9b69743d..718a3f067784 100644 --- a/plugins/editorconfig/frontend/intellij.editorconfig.frontend.iml +++ b/plugins/editorconfig/frontend/intellij.editorconfig.frontend.iml @@ -14,6 +14,8 @@ + + diff --git a/plugins/emojipicker/BUILD.bazel b/plugins/emojipicker/BUILD.bazel index ad5872d42cea..72367caac19d 100644 --- a/plugins/emojipicker/BUILD.bazel +++ b/plugins/emojipicker/BUILD.bazel @@ -20,7 +20,9 @@ jvm_library( "//platform/editor-ui-api:editor-ui", "//platform/lang-api:lang", "//platform/platform-impl:ide-impl", + "//platform/ide-core", "//platform/core-ui", + "//platform/util:util-ui", "//platform/projectModel-api:projectModel", "//platform/util-ex", "//platform/util/xmlDom", @@ -39,7 +41,9 @@ jvm_library( "//platform/editor-ui-api:editor-ui_test_lib", "//platform/lang-api:lang_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/util:util-ui_test_lib", "//platform/projectModel-api:projectModel_test_lib", "//platform/util-ex:util-ex_test_lib", "//platform/util/xmlDom:xmlDom_test_lib", diff --git a/plugins/emojipicker/intellij.emojipicker.iml b/plugins/emojipicker/intellij.emojipicker.iml index 2a1c610f6dee..f45bf04ae38f 100644 --- a/plugins/emojipicker/intellij.emojipicker.iml +++ b/plugins/emojipicker/intellij.emojipicker.iml @@ -15,7 +15,9 @@ + + diff --git a/plugins/env-files-support/BUILD.bazel b/plugins/env-files-support/BUILD.bazel index 054f9ca77946..89bb7cc10fff 100644 --- a/plugins/env-files-support/BUILD.bazel +++ b/plugins/env-files-support/BUILD.bazel @@ -23,7 +23,9 @@ jvm_library( "//platform/core-impl", "//platform/util", "//platform/platform-impl:ide-impl", + "//platform/ide-core", "//platform/analysis-impl", + "//platform/util:util-ui", "//platform/refactoring", "//platform/lang-impl", "//platform/lang-api:lang", @@ -47,7 +49,9 @@ jvm_library( "//platform/core-impl:core-impl_test_lib", "//platform/util:util_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/analysis-impl:analysis-impl_test_lib", + "//platform/util:util-ui_test_lib", "//platform/refactoring:refactoring_test_lib", "//platform/lang-impl:lang-impl_test_lib", "//platform/lang-api:lang_test_lib", diff --git a/plugins/env-files-support/intellij.dotenv.iml b/plugins/env-files-support/intellij.dotenv.iml index 6bc9aee66c59..e875cf8223d0 100644 --- a/plugins/env-files-support/intellij.dotenv.iml +++ b/plugins/env-files-support/intellij.dotenv.iml @@ -19,7 +19,9 @@ + + diff --git a/plugins/evaluation-plugin/BUILD.bazel b/plugins/evaluation-plugin/BUILD.bazel index 1b7654bd9d6e..6f5b7ab71c4c 100644 --- a/plugins/evaluation-plugin/BUILD.bazel +++ b/plugins/evaluation-plugin/BUILD.bazel @@ -32,6 +32,7 @@ jvm_library( "//platform/projectModel-api:projectModel", "//plugins/stats-collector", "//platform/ide-core-impl", + "//platform/ide-core", "//platform/platform-impl:ide-impl", "//platform/lang-impl", "//platform/core-ui", @@ -45,6 +46,8 @@ jvm_library( "//libraries/kotlinx/coroutines/core", "@lib//:jetbrains-annotations", "//platform/backend/observation", + "//platform/util:util-ui", + "//platform/util-ex", ] ) @@ -72,6 +75,7 @@ jvm_library( "//platform/projectModel-api:projectModel_test_lib", "//plugins/stats-collector:stats-collector_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/platform-impl:ide-impl_test_lib", "//platform/lang-impl:lang-impl_test_lib", "//platform/core-ui:core-ui_test_lib", @@ -83,6 +87,8 @@ jvm_library( "//platform/warmup:warmup_test_lib", "//libraries/kotlinx/coroutines/core:core_test_lib", "//platform/backend/observation:observation_test_lib", + "//platform/util:util-ui_test_lib", + "//platform/util-ex:util-ex_test_lib", ] ) ### auto-generated section `build intellij.evaluationPlugin` end diff --git a/plugins/evaluation-plugin/intellij.evaluationPlugin.iml b/plugins/evaluation-plugin/intellij.evaluationPlugin.iml index 8bc78e0c3da5..958c75228ccb 100644 --- a/plugins/evaluation-plugin/intellij.evaluationPlugin.iml +++ b/plugins/evaluation-plugin/intellij.evaluationPlugin.iml @@ -26,6 +26,7 @@ + @@ -39,5 +40,7 @@ + + \ No newline at end of file diff --git a/plugins/evaluation-plugin/languages/BUILD.bazel b/plugins/evaluation-plugin/languages/BUILD.bazel index 06028e5967a5..cd59da6a0cdf 100644 --- a/plugins/evaluation-plugin/languages/BUILD.bazel +++ b/plugins/evaluation-plugin/languages/BUILD.bazel @@ -13,11 +13,13 @@ jvm_library( "//platform/core-api:core", "//platform/editor-ui-api:editor-ui", "//platform/platform-api:ide", + "//platform/ide-core", "//platform/lang-impl", "//plugins/evaluation-plugin/core", "//platform/projectModel-api:projectModel", "//platform/statistics", "//platform/statistics/uploader", + "//platform/util-ex", "@lib//:gson", ] ) @@ -34,11 +36,13 @@ jvm_library( "//platform/core-api:core_test_lib", "//platform/editor-ui-api:editor-ui_test_lib", "//platform/platform-api:ide_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/lang-impl:lang-impl_test_lib", "//plugins/evaluation-plugin/core:core_test_lib", "//platform/projectModel-api:projectModel_test_lib", "//platform/statistics:statistics_test_lib", "//platform/statistics/uploader:uploader_test_lib", + "//platform/util-ex:util-ex_test_lib", ] ) ### auto-generated section `build intellij.evaluationPlugin.languages` end diff --git a/plugins/evaluation-plugin/languages/intellij.evaluationPlugin.languages.iml b/plugins/evaluation-plugin/languages/intellij.evaluationPlugin.languages.iml index 6c1e733974fe..ce2861700de7 100644 --- a/plugins/evaluation-plugin/languages/intellij.evaluationPlugin.languages.iml +++ b/plugins/evaluation-plugin/languages/intellij.evaluationPlugin.languages.iml @@ -13,11 +13,13 @@ + + \ No newline at end of file diff --git a/plugins/evaluation-plugin/languages/java/BUILD.bazel b/plugins/evaluation-plugin/languages/java/BUILD.bazel index 7c7e74b443ef..7937db0acbd2 100644 --- a/plugins/evaluation-plugin/languages/java/BUILD.bazel +++ b/plugins/evaluation-plugin/languages/java/BUILD.bazel @@ -17,11 +17,15 @@ jvm_library( "@lib//:kotlin-stdlib", "//platform/analysis-api:analysis", "//platform/core-api:core", + "//platform/core-impl", + "//platform/platform-api:ide", + "//platform/ide-core", "//platform/editor-ui-api:editor-ui", "//platform/external-system-impl:externalSystem-impl", "//plugins/maven", "//java/openapi:java", "//java/java-impl:impl", + "//java/java-psi-api:psi", "//plugins/evaluation-plugin/languages", "//plugins/evaluation-plugin/core", "//plugins/gradle", @@ -30,9 +34,12 @@ jvm_library( "//platform/lang-core", "//platform/projectModel-api:projectModel", "//platform/refactoring", + "//java/java-frontback-psi-api:frontback-psi", "//platform/smRunner", "//platform/execution", "//platform/backend/observation", + "//platform/testRunner", + "//platform/util-ex", ] ) @@ -45,11 +52,15 @@ jvm_library( ":java", "//platform/analysis-api:analysis_test_lib", "//platform/core-api:core_test_lib", + "//platform/core-impl:core-impl_test_lib", + "//platform/platform-api:ide_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/editor-ui-api:editor-ui_test_lib", "//platform/external-system-impl:externalSystem-impl_test_lib", "//plugins/maven:maven_test_lib", "//java/openapi:java_test_lib", "//java/java-impl:impl_test_lib", + "//java/java-psi-api:psi_test_lib", "//plugins/evaluation-plugin/languages:languages_test_lib", "//plugins/evaluation-plugin/core:core_test_lib", "//plugins/gradle:gradle_test_lib", @@ -64,11 +75,14 @@ jvm_library( "//libraries/kotlinx/coroutines/test:test_test_lib", "//java/testFramework", "//java/testFramework:testFramework_test_lib", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//platform/smRunner:smRunner_test_lib", "//platform/execution:execution_test_lib", "//plugins/evaluation-plugin:evaluationPlugin-tests", "//plugins/evaluation-plugin:evaluationPlugin-tests_test_lib", "//platform/backend/observation:observation_test_lib", + "//platform/testRunner:testRunner_test_lib", + "//platform/util-ex:util-ex_test_lib", ] ) ### auto-generated section `build intellij.evaluationPlugin.languages.java` end @@ -111,6 +125,8 @@ jvm_library( "//java/openapi:java_test_lib", "//java/java-impl:impl", "//java/java-impl:impl_test_lib", + "//java/java-psi-api:psi", + "//java/java-psi-api:psi_test_lib", "//plugins/evaluation-plugin/languages", "//plugins/evaluation-plugin/languages:languages_test_lib", "//plugins/evaluation-plugin/core", diff --git a/plugins/evaluation-plugin/languages/java/intellij.evaluationPlugin.languages.java.iml b/plugins/evaluation-plugin/languages/java/intellij.evaluationPlugin.languages.java.iml index bc9d49ae51c3..bfef877f1ad2 100644 --- a/plugins/evaluation-plugin/languages/java/intellij.evaluationPlugin.languages.java.iml +++ b/plugins/evaluation-plugin/languages/java/intellij.evaluationPlugin.languages.java.iml @@ -11,11 +11,15 @@ + + + + @@ -27,9 +31,12 @@ + + + \ No newline at end of file diff --git a/plugins/evaluation-plugin/languages/java/intellij.evaluationPlugin.languages.java.tests.iml b/plugins/evaluation-plugin/languages/java/intellij.evaluationPlugin.languages.java.tests.iml index 217c5a030153..8e5761702ab5 100644 --- a/plugins/evaluation-plugin/languages/java/intellij.evaluationPlugin.languages.java.tests.iml +++ b/plugins/evaluation-plugin/languages/java/intellij.evaluationPlugin.languages.java.tests.iml @@ -15,6 +15,7 @@ + diff --git a/plugins/evaluation-plugin/languages/python/BUILD.bazel b/plugins/evaluation-plugin/languages/python/BUILD.bazel index 3ef9b73a50ed..72bf8cd58f35 100644 --- a/plugins/evaluation-plugin/languages/python/BUILD.bazel +++ b/plugins/evaluation-plugin/languages/python/BUILD.bazel @@ -22,7 +22,11 @@ jvm_library( "//platform/core-impl", "//platform/lang-impl", "//platform/platform-impl:ide-impl", + "//platform/ide-core", + "//platform/progress/shared:ide-progress", "//platform/projectModel-api:projectModel", + "//platform/util:util-ui", + "//platform/util-ex", "//python:python-community-impl", "//plugins/evaluation-plugin/languages", "//plugins/evaluation-plugin/core", @@ -43,7 +47,11 @@ jvm_library( "//platform/core-impl:core-impl_test_lib", "//platform/lang-impl:lang-impl_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", + "//platform/progress/shared:ide-progress_test_lib", "//platform/projectModel-api:projectModel_test_lib", + "//platform/util:util-ui_test_lib", + "//platform/util-ex:util-ex_test_lib", "//python:python-community-impl_test_lib", "//plugins/evaluation-plugin/languages:languages_test_lib", "//plugins/evaluation-plugin/core:core_test_lib", diff --git a/plugins/evaluation-plugin/languages/python/intellij.evaluationPlugin.languages.python.iml b/plugins/evaluation-plugin/languages/python/intellij.evaluationPlugin.languages.python.iml index 9e631d5316bc..b1022e790347 100644 --- a/plugins/evaluation-plugin/languages/python/intellij.evaluationPlugin.languages.python.iml +++ b/plugins/evaluation-plugin/languages/python/intellij.evaluationPlugin.languages.python.iml @@ -16,7 +16,11 @@ + + + + diff --git a/plugins/filePrediction/BUILD.bazel b/plugins/filePrediction/BUILD.bazel index 5d22796fd4db..4ec03f171a16 100644 --- a/plugins/filePrediction/BUILD.bazel +++ b/plugins/filePrediction/BUILD.bazel @@ -24,6 +24,7 @@ jvm_library( "//platform/projectModel-api:projectModel", "//platform/vcs-api:vcs", "//platform/ide-core-impl", + "//platform/ide-core", "//platform/vcs-log/impl", "//plugins/git4idea:vcs-git", "//uast/uast-common:uast", @@ -55,6 +56,7 @@ jvm_library( "//platform/projectModel-api:projectModel_test_lib", "//platform/vcs-api:vcs_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/vcs-log/impl:impl_test_lib", "//plugins/git4idea:vcs-git_test_lib", "//uast/uast-common:uast_test_lib", @@ -124,6 +126,7 @@ jvm_library( "//platform/vcs-api:vcs", "//platform/vcs-api:vcs_test_lib", "//platform/ide-core-impl", + "//platform/ide-core", "//platform/vcs-log/impl", "//platform/vcs-log/impl:impl_test_lib", "//plugins/git4idea:vcs-git", @@ -154,6 +157,7 @@ jvm_library( ":filePrediction-tests", "//platform/platform-impl:ide-impl_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/platform-impl/internal:internal_test_lib", ] ) diff --git a/plugins/filePrediction/intellij.filePrediction.iml b/plugins/filePrediction/intellij.filePrediction.iml index 63a0105e3e47..36ae1c4dbbbb 100644 --- a/plugins/filePrediction/intellij.filePrediction.iml +++ b/plugins/filePrediction/intellij.filePrediction.iml @@ -19,6 +19,7 @@ + diff --git a/plugins/filePrediction/intellij.filePrediction.tests.iml b/plugins/filePrediction/intellij.filePrediction.tests.iml index af4884ab076f..728e1337d6e4 100644 --- a/plugins/filePrediction/intellij.filePrediction.tests.iml +++ b/plugins/filePrediction/intellij.filePrediction.tests.iml @@ -21,6 +21,7 @@ + diff --git a/plugins/git-features-trainer/BUILD.bazel b/plugins/git-features-trainer/BUILD.bazel index 27a21a9998ba..fb5a53ca3eac 100644 --- a/plugins/git-features-trainer/BUILD.bazel +++ b/plugins/git-features-trainer/BUILD.bazel @@ -21,6 +21,7 @@ jvm_library( "//platform/core-api:core", "//platform/editor-ui-api:editor-ui", "//platform/platform-impl:ide-impl", + "//platform/ide-core", "//platform/core-impl", "//platform/projectModel-api:projectModel", "//platform/dvcs-impl:vcs-dvcs-impl", @@ -36,6 +37,7 @@ jvm_library( "//platform/lang-impl", "//platform/dvcs-impl/shared", "//platform/vcs-impl/shared", + "//platform/util:util-ui", ] ) @@ -51,6 +53,7 @@ jvm_library( "//platform/core-api:core_test_lib", "//platform/editor-ui-api:editor-ui_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/core-impl:core-impl_test_lib", "//platform/projectModel-api:projectModel_test_lib", "//platform/dvcs-impl:vcs-dvcs-impl_test_lib", @@ -68,6 +71,7 @@ jvm_library( "//platform/testFramework:testFramework_test_lib", "//platform/dvcs-impl/shared:shared_test_lib", "//platform/vcs-impl/shared:shared_test_lib", + "//platform/util:util-ui_test_lib", ] ) ### auto-generated section `build intellij.vcs.git.featuresTrainer` end diff --git a/plugins/git-features-trainer/intellij.vcs.git.featuresTrainer.iml b/plugins/git-features-trainer/intellij.vcs.git.featuresTrainer.iml index b818eaadfb69..5a89a83e4ce6 100644 --- a/plugins/git-features-trainer/intellij.vcs.git.featuresTrainer.iml +++ b/plugins/git-features-trainer/intellij.vcs.git.featuresTrainer.iml @@ -16,6 +16,7 @@ + @@ -32,5 +33,6 @@ + \ No newline at end of file diff --git a/plugins/git4idea/BUILD.bazel b/plugins/git4idea/BUILD.bazel index f6b41a4544ca..05af4ea0e520 100644 --- a/plugins/git4idea/BUILD.bazel +++ b/plugins/git4idea/BUILD.bazel @@ -87,10 +87,12 @@ jvm_library( "//platform/platform-util-netty:ide-util-netty", "//platform/collaboration-tools", "//platform/ide-core-impl", + "//platform/ide-core", "//platform/util/text-matching", "//plugins/performanceTesting/core:performanceTesting", "//platform/backend/observation", "//platform/util/coroutines", + "//platform/util:util-ui", "//libraries/http-client", "//platform/platform-impl/ui", "//platform/dvcs-impl/shared", @@ -102,6 +104,7 @@ jvm_library( "//platform/eel", "//platform/platform-impl/recentProjects", "//platform/platform-impl/eel:ide-impl-wsl", + "//platform/progress/shared:ide-progress", "//platform/execution", "//platform/forms_rt:java-guiForms-rt", ], @@ -206,10 +209,12 @@ jvm_library( "//platform/platform-util-netty:ide-util-netty_test_lib", "//platform/collaboration-tools:collaboration-tools_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/util/text-matching:text-matching_test_lib", "//plugins/performanceTesting/core:performanceTesting_test_lib", "//platform/backend/observation:observation_test_lib", "//platform/util/coroutines:coroutines_test_lib", + "//platform/util:util-ui_test_lib", "//libraries/http-client:http-client_test_lib", "//platform/platform-impl/ui:ui_test_lib", "//platform/dvcs-impl/shared:shared_test_lib", @@ -223,6 +228,7 @@ jvm_library( "//platform/eel:eel_test_lib", "//platform/platform-impl/recentProjects:recentProjects_test_lib", "//platform/platform-impl/eel:ide-impl-wsl_test_lib", + "//platform/progress/shared:ide-progress_test_lib", "//platform/execution:execution_test_lib", "//platform/forms_rt:java-guiForms-rt_test_lib", "//tools/intellij.tools.ide.metrics.benchmark:ide-metrics-benchmark", @@ -410,6 +416,7 @@ jvm_library( "//platform/collaboration-tools", "//platform/collaboration-tools:collaboration-tools_test_lib", "//platform/ide-core-impl", + "//platform/ide-core", "//platform/util/text-matching", "//platform/util/text-matching:text-matching_test_lib", "//plugins/performanceTesting/core:performanceTesting", @@ -418,6 +425,8 @@ jvm_library( "//platform/backend/observation:observation_test_lib", "//platform/util/coroutines", "//platform/util/coroutines:coroutines_test_lib", + "//platform/util:util-ui", + "//platform/util:util-ui_test_lib", "//libraries/http-client", "//libraries/http-client:http-client_test_lib", "//platform/platform-impl/ui", @@ -468,6 +477,7 @@ jvm_library( "//platform/platform-util-io:ide-util-io_test_lib", "//platform/platform-util-netty:ide-util-netty_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/platform-impl/ui:ui_test_lib", "//platform/platform-impl/rpc:rpc_test_lib", "//platform/platform-impl/recentProjects:recentProjects_test_lib", diff --git a/plugins/git4idea/frontend/BUILD.bazel b/plugins/git4idea/frontend/BUILD.bazel index 0274140cc21c..9db79c7919ca 100644 --- a/plugins/git4idea/frontend/BUILD.bazel +++ b/plugins/git4idea/frontend/BUILD.bazel @@ -23,6 +23,8 @@ jvm_library( "//platform/project/shared:project", "//platform/core-ui", "//platform/platform-impl/rpc", + "//platform/ide-core", + "//platform/progress/shared:ide-progress", "//platform/util/coroutines", "//platform/analysis-api:analysis", "//platform/dvcs-impl/shared", @@ -30,6 +32,7 @@ jvm_library( "//fleet/kernel", "//platform/searchEverywhere/frontend", "//platform/scopes", + "//platform/util:util-ui", ] ) @@ -48,6 +51,8 @@ jvm_library( "//platform/project/shared:project_test_lib", "//platform/core-ui:core-ui_test_lib", "//platform/platform-impl/rpc:rpc_test_lib", + "//platform/ide-core:ide-core_test_lib", + "//platform/progress/shared:ide-progress_test_lib", "//platform/util/coroutines:coroutines_test_lib", "//platform/analysis-api:analysis_test_lib", "//platform/dvcs-impl/shared:shared_test_lib", @@ -55,6 +60,7 @@ jvm_library( "//fleet/kernel:kernel_test_lib", "//platform/searchEverywhere/frontend:frontend_test_lib", "//platform/scopes:scopes_test_lib", + "//platform/util:util-ui_test_lib", ] ) ### auto-generated section `build intellij.vcs.git.frontend` end diff --git a/plugins/git4idea/frontend/intellij.vcs.git.frontend.iml b/plugins/git4idea/frontend/intellij.vcs.git.frontend.iml index e70dec587f51..c73f033d199e 100644 --- a/plugins/git4idea/frontend/intellij.vcs.git.frontend.iml +++ b/plugins/git4idea/frontend/intellij.vcs.git.frontend.iml @@ -42,6 +42,8 @@ + + @@ -49,5 +51,6 @@ + \ No newline at end of file diff --git a/plugins/git4idea/intellij.vcs.git.iml b/plugins/git4idea/intellij.vcs.git.iml index 30abe282a24d..28b09e65c38b 100644 --- a/plugins/git4idea/intellij.vcs.git.iml +++ b/plugins/git4idea/intellij.vcs.git.iml @@ -108,10 +108,12 @@ + + @@ -124,6 +126,7 @@ + diff --git a/plugins/git4idea/intellij.vcs.git.tests.iml b/plugins/git4idea/intellij.vcs.git.tests.iml index 5fded926988f..0607ed35c794 100644 --- a/plugins/git4idea/intellij.vcs.git.tests.iml +++ b/plugins/git4idea/intellij.vcs.git.tests.iml @@ -107,10 +107,12 @@ + + diff --git a/plugins/git4idea/shared/BUILD.bazel b/plugins/git4idea/shared/BUILD.bazel index 6ef52a90141a..6c6a6380e6af 100644 --- a/plugins/git4idea/shared/BUILD.bazel +++ b/plugins/git4idea/shared/BUILD.bazel @@ -33,9 +33,11 @@ jvm_library( "//platform/analysis-api:analysis", "//platform/util/text-matching", "//platform/platform-impl/ui", + "//platform/ide-core", "//platform/diagnostic/telemetry", "@lib//:opentelemetry", "//platform/vcs-api/shared", + "//platform/util:util-ui", ] ) @@ -64,8 +66,10 @@ jvm_library( "//platform/analysis-api:analysis_test_lib", "//platform/util/text-matching:text-matching_test_lib", "//platform/platform-impl/ui:ui_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/diagnostic/telemetry:telemetry_test_lib", "//platform/vcs-api/shared:shared_test_lib", + "//platform/util:util-ui_test_lib", ] ) ### auto-generated section `build intellij.vcs.git.shared` end diff --git a/plugins/git4idea/shared/intellij.vcs.git.shared.iml b/plugins/git4idea/shared/intellij.vcs.git.shared.iml index 4b96d003d9b0..a665fd3dca13 100644 --- a/plugins/git4idea/shared/intellij.vcs.git.shared.iml +++ b/plugins/git4idea/shared/intellij.vcs.git.shared.iml @@ -52,8 +52,10 @@ + + \ No newline at end of file diff --git a/plugins/github/github-core/BUILD.bazel b/plugins/github/github-core/BUILD.bazel index dfc9465b095a..ff4563e5636f 100644 --- a/plugins/github/github-core/BUILD.bazel +++ b/plugins/github/github-core/BUILD.bazel @@ -55,6 +55,7 @@ jvm_library( "//platform/diff-impl", "//platform/statistics", "//platform/built-in-server:builtInServer-impl", + "//platform/built-in-server-api:builtInServer", "//libraries/netty/codec-http:libraries-netty-codec-http", "//platform/collaboration-tools", "//libraries/netty/buffer", @@ -72,10 +73,14 @@ jvm_library( "//libraries/kotlinx/serialization/json", "@lib//:kotlinc-kotlinx-serialization-compiler-plugin-provided", "//platform/util/coroutines", + "//platform/util:util-ui", + "//platform/util-ex", "//platform/platform-impl/ui", "//libraries/gson", "//platform/dvcs-impl/shared", "//platform/ide-core-impl", + "//platform/ide-core", + "//platform/progress/shared:ide-progress", "//platform/vcs-impl/shared", "//platform/lang-api:lang", "//platform/util/concurrency", @@ -127,6 +132,7 @@ jvm_library( "//platform/diff-impl:diff-impl_test_lib", "//platform/statistics:statistics_test_lib", "//platform/built-in-server:builtInServer-impl_test_lib", + "//platform/built-in-server-api:builtInServer_test_lib", "//libraries/netty/codec-http:libraries-netty-codec-http_test_lib", "//platform/collaboration-tools:collaboration-tools_test_lib", "//libraries/netty/buffer:buffer_test_lib", @@ -146,6 +152,8 @@ jvm_library( "//libraries/kotlinx/serialization/json:json_test_lib", "@lib//:kotlinc-kotlinx-serialization-compiler-plugin-provided", "//platform/util/coroutines:coroutines_test_lib", + "//platform/util:util-ui_test_lib", + "//platform/util-ex:util-ex_test_lib", "@lib//:junit4", "//libraries/kotlinx/coroutines/test", "//libraries/kotlinx/coroutines/test:test_test_lib", @@ -161,6 +169,8 @@ jvm_library( "@lib//:vcs-github-apollographql-apollo-ast-jvm", "//platform/dvcs-impl/shared:shared_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", + "//platform/progress/shared:ide-progress_test_lib", "//platform/vcs-impl/shared:shared_test_lib", "//platform/testFramework/junit5", "//platform/testFramework/junit5:junit5_test_lib", @@ -302,6 +312,8 @@ jvm_library( "@lib//:kotlinc-kotlinx-serialization-compiler-plugin-provided", "//platform/util/coroutines", "//platform/util/coroutines:coroutines_test_lib", + "//platform/util:util-ui", + "//platform/util:util-ui_test_lib", "@lib//:junit4", "//libraries/kotlinx/coroutines/test", "//libraries/kotlinx/coroutines/test:test_test_lib", @@ -319,6 +331,7 @@ jvm_library( "//platform/dvcs-impl/shared", "//platform/dvcs-impl/shared:shared_test_lib", "//platform/ide-core-impl", + "//platform/ide-core", "//platform/vcs-impl/shared", "//platform/vcs-impl/shared:shared_test_lib", "//platform/testFramework/junit5", @@ -339,6 +352,7 @@ jvm_library( "//platform/platform-util-netty:ide-util-netty_test_lib", "//platform/platform-impl/ui:ui_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", ] ) ### auto-generated section `build intellij.vcs.github.tests` end diff --git a/plugins/github/github-core/intellij.vcs.github.iml b/plugins/github/github-core/intellij.vcs.github.iml index 6b7a6ee7f4d2..d94bfefff34d 100644 --- a/plugins/github/github-core/intellij.vcs.github.iml +++ b/plugins/github/github-core/intellij.vcs.github.iml @@ -66,6 +66,7 @@ + @@ -84,6 +85,8 @@ + + @@ -134,6 +137,8 @@ + + diff --git a/plugins/github/github-core/intellij.vcs.github.tests.iml b/plugins/github/github-core/intellij.vcs.github.tests.iml index 04b4da0df086..d23a7e8790e8 100644 --- a/plugins/github/github-core/intellij.vcs.github.tests.iml +++ b/plugins/github/github-core/intellij.vcs.github.tests.iml @@ -84,6 +84,7 @@ + @@ -134,6 +135,7 @@ + diff --git a/plugins/github/github-git/BUILD.bazel b/plugins/github/github-git/BUILD.bazel index 29b1c2c8c009..5c4ddb3a0f9d 100644 --- a/plugins/github/github-git/BUILD.bazel +++ b/plugins/github/github-git/BUILD.bazel @@ -27,6 +27,7 @@ jvm_library( "//platform/util/coroutines", "//platform/util/progress", "//platform/ide-core", + "//platform/progress/shared:ide-progress", "//platform/dvcs-impl:vcs-dvcs-impl", "//platform/core-ui", "//platform/vcs-api:vcs", @@ -56,6 +57,7 @@ jvm_library( "//platform/util/coroutines:coroutines_test_lib", "//platform/util/progress:progress_test_lib", "//platform/ide-core:ide-core_test_lib", + "//platform/progress/shared:ide-progress_test_lib", "//platform/dvcs-impl:vcs-dvcs-impl_test_lib", "//platform/core-ui:core-ui_test_lib", "//platform/vcs-api:vcs_test_lib", diff --git a/plugins/github/github-git/intellij.vcs.github.git.iml b/plugins/github/github-git/intellij.vcs.github.git.iml index 9dc018494ddf..574248a6e3ac 100644 --- a/plugins/github/github-git/intellij.vcs.github.git.iml +++ b/plugins/github/github-git/intellij.vcs.github.git.iml @@ -21,6 +21,7 @@ + diff --git a/plugins/gitlab/gitlab-core/BUILD.bazel b/plugins/gitlab/gitlab-core/BUILD.bazel index 6183e6d34f05..98c3f15684f9 100644 --- a/plugins/gitlab/gitlab-core/BUILD.bazel +++ b/plugins/gitlab/gitlab-core/BUILD.bazel @@ -61,11 +61,14 @@ jvm_library( "//platform/vcs-log/api:vcs-log", "//libraries/jsoup", "//platform/util/coroutines", + "//platform/util-ex", "//platform/dvcs-impl/shared", "//platform/ide-core-impl", + "//platform/ide-core", "//platform/vcs-impl/shared", "//platform/code-style-api:codeStyle", "//platform/observable", + "//platform/progress/shared:ide-progress", ] ) @@ -122,13 +125,16 @@ jvm_library( "//platform/testFramework/junit5", "//platform/testFramework/junit5:junit5_test_lib", "//platform/util/coroutines:coroutines_test_lib", + "//platform/util-ex:util-ex_test_lib", "@lib//:io-mockk", "@lib//:io-mockk-jvm", "//platform/dvcs-impl/shared:shared_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/vcs-impl/shared:shared_test_lib", "//platform/code-style-api:codeStyle_test_lib", "//platform/observable:observable_test_lib", + "//platform/progress/shared:ide-progress_test_lib", ] ) ### auto-generated section `build intellij.vcs.gitlab` end diff --git a/plugins/gitlab/gitlab-core/intellij.vcs.gitlab.iml b/plugins/gitlab/gitlab-core/intellij.vcs.gitlab.iml index 0a69392d316e..c2923167e393 100644 --- a/plugins/gitlab/gitlab-core/intellij.vcs.gitlab.iml +++ b/plugins/gitlab/gitlab-core/intellij.vcs.gitlab.iml @@ -75,12 +75,15 @@ + + + \ No newline at end of file diff --git a/plugins/gitlab/gitlab-git/BUILD.bazel b/plugins/gitlab/gitlab-git/BUILD.bazel index 44074c721494..4ae16783f78c 100644 --- a/plugins/gitlab/gitlab-git/BUILD.bazel +++ b/plugins/gitlab/gitlab-git/BUILD.bazel @@ -29,6 +29,7 @@ jvm_library( "//platform/util", "//platform/util/coroutines", "//platform/util/progress", + "//platform/util:util-ui", "//platform/collaboration-tools", "//platform/dvcs-impl:vcs-dvcs-impl", "//platform/vcs-impl", @@ -60,6 +61,7 @@ jvm_library( "//platform/util:util_test_lib", "//platform/util/coroutines:coroutines_test_lib", "//platform/util/progress:progress_test_lib", + "//platform/util:util-ui_test_lib", "//platform/collaboration-tools:collaboration-tools_test_lib", "//platform/dvcs-impl:vcs-dvcs-impl_test_lib", "//platform/vcs-impl:vcs-impl_test_lib", diff --git a/plugins/gitlab/gitlab-git/intellij.vcs.gitlab.git.iml b/plugins/gitlab/gitlab-git/intellij.vcs.gitlab.git.iml index 9f92a20c8237..d1fa6fa51669 100644 --- a/plugins/gitlab/gitlab-git/intellij.vcs.gitlab.git.iml +++ b/plugins/gitlab/gitlab-git/intellij.vcs.gitlab.git.iml @@ -23,6 +23,7 @@ + diff --git a/plugins/gitlab/gitlab-yaml/BUILD.bazel b/plugins/gitlab/gitlab-yaml/BUILD.bazel index 45a364968dfd..d05f1001fd79 100644 --- a/plugins/gitlab/gitlab-yaml/BUILD.bazel +++ b/plugins/gitlab/gitlab-yaml/BUILD.bazel @@ -18,6 +18,7 @@ jvm_library( "//plugins/yaml/backend", "@lib//:kotlin-stdlib", "//platform/util/base", + "//platform/util/base/multiplatform", "//plugins/yaml", "//platform/analysis-impl", ] @@ -37,6 +38,7 @@ jvm_library( "//plugins/gitlab/gitlab-core:vcs-gitlab_test_lib", "//plugins/yaml/backend:backend_test_lib", "//platform/util/base:base_test_lib", + "//platform/util/base/multiplatform:multiplatform_test_lib", "//plugins/yaml:yaml_test_lib", "//platform/analysis-impl:analysis-impl_test_lib", "//platform/testFramework", diff --git a/plugins/gitlab/gitlab-yaml/intellij.vcs.gitlab.yaml.iml b/plugins/gitlab/gitlab-yaml/intellij.vcs.gitlab.yaml.iml index b5a3e3d4a6cd..f4a59c5c5124 100644 --- a/plugins/gitlab/gitlab-yaml/intellij.vcs.gitlab.yaml.iml +++ b/plugins/gitlab/gitlab-yaml/intellij.vcs.gitlab.yaml.iml @@ -14,6 +14,7 @@ + diff --git a/plugins/gradle-maven/BUILD.bazel b/plugins/gradle-maven/BUILD.bazel index 0f4747c73bba..61fd2eaacd2e 100644 --- a/plugins/gradle-maven/BUILD.bazel +++ b/plugins/gradle-maven/BUILD.bazel @@ -27,7 +27,10 @@ jvm_library( "//platform/projectModel-api:projectModel", "//plugins/repository-search/common", "//plugins/gradle/java/groovy", + "//java/java-psi-api:psi", "//platform/util/concurrency", + "//platform/lang-api:lang", + "//platform/util:util-ui", ] ) @@ -53,7 +56,10 @@ jvm_library( "//platform/testFramework", "//platform/testFramework:testFramework_test_lib", "//plugins/gradle/java/groovy:groovy_test_lib", + "//java/java-psi-api:psi_test_lib", "//platform/util/concurrency:concurrency_test_lib", + "//platform/lang-api:lang_test_lib", + "//platform/util:util-ui_test_lib", ] ) ### auto-generated section `build intellij.gradle.java.maven` end @@ -100,6 +106,8 @@ jvm_library( "//platform/platform-impl:ide-impl", "//platform/lang-impl", "//platform/lang-impl:lang-impl_test_lib", + "//platform/lang-api:lang", + "//platform/lang-api:lang_test_lib", "//platform/projectModel-api:projectModel", "//platform/projectModel-api:projectModel_test_lib", "//plugins/repository-search/common", diff --git a/plugins/gradle-maven/intellij.gradle.java.maven.iml b/plugins/gradle-maven/intellij.gradle.java.maven.iml index 236228de7943..3daa8a230aaf 100644 --- a/plugins/gradle-maven/intellij.gradle.java.maven.iml +++ b/plugins/gradle-maven/intellij.gradle.java.maven.iml @@ -22,6 +22,9 @@ + + + \ No newline at end of file diff --git a/plugins/gradle-maven/intellij.gradle.java.maven.tests.iml b/plugins/gradle-maven/intellij.gradle.java.maven.tests.iml index 666639d405a2..de5ef7c8ee0b 100644 --- a/plugins/gradle-maven/intellij.gradle.java.maven.tests.iml +++ b/plugins/gradle-maven/intellij.gradle.java.maven.tests.iml @@ -17,6 +17,7 @@ + diff --git a/plugins/gradle/BUILD.bazel b/plugins/gradle/BUILD.bazel index 99d395b5d02d..e1ef0db1d608 100644 --- a/plugins/gradle/BUILD.bazel +++ b/plugins/gradle/BUILD.bazel @@ -46,6 +46,7 @@ jvm_library( "//platform/util/progress", "@lib//:slf4j-jdk14", "//platform/ide-core-impl", + "//platform/ide-core", "@lib//:gradle", "//libraries/gson", "//platform/object-serializer:objectSerializer-annotations", @@ -70,6 +71,7 @@ jvm_library( "//platform/workspace/jps", "//platform/backend/observation", "//platform/platform-impl/ui", + "//platform/progress/shared:ide-progress", "//platform/eel-provider", "//platform/ijent", "//platform/core-api:core", @@ -80,6 +82,9 @@ jvm_library( "//platform/forms_rt:java-guiForms-rt", "//libraries/jspecify", "//platform/util/text-matching", + "//platform/util:util-ui", + "//platform/util-ex", + "//platform/testRunner", "@lib//:org-codehaus-groovy-groovy-provided", "@lib//:org-codehaus-groovy-groovy-ant-provided", ], @@ -132,6 +137,7 @@ jvm_library( "//platform/smRunner:smRunner_test_lib", "//platform/util/progress:progress_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//libraries/gson:gson_test_lib", "//platform/object-serializer:objectSerializer-annotations_test_lib", "//libraries/ion:ion_test_lib", @@ -154,6 +160,7 @@ jvm_library( "//platform/workspace/jps:jps_test_lib", "//platform/backend/observation:observation_test_lib", "//platform/platform-impl/ui:ui_test_lib", + "//platform/progress/shared:ide-progress_test_lib", "//platform/eel-provider:eel-provider_test_lib", "//platform/ijent:ijent_test_lib", "//platform/core-api:core_test_lib", @@ -164,6 +171,9 @@ jvm_library( "//platform/forms_rt:java-guiForms-rt_test_lib", "//libraries/jspecify:jspecify_test_lib", "//platform/util/text-matching:text-matching_test_lib", + "//platform/util:util-ui_test_lib", + "//platform/util-ex:util-ex_test_lib", + "//platform/testRunner:testRunner_test_lib", "@lib//:org-codehaus-groovy-groovy-provided", "@lib//:org-codehaus-groovy-groovy-ant-provided", ] @@ -270,6 +280,7 @@ jvm_library( "//platform/external-system-impl:externalSystem-impl_test_lib", "//platform/observable", "//platform/platform-util-io:ide-util-io", + "//platform/ide-core", "//plugins/gradle/java", "//plugins/gradle/java:java_test_lib", "//plugins/gradle/java/plugin", @@ -310,8 +321,14 @@ jvm_library( "//platform/boot:boot_test_lib", "//platform/core-ui", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", "//platform/util/jdom", "//platform/util/jdom:jdom_test_lib", + "//platform/util:util-ui", + "//platform/util:util-ui_test_lib", + "//platform/util-ex", + "//platform/util-ex:util-ex_test_lib", "//plugins/groovy", "//plugins/groovy:groovy_test_lib", "//libraries/kotlinx/coroutines/core", @@ -334,6 +351,8 @@ jvm_library( "//libraries/guava:guava_test_lib", "//platform/execution", "//platform/execution:execution_test_lib", + "//java/java-syntax:syntax", + "//java/java-syntax:syntax_test_lib", "//platform/eel", "//platform/eel:eel_test_lib", "//platform/eel-provider", @@ -353,6 +372,8 @@ jvm_library( "//platform/code-style-api:codeStyle_test_lib", "//platform/util/concurrency", "//platform/util/concurrency:concurrency_test_lib", + "//platform/testRunner", + "//platform/testRunner:testRunner_test_lib", "//plugins/groovy:groovy-tests", "//plugins/groovy:groovy-tests_test_lib", ], @@ -364,6 +385,7 @@ jvm_library( ":gradle-tests", "//platform/observable:observable_test_lib", "//platform/platform-util-io:ide-util-io_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/execution.dashboard:execution.dashboard_test_lib", ] ) diff --git a/plugins/gradle/completion/kotlin/BUILD.bazel b/plugins/gradle/completion/kotlin/BUILD.bazel index 45221f7227a2..9a02e39ce739 100644 --- a/plugins/gradle/completion/kotlin/BUILD.bazel +++ b/plugins/gradle/completion/kotlin/BUILD.bazel @@ -16,6 +16,7 @@ jvm_library( deps = [ "@lib//:kotlin-stdlib", "//platform/core-api:core", + "//platform/core-impl", "//platform/util", "//platform/analysis-api:analysis", "//plugins/repository-search/completion", @@ -40,6 +41,7 @@ jvm_library( runtime_deps = [ ":kotlin", "//platform/core-api:core_test_lib", + "//platform/core-impl:core-impl_test_lib", "//platform/util:util_test_lib", "//platform/analysis-api:analysis_test_lib", "//plugins/repository-search/completion:completion_test_lib", diff --git a/plugins/gradle/completion/kotlin/intellij.gradle.completion.kotlin.iml b/plugins/gradle/completion/kotlin/intellij.gradle.completion.kotlin.iml index 3e245c45b1de..c622850a617b 100644 --- a/plugins/gradle/completion/kotlin/intellij.gradle.completion.kotlin.iml +++ b/plugins/gradle/completion/kotlin/intellij.gradle.completion.kotlin.iml @@ -10,6 +10,7 @@ + diff --git a/plugins/gradle/completion/kotlin/tests/BUILD.bazel b/plugins/gradle/completion/kotlin/tests/BUILD.bazel index 73fc665dd7a5..d343cba04efd 100644 --- a/plugins/gradle/completion/kotlin/tests/BUILD.bazel +++ b/plugins/gradle/completion/kotlin/tests/BUILD.bazel @@ -35,6 +35,8 @@ jvm_library( "@lib//:kotlin-stdlib", "//platform/core-api:core", "//platform/core-api:core_test_lib", + "//platform/editor-ui-api:editor-ui", + "//platform/editor-ui-api:editor-ui_test_lib", "//platform/util", "//platform/util:util_test_lib", "//plugins/toml", @@ -73,6 +75,7 @@ jvm_library( "//plugins/kotlin/tests-common:common-tests_test_lib", "//platform/eel-provider", "//platform/eel-provider:eel-provider_test_lib", + "//platform/ide-core", "//plugins/kotlin/highlighting/highlighting-minimal:kotlin-highlighting-minimal", "//plugins/kotlin/highlighting/highlighting-minimal:kotlin-highlighting-minimal_test_lib", "//plugins/groovy:groovy-tests", @@ -83,6 +86,7 @@ jvm_library( runtime_deps = [ ":tests", "//plugins/kotlin/plugin/k2:k2_test_lib", + "//platform/ide-core:ide-core_test_lib", "//plugins/kotlin/gradle/scripting/kotlin.gradle.scripting.k2:kotlin-gradle-scripting_test_lib", ] ) diff --git a/plugins/gradle/completion/kotlin/tests/intellij.gradle.completion.kotlin.tests.iml b/plugins/gradle/completion/kotlin/tests/intellij.gradle.completion.kotlin.tests.iml index d45e88b1aff2..368564ae5554 100644 --- a/plugins/gradle/completion/kotlin/tests/intellij.gradle.completion.kotlin.tests.iml +++ b/plugins/gradle/completion/kotlin/tests/intellij.gradle.completion.kotlin.tests.iml @@ -12,6 +12,7 @@ + @@ -32,6 +33,7 @@ + diff --git a/plugins/gradle/intellij.gradle.analysis/BUILD.bazel b/plugins/gradle/intellij.gradle.analysis/BUILD.bazel index 35bd5d846a0b..bf9588327330 100644 --- a/plugins/gradle/intellij.gradle.analysis/BUILD.bazel +++ b/plugins/gradle/intellij.gradle.analysis/BUILD.bazel @@ -18,7 +18,9 @@ jvm_library( "//plugins/gradle/java", "//java/java-psi-api:psi", "//java/java-psi-impl:psi-impl", + "//java/java-frontback-psi-api:frontback-psi", "//platform/core-api:core", + "//platform/core-impl", "//platform/util", "//platform/projectModel-api:projectModel", ] @@ -35,7 +37,9 @@ jvm_library( "//plugins/gradle/java:java_test_lib", "//java/java-psi-api:psi_test_lib", "//java/java-psi-impl:psi-impl_test_lib", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//platform/core-api:core_test_lib", + "//platform/core-impl:core-impl_test_lib", "//platform/util:util_test_lib", "//platform/projectModel-api:projectModel_test_lib", ] diff --git a/plugins/gradle/intellij.gradle.analysis/intellij.gradle.analysis.iml b/plugins/gradle/intellij.gradle.analysis/intellij.gradle.analysis.iml index cdb749ac290c..1396533a25e6 100644 --- a/plugins/gradle/intellij.gradle.analysis/intellij.gradle.analysis.iml +++ b/plugins/gradle/intellij.gradle.analysis/intellij.gradle.analysis.iml @@ -12,7 +12,9 @@ + + diff --git a/plugins/gradle/intellij.gradle.iml b/plugins/gradle/intellij.gradle.iml index 6350011cc39b..43c7f3fbf4c6 100644 --- a/plugins/gradle/intellij.gradle.iml +++ b/plugins/gradle/intellij.gradle.iml @@ -33,6 +33,7 @@ + @@ -57,6 +58,7 @@ + @@ -67,6 +69,9 @@ + + + diff --git a/plugins/gradle/intellij.gradle.tests.iml b/plugins/gradle/intellij.gradle.tests.iml index 4529694590de..764abf109485 100644 --- a/plugins/gradle/intellij.gradle.tests.iml +++ b/plugins/gradle/intellij.gradle.tests.iml @@ -31,6 +31,7 @@ + @@ -52,7 +53,10 @@ + + + @@ -65,6 +69,7 @@ + @@ -75,6 +80,7 @@ + \ No newline at end of file diff --git a/plugins/gradle/java/BUILD.bazel b/plugins/gradle/java/BUILD.bazel index 45d7d3b092d9..7347124b9bca 100644 --- a/plugins/gradle/java/BUILD.bazel +++ b/plugins/gradle/java/BUILD.bazel @@ -38,12 +38,15 @@ jvm_library( "//platform/lang-api:lang", "//platform/external-system-api/dependency-updater", "//platform/ide-core-impl", + "//platform/ide-core", "//java/compiler/openapi:java-compiler", "//platform/workspace/storage", "//java/execution/impl", "//platform/lang-impl", "//java/openapi:java", + "//java/java-syntax:syntax", "//java/java-impl:impl", + "//java/java-psi-api:psi", "//platform/smRunner", "//libraries/gson", "//jps/jps-builders:build", @@ -53,9 +56,11 @@ jvm_library( "//jps/model-impl", "//platform/statistics", "//platform/core-ui", + "//platform/core-impl", "//platform/platform-util-io:ide-util-io", "//java/debugger/impl", "//platform/util/jdom", + "//platform/util:util-ui", "//java/compiler/impl", "//libraries/kotlinx/coroutines/core", "//platform/object-serializer:objectSerializer-annotations", @@ -65,8 +70,10 @@ jvm_library( "//libraries/fastutil", "//platform/platform-impl/ui", "//java/debugger/shared", + "//java/java-frontback-psi-api:frontback-psi", "//platform/eel-provider", "//platform/execution", + "//platform/testRunner", "//plugins/properties/properties-psi-impl:backend-psi", ], exports = ["//plugins/gradle:gradle-common"], @@ -107,12 +114,15 @@ jvm_library( "//platform/lang-api:lang_test_lib", "//platform/external-system-api/dependency-updater:dependency-updater_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//java/compiler/openapi:java-compiler_test_lib", "//platform/workspace/storage:storage_test_lib", "//java/execution/impl:impl_test_lib", "//platform/lang-impl:lang-impl_test_lib", "//java/openapi:java_test_lib", + "//java/java-syntax:syntax_test_lib", "//java/java-impl:impl_test_lib", + "//java/java-psi-api:psi_test_lib", "//platform/smRunner:smRunner_test_lib", "//libraries/gson:gson_test_lib", "//jps/jps-builders:build_test_lib", @@ -122,9 +132,11 @@ jvm_library( "//jps/model-impl:model-impl_test_lib", "//platform/statistics:statistics_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl:core-impl_test_lib", "//platform/platform-util-io:ide-util-io_test_lib", "//java/debugger/impl:impl_test_lib", "//platform/util/jdom:jdom_test_lib", + "//platform/util:util-ui_test_lib", "//java/compiler/impl:impl_test_lib", "//libraries/kotlinx/coroutines/core:core_test_lib", "//platform/object-serializer:objectSerializer-annotations_test_lib", @@ -134,8 +146,10 @@ jvm_library( "//libraries/fastutil:fastutil_test_lib", "//platform/platform-impl/ui:ui_test_lib", "//java/debugger/shared:shared_test_lib", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//platform/eel-provider:eel-provider_test_lib", "//platform/execution:execution_test_lib", + "//platform/testRunner:testRunner_test_lib", "//plugins/properties/properties-psi-impl:backend-psi_test_lib", ] ) @@ -202,6 +216,10 @@ jvm_library( "//platform/testFramework:testFramework_test_lib", "//java/testFramework", "//java/testFramework:testFramework_test_lib", + "//java/java-syntax:syntax", + "//java/java-syntax:syntax_test_lib", + "//java/java-psi-api:psi", + "//java/java-psi-api:psi_test_lib", "//platform/observable", "//java/java-runtime:rt", "//java/java-runtime:rt_test_lib", @@ -230,6 +248,8 @@ jvm_library( "@lib//:mockito-kotlin", "//java/execution/impl", "//java/execution/impl:impl_test_lib", + "//java/java-frontback-psi-api:frontback-psi", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//plugins/groovy", "//plugins/groovy:groovy_test_lib", "@lib//:assert_j", @@ -238,7 +258,10 @@ jvm_library( "@lib//:org-codehaus-groovy-groovy-json", "//platform/core-ui", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", "//platform/platform-util-io:ide-util-io", + "//platform/ide-core", "//jps/model-impl", "//jps/model-impl:model-impl_test_lib", "//platform/workspace/storage", @@ -275,6 +298,8 @@ jvm_library( "//platform/smRunner:smRunner_test_lib", "//platform/statistics/testFramework", "//platform/statistics/testFramework:testFramework_test_lib", + "//platform/statistics", + "//platform/statistics:statistics_test_lib", "//platform/execution", "//platform/execution:execution_test_lib", "//platform/refactoring", @@ -291,11 +316,18 @@ jvm_library( "//plugins/groovy:groovy-tests_test_lib", "//platform/smRunner:smRunner-tests", "//platform/smRunner:smRunner-tests_test_lib", + "//platform/util:util-ui", + "//platform/util:util-ui_test_lib", + "//platform/util-ex", + "//platform/util-ex:util-ex_test_lib", + "//platform/testRunner", + "//platform/testRunner:testRunner_test_lib", ], runtime_deps = [ ":java-tests", "//platform/observable:observable_test_lib", "//platform/platform-util-io:ide-util-io_test_lib", + "//platform/ide-core:ide-core_test_lib", ] ) ### auto-generated section `build intellij.gradle.java.tests` end diff --git a/plugins/gradle/java/coverage/BUILD.bazel b/plugins/gradle/java/coverage/BUILD.bazel index c8f8f2079841..b14484e7a8d0 100644 --- a/plugins/gradle/java/coverage/BUILD.bazel +++ b/plugins/gradle/java/coverage/BUILD.bazel @@ -19,6 +19,9 @@ jvm_library( "//platform/external-system-impl:externalSystem-impl", "//platform/execution", "//platform/smRunner", + "//platform/lang-api:lang", + "//platform/ide-core", + "//platform/testRunner", "//plugins/gradle", "//plugins/coverage", ] @@ -34,6 +37,9 @@ jvm_library( "//platform/external-system-impl:externalSystem-impl_test_lib", "//platform/execution:execution_test_lib", "//platform/smRunner:smRunner_test_lib", + "//platform/lang-api:lang_test_lib", + "//platform/ide-core:ide-core_test_lib", + "//platform/testRunner:testRunner_test_lib", "//plugins/gradle:gradle_test_lib", "//plugins/coverage:coverage_test_lib", ] diff --git a/plugins/gradle/java/coverage/intellij.gradle.java.coverage.iml b/plugins/gradle/java/coverage/intellij.gradle.java.coverage.iml index 96cc644e9454..054b0484cd14 100644 --- a/plugins/gradle/java/coverage/intellij.gradle.java.coverage.iml +++ b/plugins/gradle/java/coverage/intellij.gradle.java.coverage.iml @@ -13,6 +13,9 @@ + + + diff --git a/plugins/gradle/java/groovy/BUILD.bazel b/plugins/gradle/java/groovy/BUILD.bazel index db70718fb0e9..e73ead4dfda2 100644 --- a/plugins/gradle/java/groovy/BUILD.bazel +++ b/plugins/gradle/java/groovy/BUILD.bazel @@ -19,6 +19,7 @@ jvm_library( "//libraries/kotlinx/coroutines/core", "//plugins/gradle/java", "//platform/core-api:core", + "//platform/lang-api:lang", "//platform/lang-core", "//platform/core-impl", "//platform/util", @@ -28,6 +29,7 @@ jvm_library( "//java/java-psi-api:psi", "//java/idea-ui:ui", "//platform/util:util-ui", + "//platform/util-ex", "//platform/projectModel-api:projectModel", "//plugins/groovy", "//plugins/groovy/jps-plugin:jps", @@ -45,12 +47,16 @@ jvm_library( "//platform/core-ui", "//platform/code-style-api:codeStyle", "//libraries/gson", + "//platform/editor-ui-api:editor-ui", "//java/compiler/impl", + "//java/java-frontback-psi-api:frontback-psi", "//platform/smRunner", "//jps/jps-builders:build", "//jps/model-api:model", "//plugins/gradle/jps-plugin:jps", "//platform/platform-util-io:ide-util-io", + "//platform/ide-core", + "//platform/testRunner", ] ) @@ -64,6 +70,7 @@ jvm_library( "//libraries/kotlinx/coroutines/core:core_test_lib", "//plugins/gradle/java:java_test_lib", "//platform/core-api:core_test_lib", + "//platform/lang-api:lang_test_lib", "//platform/lang-core:lang-core_test_lib", "//platform/core-impl:core-impl_test_lib", "//platform/util:util_test_lib", @@ -73,6 +80,7 @@ jvm_library( "//java/java-psi-api:psi_test_lib", "//java/idea-ui:ui_test_lib", "//platform/util:util-ui_test_lib", + "//platform/util-ex:util-ex_test_lib", "//platform/projectModel-api:projectModel_test_lib", "//plugins/groovy:groovy_test_lib", "//plugins/groovy/jps-plugin:jps_test_lib", @@ -90,12 +98,16 @@ jvm_library( "//platform/core-ui:core-ui_test_lib", "//platform/code-style-api:codeStyle_test_lib", "//libraries/gson:gson_test_lib", + "//platform/editor-ui-api:editor-ui_test_lib", "//java/compiler/impl:impl_test_lib", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//platform/smRunner:smRunner_test_lib", "//jps/jps-builders:build_test_lib", "//jps/model-api:model_test_lib", "//plugins/gradle/jps-plugin:jps_test_lib", "//platform/platform-util-io:ide-util-io_test_lib", + "//platform/ide-core:ide-core_test_lib", + "//platform/testRunner:testRunner_test_lib", ] ) ### auto-generated section `build intellij.gradle.java.groovy` end diff --git a/plugins/gradle/java/groovy/intellij.gradle.java.groovy.iml b/plugins/gradle/java/groovy/intellij.gradle.java.groovy.iml index 6889cf2d6f8a..6681addd1a95 100644 --- a/plugins/gradle/java/groovy/intellij.gradle.java.groovy.iml +++ b/plugins/gradle/java/groovy/intellij.gradle.java.groovy.iml @@ -13,6 +13,7 @@ + @@ -22,6 +23,7 @@ + @@ -39,11 +41,15 @@ + + + + \ No newline at end of file diff --git a/plugins/gradle/java/intellij.gradle.java.iml b/plugins/gradle/java/intellij.gradle.java.iml index 18323da4508d..f20fc26d3643 100644 --- a/plugins/gradle/java/intellij.gradle.java.iml +++ b/plugins/gradle/java/intellij.gradle.java.iml @@ -33,12 +33,15 @@ + + + @@ -49,9 +52,11 @@ + + @@ -61,8 +66,10 @@ + + \ No newline at end of file diff --git a/plugins/gradle/java/intellij.gradle.java.tests.iml b/plugins/gradle/java/intellij.gradle.java.tests.iml index 64d32c1765c0..6a6e7a269c18 100644 --- a/plugins/gradle/java/intellij.gradle.java.tests.iml +++ b/plugins/gradle/java/intellij.gradle.java.tests.iml @@ -25,6 +25,8 @@ + + @@ -40,12 +42,15 @@ + + + @@ -64,6 +69,7 @@ + @@ -72,5 +78,8 @@ + + + \ No newline at end of file diff --git a/plugins/gradle/java/performance/BUILD.bazel b/plugins/gradle/java/performance/BUILD.bazel index 41fc78c95bd3..fa3859e20779 100644 --- a/plugins/gradle/java/performance/BUILD.bazel +++ b/plugins/gradle/java/performance/BUILD.bazel @@ -31,8 +31,10 @@ jvm_library( "//platform/util/concurrency", "//platform/core-api:core", "//platform/core-ui", + "//platform/editor-ui-api:editor-ui", "//platform/execution", "//platform/ide-core-impl", + "//platform/ide-core", "//platform/lang-impl", "//plugins/maven", "//plugins/gradle/java", @@ -63,8 +65,10 @@ jvm_library( "//platform/util/concurrency:concurrency_test_lib", "//platform/core-api:core_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/editor-ui-api:editor-ui_test_lib", "//platform/execution:execution_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/lang-impl:lang-impl_test_lib", "//plugins/maven:maven_test_lib", "//plugins/gradle/java:java_test_lib", diff --git a/plugins/gradle/java/performance/intellij.gradle.java.performance.iml b/plugins/gradle/java/performance/intellij.gradle.java.performance.iml index b5c7979adc92..98ef7cc78127 100644 --- a/plugins/gradle/java/performance/intellij.gradle.java.performance.iml +++ b/plugins/gradle/java/performance/intellij.gradle.java.performance.iml @@ -25,8 +25,10 @@ + + diff --git a/plugins/gradle/jps-plugin/BUILD.bazel b/plugins/gradle/jps-plugin/BUILD.bazel index 0976f3bfac86..223218174fd5 100644 --- a/plugins/gradle/jps-plugin/BUILD.bazel +++ b/plugins/gradle/jps-plugin/BUILD.bazel @@ -25,6 +25,8 @@ jvm_library( "//libraries/gson", "//libraries/fastutil", "//platform/util/jdom", + "//platform/util/base/multiplatform", + "//platform/util/base", "//libraries/hash4j", ] ) @@ -49,6 +51,8 @@ jvm_library( "//platform/testFramework:testFramework_test_lib", "//libraries/fastutil:fastutil_test_lib", "//platform/util/jdom:jdom_test_lib", + "//platform/util/base/multiplatform:multiplatform_test_lib", + "//platform/util/base:base_test_lib", "//jps/jps-builders:build-tests", "//jps/jps-builders:build-tests_test_lib", "//libraries/hash4j:hash4j_test_lib", diff --git a/plugins/gradle/jps-plugin/intellij.gradle.jps.iml b/plugins/gradle/jps-plugin/intellij.gradle.jps.iml index f04699b3d30c..8edddefe3f4b 100644 --- a/plugins/gradle/jps-plugin/intellij.gradle.jps.iml +++ b/plugins/gradle/jps-plugin/intellij.gradle.jps.iml @@ -53,6 +53,8 @@ + + diff --git a/plugins/gradle/properties/BUILD.bazel b/plugins/gradle/properties/BUILD.bazel index 0f621dabc343..3b1b63701315 100644 --- a/plugins/gradle/properties/BUILD.bazel +++ b/plugins/gradle/properties/BUILD.bazel @@ -20,6 +20,7 @@ jvm_library( "//platform/analysis-api:analysis", "//platform/core-api:core", "//platform/core-ui", + "//platform/editor-ui-api:editor-ui", "//platform/lang-api:lang", "//platform/lang-impl", "//platform/projectModel-api:projectModel", @@ -41,6 +42,7 @@ jvm_library( "//platform/analysis-api:analysis_test_lib", "//platform/core-api:core_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/editor-ui-api:editor-ui_test_lib", "//platform/lang-api:lang_test_lib", "//platform/lang-impl:lang-impl_test_lib", "//platform/projectModel-api:projectModel_test_lib", diff --git a/plugins/gradle/properties/intellij.gradle.properties.iml b/plugins/gradle/properties/intellij.gradle.properties.iml index c1923c70076a..01aa99613b70 100644 --- a/plugins/gradle/properties/intellij.gradle.properties.iml +++ b/plugins/gradle/properties/intellij.gradle.properties.iml @@ -14,6 +14,7 @@ + diff --git a/plugins/gradle/tooling-extension-impl/BUILD.bazel b/plugins/gradle/tooling-extension-impl/BUILD.bazel index 299423109995..556935337b94 100644 --- a/plugins/gradle/tooling-extension-impl/BUILD.bazel +++ b/plugins/gradle/tooling-extension-impl/BUILD.bazel @@ -123,10 +123,14 @@ jvm_library( "//libraries/ion:ion_test_lib", "//platform/core-api:core", "//platform/core-api:core_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", "//platform/execution", "//platform/execution:execution_test_lib", "//platform/lang-core", "//platform/lang-core:lang-core_test_lib", + "//platform/lang-api:lang", + "//platform/lang-api:lang_test_lib", "//platform/projectModel-api:projectModel", "//platform/projectModel-api:projectModel_test_lib", "//platform/testFramework", diff --git a/plugins/gradle/tooling-extension-impl/intellij.gradle.toolingExtension.tests.iml b/plugins/gradle/tooling-extension-impl/intellij.gradle.toolingExtension.tests.iml index 8b7f2513d786..16eb6863a8c9 100644 --- a/plugins/gradle/tooling-extension-impl/intellij.gradle.toolingExtension.tests.iml +++ b/plugins/gradle/tooling-extension-impl/intellij.gradle.toolingExtension.tests.iml @@ -77,8 +77,10 @@ + + diff --git a/plugins/grazie/java/BUILD.bazel b/plugins/grazie/java/BUILD.bazel index c2c042bfdc93..7762d22f0b18 100644 --- a/plugins/grazie/java/BUILD.bazel +++ b/plugins/grazie/java/BUILD.bazel @@ -21,7 +21,9 @@ jvm_library( "//java/java-psi-api:psi", "//java/java-psi-impl:psi-impl", "//java/java-analysis-impl:analysis-impl", + "//java/java-frontback-psi-api:frontback-psi", "//platform/core-api:core", + "//platform/core-impl", "//platform/util-ex", "//platform/analysis-api:analysis", "//spellchecker", @@ -41,7 +43,9 @@ jvm_library( "//java/java-psi-api:psi_test_lib", "//java/java-psi-impl:psi-impl_test_lib", "//java/java-analysis-impl:analysis-impl_test_lib", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//platform/core-api:core_test_lib", + "//platform/core-impl:core-impl_test_lib", "//platform/util-ex:util-ex_test_lib", "//platform/analysis-api:analysis_test_lib", "//spellchecker:spellchecker_test_lib", diff --git a/plugins/grazie/java/intellij.grazie.java.iml b/plugins/grazie/java/intellij.grazie.java.iml index 83da18165d9c..251458731301 100644 --- a/plugins/grazie/java/intellij.grazie.java.iml +++ b/plugins/grazie/java/intellij.grazie.java.iml @@ -15,7 +15,9 @@ + + diff --git a/plugins/grazie/src/BUILD.bazel b/plugins/grazie/src/BUILD.bazel index b632b4b2712a..aad2802c0106 100644 --- a/plugins/grazie/src/BUILD.bazel +++ b/plugins/grazie/src/BUILD.bazel @@ -89,6 +89,8 @@ jvm_library( "//platform/diff-impl", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", "//platform/ide-core-impl", + "//platform/ide-core", + "//platform/progress/shared:ide-progress", ], exports = [ "@lib//:grazie-core-ai-grazie-api-gateway-client-jvm", @@ -174,6 +176,8 @@ jvm_library( "//platform/diff-impl:diff-impl_test_lib", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", + "//platform/progress/shared:ide-progress_test_lib", ] ) ### auto-generated section `build intellij.grazie.core` end diff --git a/plugins/grazie/src/intellij.grazie.core.iml b/plugins/grazie/src/intellij.grazie.core.iml index 5c6a5a301f9f..add7303b10be 100644 --- a/plugins/grazie/src/intellij.grazie.core.iml +++ b/plugins/grazie/src/intellij.grazie.core.iml @@ -733,5 +733,7 @@ + + \ No newline at end of file diff --git a/plugins/grazie/src/test/BUILD.bazel b/plugins/grazie/src/test/BUILD.bazel index 0d300de3daaf..9eb9eb589824 100644 --- a/plugins/grazie/src/test/BUILD.bazel +++ b/plugins/grazie/src/test/BUILD.bazel @@ -41,12 +41,18 @@ jvm_library( "//platform/core-api:core_test_lib", "//platform/core-ui", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", "//platform/editor-ui-api:editor-ui", "//platform/editor-ui-api:editor-ui_test_lib", + "//platform/lang-api:lang", + "//platform/lang-api:lang_test_lib", "//platform/projectModel-api:projectModel", "//platform/projectModel-api:projectModel_test_lib", "//platform/util/jdom", "//platform/util/jdom:jdom_test_lib", + "//platform/util:util-ui", + "//platform/util:util-ui_test_lib", "//spellchecker", "//spellchecker:spellchecker_test_lib", "//plugins/grazie", @@ -56,6 +62,8 @@ jvm_library( "@lib//:kotlin-test", "//java/testFramework", "//java/testFramework:testFramework_test_lib", + "//java/java-psi-api:psi", + "//java/java-psi-api:psi_test_lib", "@lib//:grazie-tests-ai-grazie-spell-hunspell-de", "@lib//:grazie-tests-ai-grazie-spell-hunspell-ru", "@lib//:grazie-tests-ai-grazie-spell-hunspell-uk", @@ -78,6 +86,8 @@ jvm_library( "//platform/vcs-impl:vcs-impl_test_lib", "//xml/xml-psi-api:psi", "//xml/xml-psi-api:psi_test_lib", + "//xml/xml-parser:parser", + "//xml/xml-parser:parser_test_lib", "//plugins/grazie/java", "//plugins/grazie/java:java_test_lib", "//platform/vcs-api:vcs", @@ -104,6 +114,7 @@ jvm_library( "//RegExpSupport:regexp-tests_test_lib", "//platform/xdebugger-impl:debugger-impl-tests", "//platform/xdebugger-impl:debugger-impl-tests_test_lib", + "//platform/ide-core", "//libraries/fastutil", "//libraries/fastutil:fastutil_test_lib", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", @@ -116,7 +127,10 @@ jvm_library( "@lib//:grazie-tests-ai-grazie-spell-hunspell-ru", "@lib//:grazie-tests-ai-grazie-spell-hunspell-uk", ], - runtime_deps = [":grazie-tests"] + runtime_deps = [ + ":grazie-tests", + "//platform/ide-core:ide-core_test_lib", + ] ) ### auto-generated section `build intellij.grazie.tests` end diff --git a/plugins/grazie/src/test/intellij.grazie.tests.iml b/plugins/grazie/src/test/intellij.grazie.tests.iml index e47c25270d41..0a0a10998cb1 100644 --- a/plugins/grazie/src/test/intellij.grazie.tests.iml +++ b/plugins/grazie/src/test/intellij.grazie.tests.iml @@ -11,14 +11,18 @@ + + + + @@ -355,6 +359,7 @@ + @@ -369,6 +374,7 @@ + diff --git a/plugins/grazie/src/tests.pro/BUILD.bazel b/plugins/grazie/src/tests.pro/BUILD.bazel index ced67438073b..9eac2b8bc92b 100644 --- a/plugins/grazie/src/tests.pro/BUILD.bazel +++ b/plugins/grazie/src/tests.pro/BUILD.bazel @@ -102,6 +102,9 @@ jvm_library( "//RegExpSupport:regexp-tests_test_lib", "//platform/xdebugger-impl:debugger-impl-tests", "//platform/xdebugger-impl:debugger-impl-tests_test_lib", + "//platform/ide-core", + "//platform/util:util-ui", + "//platform/util:util-ui_test_lib", "//python/python-venv:venv-tests", "//python/python-venv:venv-tests_test_lib", "//python/services/system-python:python-community-services-systemPython-tests", @@ -115,6 +118,7 @@ jvm_library( ":tests.pro", "//python/pluginCore:community-plugin_test_lib", "//plugins/kotlin:kotlin-plugin-community-main_test_lib", + "//platform/ide-core:ide-core_test_lib", ] ) ### auto-generated section `build intellij.grazie.tests.pro` end diff --git a/plugins/grazie/src/tests.pro/intellij.grazie.tests.pro.iml b/plugins/grazie/src/tests.pro/intellij.grazie.tests.pro.iml index 027ad4610e17..6fc3c12fc57e 100644 --- a/plugins/grazie/src/tests.pro/intellij.grazie.tests.pro.iml +++ b/plugins/grazie/src/tests.pro/intellij.grazie.tests.pro.iml @@ -787,6 +787,8 @@ + + diff --git a/plugins/groovy/BUILD.bazel b/plugins/groovy/BUILD.bazel index cca2c6ca4020..955b16138c3a 100644 --- a/plugins/groovy/BUILD.bazel +++ b/plugins/groovy/BUILD.bazel @@ -31,6 +31,8 @@ jvm_library( "//platform/workspace/storage", "//xml/dom-openapi:dom", "//java/openapi:java", + "//java/java-syntax:syntax", + "//java/java-psi-api:psi", "//java/debugger/openapi:java-debugger", "//plugins/groovy/rt", "//platform/observable", @@ -39,6 +41,7 @@ jvm_library( "//platform/smRunner", "//java/compiler/impl", "//platform/ide-core-impl", + "//platform/ide-core", "//java/debugger/impl", "//platform/lang-api:lang", "@community//build:build-javac-rt", @@ -71,12 +74,17 @@ jvm_library( "//platform/platform-util-io:ide-util-io", "//java/java-impl-refactorings:impl-refactorings", "//platform/util/jdom", + "//platform/util:util-ui", + "//platform/util-ex", "//platform/workspace/jps", "//platform/backend/workspace", "//xml/xml-psi-api:psi", "//java/unscramble", "//platform/execution", + "//platform/statistics", + "//platform/testRunner", "//platform/forms_rt:java-guiForms-rt", + "//java/java-frontback-psi-api:frontback-psi", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", ], exports = ["//plugins/groovy/groovy-psi:psi"] @@ -110,6 +118,8 @@ jvm_library( "//platform/workspace/storage:storage_test_lib", "//xml/dom-openapi:dom_test_lib", "//java/openapi:java_test_lib", + "//java/java-syntax:syntax_test_lib", + "//java/java-psi-api:psi_test_lib", "//java/debugger/openapi:java-debugger_test_lib", "//plugins/groovy/rt:rt_test_lib", "//platform/observable:observable_test_lib", @@ -118,6 +128,7 @@ jvm_library( "//platform/smRunner:smRunner_test_lib", "//java/compiler/impl:impl_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//java/debugger/impl:impl_test_lib", "//platform/lang-api:lang_test_lib", "@community//build:build-javac-rt_test_lib", @@ -162,6 +173,8 @@ jvm_library( "//libraries/asm:asm_test_lib", "//java/java-impl-refactorings:impl-refactorings_test_lib", "//platform/util/jdom:jdom_test_lib", + "//platform/util:util-ui_test_lib", + "//platform/util-ex:util-ex_test_lib", "//platform/build-scripts/downloader", "//platform/build-scripts/downloader:downloader_test_lib", "@lib//:assert_j", @@ -174,8 +187,11 @@ jvm_library( "//xml/xml-psi-api:psi_test_lib", "//java/unscramble:unscramble_test_lib", "//platform/execution:execution_test_lib", + "//platform/statistics:statistics_test_lib", + "//platform/testRunner:testRunner_test_lib", "@lib//:jet_check", "//platform/forms_rt:java-guiForms-rt_test_lib", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", ] ) @@ -241,6 +257,10 @@ jvm_library( "//java/openapi:java_test_lib", "//java/debugger/openapi:java-debugger", "//java/debugger/openapi:java-debugger_test_lib", + "//java/java-syntax:syntax", + "//java/java-syntax:syntax_test_lib", + "//java/java-psi-api:psi", + "//java/java-psi-api:psi_test_lib", "//plugins/groovy/rt", "//plugins/groovy/rt:rt_test_lib", "//platform/observable", @@ -252,6 +272,7 @@ jvm_library( "//java/compiler/impl", "//java/compiler/impl:impl_test_lib", "//platform/ide-core-impl", + "//platform/ide-core", "//java/debugger/impl", "//java/debugger/impl:impl_test_lib", "//platform/lang-api:lang", @@ -327,6 +348,10 @@ jvm_library( "//java/java-impl-refactorings:impl-refactorings_test_lib", "//platform/util/jdom", "//platform/util/jdom:jdom_test_lib", + "//platform/util:util-ui", + "//platform/util:util-ui_test_lib", + "//platform/util-ex", + "//platform/util-ex:util-ex_test_lib", "//platform/build-scripts/downloader", "//platform/build-scripts/downloader:downloader_test_lib", "@lib//:assert_j", @@ -347,6 +372,8 @@ jvm_library( "@lib//:jet_check", "//platform/forms_rt:java-guiForms-rt", "//platform/forms_rt:java-guiForms-rt_test_lib", + "//java/java-frontback-psi-api:frontback-psi", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", ], @@ -359,6 +386,7 @@ jvm_library( "//platform/observable:observable_test_lib", "//platform/platform-impl:ide-impl_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/platform-util-io:ide-util-io_test_lib", ] ) diff --git a/plugins/groovy/ant/BUILD.bazel b/plugins/groovy/ant/BUILD.bazel index df46e15082b8..8fc5fb424cc5 100644 --- a/plugins/groovy/ant/BUILD.bazel +++ b/plugins/groovy/ant/BUILD.bazel @@ -15,11 +15,14 @@ jvm_library( resources = [":ant_resources"], deps = [ "//platform/core-api:core", + "//platform/core-impl", "//platform/projectModel-api:projectModel", "//plugins/groovy", "//plugins/ant", "//platform/util", + "//java/java-psi-api:psi", "//java/java-psi-impl:psi-impl", + "//java/java-frontback-psi-api:frontback-psi", "//platform/ide-core-impl", "//platform/util-class-loader:util-classLoader", "//platform/analysis-api:analysis", @@ -37,11 +40,14 @@ jvm_library( runtime_deps = [ ":ant", "//platform/core-api:core_test_lib", + "//platform/core-impl:core-impl_test_lib", "//platform/projectModel-api:projectModel_test_lib", "//plugins/groovy:groovy_test_lib", "//plugins/ant:ant_test_lib", "//platform/util:util_test_lib", + "//java/java-psi-api:psi_test_lib", "//java/java-psi-impl:psi-impl_test_lib", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", "//platform/util-class-loader:util-classLoader_test_lib", "//platform/analysis-api:analysis_test_lib", diff --git a/plugins/groovy/ant/intellij.groovy.ant.iml b/plugins/groovy/ant/intellij.groovy.ant.iml index 8ca53b31e6e3..a18636081d35 100644 --- a/plugins/groovy/ant/intellij.groovy.ant.iml +++ b/plugins/groovy/ant/intellij.groovy.ant.iml @@ -9,11 +9,14 @@ + + + diff --git a/plugins/groovy/groovy-psi/BUILD.bazel b/plugins/groovy/groovy-psi/BUILD.bazel index d83f76fb1169..4c30a9eb3147 100644 --- a/plugins/groovy/groovy-psi/BUILD.bazel +++ b/plugins/groovy/groovy-psi/BUILD.bazel @@ -22,9 +22,12 @@ jvm_library( "//platform/core-api:core", "//platform/editor-ui-api:editor-ui", "//platform/platform-impl:ide-impl", + "//java/java-psi-api:psi", "//java/java-psi-impl:psi-impl", + "//java/java-syntax:syntax", "//java/java-impl:impl", "//platform/ide-core-impl", + "//platform/ide-core", "//platform/core-impl", "//platform/extensions", "//platform/indexing-api:indexing", @@ -36,6 +39,7 @@ jvm_library( "//platform/editor-ui-ex:editor-ex", "//java/java-analysis-impl:analysis-impl", "//java/java-structure-view:structureView", + "//java/java-frontback-psi-api:frontback-psi", "//plugins/properties/properties-psi-impl:backend-psi", "//plugins/properties/properties-psi-api:psi", "//platform/core-ui", @@ -43,7 +47,10 @@ jvm_library( "//libraries/fastutil", "//libraries/asm", "//platform/util/jdom", + "//platform/util:util-ui", + "//platform/util-ex", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", + "//platform/lang-api:lang", ], exports = ["@lib//:org-codehaus-groovy-groovy"] ) @@ -67,9 +74,12 @@ jvm_library( "//platform/core-api:core_test_lib", "//platform/editor-ui-api:editor-ui_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//java/java-psi-api:psi_test_lib", "//java/java-psi-impl:psi-impl_test_lib", + "//java/java-syntax:syntax_test_lib", "//java/java-impl:impl_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/core-impl:core-impl_test_lib", "//platform/extensions:extensions_test_lib", "//platform/indexing-api:indexing_test_lib", @@ -81,6 +91,7 @@ jvm_library( "//platform/editor-ui-ex:editor-ex_test_lib", "//java/java-analysis-impl:analysis-impl_test_lib", "//java/java-structure-view:structureView_test_lib", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//plugins/properties/properties-psi-impl:backend-psi_test_lib", "//plugins/properties/properties-psi-api:psi_test_lib", "//platform/core-ui:core-ui_test_lib", @@ -88,7 +99,10 @@ jvm_library( "//libraries/fastutil:fastutil_test_lib", "//libraries/asm:asm_test_lib", "//platform/util/jdom:jdom_test_lib", + "//platform/util:util-ui_test_lib", + "//platform/util-ex:util-ex_test_lib", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", + "//platform/lang-api:lang_test_lib", ] ) ### auto-generated section `build intellij.groovy.psi` end diff --git a/plugins/groovy/groovy-psi/intellij.groovy.psi.iml b/plugins/groovy/groovy-psi/intellij.groovy.psi.iml index b01137308beb..bfc9ecd889b0 100644 --- a/plugins/groovy/groovy-psi/intellij.groovy.psi.iml +++ b/plugins/groovy/groovy-psi/intellij.groovy.psi.iml @@ -19,9 +19,12 @@ + + + @@ -33,6 +36,7 @@ + @@ -40,6 +44,9 @@ + + + \ No newline at end of file diff --git a/plugins/groovy/groovy-uast-tests/BUILD.bazel b/plugins/groovy/groovy-uast-tests/BUILD.bazel index 06fb943afd26..5b36318d9899 100644 --- a/plugins/groovy/groovy-uast-tests/BUILD.bazel +++ b/plugins/groovy/groovy-uast-tests/BUILD.bazel @@ -16,8 +16,12 @@ jvm_library( deps = [ "//java/openapi:java", "//java/openapi:java_test_lib", + "//java/java-psi-api:psi", + "//java/java-psi-api:psi_test_lib", "//platform/core-api:core", "//platform/core-api:core_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", "//platform/lang-api:lang", "//platform/lang-api:lang_test_lib", "//plugins/groovy/groovy-psi:psi", diff --git a/plugins/groovy/groovy-uast-tests/intellij.groovy.uast.tests.iml b/plugins/groovy/groovy-uast-tests/intellij.groovy.uast.tests.iml index 4b051b72e724..dd6636eed180 100644 --- a/plugins/groovy/groovy-uast-tests/intellij.groovy.uast.tests.iml +++ b/plugins/groovy/groovy-uast-tests/intellij.groovy.uast.tests.iml @@ -8,7 +8,9 @@ + + diff --git a/plugins/groovy/intellij.groovy.iml b/plugins/groovy/intellij.groovy.iml index 1d6e87189072..4c5119e7bb4a 100644 --- a/plugins/groovy/intellij.groovy.iml +++ b/plugins/groovy/intellij.groovy.iml @@ -25,6 +25,8 @@ + + @@ -33,6 +35,7 @@ + @@ -71,6 +74,8 @@ + + @@ -80,8 +85,11 @@ + + + \ No newline at end of file diff --git a/plugins/groovy/intellij.groovy.tests.iml b/plugins/groovy/intellij.groovy.tests.iml index ac60508e4e5c..b97d8411da8e 100644 --- a/plugins/groovy/intellij.groovy.tests.iml +++ b/plugins/groovy/intellij.groovy.tests.iml @@ -25,6 +25,8 @@ + + @@ -32,6 +34,7 @@ + @@ -70,6 +73,8 @@ + + @@ -81,6 +86,7 @@ + diff --git a/plugins/groovy/jps-plugin/BUILD.bazel b/plugins/groovy/jps-plugin/BUILD.bazel index 9a7a37718cfc..994c8210b651 100644 --- a/plugins/groovy/jps-plugin/BUILD.bazel +++ b/plugins/groovy/jps-plugin/BUILD.bazel @@ -27,6 +27,9 @@ jvm_library( "//platform/util-class-loader:util-classLoader", "//libraries/asm", "//platform/util/jdom", + "//platform/util/multiplatform", + "//platform/util/base/multiplatform", + "//platform/util/base", "@lib//:kotlin-stdlib", "@lib//:jetbrains-annotations", ] @@ -52,6 +55,9 @@ jvm_library( "//platform/util-class-loader:util-classLoader_test_lib", "//libraries/asm:asm_test_lib", "//platform/util/jdom:jdom_test_lib", + "//platform/util/multiplatform:multiplatform_test_lib", + "//platform/util/base/multiplatform:multiplatform_test_lib", + "//platform/util/base:base_test_lib", ] ) ### auto-generated section `build intellij.groovy.jps` end diff --git a/plugins/groovy/jps-plugin/intellij.groovy.jps.iml b/plugins/groovy/jps-plugin/intellij.groovy.jps.iml index 01339c7ed17d..79a586446180 100644 --- a/plugins/groovy/jps-plugin/intellij.groovy.jps.iml +++ b/plugins/groovy/jps-plugin/intellij.groovy.jps.iml @@ -36,6 +36,9 @@ + + + diff --git a/plugins/groovy/structuralsearch-groovy/BUILD.bazel b/plugins/groovy/structuralsearch-groovy/BUILD.bazel index 701785ffd4e6..e7a27095af1f 100644 --- a/plugins/groovy/structuralsearch-groovy/BUILD.bazel +++ b/plugins/groovy/structuralsearch-groovy/BUILD.bazel @@ -21,11 +21,13 @@ jvm_library( "//plugins/groovy", "//platform/core-impl", "//java/openapi:java", + "//java/java-frontback-psi-api:frontback-psi", "//platform/lang-impl", "//platform/duplicates-analysis", "//platform/core-ui", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", "//platform/code-style-api:codeStyle", + "//java/java-psi-api:psi", ] ) @@ -45,6 +47,7 @@ jvm_library( "//platform/testFramework:testFramework_test_lib", "//platform/core-impl:core-impl_test_lib", "//java/openapi:java_test_lib", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//platform/lang-impl:lang-impl_test_lib", "//platform/structuralsearch:structuralSearch-tests", "//platform/structuralsearch:structuralSearch-tests_test_lib", @@ -54,6 +57,7 @@ jvm_library( "//platform/core-ui:core-ui_test_lib", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", "//platform/code-style-api:codeStyle_test_lib", + "//java/java-psi-api:psi_test_lib", ] ) ### auto-generated section `build intellij.groovy.structuralSearch` end diff --git a/plugins/groovy/structuralsearch-groovy/intellij.groovy.structuralSearch.iml b/plugins/groovy/structuralsearch-groovy/intellij.groovy.structuralSearch.iml index 11e67866e597..e6bcf1d9c0e2 100644 --- a/plugins/groovy/structuralsearch-groovy/intellij.groovy.structuralSearch.iml +++ b/plugins/groovy/structuralsearch-groovy/intellij.groovy.structuralSearch.iml @@ -16,6 +16,7 @@ + @@ -23,5 +24,6 @@ + \ No newline at end of file diff --git a/plugins/hg4idea/BUILD.bazel b/plugins/hg4idea/BUILD.bazel index d994b905fd22..08eca3c2d47e 100644 --- a/plugins/hg4idea/BUILD.bazel +++ b/plugins/hg4idea/BUILD.bazel @@ -25,6 +25,7 @@ jvm_library( "//platform/platform-api:ide", "//platform/vcs-impl", "//platform/ide-core-impl", + "//platform/ide-core", "//platform/platform-impl:ide-impl", "//libraries/guava", "//platform/forms_rt:java-guiForms-rt", @@ -44,6 +45,8 @@ jvm_library( "//libraries/fastutil", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", "//platform/lang-core", + "//platform/util:util-ui", + "//platform/util-ex", ] ) @@ -67,6 +70,7 @@ jvm_library( "//platform/platform-api:ide_test_lib", "//platform/vcs-impl:vcs-impl_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/platform-impl:ide-impl_test_lib", "//libraries/guava:guava_test_lib", "//platform/forms_rt:java-guiForms-rt_test_lib", @@ -88,6 +92,8 @@ jvm_library( "//libraries/fastutil:fastutil_test_lib", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", "//platform/lang-core:lang-core_test_lib", + "//platform/util:util-ui_test_lib", + "//platform/util-ex:util-ex_test_lib", ] ) ### auto-generated section `build intellij.vcs.hg` end @@ -138,6 +144,7 @@ jvm_library( "//platform/vcs-impl", "//platform/vcs-impl:vcs-impl_test_lib", "//platform/ide-core-impl", + "//platform/ide-core", "//platform/platform-impl:ide-impl", "//libraries/guava", "//libraries/guava:guava_test_lib", @@ -164,6 +171,8 @@ jvm_library( "//platform/platform-util-io:ide-util-io", "//platform/util/coroutines", "//platform/util/coroutines:coroutines_test_lib", + "//platform/util:util-ui", + "//platform/util:util-ui_test_lib", "//platform/dvcs-impl/shared", "//platform/dvcs-impl/shared:shared_test_lib", "//platform/vcs-impl/shared", @@ -182,6 +191,7 @@ jvm_library( runtime_deps = [ ":vcs-hg-tests", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/platform-impl:ide-impl_test_lib", "//platform/platform-util-io:ide-util-io_test_lib", ] diff --git a/plugins/hg4idea/intellij.vcs.hg.iml b/plugins/hg4idea/intellij.vcs.hg.iml index 50e2d31a748d..0f694ac7294f 100644 --- a/plugins/hg4idea/intellij.vcs.hg.iml +++ b/plugins/hg4idea/intellij.vcs.hg.iml @@ -20,6 +20,7 @@ + @@ -40,5 +41,7 @@ + + \ No newline at end of file diff --git a/plugins/hg4idea/intellij.vcs.hg.tests.iml b/plugins/hg4idea/intellij.vcs.hg.tests.iml index 9fa41f6518a1..82789a759b19 100644 --- a/plugins/hg4idea/intellij.vcs.hg.tests.iml +++ b/plugins/hg4idea/intellij.vcs.hg.tests.iml @@ -19,6 +19,7 @@ + @@ -33,6 +34,7 @@ + diff --git a/plugins/htmltools/BUILD.bazel b/plugins/htmltools/BUILD.bazel index 90b3ea1c2c81..d70abbfe1e4b 100644 --- a/plugins/htmltools/BUILD.bazel +++ b/plugins/htmltools/BUILD.bazel @@ -26,12 +26,14 @@ jvm_library( "//platform/lang-impl", "//images", "//platform/platform-impl:ide-impl", + "//platform/ide-core", "//xml/xml-parser:parser", "//platform/indexing-impl", "//xml/xml-psi-api:psi", "//platform/core-ui", "//xml/xml-analysis-api:analysis", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", + "//platform/util:util-ui", ] ) @@ -54,12 +56,14 @@ jvm_library( "//platform/lang-impl:lang-impl_test_lib", "//images:images_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//xml/xml-parser:parser_test_lib", "//platform/indexing-impl:indexing-impl_test_lib", "//xml/xml-psi-api:psi_test_lib", "//platform/core-ui:core-ui_test_lib", "//xml/xml-analysis-api:analysis_test_lib", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", + "//platform/util:util-ui_test_lib", ] ) ### auto-generated section `build intellij.html.tools` end @@ -135,8 +139,12 @@ jvm_library( "//libraries/fastutil:fastutil_test_lib", "//platform/util/concurrency", "//platform/util/concurrency:concurrency_test_lib", + "//platform/ide-core", ], - runtime_deps = [":html-tools-tests"] + runtime_deps = [ + ":html-tools-tests", + "//platform/ide-core:ide-core_test_lib", + ] ) ### auto-generated section `build intellij.html.tools.tests` end diff --git a/plugins/htmltools/intellij.html.tools.iml b/plugins/htmltools/intellij.html.tools.iml index b087451a86d6..10f49ea6672e 100644 --- a/plugins/htmltools/intellij.html.tools.iml +++ b/plugins/htmltools/intellij.html.tools.iml @@ -20,12 +20,14 @@ + + diff --git a/plugins/htmltools/intellij.html.tools.tests.iml b/plugins/htmltools/intellij.html.tools.tests.iml index 25c68fd308f5..d3b1bb1555ad 100644 --- a/plugins/htmltools/intellij.html.tools.tests.iml +++ b/plugins/htmltools/intellij.html.tools.tests.iml @@ -30,5 +30,6 @@ + \ No newline at end of file diff --git a/plugins/ide-features-trainer/BUILD.bazel b/plugins/ide-features-trainer/BUILD.bazel index da32f285dc8c..39d9cbc5b3f2 100644 --- a/plugins/ide-features-trainer/BUILD.bazel +++ b/plugins/ide-features-trainer/BUILD.bazel @@ -38,6 +38,7 @@ jvm_library( "//platform/xdebugger-impl/shared", "//platform/projectModel-api:projectModel", "//platform/ide-core-impl", + "//platform/ide-core", "//platform/usageView", "//platform/statistics", "//platform/refactoring", @@ -48,6 +49,7 @@ jvm_library( "//libraries/kotlinx/serialization/json", "//libraries/kotlinx/datetime", "//platform/util/jdom", + "//platform/util:util-ui", "//platform/editor-ui-ex:editor-ex", "//platform/lvcs-impl", "//platform/tips-of-the-day:tips", @@ -97,6 +99,7 @@ jvm_library( "//platform/testFramework", "//platform/testFramework:testFramework_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/usageView:usageView_test_lib", "//platform/statistics:statistics_test_lib", "//platform/refactoring:refactoring_test_lib", @@ -107,6 +110,7 @@ jvm_library( "//libraries/kotlinx/serialization/json:json_test_lib", "//libraries/kotlinx/datetime:datetime_test_lib", "//platform/util/jdom:jdom_test_lib", + "//platform/util:util-ui_test_lib", "//platform/editor-ui-ex:editor-ex_test_lib", "//platform/lvcs-impl:lvcs-impl_test_lib", "//platform/tips-of-the-day:tips_test_lib", @@ -203,6 +207,7 @@ jvm_library( "//platform/testFramework", "//platform/testFramework:testFramework_test_lib", "//platform/ide-core-impl", + "//platform/ide-core", "//platform/usageView", "//platform/usageView:usageView_test_lib", "//platform/statistics", @@ -249,6 +254,7 @@ jvm_library( ":featuresTrainer-tests", "//platform/platform-impl:ide-impl_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", ] ) ### auto-generated section `build intellij.featuresTrainer.tests` end diff --git a/plugins/ide-features-trainer/intellij.featuresTrainer.iml b/plugins/ide-features-trainer/intellij.featuresTrainer.iml index 10b8f3cb8e5a..2c68db60bdae 100644 --- a/plugins/ide-features-trainer/intellij.featuresTrainer.iml +++ b/plugins/ide-features-trainer/intellij.featuresTrainer.iml @@ -55,6 +55,7 @@ + @@ -65,6 +66,7 @@ + diff --git a/plugins/ide-features-trainer/intellij.featuresTrainer.tests.iml b/plugins/ide-features-trainer/intellij.featuresTrainer.tests.iml index dcb8bf6b8c6f..37d9fc878996 100644 --- a/plugins/ide-features-trainer/intellij.featuresTrainer.tests.iml +++ b/plugins/ide-features-trainer/intellij.featuresTrainer.tests.iml @@ -57,6 +57,7 @@ + diff --git a/plugins/ide-features-trainer/onboarding/BUILD.bazel b/plugins/ide-features-trainer/onboarding/BUILD.bazel index 6e22e80fe7e5..340091b09ec8 100644 --- a/plugins/ide-features-trainer/onboarding/BUILD.bazel +++ b/plugins/ide-features-trainer/onboarding/BUILD.bazel @@ -22,6 +22,8 @@ jvm_library( "//plugins/ide-features-trainer:featuresTrainer", "//platform/core-ui", "//platform/new-users-onboarding", + "//platform/ide-core", + "//platform/util:util-ui", ] ) @@ -39,6 +41,8 @@ jvm_library( "//plugins/ide-features-trainer:featuresTrainer_test_lib", "//platform/core-ui:core-ui_test_lib", "//platform/new-users-onboarding:new-users-onboarding_test_lib", + "//platform/ide-core:ide-core_test_lib", + "//platform/util:util-ui_test_lib", ] ) ### auto-generated section `build intellij.featuresTrainer.onboarding` end diff --git a/plugins/ide-features-trainer/onboarding/intellij.featuresTrainer.onboarding.iml b/plugins/ide-features-trainer/onboarding/intellij.featuresTrainer.onboarding.iml index bdce1409f6ba..91fab032bb66 100644 --- a/plugins/ide-features-trainer/onboarding/intellij.featuresTrainer.onboarding.iml +++ b/plugins/ide-features-trainer/onboarding/intellij.featuresTrainer.onboarding.iml @@ -16,5 +16,7 @@ + + \ No newline at end of file diff --git a/plugins/ide-startup/importSettings/BUILD.bazel b/plugins/ide-startup/importSettings/BUILD.bazel index f8c4477b55ee..ce9ce61a3c38 100644 --- a/plugins/ide-startup/importSettings/BUILD.bazel +++ b/plugins/ide-startup/importSettings/BUILD.bazel @@ -23,6 +23,7 @@ jvm_library( "//platform/core-ui", "//platform/ide-core-impl", "//platform/ide-core/plugins", + "//platform/ide-core", "//platform/core-impl", "//libraries/rd/core", "//libraries/rd/swing", @@ -46,8 +47,10 @@ jvm_library( "//platform/util:util-ui", "//platform/lang-impl", "//platform/util/progress", + "//platform/util-ex", "//platform/platform-impl/ui", "//platform/platform-impl/initial-config-import", + "//platform/progress/shared:ide-progress", "//platform/pluginSystem/parser/impl", ] ) @@ -67,6 +70,7 @@ jvm_library( "//platform/core-ui:core-ui_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", "//platform/ide-core/plugins:plugins_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/core-impl:core-impl_test_lib", "//libraries/rd/core:core_test_lib", "//libraries/rd/swing:swing_test_lib", @@ -92,8 +96,10 @@ jvm_library( "//platform/testFramework/junit5:junit5_test_lib", "//platform/lang-impl:lang-impl_test_lib", "//platform/util/progress:progress_test_lib", + "//platform/util-ex:util-ex_test_lib", "//platform/platform-impl/ui:ui_test_lib", "//platform/platform-impl/initial-config-import:initial-config-import_test_lib", + "//platform/progress/shared:ide-progress_test_lib", "//platform/pluginSystem/parser/impl:impl_test_lib", ] ) diff --git a/plugins/ide-startup/importSettings/intellij.ide.startup.importSettings.iml b/plugins/ide-startup/importSettings/intellij.ide.startup.importSettings.iml index be38d656e68b..119fe20f92bb 100644 --- a/plugins/ide-startup/importSettings/intellij.ide.startup.importSettings.iml +++ b/plugins/ide-startup/importSettings/intellij.ide.startup.importSettings.iml @@ -39,6 +39,7 @@ + @@ -64,8 +65,10 @@ + + \ No newline at end of file diff --git a/plugins/java-decompiler/plugin/BUILD.bazel b/plugins/java-decompiler/plugin/BUILD.bazel index b61ee21690da..3e34cb824ec0 100644 --- a/plugins/java-decompiler/plugin/BUILD.bazel +++ b/plugins/java-decompiler/plugin/BUILD.bazel @@ -22,11 +22,15 @@ jvm_library( "//platform/projectModel-api:projectModel", "//java/java-psi-api:psi", "//platform/ide-core-impl", + "//platform/ide-core", "//java/java-psi-impl:psi-impl", "//platform/util", "//platform/platform-impl:ide-impl", "//platform/core-api:core", + "//platform/util:util-ui", + "//java/java-frontback-psi-api:frontback-psi", "//platform/core-ui", + "//platform/core-impl", "//platform/lang-impl", "//platform/statistics", ], @@ -54,13 +58,17 @@ jvm_library( "//platform/testFramework:testFramework_test_lib", "//java/java-psi-api:psi_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//java/java-psi-impl:psi-impl_test_lib", "//platform/util:util_test_lib", "//platform/platform-impl:ide-impl_test_lib", "//platform/core-api:core_test_lib", + "//platform/util:util-ui_test_lib", "//java/testFramework", "//java/testFramework:testFramework_test_lib", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl:core-impl_test_lib", "//tools/intellij.tools.ide.metrics.benchmark:ide-metrics-benchmark", "//tools/intellij.tools.ide.metrics.benchmark:ide-metrics-benchmark_test_lib", "//platform/lang-impl:lang-impl_test_lib", @@ -112,10 +120,13 @@ jvm_library( "//java/java-psi-api:psi", "//java/java-psi-api:psi_test_lib", "//platform/ide-core-impl", + "//platform/ide-core", "//java/java-psi-impl:psi-impl", "//java/java-psi-impl:psi-impl_test_lib", "//platform/util", "//platform/util:util_test_lib", + "//platform/util:util-ui", + "//platform/util:util-ui_test_lib", "//platform/platform-impl:ide-impl", "//platform/core-api:core", "//platform/core-api:core_test_lib", @@ -123,6 +134,8 @@ jvm_library( "//java/testFramework:testFramework_test_lib", "//platform/core-ui", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", "//tools/intellij.tools.ide.metrics.benchmark:ide-metrics-benchmark", "//tools/intellij.tools.ide.metrics.benchmark:ide-metrics-benchmark_test_lib", "//platform/lang-impl", @@ -131,6 +144,8 @@ jvm_library( "//platform/statistics:statistics_test_lib", "//platform/structure-view-impl:structureView-impl", "//platform/structure-view-impl:structureView-impl_test_lib", + "//java/java-frontback-psi-api:frontback-psi", + "//java/java-frontback-psi-api:frontback-psi_test_lib", ], exports = [ "//plugins/java-decompiler/engine", @@ -139,6 +154,7 @@ jvm_library( runtime_deps = [ ":java-decompiler-tests", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/platform-impl:ide-impl_test_lib", ] ) diff --git a/plugins/java-decompiler/plugin/intellij.java.decompiler.iml b/plugins/java-decompiler/plugin/intellij.java.decompiler.iml index ee2e4ec329a9..f315291ad44d 100644 --- a/plugins/java-decompiler/plugin/intellij.java.decompiler.iml +++ b/plugins/java-decompiler/plugin/intellij.java.decompiler.iml @@ -17,12 +17,16 @@ + + + + diff --git a/plugins/java-decompiler/plugin/intellij.java.decompiler.tests.iml b/plugins/java-decompiler/plugin/intellij.java.decompiler.tests.iml index eaf3c20aad64..e3204ea1e228 100644 --- a/plugins/java-decompiler/plugin/intellij.java.decompiler.tests.iml +++ b/plugins/java-decompiler/plugin/intellij.java.decompiler.tests.iml @@ -16,17 +16,21 @@ + + + + \ No newline at end of file diff --git a/plugins/java-i18n/BUILD.bazel b/plugins/java-i18n/BUILD.bazel index fd1d49f0ee14..a0d98dff23f3 100644 --- a/plugins/java-i18n/BUILD.bazel +++ b/plugins/java-i18n/BUILD.bazel @@ -32,6 +32,7 @@ jvm_library( "//plugins/properties:properties-backend", "//platform/platform-impl:ide-impl", "//platform/ide-core-impl", + "//platform/ide-core", "//platform/lang-impl", "//platform/lang-core", "//xml/impl", @@ -45,12 +46,17 @@ jvm_library( "//jvm/jvm-analysis-api:analysis", "//libraries/stream", "//platform/core-ui", + "//platform/core-impl", "//libraries/icu4j", "//libraries/fastutil", "//java/java-impl-refactorings:impl-refactorings", "//platform/util/jdom", + "//platform/util:util-ui", "//xml/xml-psi-api:psi", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", + "//java/java-syntax:syntax", + "//java/java-psi-api:psi", + "//java/java-frontback-psi-api:frontback-psi", ], exports = [ "//plugins/properties:properties-backend", @@ -90,6 +96,7 @@ jvm_library( "//plugins/properties:properties-backend_test_lib", "//platform/platform-impl:ide-impl_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/lang-impl:lang-impl_test_lib", "//platform/lang-core:lang-core_test_lib", "//xml/impl:impl_test_lib", @@ -115,15 +122,20 @@ jvm_library( "//jvm/jvm-analysis-api:analysis_test_lib", "//libraries/stream:stream_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl:core-impl_test_lib", "//libraries/icu4j:icu4j_test_lib", "//libraries/fastutil:fastutil_test_lib", "//java/java-impl-refactorings:impl-refactorings_test_lib", "//platform/util/jdom:jdom_test_lib", + "//platform/util:util-ui_test_lib", "//xml/xml-psi-api:psi_test_lib", "//tools/intellij.tools.ide.metrics.benchmark:ide-metrics-benchmark", "//tools/intellij.tools.ide.metrics.benchmark:ide-metrics-benchmark_test_lib", "//platform/backend:backend_test_lib", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", + "//java/java-syntax:syntax_test_lib", + "//java/java-psi-api:psi_test_lib", + "//java/java-frontback-psi-api:frontback-psi_test_lib", ] ) ### auto-generated section `build intellij.java.i18n` end @@ -180,6 +192,10 @@ jvm_library( "//java/openapi:java_test_lib", "//platform/projectModel-api:projectModel", "//platform/projectModel-api:projectModel_test_lib", + "//java/java-syntax:syntax", + "//java/java-syntax:syntax_test_lib", + "//java/java-psi-api:psi", + "//java/java-psi-api:psi_test_lib", "//platform/forms_rt:java-guiForms-rt", "//platform/forms_rt:java-guiForms-rt_test_lib", "//platform/refactoring", @@ -228,6 +244,8 @@ jvm_library( "//libraries/stream:stream_test_lib", "//platform/core-ui", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", "//libraries/icu4j", "//libraries/icu4j:icu4j_test_lib", "//libraries/fastutil", @@ -242,6 +260,8 @@ jvm_library( "//tools/intellij.tools.ide.metrics.benchmark:ide-metrics-benchmark_test_lib", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", + "//java/java-frontback-psi-api:frontback-psi", + "//java/java-frontback-psi-api:frontback-psi_test_lib", ], exports = [ "//plugins/properties:properties-backend", diff --git a/plugins/java-i18n/intellij.java.i18n.iml b/plugins/java-i18n/intellij.java.i18n.iml index 005cbea16718..6d788776020f 100644 --- a/plugins/java-i18n/intellij.java.i18n.iml +++ b/plugins/java-i18n/intellij.java.i18n.iml @@ -26,6 +26,7 @@ + @@ -45,13 +46,18 @@ + + + + + \ No newline at end of file diff --git a/plugins/java-i18n/intellij.java.i18n.tests.iml b/plugins/java-i18n/intellij.java.i18n.tests.iml index 71780d42df83..bc1d43282da4 100644 --- a/plugins/java-i18n/intellij.java.i18n.tests.iml +++ b/plugins/java-i18n/intellij.java.i18n.tests.iml @@ -19,6 +19,8 @@ + + @@ -44,6 +46,7 @@ + @@ -53,6 +56,7 @@ + \ No newline at end of file diff --git a/plugins/javaFX/BUILD.bazel b/plugins/javaFX/BUILD.bazel index e695c2d6ae0d..1fee3553434f 100644 --- a/plugins/javaFX/BUILD.bazel +++ b/plugins/javaFX/BUILD.bazel @@ -29,12 +29,14 @@ jvm_library( "//platform/refactoring", "//platform/platform-impl:ide-impl", "//platform/ide-core-impl", + "//platform/ide-core", "//platform/lang-impl", "//java/java-psi-api:psi", "//xml/impl", "//java/java-impl:impl", "//java/java-indexing-api:indexing", "//java/openapi:java", + "//java/java-syntax:syntax", "//java/compiler/openapi:java-compiler", "//java/compiler/impl", "//plugins/javaFX/common", @@ -43,14 +45,18 @@ jvm_library( "//java/typeMigration", "//platform/util/nanoxml", "//platform/core-ui", + "//platform/core-impl", "//platform/forms_rt:java-guiForms-rt", "//platform/code-style-impl:codeStyle-impl", "//platform/platform-util-io:ide-util-io", "//spellchecker", "//java/java-impl-refactorings:impl-refactorings", + "//java/java-frontback-psi-api:frontback-psi", "//xml/xml-psi-api:psi", "//platform/util/jdom", + "//platform/util:util-ui", "//xml/xml-analysis-api:analysis", + "//xml/xml-parser:parser", "//platform/execution", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", "//platform/util/concurrency", @@ -81,12 +87,14 @@ jvm_library( "//platform/testFramework:testFramework_test_lib", "//platform/platform-impl:ide-impl_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/lang-impl:lang-impl_test_lib", "//java/java-psi-api:psi_test_lib", "//xml/impl:impl_test_lib", "//java/java-impl:impl_test_lib", "//java/java-indexing-api:indexing_test_lib", "//java/openapi:java_test_lib", + "//java/java-syntax:syntax_test_lib", "//java/compiler/openapi:java-compiler_test_lib", "//java/compiler/impl:impl_test_lib", "//plugins/javaFX/common:common_test_lib", @@ -99,14 +107,18 @@ jvm_library( "//java/java-tests:tests", "//java/java-tests:tests_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl:core-impl_test_lib", "//platform/forms_rt:java-guiForms-rt_test_lib", "//platform/code-style-impl:codeStyle-impl_test_lib", "//platform/platform-util-io:ide-util-io_test_lib", "//spellchecker:spellchecker_test_lib", "//java/java-impl-refactorings:impl-refactorings_test_lib", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//xml/xml-psi-api:psi_test_lib", "//platform/util/jdom:jdom_test_lib", + "//platform/util:util-ui_test_lib", "//xml/xml-analysis-api:analysis_test_lib", + "//xml/xml-parser:parser_test_lib", "//platform/execution:execution_test_lib", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", "//platform/util/concurrency:concurrency_test_lib", @@ -253,6 +265,8 @@ jvm_library( "//java/java-tests:tests_test_lib", "//platform/core-ui", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", "//platform/forms_rt:java-guiForms-rt", "//platform/forms_rt:java-guiForms-rt_test_lib", "//platform/code-style-impl:codeStyle-impl", diff --git a/plugins/javaFX/community/BUILD.bazel b/plugins/javaFX/community/BUILD.bazel index b27ffba73366..800f5ce2af50 100644 --- a/plugins/javaFX/community/BUILD.bazel +++ b/plugins/javaFX/community/BUILD.bazel @@ -115,6 +115,8 @@ jvm_library( "//platform/core-api:core_test_lib", "//platform/lang-core", "//platform/lang-core:lang-core_test_lib", + "//platform/lang-api:lang", + "//platform/lang-api:lang_test_lib", "//platform/editor-ui-api:editor-ui", "//platform/editor-ui-api:editor-ui_test_lib", "//platform/platform-impl:ide-impl", @@ -144,6 +146,8 @@ jvm_library( "//java/compiler/openapi:java-compiler_test_lib", "//platform/core-ui", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", "//plugins/javaFX:javaFX-properties", "//plugins/javaFX:javaFX-properties_test_lib", "//xml/xml-psi-api:psi", @@ -154,6 +158,12 @@ jvm_library( "//libraries/fastutil:fastutil_test_lib", "//plugins/javaFX:javaFX-tests", "//plugins/javaFX:javaFX-tests_test_lib", + "//java/java-syntax:syntax", + "//java/java-syntax:syntax_test_lib", + "//java/java-psi-api:psi", + "//java/java-psi-api:psi_test_lib", + "//java/java-frontback-psi-api:frontback-psi", + "//java/java-frontback-psi-api:frontback-psi_test_lib", ], exports = [ "//plugins/javaFX", diff --git a/plugins/javaFX/community/intellij.javaFX.community.tests.iml b/plugins/javaFX/community/intellij.javaFX.community.tests.iml index 10df052cca39..fca20c2a2f37 100644 --- a/plugins/javaFX/community/intellij.javaFX.community.tests.iml +++ b/plugins/javaFX/community/intellij.javaFX.community.tests.iml @@ -12,6 +12,7 @@ + @@ -27,12 +28,16 @@ + + + + \ No newline at end of file diff --git a/plugins/javaFX/intellij.javaFX.iml b/plugins/javaFX/intellij.javaFX.iml index d954978d17af..63c5252bcd2d 100644 --- a/plugins/javaFX/intellij.javaFX.iml +++ b/plugins/javaFX/intellij.javaFX.iml @@ -24,12 +24,14 @@ + + @@ -40,14 +42,18 @@ + + + + diff --git a/plugins/javaFX/intellij.javaFX.tests.iml b/plugins/javaFX/intellij.javaFX.tests.iml index 5cebfdbcb53d..5a1e845d2f51 100644 --- a/plugins/javaFX/intellij.javaFX.tests.iml +++ b/plugins/javaFX/intellij.javaFX.tests.iml @@ -39,6 +39,7 @@ + diff --git a/plugins/javaFX/jps/BUILD.bazel b/plugins/javaFX/jps/BUILD.bazel index 82e837581b70..c5b7228eadaf 100644 --- a/plugins/javaFX/jps/BUILD.bazel +++ b/plugins/javaFX/jps/BUILD.bazel @@ -22,6 +22,7 @@ jvm_library( "//plugins/javaFX/common", "//jps/model-impl", "//platform/util/jdom", + "//platform/util/base/multiplatform", "@lib//:jetbrains-annotations", ] ) @@ -41,6 +42,7 @@ jvm_library( "//plugins/javaFX/common:common_test_lib", "//jps/model-impl:model-impl_test_lib", "//platform/util/jdom:jdom_test_lib", + "//platform/util/base/multiplatform:multiplatform_test_lib", ] ) ### auto-generated section `build intellij.javaFX.jps` end diff --git a/plugins/javaFX/jps/intellij.javaFX.jps.iml b/plugins/javaFX/jps/intellij.javaFX.jps.iml index 906d637fd092..4781e453e992 100644 --- a/plugins/javaFX/jps/intellij.javaFX.jps.iml +++ b/plugins/javaFX/jps/intellij.javaFX.jps.iml @@ -31,6 +31,7 @@ + \ No newline at end of file diff --git a/plugins/javaFX/sceneBuilder/BUILD.bazel b/plugins/javaFX/sceneBuilder/BUILD.bazel index a84125fa6f4d..0a4d6e77fbaa 100644 --- a/plugins/javaFX/sceneBuilder/BUILD.bazel +++ b/plugins/javaFX/sceneBuilder/BUILD.bazel @@ -11,6 +11,8 @@ jvm_library( "//java/java-psi-api:psi", "//java/java-indexing-api:indexing", "//java/openapi:java", + "//java/java-frontback-psi-api:frontback-psi", + "//java/java-syntax:syntax", "//plugins/javaFX", "//platform/core-api:core", "//jps/model-api:model", @@ -33,6 +35,8 @@ jvm_library( "//java/java-psi-api:psi_test_lib", "//java/java-indexing-api:indexing_test_lib", "//java/openapi:java_test_lib", + "//java/java-frontback-psi-api:frontback-psi_test_lib", + "//java/java-syntax:syntax_test_lib", "//plugins/javaFX:javaFX_test_lib", "//platform/core-api:core_test_lib", "//jps/model-api:model_test_lib", diff --git a/plugins/javaFX/sceneBuilder/intellij.javaFX.sceneBuilder.iml b/plugins/javaFX/sceneBuilder/intellij.javaFX.sceneBuilder.iml index 23d2fad4ef06..985b6e9d043e 100644 --- a/plugins/javaFX/sceneBuilder/intellij.javaFX.sceneBuilder.iml +++ b/plugins/javaFX/sceneBuilder/intellij.javaFX.sceneBuilder.iml @@ -11,6 +11,8 @@ + + diff --git a/plugins/jshell/console/BUILD.bazel b/plugins/jshell/console/BUILD.bazel index 84e8ac820e0f..162021d22ed2 100644 --- a/plugins/jshell/console/BUILD.bazel +++ b/plugins/jshell/console/BUILD.bazel @@ -22,12 +22,20 @@ jvm_library( "//platform/analysis-api:analysis", "//platform/projectModel-api:projectModel", "//java/openapi:java", + "//java/java-syntax:syntax", "//java/execution/impl", "//java/java-psi-impl:psi-impl", + "//java/java-psi-api:psi", + "//java/java-frontback-psi-api:frontback-psi", "//platform/platform-impl:ide-impl", + "//platform/ide-core", "//platform/core-ui", + "//platform/core-impl", + "//platform/editor-ui-api:editor-ui", "//platform/lang-core", "//jps/model-api:model", + "//platform/lang-api:lang", + "//platform/util:util-ui", ] ) @@ -46,12 +54,20 @@ jvm_library( "//platform/analysis-api:analysis_test_lib", "//platform/projectModel-api:projectModel_test_lib", "//java/openapi:java_test_lib", + "//java/java-syntax:syntax_test_lib", "//java/execution/impl:impl_test_lib", "//java/java-psi-impl:psi-impl_test_lib", + "//java/java-psi-api:psi_test_lib", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl:core-impl_test_lib", + "//platform/editor-ui-api:editor-ui_test_lib", "//platform/lang-core:lang-core_test_lib", "//jps/model-api:model_test_lib", + "//platform/lang-api:lang_test_lib", + "//platform/util:util-ui_test_lib", ] ) ### auto-generated section `build intellij.java.jshell.console` end diff --git a/plugins/jshell/console/intellij.java.jshell.console.iml b/plugins/jshell/console/intellij.java.jshell.console.iml index 1f93c2a9e278..d354707208c0 100644 --- a/plugins/jshell/console/intellij.java.jshell.console.iml +++ b/plugins/jshell/console/intellij.java.jshell.console.iml @@ -16,11 +16,19 @@ + + + + + + + + \ No newline at end of file diff --git a/plugins/jsonpath/BUILD.bazel b/plugins/jsonpath/BUILD.bazel index 7988e83d5375..9d2f21f1a2a4 100644 --- a/plugins/jsonpath/BUILD.bazel +++ b/plugins/jsonpath/BUILD.bazel @@ -24,6 +24,7 @@ jvm_library( "//json/backend", "//platform/core-impl", "//platform/platform-api:ide", + "//platform/ide-core", "//platform/util:util-ui", "//platform/lang-impl", "//spellchecker", @@ -50,6 +51,7 @@ jvm_library( "//json/backend:backend_test_lib", "//platform/core-impl:core-impl_test_lib", "//platform/platform-api:ide_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/util:util-ui_test_lib", "@lib//:assert_j", "//platform/lang-impl:lang-impl_test_lib", diff --git a/plugins/jsonpath/intellij.jsonpath.iml b/plugins/jsonpath/intellij.jsonpath.iml index 96659de0fdca..077c1826af6a 100644 --- a/plugins/jsonpath/intellij.jsonpath.iml +++ b/plugins/jsonpath/intellij.jsonpath.iml @@ -19,6 +19,7 @@ + diff --git a/plugins/junit/BUILD.bazel b/plugins/junit/BUILD.bazel index f898a32943e8..b1c2cb8b887e 100644 --- a/plugins/junit/BUILD.bazel +++ b/plugins/junit/BUILD.bazel @@ -16,16 +16,20 @@ jvm_library( deps = [ "//java/execution/openapi:java-execution", "//java/openapi:java", + "//java/java-syntax:syntax", "//java/execution/impl", + "//java/java-psi-api:psi", "//java/java-runtime:rt", "//platform/analysis-api:analysis", "//platform/code-style-api:codeStyle", "//platform/util/concurrency", "//platform/core-api:core", + "//platform/lang-api:lang", "//platform/editor-ui-api:editor-ui", "//platform/execution-impl", "//platform/indexing-api:indexing", "//jps/model-api:model", + "//jps/model-serialization", "//platform/lang-core", "//platform/projectModel-api:projectModel", "//platform/refactoring", @@ -45,12 +49,17 @@ jvm_library( "//jvm/jvm-analysis-quickFix:analysis-quickFix", "//libraries/fastutil", "//platform/platform-util-io:ide-util-io", + "//platform/ide-core", "//java/java-impl-refactorings:impl-refactorings", "//platform/util/jdom", + "//platform/util:util-ui", "//plugins/properties/properties-psi-impl:backend-psi", "//platform/core-ui", + "//platform/core-impl", "//platform/execution", + "//platform/statistics", "//platform/forms_rt:java-guiForms-rt", + "//java/java-frontback-psi-api:frontback-psi", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", ], exports = ["//jvm/jvm-analysis-api:analysis"] @@ -69,16 +78,20 @@ jvm_library( ":junit", "//java/execution/openapi:java-execution_test_lib", "//java/openapi:java_test_lib", + "//java/java-syntax:syntax_test_lib", "//java/execution/impl:impl_test_lib", + "//java/java-psi-api:psi_test_lib", "//java/java-runtime:rt_test_lib", "//platform/analysis-api:analysis_test_lib", "//platform/code-style-api:codeStyle_test_lib", "//platform/util/concurrency:concurrency_test_lib", "//platform/core-api:core_test_lib", + "//platform/lang-api:lang_test_lib", "//platform/editor-ui-api:editor-ui_test_lib", "//platform/execution-impl:execution-impl_test_lib", "//platform/indexing-api:indexing_test_lib", "//jps/model-api:model_test_lib", + "//jps/model-serialization:model-serialization_test_lib", "//platform/lang-core:lang-core_test_lib", "//platform/projectModel-api:projectModel_test_lib", "//platform/refactoring:refactoring_test_lib", @@ -98,12 +111,17 @@ jvm_library( "//jvm/jvm-analysis-quickFix:analysis-quickFix_test_lib", "//libraries/fastutil:fastutil_test_lib", "//platform/platform-util-io:ide-util-io_test_lib", + "//platform/ide-core:ide-core_test_lib", "//java/java-impl-refactorings:impl-refactorings_test_lib", "//platform/util/jdom:jdom_test_lib", + "//platform/util:util-ui_test_lib", "//plugins/properties/properties-psi-impl:backend-psi_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl:core-impl_test_lib", "//platform/execution:execution_test_lib", + "//platform/statistics:statistics_test_lib", "//platform/forms_rt:java-guiForms-rt_test_lib", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", ] ) diff --git a/plugins/junit/groovy-tests/BUILD.bazel b/plugins/junit/groovy-tests/BUILD.bazel index 73e6c88214a9..4b2785fc3fab 100644 --- a/plugins/junit/groovy-tests/BUILD.bazel +++ b/plugins/junit/groovy-tests/BUILD.bazel @@ -22,6 +22,8 @@ jvm_library( "//platform/analysis-api:analysis_test_lib", "//platform/core-api:core", "//platform/core-api:core_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", "//platform/projectModel-api:projectModel", "//platform/projectModel-api:projectModel_test_lib", "//platform/testFramework", @@ -30,6 +32,10 @@ jvm_library( "//jvm/jvm-analysis-testFramework:analysis-testFramework_test_lib", "//plugins/junit/testFramework", "//plugins/junit/testFramework:testFramework_test_lib", + "//java/java-syntax:syntax", + "//java/java-syntax:syntax_test_lib", + "//java/java-psi-api:psi", + "//java/java-psi-api:psi_test_lib", ], runtime_deps = [":groovy-tests"] ) diff --git a/plugins/junit/groovy-tests/intellij.junit.groovy.tests.iml b/plugins/junit/groovy-tests/intellij.junit.groovy.tests.iml index 6646b1e804fc..ab2f3407983a 100644 --- a/plugins/junit/groovy-tests/intellij.junit.groovy.tests.iml +++ b/plugins/junit/groovy-tests/intellij.junit.groovy.tests.iml @@ -11,9 +11,12 @@ + + + \ No newline at end of file diff --git a/plugins/junit/intellij.junit.iml b/plugins/junit/intellij.junit.iml index f8640f46ca55..f30dc0751219 100644 --- a/plugins/junit/intellij.junit.iml +++ b/plugins/junit/intellij.junit.iml @@ -10,16 +10,20 @@ + + + + @@ -39,12 +43,17 @@ + + + + + \ No newline at end of file diff --git a/plugins/junit/java-tests/BUILD.bazel b/plugins/junit/java-tests/BUILD.bazel index 9655618ecdd7..377f1cfef928 100644 --- a/plugins/junit/java-tests/BUILD.bazel +++ b/plugins/junit/java-tests/BUILD.bazel @@ -21,20 +21,28 @@ jvm_library( "//platform/core-api:core_test_lib", "//platform/core-ui", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", "//platform/editor-ui-api:editor-ui", "//platform/editor-ui-api:editor-ui_test_lib", "//platform/execution-impl", "//platform/execution-impl:execution-impl_test_lib", "//jps/model-api:model", "//jps/model-api:model_test_lib", + "//jps/model-serialization", + "//jps/model-serialization:model-serialization_test_lib", "//platform/lang-core", "//platform/lang-core:lang-core_test_lib", + "//platform/lang-api:lang", + "//platform/lang-api:lang_test_lib", "//platform/projectModel-api:projectModel", "//platform/projectModel-api:projectModel_test_lib", "//platform/refactoring", "//platform/refactoring:refactoring_test_lib", "//platform/util/jdom", "//platform/util/jdom:jdom_test_lib", + "//platform/util:util-ui", + "//platform/util:util-ui_test_lib", "//plugins/junit_rt:junit-rt", "//plugins/junit_rt:junit-rt_test_lib", "//plugins/properties/properties-psi-impl:backend-psi", @@ -52,12 +60,17 @@ jvm_library( "//java/java-runtime:rt", "//java/java-runtime:rt_test_lib", "//platform/platform-util-io:ide-util-io", + "//platform/ide-core", "//java/execution/impl", "//java/execution/impl:impl_test_lib", "//java/openapi:java", "//java/openapi:java_test_lib", "//java/java-tests:tests", "//java/java-tests:tests_test_lib", + "//java/java-syntax:syntax", + "//java/java-syntax:syntax_test_lib", + "//java/java-psi-api:psi", + "//java/java-psi-api:psi_test_lib", "//platform/external-system-impl:externalSystem-impl", "//platform/external-system-impl:externalSystem-impl_test_lib", "//platform/testFramework/extensions:testExtensions", @@ -67,12 +80,17 @@ jvm_library( "//java/compiler/openapi:java-compiler_test_lib", "//java/java-impl-refactorings:impl-refactorings", "//java/java-impl-refactorings:impl-refactorings_test_lib", + "//java/java-frontback-psi-api:frontback-psi", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//platform/execution", "//platform/execution:execution_test_lib", + "//platform/testRunner", + "//platform/testRunner:testRunner_test_lib", ], runtime_deps = [ ":java-tests", "//platform/platform-util-io:ide-util-io_test_lib", + "//platform/ide-core:ide-core_test_lib", ] ) ### auto-generated section `build intellij.junit.java.tests` end diff --git a/plugins/junit/java-tests/intellij.junit.java.tests.iml b/plugins/junit/java-tests/intellij.junit.java.tests.iml index a380d28d4c92..27be19ead499 100644 --- a/plugins/junit/java-tests/intellij.junit.java.tests.iml +++ b/plugins/junit/java-tests/intellij.junit.java.tests.iml @@ -10,13 +10,17 @@ + + + + @@ -26,14 +30,19 @@ + + + + + \ No newline at end of file diff --git a/plugins/junit/kotlin-tests-k1/BUILD.bazel b/plugins/junit/kotlin-tests-k1/BUILD.bazel index fc33c8e06d56..4db82134f76b 100644 --- a/plugins/junit/kotlin-tests-k1/BUILD.bazel +++ b/plugins/junit/kotlin-tests-k1/BUILD.bazel @@ -33,6 +33,8 @@ jvm_library( "//platform/analysis-api:analysis_test_lib", "//platform/core-api:core", "//platform/core-api:core_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", "//plugins/kotlin/code-insight/api", "//plugins/kotlin/code-insight/api:api_test_lib", ], diff --git a/plugins/junit/kotlin-tests-k1/intellij.junit.kotlin.tests.k1.iml b/plugins/junit/kotlin-tests-k1/intellij.junit.kotlin.tests.k1.iml index d1b48c49e0ab..b5e72c54003b 100644 --- a/plugins/junit/kotlin-tests-k1/intellij.junit.kotlin.tests.k1.iml +++ b/plugins/junit/kotlin-tests-k1/intellij.junit.kotlin.tests.k1.iml @@ -17,6 +17,7 @@ + \ No newline at end of file diff --git a/plugins/junit/kotlin-tests-k2/BUILD.bazel b/plugins/junit/kotlin-tests-k2/BUILD.bazel index 5b353effbe5a..8daef2f6d9af 100644 --- a/plugins/junit/kotlin-tests-k2/BUILD.bazel +++ b/plugins/junit/kotlin-tests-k2/BUILD.bazel @@ -33,6 +33,8 @@ jvm_library( "//platform/analysis-api:analysis_test_lib", "//platform/core-api:core", "//platform/core-api:core_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", ], runtime_deps = [ ":kotlin-tests-k2", diff --git a/plugins/junit/kotlin-tests-k2/intellij.junit.kotlin.tests.k2.iml b/plugins/junit/kotlin-tests-k2/intellij.junit.kotlin.tests.k2.iml index 5275dd735899..deed8195db8f 100644 --- a/plugins/junit/kotlin-tests-k2/intellij.junit.kotlin.tests.k2.iml +++ b/plugins/junit/kotlin-tests-k2/intellij.junit.kotlin.tests.k2.iml @@ -17,5 +17,6 @@ + \ No newline at end of file diff --git a/plugins/junit/kotlin-tests-shared/BUILD.bazel b/plugins/junit/kotlin-tests-shared/BUILD.bazel index fb48f115c1f8..bec876522abc 100644 --- a/plugins/junit/kotlin-tests-shared/BUILD.bazel +++ b/plugins/junit/kotlin-tests-shared/BUILD.bazel @@ -24,16 +24,24 @@ jvm_library( "//platform/analysis-api:analysis_test_lib", "//platform/core-api:core", "//platform/core-api:core_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", "//jps/model-api:model", "//jps/model-api:model_test_lib", "//platform/projectModel-api:projectModel", "//platform/projectModel-api:projectModel_test_lib", + "//platform/editor-ui-api:editor-ui", + "//platform/editor-ui-api:editor-ui_test_lib", + "//platform/lang-api:lang", + "//platform/lang-api:lang_test_lib", "//platform/refactoring", "//platform/refactoring:refactoring_test_lib", "//plugins/kotlin/plugin/common", "//plugins/kotlin/plugin/common:common_test_lib", "//java/testFramework", "//java/testFramework:testFramework_test_lib", + "//java/java-psi-api:psi", + "//java/java-psi-api:psi_test_lib", "//plugins/junit/testFramework", "//plugins/junit/testFramework:testFramework_test_lib", "//platform/testFramework", @@ -52,6 +60,10 @@ jvm_library( "//plugins/kotlin/base/plugin:plugin_test_lib", "//plugins/kotlin/base/plugin:kotlin-base-plugin-tests", "//plugins/kotlin/base/plugin:kotlin-base-plugin-tests_test_lib", + "//java/java-syntax:syntax", + "//java/java-syntax:syntax_test_lib", + "//java/java-frontback-psi-api:frontback-psi", + "//java/java-frontback-psi-api:frontback-psi_test_lib", ], exports = [ "//plugins/kotlin/plugin/common", diff --git a/plugins/junit/kotlin-tests-shared/intellij.junit.kotlin.tests.shared.iml b/plugins/junit/kotlin-tests-shared/intellij.junit.kotlin.tests.shared.iml index 54073303cf42..b1998669f6e6 100644 --- a/plugins/junit/kotlin-tests-shared/intellij.junit.kotlin.tests.shared.iml +++ b/plugins/junit/kotlin-tests-shared/intellij.junit.kotlin.tests.shared.iml @@ -9,11 +9,15 @@ + + + + @@ -23,5 +27,7 @@ + + \ No newline at end of file diff --git a/plugins/junit/testFramework/BUILD.bazel b/plugins/junit/testFramework/BUILD.bazel index 81d03958a6e1..aca5550e7d1a 100644 --- a/plugins/junit/testFramework/BUILD.bazel +++ b/plugins/junit/testFramework/BUILD.bazel @@ -11,16 +11,16 @@ jvm_library( "//plugins/junit", "//java/java-frontback-psi-api:frontback-psi", "//java/testFramework", + "//java/java-syntax:syntax", + "//java/java-psi-api:psi", "//platform/analysis-api:analysis", "//platform/core-api:core", + "//platform/core-impl", "//jps/model-api:model", "//platform/testFramework", "//platform/projectModel-api:projectModel", ], - exports = [ - "//plugins/junit", - "//java/java-frontback-psi-api:frontback-psi", - ] + exports = ["//plugins/junit"] ) jvm_library( @@ -31,8 +31,6 @@ jvm_library( exports = [ "//plugins/junit", "//plugins/junit:junit_test_lib", - "//java/java-frontback-psi-api:frontback-psi", - "//java/java-frontback-psi-api:frontback-psi_test_lib", ], runtime_deps = [ ":testFramework", @@ -40,8 +38,11 @@ jvm_library( "//plugins/junit:junit_test_lib", "//java/java-frontback-psi-api:frontback-psi_test_lib", "//java/testFramework:testFramework_test_lib", + "//java/java-syntax:syntax_test_lib", + "//java/java-psi-api:psi_test_lib", "//platform/analysis-api:analysis_test_lib", "//platform/core-api:core_test_lib", + "//platform/core-impl:core-impl_test_lib", "//jps/model-api:model_test_lib", "//platform/testFramework:testFramework_test_lib", "//platform/projectModel-api:projectModel_test_lib", diff --git a/plugins/junit/testFramework/intellij.junit.testFramework.iml b/plugins/junit/testFramework/intellij.junit.testFramework.iml index e769ed8f55a4..cd283c697656 100644 --- a/plugins/junit/testFramework/intellij.junit.testFramework.iml +++ b/plugins/junit/testFramework/intellij.junit.testFramework.iml @@ -9,10 +9,13 @@ - + + + + diff --git a/plugins/junit5_rt_tests/BUILD.bazel b/plugins/junit5_rt_tests/BUILD.bazel index ae90ee9ece40..6a200ea657d3 100644 --- a/plugins/junit5_rt_tests/BUILD.bazel +++ b/plugins/junit5_rt_tests/BUILD.bazel @@ -35,6 +35,10 @@ jvm_library( "//plugins/junit:junit_test_lib", "//java/java-tests:tests", "//java/java-tests:tests_test_lib", + "//java/java-syntax:syntax", + "//java/java-syntax:syntax_test_lib", + "//java/java-psi-api:psi", + "//java/java-psi-api:psi_test_lib", "//aether-dependency-resolver", "//aether-dependency-resolver:aether-dependency-resolver_test_lib", "//java/compiler/openapi:java-compiler", @@ -53,6 +57,8 @@ jvm_library( "//jps/model-api:model_test_lib", "//platform/lang-core", "//platform/lang-core:lang-core_test_lib", + "//platform/lang-api:lang", + "//platform/lang-api:lang_test_lib", "//platform/projectModel-api:projectModel", "//platform/projectModel-api:projectModel_test_lib", "//platform/smRunner", @@ -61,11 +67,14 @@ jvm_library( "//platform/testFramework:testFramework_test_lib", "//java/java-runtime:rt", "//java/java-runtime:rt_test_lib", + "//java/java-frontback-psi-api:frontback-psi", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "@lib//:junit5", "@lib//:junit5Launcher", "//libraries/stream", "//libraries/stream:stream_test_lib", "//platform/platform-util-io:ide-util-io", + "//platform/ide-core", "@lib//:junit5Jupiter", "@lib//:junit5Vintage", "//platform/testFramework/junit5", @@ -80,10 +89,13 @@ jvm_library( "//platform/xdebugger-impl:debugger-impl-tests_test_lib", "//platform/code-style-api:codeStyle", "//platform/code-style-api:codeStyle_test_lib", + "//platform/testRunner", + "//platform/testRunner:testRunner_test_lib", ], runtime_deps = [ ":junit-v5-rt-tests", "//platform/platform-util-io:ide-util-io_test_lib", + "//platform/ide-core:ide-core_test_lib", ] ) ### auto-generated section `build intellij.junit.v5.rt.tests` end diff --git a/plugins/junit5_rt_tests/intellij.junit.v5.rt.tests.iml b/plugins/junit5_rt_tests/intellij.junit.v5.rt.tests.iml index e54b050d0def..5670a0bb0843 100644 --- a/plugins/junit5_rt_tests/intellij.junit.v5.rt.tests.iml +++ b/plugins/junit5_rt_tests/intellij.junit.v5.rt.tests.iml @@ -13,6 +13,8 @@ + + @@ -22,14 +24,17 @@ + + + @@ -38,5 +43,6 @@ + \ No newline at end of file diff --git a/plugins/junit6_rt_tests/BUILD.bazel b/plugins/junit6_rt_tests/BUILD.bazel index 11c59cc47d59..1ea883bf934a 100644 --- a/plugins/junit6_rt_tests/BUILD.bazel +++ b/plugins/junit6_rt_tests/BUILD.bazel @@ -23,6 +23,8 @@ jvm_library( "//plugins/junit:junit_test_lib", "//java/java-tests:tests", "//java/java-tests:tests_test_lib", + "//java/java-psi-api:psi", + "//java/java-psi-api:psi_test_lib", "//aether-dependency-resolver", "//aether-dependency-resolver:aether-dependency-resolver_test_lib", "//java/compiler/openapi:java-compiler", @@ -41,6 +43,8 @@ jvm_library( "//jps/model-api:model_test_lib", "//platform/lang-core", "//platform/lang-core:lang-core_test_lib", + "//platform/lang-api:lang", + "//platform/lang-api:lang_test_lib", "//platform/projectModel-api:projectModel", "//platform/projectModel-api:projectModel_test_lib", "//platform/smRunner", @@ -49,9 +53,12 @@ jvm_library( "//platform/testFramework:testFramework_test_lib", "//java/java-runtime:rt", "//java/java-runtime:rt_test_lib", + "//java/java-frontback-psi-api:frontback-psi", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//libraries/stream", "//libraries/stream:stream_test_lib", "//platform/platform-util-io:ide-util-io", + "//platform/ide-core", "//platform/testFramework/junit5", "//platform/testFramework/junit5:junit5_test_lib", "//platform/execution", @@ -62,10 +69,13 @@ jvm_library( "//RegExpSupport:regexp-tests_test_lib", "//platform/xdebugger-impl:debugger-impl-tests", "//platform/xdebugger-impl:debugger-impl-tests_test_lib", + "//platform/testRunner", + "//platform/testRunner:testRunner_test_lib", ], runtime_deps = [ ":junit-v6-rt-tests", "//platform/platform-util-io:ide-util-io_test_lib", + "//platform/ide-core:ide-core_test_lib", ] ) ### auto-generated section `build intellij.junit.v6.rt.tests` end diff --git a/plugins/junit6_rt_tests/intellij.junit.v6.rt.tests.iml b/plugins/junit6_rt_tests/intellij.junit.v6.rt.tests.iml index a76adcae9493..73d2a2bc1335 100644 --- a/plugins/junit6_rt_tests/intellij.junit.v6.rt.tests.iml +++ b/plugins/junit6_rt_tests/intellij.junit.v6.rt.tests.iml @@ -11,6 +11,7 @@ + @@ -20,16 +21,20 @@ + + + + \ No newline at end of file diff --git a/plugins/kotlin/base/analysis-api/analysis-api-k2-tests/BUILD.bazel b/plugins/kotlin/base/analysis-api/analysis-api-k2-tests/BUILD.bazel index e78d3a77892c..4525098dad81 100644 --- a/plugins/kotlin/base/analysis-api/analysis-api-k2-tests/BUILD.bazel +++ b/plugins/kotlin/base/analysis-api/analysis-api-k2-tests/BUILD.bazel @@ -30,6 +30,8 @@ jvm_library( "//platform/core-api:core_test_lib", "//platform/indexing-api:indexing", "//platform/indexing-api:indexing_test_lib", + "//java/java-psi-api:psi", + "//java/java-psi-api:psi_test_lib", "//plugins/kotlin/plugin/k2", "//plugins/kotlin/plugin/k2:k2_test_lib", "@lib//:kotlinc-analysis-api", diff --git a/plugins/kotlin/base/analysis-api/analysis-api-k2-tests/kotlin.base.analysis.analysis-api.k2.tests.iml b/plugins/kotlin/base/analysis-api/analysis-api-k2-tests/kotlin.base.analysis.analysis-api.k2.tests.iml index c797b5f8e29f..30e91be11967 100644 --- a/plugins/kotlin/base/analysis-api/analysis-api-k2-tests/kotlin.base.analysis.analysis-api.k2.tests.iml +++ b/plugins/kotlin/base/analysis-api/analysis-api-k2-tests/kotlin.base.analysis.analysis-api.k2.tests.iml @@ -26,6 +26,7 @@ + diff --git a/plugins/kotlin/base/analysis/BUILD.bazel b/plugins/kotlin/base/analysis/BUILD.bazel index 16d5eec52a33..400eacde245f 100644 --- a/plugins/kotlin/base/analysis/BUILD.bazel +++ b/plugins/kotlin/base/analysis/BUILD.bazel @@ -32,10 +32,13 @@ jvm_library( "@lib//:kotlinc-analysis-api", "//java/java-indexing-api:indexing", "//platform/analysis-api:analysis", + "//platform/lang-api:lang", "//platform/util/concurrency", "//platform/core-api:core", + "//platform/core-impl", "//platform/editor-ui-api:editor-ui", "//platform/platform-impl:ide-impl", + "//platform/ide-core", "@lib//:kotlinc-kotlin-scripting-common", "@lib//:kotlinc-kotlin-scripting-jvm", "@lib//:kotlinc-kotlin-scripting-compiler-impl", @@ -65,10 +68,12 @@ jvm_library( "//java/openapi:java", "//java/manifest", "//java/java-impl:impl", + "//java/java-psi-api:psi", "//xml/xml-psi-impl:psi-impl", "//platform/workspace/jps", "//platform/backend/workspace", "//java/java-analysis-api:analysis", + "//java/java-frontback-psi-api:frontback-psi", "//plugins/kotlin/base/scripting/scripting.shared", ] ) @@ -83,10 +88,13 @@ jvm_library( ":analysis", "//java/java-indexing-api:indexing_test_lib", "//platform/analysis-api:analysis_test_lib", + "//platform/lang-api:lang_test_lib", "//platform/util/concurrency:concurrency_test_lib", "//platform/core-api:core_test_lib", + "//platform/core-impl:core-impl_test_lib", "//platform/editor-ui-api:editor-ui_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//libraries/kotlinx/coroutines/core:core_test_lib", "//libraries/guava:guava_test_lib", "//platform/indexing-api:indexing_test_lib", @@ -111,10 +119,12 @@ jvm_library( "//java/openapi:java_test_lib", "//java/manifest:manifest_test_lib", "//java/java-impl:impl_test_lib", + "//java/java-psi-api:psi_test_lib", "//xml/xml-psi-impl:psi-impl_test_lib", "//platform/workspace/jps:jps_test_lib", "//platform/backend/workspace:workspace_test_lib", "//java/java-analysis-api:analysis_test_lib", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//plugins/kotlin/base/scripting/scripting.shared:scripting.shared_test_lib", ] ) diff --git a/plugins/kotlin/base/analysis/intellij.kotlin.base.analysis.iml b/plugins/kotlin/base/analysis/intellij.kotlin.base.analysis.iml index 1cf408e286de..8db1bc5aa29b 100644 --- a/plugins/kotlin/base/analysis/intellij.kotlin.base.analysis.iml +++ b/plugins/kotlin/base/analysis/intellij.kotlin.base.analysis.iml @@ -29,10 +29,13 @@ + + + @@ -62,10 +65,12 @@ + + \ No newline at end of file diff --git a/plugins/kotlin/base/code-insight/BUILD.bazel b/plugins/kotlin/base/code-insight/BUILD.bazel index 438f3d89c30a..38849b56f35a 100644 --- a/plugins/kotlin/base/code-insight/BUILD.bazel +++ b/plugins/kotlin/base/code-insight/BUILD.bazel @@ -46,11 +46,13 @@ jvm_library( "//plugins/kotlin/base/facet", "//plugins/kotlin/base/project-structure", "//platform/platform-impl:ide-impl", + "//platform/ide-core", "//plugins/kotlin/base/indices", "//plugins/kotlin/base/platforms", "//plugins/kotlin/base/resources:kotlin-base-resources", "//platform/analysis-impl", "//platform/core-ui", + "//platform/core-impl", "//platform/execution", "//platform/execution-impl", "//platform/lang-api:lang", @@ -60,12 +62,15 @@ jvm_library( "//platform/refactoring", "//platform/external-system-api:externalSystem", "//java/openapi:java", + "//java/java-syntax:syntax", "//java/java-impl:impl", + "//java/java-psi-api:psi", "//java/java-analysis-api:analysis", "//platform/backend/workspace", "//plugins/kotlin/formatter", "//plugins/kotlin/base/code-insight/minimal", "//platform/util/concurrency", + "//platform/util:util-ui", ], exports = ["//plugins/kotlin/base/code-insight/minimal"] ) @@ -95,11 +100,13 @@ jvm_library( "//plugins/kotlin/base/facet:facet_test_lib", "//plugins/kotlin/base/project-structure:project-structure_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//plugins/kotlin/base/indices:indices_test_lib", "//plugins/kotlin/base/platforms:platforms_test_lib", "//plugins/kotlin/base/resources:kotlin-base-resources_test_lib", "//platform/analysis-impl:analysis-impl_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl:core-impl_test_lib", "//platform/execution:execution_test_lib", "//platform/execution-impl:execution-impl_test_lib", "//platform/lang-api:lang_test_lib", @@ -109,7 +116,9 @@ jvm_library( "//platform/refactoring:refactoring_test_lib", "//platform/external-system-api:externalSystem_test_lib", "//java/openapi:java_test_lib", + "//java/java-syntax:syntax_test_lib", "//java/java-impl:impl_test_lib", + "//java/java-psi-api:psi_test_lib", "//java/java-analysis-api:analysis_test_lib", "//java/testFramework", "//java/testFramework:testFramework_test_lib", @@ -125,6 +134,7 @@ jvm_library( "//plugins/kotlin/base/code-insight/minimal:minimal_test_lib", "@lib//:kotlin-test", "//platform/util/concurrency:concurrency_test_lib", + "//platform/util:util-ui_test_lib", ] ) ### auto-generated section `build intellij.kotlin.base.codeInsight` end @@ -196,6 +206,7 @@ jvm_library( "//plugins/kotlin/base/project-structure", "//plugins/kotlin/base/project-structure:project-structure_test_lib", "//platform/platform-impl:ide-impl", + "//platform/ide-core", "//plugins/kotlin/base/indices", "//plugins/kotlin/base/indices:indices_test_lib", "//plugins/kotlin/base/platforms", @@ -206,6 +217,8 @@ jvm_library( "//platform/analysis-impl:analysis-impl_test_lib", "//platform/core-ui", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", "//platform/execution", "//platform/execution:execution_test_lib", "//platform/execution-impl", @@ -254,6 +267,7 @@ jvm_library( runtime_deps = [ ":kotlin-base-codeInsight-tests", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", ] ) ### auto-generated section `build intellij.kotlin.base.codeInsight.tests` end diff --git a/plugins/kotlin/base/code-insight/intellij.kotlin.base.codeInsight.iml b/plugins/kotlin/base/code-insight/intellij.kotlin.base.codeInsight.iml index aa1c235a5710..ffad7cb5d4d3 100644 --- a/plugins/kotlin/base/code-insight/intellij.kotlin.base.codeInsight.iml +++ b/plugins/kotlin/base/code-insight/intellij.kotlin.base.codeInsight.iml @@ -42,11 +42,13 @@ + + @@ -56,7 +58,9 @@ + + @@ -68,5 +72,6 @@ + \ No newline at end of file diff --git a/plugins/kotlin/base/code-insight/intellij.kotlin.base.codeInsight.tests.iml b/plugins/kotlin/base/code-insight/intellij.kotlin.base.codeInsight.tests.iml index 352cfb28ed89..b73f8e630bf8 100644 --- a/plugins/kotlin/base/code-insight/intellij.kotlin.base.codeInsight.tests.iml +++ b/plugins/kotlin/base/code-insight/intellij.kotlin.base.codeInsight.tests.iml @@ -41,11 +41,13 @@ + + diff --git a/plugins/kotlin/base/compiler-configuration-ui/BUILD.bazel b/plugins/kotlin/base/compiler-configuration-ui/BUILD.bazel index 1eec1aa99ea4..7dd564b5d773 100644 --- a/plugins/kotlin/base/compiler-configuration-ui/BUILD.bazel +++ b/plugins/kotlin/base/compiler-configuration-ui/BUILD.bazel @@ -19,6 +19,7 @@ jvm_library( "@lib//:kotlinc-kotlin-compiler-common", "@lib//:kotlinc-kotlin-jps-common", "//platform/core-api:core", + "//platform/lang-api:lang", "//jps/model-api:model", "//platform/lang-core", "//platform/projectModel-api:projectModel", @@ -34,6 +35,7 @@ jvm_library( "//platform/core-ui", "//platform/util:util-ui", "//platform/platform-impl:ide-impl", + "//platform/ide-core", "//java/openapi:java", "//java/idea-ui:ui", "//java/compiler/impl", @@ -51,6 +53,7 @@ jvm_library( ":kotlin-base-compilerConfiguration-ui", "//libraries/kotlin/reflect:reflect_test_lib", "//platform/core-api:core_test_lib", + "//platform/lang-api:lang_test_lib", "//jps/model-api:model_test_lib", "//platform/lang-core:lang-core_test_lib", "//platform/projectModel-api:projectModel_test_lib", @@ -66,6 +69,7 @@ jvm_library( "//platform/core-ui:core-ui_test_lib", "//platform/util:util-ui_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//java/openapi:java_test_lib", "//java/idea-ui:ui_test_lib", "//java/compiler/impl:impl_test_lib", diff --git a/plugins/kotlin/base/compiler-configuration-ui/intellij.kotlin.base.compilerConfiguration.ui.iml b/plugins/kotlin/base/compiler-configuration-ui/intellij.kotlin.base.compilerConfiguration.ui.iml index 9f96ad3fbaa4..31b68048dfb2 100644 --- a/plugins/kotlin/base/compiler-configuration-ui/intellij.kotlin.base.compilerConfiguration.ui.iml +++ b/plugins/kotlin/base/compiler-configuration-ui/intellij.kotlin.base.compilerConfiguration.ui.iml @@ -13,6 +13,7 @@ + @@ -28,6 +29,7 @@ + diff --git a/plugins/kotlin/base/facet/BUILD.bazel b/plugins/kotlin/base/facet/BUILD.bazel index 59b95a4520fd..684033f7e557 100644 --- a/plugins/kotlin/base/facet/BUILD.bazel +++ b/plugins/kotlin/base/facet/BUILD.bazel @@ -18,6 +18,7 @@ jvm_library( "@lib//:kotlinc-kotlin-compiler-common", "@lib//:kotlinc-kotlin-jps-common", "//platform/core-api:core", + "//platform/lang-api:lang", "//platform/editor-ui-api:editor-ui", "//jps/model-api:model", "//jps/model-serialization", @@ -38,8 +39,11 @@ jvm_library( "//platform/external-system-impl:externalSystem-impl", "//java/openapi:java", "//java/java-impl:impl", + "//java/java-syntax:syntax", + "//java/java-psi-api:psi", "//platform/workspace/jps", "//platform/backend/workspace", + "//platform/ide-core", "//libraries/gson", ] ) @@ -52,6 +56,7 @@ jvm_library( runtime_deps = [ ":facet", "//platform/core-api:core_test_lib", + "//platform/lang-api:lang_test_lib", "//platform/editor-ui-api:editor-ui_test_lib", "//jps/model-api:model_test_lib", "//jps/model-serialization:model-serialization_test_lib", @@ -72,8 +77,11 @@ jvm_library( "//platform/external-system-impl:externalSystem-impl_test_lib", "//java/openapi:java_test_lib", "//java/java-impl:impl_test_lib", + "//java/java-syntax:syntax_test_lib", + "//java/java-psi-api:psi_test_lib", "//platform/workspace/jps:jps_test_lib", "//platform/backend/workspace:workspace_test_lib", + "//platform/ide-core:ide-core_test_lib", "//libraries/gson:gson_test_lib", ] ) diff --git a/plugins/kotlin/base/facet/intellij.kotlin.base.facet.iml b/plugins/kotlin/base/facet/intellij.kotlin.base.facet.iml index 61309806d7b4..08cdaaa326d4 100644 --- a/plugins/kotlin/base/facet/intellij.kotlin.base.facet.iml +++ b/plugins/kotlin/base/facet/intellij.kotlin.base.facet.iml @@ -13,6 +13,7 @@ + @@ -33,8 +34,11 @@ + + + \ No newline at end of file diff --git a/plugins/kotlin/base/facet/tests/BUILD.bazel b/plugins/kotlin/base/facet/tests/BUILD.bazel index 20d5142999c2..6e942105757e 100644 --- a/plugins/kotlin/base/facet/tests/BUILD.bazel +++ b/plugins/kotlin/base/facet/tests/BUILD.bazel @@ -20,6 +20,7 @@ jvm_library( "//platform/util/jdom", "//platform/core-impl", "//platform/lang-core", + "//platform/lang-api:lang", "//platform/projectModel-api:projectModel", "//platform/external-system-api:externalSystem", "//platform/external-system-impl:externalSystem-impl", @@ -71,6 +72,8 @@ jvm_library( "//platform/core-impl:core-impl_test_lib", "//platform/lang-core", "//platform/lang-core:lang-core_test_lib", + "//platform/lang-api:lang", + "//platform/lang-api:lang_test_lib", "//platform/projectModel-api:projectModel", "//platform/projectModel-api:projectModel_test_lib", "//platform/external-system-api:externalSystem", @@ -87,6 +90,7 @@ jvm_library( "//platform/backend/workspace:workspace_test_lib", "//platform/testFramework", "//platform/testFramework:testFramework_test_lib", + "//platform/ide-core", "//java/testFramework", "//java/testFramework:testFramework_test_lib", "//plugins/kotlin/base/facet", @@ -101,6 +105,7 @@ jvm_library( runtime_deps = [ ":tests", "//plugins/kotlin/plugin/k2:k2_test_lib", + "//platform/ide-core:ide-core_test_lib", ] ) ### auto-generated section `build intellij.kotlin.base.facet.tests` end diff --git a/plugins/kotlin/base/facet/tests/intellij.kotlin.base.facet.tests.iml b/plugins/kotlin/base/facet/tests/intellij.kotlin.base.facet.tests.iml index 5c31dcb06417..7983a6f994aa 100644 --- a/plugins/kotlin/base/facet/tests/intellij.kotlin.base.facet.tests.iml +++ b/plugins/kotlin/base/facet/tests/intellij.kotlin.base.facet.tests.iml @@ -26,6 +26,7 @@ + @@ -34,6 +35,7 @@ + diff --git a/plugins/kotlin/base/fe10/analysis/BUILD.bazel b/plugins/kotlin/base/fe10/analysis/BUILD.bazel index fbb5bfafd9e1..f93315a9821f 100644 --- a/plugins/kotlin/base/fe10/analysis/BUILD.bazel +++ b/plugins/kotlin/base/fe10/analysis/BUILD.bazel @@ -30,6 +30,7 @@ jvm_library( "//libraries/guava", "@lib//:vavr", "@lib//:javax-inject", + "//platform/lang-api:lang", "//java/java-indexing-api:indexing", "//platform/analysis-api:analysis", "//platform/core-api:core", @@ -49,9 +50,13 @@ jvm_library( "//platform/core-impl", "//platform/editor-ui-api:editor-ui", "//platform/core-ui", + "//platform/statistics", + "//platform/util:util-ui", "//java/java-impl:impl", + "//java/java-psi-api:psi", "//java/openapi:java", "//java/java-analysis-api:analysis", + "//java/java-frontback-psi-api:frontback-psi", "//plugins/kotlin/base/statistics", "@lib//:kotlinc-analysis-api-impl-base", "//plugins/kotlin/base/plugin", @@ -72,6 +77,7 @@ jvm_library( runtime_deps = [ ":analysis", "//libraries/guava:guava_test_lib", + "//platform/lang-api:lang_test_lib", "//java/java-indexing-api:indexing_test_lib", "//platform/analysis-api:analysis_test_lib", "//platform/core-api:core_test_lib", @@ -91,9 +97,13 @@ jvm_library( "//platform/core-impl:core-impl_test_lib", "//platform/editor-ui-api:editor-ui_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/statistics:statistics_test_lib", + "//platform/util:util-ui_test_lib", "//java/java-impl:impl_test_lib", + "//java/java-psi-api:psi_test_lib", "//java/openapi:java_test_lib", "//java/java-analysis-api:analysis_test_lib", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//plugins/kotlin/base/statistics:statistics_test_lib", "//plugins/kotlin/base/plugin:plugin_test_lib", "//plugins/kotlin/base/scripting/scripting.k1:scripting.k1_test_lib", diff --git a/plugins/kotlin/base/fe10/analysis/kotlin.base.fe10.analysis.iml b/plugins/kotlin/base/fe10/analysis/kotlin.base.fe10.analysis.iml index 6b19d4981f73..d9fdcf91b06a 100644 --- a/plugins/kotlin/base/fe10/analysis/kotlin.base.fe10.analysis.iml +++ b/plugins/kotlin/base/fe10/analysis/kotlin.base.fe10.analysis.iml @@ -34,6 +34,7 @@ + @@ -53,9 +54,13 @@ + + + + diff --git a/plugins/kotlin/base/fe10/kdoc/BUILD.bazel b/plugins/kotlin/base/fe10/kdoc/BUILD.bazel index 1ae12924ab69..6bf355723548 100644 --- a/plugins/kotlin/base/fe10/kdoc/BUILD.bazel +++ b/plugins/kotlin/base/fe10/kdoc/BUILD.bazel @@ -30,6 +30,7 @@ jvm_library( "//platform/core-impl", "//platform/projectModel-impl", "//java/java-indexing-impl:indexing-impl", + "//java/java-psi-api:psi", ] ) @@ -51,6 +52,7 @@ jvm_library( "//platform/core-impl:core-impl_test_lib", "//platform/projectModel-impl:projectModel-impl_test_lib", "//java/java-indexing-impl:indexing-impl_test_lib", + "//java/java-psi-api:psi_test_lib", ] ) ### auto-generated section `build kotlin.base.fe10.kdoc` end diff --git a/plugins/kotlin/base/fe10/kdoc/kotlin.base.fe10.kdoc.iml b/plugins/kotlin/base/fe10/kdoc/kotlin.base.fe10.kdoc.iml index a3049bd26314..9958bca2404e 100644 --- a/plugins/kotlin/base/fe10/kdoc/kotlin.base.fe10.kdoc.iml +++ b/plugins/kotlin/base/fe10/kdoc/kotlin.base.fe10.kdoc.iml @@ -36,5 +36,6 @@ + \ No newline at end of file diff --git a/plugins/kotlin/base/fe10/project-structure/BUILD.bazel b/plugins/kotlin/base/fe10/project-structure/BUILD.bazel index c973f4246cb9..f732954b3b07 100644 --- a/plugins/kotlin/base/fe10/project-structure/BUILD.bazel +++ b/plugins/kotlin/base/fe10/project-structure/BUILD.bazel @@ -35,6 +35,7 @@ jvm_library( "//platform/core-api:core", "//platform/editor-ui-api:editor-ui", "//platform/platform-impl:ide-impl", + "//platform/ide-core", "@lib//:kotlinc-kotlin-compiler-fe10", "@lib//:kotlinc-kotlin-jps-common", "@lib//:kotlinc-analysis-api", @@ -56,6 +57,7 @@ jvm_library( "//platform/lang-impl", "//platform/external-system-api:externalSystem", "//java/openapi:java", + "//java/java-psi-api:psi", "//platform/workspace/jps", "//platform/backend/workspace", "//libraries/caffeine", @@ -80,6 +82,7 @@ jvm_library( "//platform/core-api:core_test_lib", "//platform/editor-ui-api:editor-ui_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/indexing-api:indexing_test_lib", "//jps/model-api:model_test_lib", "//jps/model-serialization:model-serialization_test_lib", @@ -97,6 +100,7 @@ jvm_library( "//platform/lang-impl:lang-impl_test_lib", "//platform/external-system-api:externalSystem_test_lib", "//java/openapi:java_test_lib", + "//java/java-psi-api:psi_test_lib", "//platform/workspace/jps:jps_test_lib", "//platform/backend/workspace:workspace_test_lib", "//libraries/caffeine:caffeine_test_lib", diff --git a/plugins/kotlin/base/fe10/project-structure/kotlin.base.fe10.project-structure.iml b/plugins/kotlin/base/fe10/project-structure/kotlin.base.fe10.project-structure.iml index a3097ff9853a..9e5bdd364c98 100644 --- a/plugins/kotlin/base/fe10/project-structure/kotlin.base.fe10.project-structure.iml +++ b/plugins/kotlin/base/fe10/project-structure/kotlin.base.fe10.project-structure.iml @@ -30,6 +30,7 @@ + @@ -51,6 +52,7 @@ + diff --git a/plugins/kotlin/base/fir/analysis-api-platform/BUILD.bazel b/plugins/kotlin/base/fir/analysis-api-platform/BUILD.bazel index 9a143f0178e9..9dca7a42ea25 100644 --- a/plugins/kotlin/base/fir/analysis-api-platform/BUILD.bazel +++ b/plugins/kotlin/base/fir/analysis-api-platform/BUILD.bazel @@ -194,6 +194,8 @@ jvm_library( "//java/openapi:java_test_lib", "//platform/external-system-api:externalSystem", "//platform/external-system-api:externalSystem_test_lib", + "//java/java-syntax:syntax", + "//java/java-syntax:syntax_test_lib", "//plugins/kotlin/project-configuration", "//plugins/kotlin/project-configuration:project-configuration_test_lib", "//plugins/kotlin/base/facet", diff --git a/plugins/kotlin/base/fir/analysis-api-platform/intellij.kotlin.analysis.platform.tests.iml b/plugins/kotlin/base/fir/analysis-api-platform/intellij.kotlin.analysis.platform.tests.iml index e4464033c301..6c4d58816898 100644 --- a/plugins/kotlin/base/fir/analysis-api-platform/intellij.kotlin.analysis.platform.tests.iml +++ b/plugins/kotlin/base/fir/analysis-api-platform/intellij.kotlin.analysis.platform.tests.iml @@ -76,6 +76,7 @@ + diff --git a/plugins/kotlin/base/fir/project-structure/BUILD.bazel b/plugins/kotlin/base/fir/project-structure/BUILD.bazel index b8ce34a5510c..2e3f099937e2 100644 --- a/plugins/kotlin/base/fir/project-structure/BUILD.bazel +++ b/plugins/kotlin/base/fir/project-structure/BUILD.bazel @@ -34,11 +34,13 @@ jvm_library( "//platform/workspace/storage", "//platform/backend/workspace", "//platform/core-api:core", + "//platform/core-impl", "//plugins/kotlin/base/project-structure", "//platform/projectModel-impl", "@lib//:kotlinc-analysis-api", "//platform/workspace/jps", "//java/java-impl:impl", + "//java/java-psi-api:psi", "@lib//:kotlinc-analysis-api-platform-interface", "@lib//:kotlinc-kotlin-compiler-common", "//plugins/kotlin/base/util", @@ -65,10 +67,12 @@ jvm_library( "//platform/workspace/storage:storage_test_lib", "//platform/backend/workspace:workspace_test_lib", "//platform/core-api:core_test_lib", + "//platform/core-impl:core-impl_test_lib", "//plugins/kotlin/base/project-structure:project-structure_test_lib", "//platform/projectModel-impl:projectModel-impl_test_lib", "//platform/workspace/jps:jps_test_lib", "//java/java-impl:impl_test_lib", + "//java/java-psi-api:psi_test_lib", "//plugins/kotlin/base/util:util_test_lib", "//plugins/kotlin/base/facet:facet_test_lib", "//plugins/kotlin/base/platforms:platforms_test_lib", @@ -138,6 +142,8 @@ jvm_library( "//platform/backend/workspace:workspace_test_lib", "//platform/core-api:core", "//platform/core-api:core_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", "//plugins/kotlin/base/project-structure", "//plugins/kotlin/base/project-structure:project-structure_test_lib", "//platform/projectModel-impl", @@ -147,6 +153,7 @@ jvm_library( "@lib//:kotlinc-analysis-api", "//platform/workspace/jps", "//platform/workspace/jps:jps_test_lib", + "//platform/ide-core", "//java/java-impl:impl", "//java/java-impl:impl_test_lib", "@lib//:kotlinc-analysis-api-platform-interface", @@ -181,6 +188,8 @@ jvm_library( "//libraries/fastutil:fastutil_test_lib", "//java/openapi:java", "//java/openapi:java_test_lib", + "//java/java-psi-api:psi", + "//java/java-psi-api:psi_test_lib", "//plugins/kotlin/base/scripting/scripting.k2:kotlin-base-scripting", "//plugins/kotlin/base/scripting/scripting.k2:kotlin-base-scripting_test_lib", "//plugins/kotlin/intellij.kotlin.base.test:base-test", @@ -188,7 +197,10 @@ jvm_library( "//plugins/kotlin/base/plugin:kotlin-base-plugin-tests", "//plugins/kotlin/base/plugin:kotlin-base-plugin-tests_test_lib", ], - runtime_deps = [":kotlin-projectStructure-tests"] + runtime_deps = [ + ":kotlin-projectStructure-tests", + "//platform/ide-core:ide-core_test_lib", + ] ) ### auto-generated section `build intellij.kotlin.projectStructure.tests` end diff --git a/plugins/kotlin/base/fir/project-structure/intellij.kotlin.projectStructure.iml b/plugins/kotlin/base/fir/project-structure/intellij.kotlin.projectStructure.iml index f3d10164f9a8..6ca8f8d199f8 100644 --- a/plugins/kotlin/base/fir/project-structure/intellij.kotlin.projectStructure.iml +++ b/plugins/kotlin/base/fir/project-structure/intellij.kotlin.projectStructure.iml @@ -30,11 +30,13 @@ + + diff --git a/plugins/kotlin/base/fir/project-structure/intellij.kotlin.projectStructure.tests.iml b/plugins/kotlin/base/fir/project-structure/intellij.kotlin.projectStructure.tests.iml index 379bc718d7ed..9ccb15fbf7e9 100644 --- a/plugins/kotlin/base/fir/project-structure/intellij.kotlin.projectStructure.tests.iml +++ b/plugins/kotlin/base/fir/project-structure/intellij.kotlin.projectStructure.tests.iml @@ -35,11 +35,13 @@ + + @@ -60,6 +62,7 @@ + diff --git a/plugins/kotlin/base/fir/scripting/BUILD.bazel b/plugins/kotlin/base/fir/scripting/BUILD.bazel index 644fc039f9c0..d2827ad7468c 100644 --- a/plugins/kotlin/base/fir/scripting/BUILD.bazel +++ b/plugins/kotlin/base/fir/scripting/BUILD.bazel @@ -30,12 +30,14 @@ jvm_library( "//platform/workspace/storage", "//platform/backend/workspace", "//platform/core-api:core", + "//platform/core-impl", "//plugins/kotlin/base/fir/analysis-api-platform:kotlin-analysis-platform", "//plugins/kotlin/base/project-structure", "//platform/projectModel-impl", "@lib//:kotlinc-analysis-api", "//platform/workspace/jps", "//java/java-impl:impl", + "//java/java-psi-api:psi", "@lib//:kotlinc-analysis-api-platform-interface", "@lib//:kotlinc-kotlin-compiler-common", "//plugins/kotlin/base/util", @@ -64,11 +66,13 @@ jvm_library( "//platform/workspace/storage:storage_test_lib", "//platform/backend/workspace:workspace_test_lib", "//platform/core-api:core_test_lib", + "//platform/core-impl:core-impl_test_lib", "//plugins/kotlin/base/fir/analysis-api-platform:kotlin-analysis-platform_test_lib", "//plugins/kotlin/base/project-structure:project-structure_test_lib", "//platform/projectModel-impl:projectModel-impl_test_lib", "//platform/workspace/jps:jps_test_lib", "//java/java-impl:impl_test_lib", + "//java/java-psi-api:psi_test_lib", "//plugins/kotlin/base/util:util_test_lib", "//plugins/kotlin/base/facet:facet_test_lib", "//plugins/kotlin/base/platforms:platforms_test_lib", diff --git a/plugins/kotlin/base/fir/scripting/intellij.kotlin.scripting.iml b/plugins/kotlin/base/fir/scripting/intellij.kotlin.scripting.iml index 0d304975c48b..06edd8e96138 100644 --- a/plugins/kotlin/base/fir/scripting/intellij.kotlin.scripting.iml +++ b/plugins/kotlin/base/fir/scripting/intellij.kotlin.scripting.iml @@ -29,12 +29,14 @@ + + diff --git a/plugins/kotlin/base/indices/BUILD.bazel b/plugins/kotlin/base/indices/BUILD.bazel index 260ff6170c42..384eaaeb5b3d 100644 --- a/plugins/kotlin/base/indices/BUILD.bazel +++ b/plugins/kotlin/base/indices/BUILD.bazel @@ -14,12 +14,14 @@ jvm_library( "//plugins/kotlin/base/psi", "//platform/core-impl", "//platform/indexing-api:indexing", + "//java/java-psi-api:psi", "//java/java-psi-impl:psi-impl", "//java/manifest", "//platform/indexing-impl", "//platform/ide-core", "//platform/analysis-api:analysis", "//java/openapi:java", + "//java/java-frontback-psi-api:frontback-psi", "//plugins/kotlin/base/plugin", ] ) @@ -36,12 +38,14 @@ jvm_library( "//plugins/kotlin/base/psi:psi_test_lib", "//platform/core-impl:core-impl_test_lib", "//platform/indexing-api:indexing_test_lib", + "//java/java-psi-api:psi_test_lib", "//java/java-psi-impl:psi-impl_test_lib", "//java/manifest:manifest_test_lib", "//platform/indexing-impl:indexing-impl_test_lib", "//platform/ide-core:ide-core_test_lib", "//platform/analysis-api:analysis_test_lib", "//java/openapi:java_test_lib", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//plugins/kotlin/base/plugin:plugin_test_lib", ] ) diff --git a/plugins/kotlin/base/indices/intellij.kotlin.base.indices.iml b/plugins/kotlin/base/indices/intellij.kotlin.base.indices.iml index f5e29ce6f17c..d1c7557ec9e0 100644 --- a/plugins/kotlin/base/indices/intellij.kotlin.base.indices.iml +++ b/plugins/kotlin/base/indices/intellij.kotlin.base.indices.iml @@ -14,12 +14,14 @@ + + \ No newline at end of file diff --git a/plugins/kotlin/base/indices/tests/BUILD.bazel b/plugins/kotlin/base/indices/tests/BUILD.bazel index b059961d969f..b6ef1110937d 100644 --- a/plugins/kotlin/base/indices/tests/BUILD.bazel +++ b/plugins/kotlin/base/indices/tests/BUILD.bazel @@ -35,6 +35,7 @@ jvm_library( "//plugins/kotlin/test-framework:test-framework_test_lib", "//platform/testFramework", "//platform/testFramework:testFramework_test_lib", + "//platform/ide-core", "//plugins/kotlin/base/test", "//plugins/kotlin/base/test:test_test_lib", "//java/openapi:java", @@ -46,7 +47,10 @@ jvm_library( "//plugins/kotlin/base/plugin", "//plugins/kotlin/base/plugin:plugin_test_lib", ], - runtime_deps = [":tests"] + runtime_deps = [ + ":tests", + "//platform/ide-core:ide-core_test_lib", + ] ) ### auto-generated section `build intellij.kotlin.base.indices.tests` end diff --git a/plugins/kotlin/base/indices/tests/intellij.kotlin.base.indices.tests.iml b/plugins/kotlin/base/indices/tests/intellij.kotlin.base.indices.tests.iml index eee5bcf90459..3055458d16b7 100644 --- a/plugins/kotlin/base/indices/tests/intellij.kotlin.base.indices.tests.iml +++ b/plugins/kotlin/base/indices/tests/intellij.kotlin.base.indices.tests.iml @@ -16,6 +16,7 @@ + diff --git a/plugins/kotlin/base/plugin/BUILD.bazel b/plugins/kotlin/base/plugin/BUILD.bazel index 0511cd3bb584..ef23b95577bc 100644 --- a/plugins/kotlin/base/plugin/BUILD.bazel +++ b/plugins/kotlin/base/plugin/BUILD.bazel @@ -37,6 +37,7 @@ jvm_library( "//platform/workspace/storage", "//java/openapi:java", "//java/java-impl:impl", + "//java/java-syntax:syntax", "//java/idea-ui:ui", "//aether-dependency-resolver", "//platform/ide-core", @@ -78,6 +79,7 @@ jvm_library( "//platform/workspace/storage:storage_test_lib", "//java/openapi:java_test_lib", "//java/java-impl:impl_test_lib", + "//java/java-syntax:syntax_test_lib", "//java/idea-ui:ui_test_lib", "//aether-dependency-resolver:aether-dependency-resolver_test_lib", "//platform/testFramework", @@ -148,6 +150,8 @@ jvm_library( "@lib//:junit4", "//jps/model-api:model", "//jps/model-api:model_test_lib", + "//jps/model-serialization", + "//jps/model-serialization:model-serialization_test_lib", "//platform/projectModel-api:projectModel", "//platform/projectModel-api:projectModel_test_lib", "//platform/execution", @@ -187,6 +191,10 @@ jvm_library( "//libraries/maven-resolver-provider:maven-resolver-provider_test_lib", "//platform/util", "//platform/util:util_test_lib", + "//platform/util:util-ui", + "//platform/util:util-ui_test_lib", + "//platform/util-ex", + "//platform/util-ex:util-ex_test_lib", "//platform/build-scripts/downloader", "//platform/build-scripts/downloader:downloader_test_lib", "//platform/lang-core", diff --git a/plugins/kotlin/base/plugin/intellij.kotlin.base.plugin.iml b/plugins/kotlin/base/plugin/intellij.kotlin.base.plugin.iml index 022c46bbcb2d..31f05cb33e0b 100644 --- a/plugins/kotlin/base/plugin/intellij.kotlin.base.plugin.iml +++ b/plugins/kotlin/base/plugin/intellij.kotlin.base.plugin.iml @@ -33,6 +33,7 @@ + diff --git a/plugins/kotlin/base/plugin/intellij.kotlin.base.plugin.tests.iml b/plugins/kotlin/base/plugin/intellij.kotlin.base.plugin.tests.iml index 9717c8481918..4b7df9f7d456 100644 --- a/plugins/kotlin/base/plugin/intellij.kotlin.base.plugin.tests.iml +++ b/plugins/kotlin/base/plugin/intellij.kotlin.base.plugin.tests.iml @@ -22,6 +22,7 @@ + @@ -43,6 +44,8 @@ + + diff --git a/plugins/kotlin/base/project-structure/BUILD.bazel b/plugins/kotlin/base/project-structure/BUILD.bazel index 9fd2b0d94042..5816179e8c77 100644 --- a/plugins/kotlin/base/project-structure/BUILD.bazel +++ b/plugins/kotlin/base/project-structure/BUILD.bazel @@ -32,8 +32,11 @@ jvm_library( "@lib//:kotlinc-kotlin-compiler-common", "//platform/analysis-api:analysis", "//platform/core-api:core", + "//platform/core-impl", + "//platform/lang-api:lang", "//platform/editor-ui-api:editor-ui", "//platform/platform-impl:ide-impl", + "//platform/ide-core", "@lib//:kotlinc-kotlin-jps-common", "@lib//:kotlinc-analysis-api", "@lib//:kotlinc-analysis-api-platform-interface", @@ -58,10 +61,12 @@ jvm_library( "//java/openapi:java", "//java/java-psi-impl:psi-impl", "//java/idea-ui:ui", + "//java/java-psi-api:psi", "//platform/workspace/jps", "//platform/backend/workspace", "//libraries/caffeine", "//platform/util/jdom", + "//platform/util:util-ui", "//java/java-impl:impl", "@lib//:kotlinc-analysis-api-impl-base", "//libraries/fastutil", @@ -79,8 +84,11 @@ jvm_library( ":project-structure", "//platform/analysis-api:analysis_test_lib", "//platform/core-api:core_test_lib", + "//platform/core-impl:core-impl_test_lib", + "//platform/lang-api:lang_test_lib", "//platform/editor-ui-api:editor-ui_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/indexing-api:indexing_test_lib", "//jps/model-api:model_test_lib", "//jps/model-serialization:model-serialization_test_lib", @@ -102,10 +110,12 @@ jvm_library( "//java/openapi:java_test_lib", "//java/java-psi-impl:psi-impl_test_lib", "//java/idea-ui:ui_test_lib", + "//java/java-psi-api:psi_test_lib", "//platform/workspace/jps:jps_test_lib", "//platform/backend/workspace:workspace_test_lib", "//libraries/caffeine:caffeine_test_lib", "//platform/util/jdom:jdom_test_lib", + "//platform/util:util-ui_test_lib", "//java/java-impl:impl_test_lib", "@lib//:junit4", "//libraries/fastutil:fastutil_test_lib", diff --git a/plugins/kotlin/base/project-structure/intellij.kotlin.base.projectStructure.iml b/plugins/kotlin/base/project-structure/intellij.kotlin.base.projectStructure.iml index ea010c772e38..f11d0b7e11ee 100644 --- a/plugins/kotlin/base/project-structure/intellij.kotlin.base.projectStructure.iml +++ b/plugins/kotlin/base/project-structure/intellij.kotlin.base.projectStructure.iml @@ -29,8 +29,11 @@ + + + @@ -55,10 +58,12 @@ + + diff --git a/plugins/kotlin/base/scripting/scripting.k1/BUILD.bazel b/plugins/kotlin/base/scripting/scripting.k1/BUILD.bazel index 33128a3aaa4c..e289ac4640af 100644 --- a/plugins/kotlin/base/scripting/scripting.k1/BUILD.bazel +++ b/plugins/kotlin/base/scripting/scripting.k1/BUILD.bazel @@ -35,6 +35,7 @@ jvm_library( "@lib//:kotlinc-kotlin-scripting-common", "@lib//:kotlinc-kotlin-scripting-jvm", "@lib//:kotlinc-kotlin-scripting-compiler-impl", + "//platform/lang-api:lang", "//libraries/kotlinx/coroutines/core", "//platform/indexing-api:indexing", "//jps/model-api:model", @@ -49,9 +50,12 @@ jvm_library( "//plugins/kotlin/base/facet", "//plugins/kotlin/base/project-structure", "//platform/core-ui", + "//platform/core-impl", "//java/java-indexing-api:indexing", "//platform/util/jdom", "//platform/util-class-loader:util-classLoader", + "//platform/util:util-ui", + "//platform/util-ex", "//platform/projectModel-impl", "//platform/analysis-api:analysis", "//platform/editor-ui-api:editor-ui", @@ -62,6 +66,7 @@ jvm_library( "//java/java-indexing-impl:indexing-impl", "//platform/collaboration-tools", "//java/java-impl:impl", + "//java/java-psi-api:psi", "//platform/backend/workspace", "//plugins/kotlin/code-insight/utils", "//platform/workspace/jps", @@ -74,6 +79,7 @@ jvm_library( "//plugins/kotlin/highlighting/highlighting-shared:kotlin-highlighting-shared", "//platform/execution", "//platform/forms_rt:java-guiForms-rt", + "//java/java-frontback-psi-api:frontback-psi", "//plugins/kotlin/preferences", "//plugins/kotlin/base/fe10/project-structure", "//plugins/kotlin/base/plugin", @@ -91,6 +97,7 @@ jvm_library( ":scripting.k1", "//platform/core-api:core_test_lib", "//platform/projectModel-api:projectModel_test_lib", + "//platform/lang-api:lang_test_lib", "//libraries/kotlinx/coroutines/core:core_test_lib", "@lib//:junit5", "//platform/indexing-api:indexing_test_lib", @@ -106,9 +113,12 @@ jvm_library( "//plugins/kotlin/base/facet:facet_test_lib", "//plugins/kotlin/base/project-structure:project-structure_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl:core-impl_test_lib", "//java/java-indexing-api:indexing_test_lib", "//platform/util/jdom:jdom_test_lib", "//platform/util-class-loader:util-classLoader_test_lib", + "//platform/util:util-ui_test_lib", + "//platform/util-ex:util-ex_test_lib", "//platform/projectModel-impl:projectModel-impl_test_lib", "//platform/analysis-api:analysis_test_lib", "//platform/editor-ui-api:editor-ui_test_lib", @@ -119,6 +129,7 @@ jvm_library( "//java/java-indexing-impl:indexing-impl_test_lib", "//platform/collaboration-tools:collaboration-tools_test_lib", "//java/java-impl:impl_test_lib", + "//java/java-psi-api:psi_test_lib", "//platform/backend/workspace:workspace_test_lib", "//plugins/kotlin/code-insight/utils:utils_test_lib", "//platform/workspace/jps:jps_test_lib", @@ -130,6 +141,7 @@ jvm_library( "//plugins/kotlin/highlighting/highlighting-shared:kotlin-highlighting-shared_test_lib", "//platform/execution:execution_test_lib", "//platform/forms_rt:java-guiForms-rt_test_lib", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//plugins/kotlin/preferences:preferences_test_lib", "//plugins/kotlin/base/fe10/project-structure:project-structure_test_lib", "//platform/testFramework", diff --git a/plugins/kotlin/base/scripting/scripting.k1/kotlin.base.scripting.k1.iml b/plugins/kotlin/base/scripting/scripting.k1/kotlin.base.scripting.k1.iml index dfd4fb2ed10e..b1ba9986dbbf 100644 --- a/plugins/kotlin/base/scripting/scripting.k1/kotlin.base.scripting.k1.iml +++ b/plugins/kotlin/base/scripting/scripting.k1/kotlin.base.scripting.k1.iml @@ -36,6 +36,7 @@ + @@ -51,9 +52,12 @@ + + + @@ -64,6 +68,7 @@ + @@ -76,6 +81,7 @@ + diff --git a/plugins/kotlin/base/scripting/scripting.k2/BUILD.bazel b/plugins/kotlin/base/scripting/scripting.k2/BUILD.bazel index a3f94ba608d7..a927c4f17c1d 100644 --- a/plugins/kotlin/base/scripting/scripting.k2/BUILD.bazel +++ b/plugins/kotlin/base/scripting/scripting.k2/BUILD.bazel @@ -36,8 +36,10 @@ jvm_library( "//plugins/kotlin/base/resources:kotlin-base-resources", "//plugins/kotlin/base/platforms", "//plugins/kotlin/base/facet", + "//platform/lang-api:lang", "//plugins/kotlin/base/project-structure", "//platform/core-ui", + "//platform/core-impl", "//platform/util/jdom", "//platform/util-class-loader:util-classLoader", "//platform/projectModel-impl", @@ -49,13 +51,16 @@ jvm_library( "//java/openapi:java", "//java/java-indexing-impl:indexing-impl", "//java/java-impl:impl", + "//java/java-psi-api:psi", "//platform/backend/workspace", "//plugins/kotlin/code-insight/utils", "//platform/workspace/jps", "//platform/external-system-impl:externalSystem-impl", "//java/idea-ui:ui", + "//java/java-frontback-psi-api:frontback-psi", "@lib//:kotlinc-kotlin-scripting-dependencies", "//platform/observable", + "//platform/progress/shared:ide-progress", "//jps/model-api:model", "//platform/refactoring", "//libraries/guava", @@ -66,6 +71,7 @@ jvm_library( "//platform/execution", "//plugins/kotlin/preferences", "//platform/util/zip", + "//platform/util:util-ui", ] ) @@ -89,8 +95,10 @@ jvm_library( "//plugins/kotlin/base/resources:kotlin-base-resources_test_lib", "//plugins/kotlin/base/platforms:platforms_test_lib", "//plugins/kotlin/base/facet:facet_test_lib", + "//platform/lang-api:lang_test_lib", "//plugins/kotlin/base/project-structure:project-structure_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl:core-impl_test_lib", "//platform/util/jdom:jdom_test_lib", "//platform/util-class-loader:util-classLoader_test_lib", "//platform/projectModel-impl:projectModel-impl_test_lib", @@ -102,12 +110,15 @@ jvm_library( "//java/openapi:java_test_lib", "//java/java-indexing-impl:indexing-impl_test_lib", "//java/java-impl:impl_test_lib", + "//java/java-psi-api:psi_test_lib", "//platform/backend/workspace:workspace_test_lib", "//plugins/kotlin/code-insight/utils:utils_test_lib", "//platform/workspace/jps:jps_test_lib", "//platform/external-system-impl:externalSystem-impl_test_lib", "//java/idea-ui:ui_test_lib", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//platform/observable:observable_test_lib", + "//platform/progress/shared:ide-progress_test_lib", "//jps/model-api:model_test_lib", "//platform/refactoring:refactoring_test_lib", "//libraries/guava:guava_test_lib", @@ -118,6 +129,7 @@ jvm_library( "//platform/execution:execution_test_lib", "//plugins/kotlin/preferences:preferences_test_lib", "//platform/util/zip:zip_test_lib", + "//platform/util:util-ui_test_lib", ] ) ### auto-generated section `build intellij.kotlin.base.scripting` end diff --git a/plugins/kotlin/base/scripting/scripting.k2/intellij.kotlin.base.scripting.iml b/plugins/kotlin/base/scripting/scripting.k2/intellij.kotlin.base.scripting.iml index 898b90d6ae8c..81c1d01038c4 100644 --- a/plugins/kotlin/base/scripting/scripting.k2/intellij.kotlin.base.scripting.iml +++ b/plugins/kotlin/base/scripting/scripting.k2/intellij.kotlin.base.scripting.iml @@ -31,8 +31,10 @@ + + @@ -44,13 +46,16 @@ + + + @@ -61,5 +66,6 @@ + \ No newline at end of file diff --git a/plugins/kotlin/base/scripting/scripting.shared/BUILD.bazel b/plugins/kotlin/base/scripting/scripting.shared/BUILD.bazel index ce614c597a4e..fd91e9f41d11 100644 --- a/plugins/kotlin/base/scripting/scripting.shared/BUILD.bazel +++ b/plugins/kotlin/base/scripting/scripting.shared/BUILD.bazel @@ -21,6 +21,7 @@ jvm_library( "@lib//:kotlinc-kotlin-scripting-jvm", "@lib//:kotlinc-kotlin-scripting-compiler-impl", "//platform/core-api:core", + "//platform/core-impl", "@lib//:kotlin-stdlib", "//plugins/kotlin/base/facet", "//platform/util", @@ -57,6 +58,7 @@ jvm_library( ":scripting.shared", "//platform/projectModel-api:projectModel_test_lib", "//platform/core-api:core_test_lib", + "//platform/core-impl:core-impl_test_lib", "//plugins/kotlin/base/facet:facet_test_lib", "//platform/util:util_test_lib", "//platform/lang-impl:lang-impl_test_lib", diff --git a/plugins/kotlin/base/scripting/scripting.shared/intellij.kotlin.base.scripting.shared.iml b/plugins/kotlin/base/scripting/scripting.shared/intellij.kotlin.base.scripting.shared.iml index c619d67c91be..ff380d51515a 100644 --- a/plugins/kotlin/base/scripting/scripting.shared/intellij.kotlin.base.scripting.shared.iml +++ b/plugins/kotlin/base/scripting/scripting.shared/intellij.kotlin.base.scripting.shared.iml @@ -15,6 +15,7 @@ + diff --git a/plugins/kotlin/base/statistics/BUILD.bazel b/plugins/kotlin/base/statistics/BUILD.bazel index de42f747b78f..27ed2d02b766 100644 --- a/plugins/kotlin/base/statistics/BUILD.bazel +++ b/plugins/kotlin/base/statistics/BUILD.bazel @@ -10,6 +10,7 @@ jvm_library( "@lib//:kotlin-stdlib", "//platform/core-api:core", "//platform/platform-impl:ide-impl", + "//platform/ide-core", "@lib//:kotlinc-kotlin-compiler-common", "@lib//:kotlinc-kotlin-jps-common", "//platform/indexing-api:indexing", @@ -22,7 +23,9 @@ jvm_library( "//platform/core-impl", "//java/java-impl:impl", "//platform/external-system-api:externalSystem", + "//platform/statistics", "//plugins/kotlin/base/compiler-configuration", + "//java/java-psi-api:psi", "//libraries/kotlinx/serialization/core", "//libraries/kotlinx/serialization/json", ] @@ -37,6 +40,7 @@ jvm_library( ":statistics", "//platform/core-api:core_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/indexing-api:indexing_test_lib", "//jps/model-api:model_test_lib", "//platform/projectModel-api:projectModel_test_lib", @@ -47,7 +51,9 @@ jvm_library( "//platform/core-impl:core-impl_test_lib", "//java/java-impl:impl_test_lib", "//platform/external-system-api:externalSystem_test_lib", + "//platform/statistics:statistics_test_lib", "//plugins/kotlin/base/compiler-configuration:compiler-configuration_test_lib", + "//java/java-psi-api:psi_test_lib", "//libraries/kotlinx/serialization/core:core_test_lib", "//libraries/kotlinx/serialization/json:json_test_lib", ] diff --git a/plugins/kotlin/base/statistics/intellij.kotlin.base.statistics.iml b/plugins/kotlin/base/statistics/intellij.kotlin.base.statistics.iml index 5176e8c290b6..cff52808c512 100644 --- a/plugins/kotlin/base/statistics/intellij.kotlin.base.statistics.iml +++ b/plugins/kotlin/base/statistics/intellij.kotlin.base.statistics.iml @@ -32,6 +32,7 @@ + @@ -44,7 +45,9 @@ + + diff --git a/plugins/kotlin/base/test/BUILD.bazel b/plugins/kotlin/base/test/BUILD.bazel index 24189d4acdc4..5d2529d1243c 100644 --- a/plugins/kotlin/base/test/BUILD.bazel +++ b/plugins/kotlin/base/test/BUILD.bazel @@ -25,14 +25,24 @@ jvm_library( "//libraries/guava:guava_test_lib", "//platform/analysis-api:analysis", "//platform/analysis-api:analysis_test_lib", + "//java/java-syntax:syntax", + "//java/java-syntax:syntax_test_lib", + "//java/java-psi-api:psi", + "//java/java-psi-api:psi_test_lib", "//platform/core-api:core", "//platform/core-api:core_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", "//jps/model-api:model", "//jps/model-api:model_test_lib", + "//platform/lang-api:lang", + "//platform/lang-api:lang_test_lib", "//platform/projectModel-api:projectModel", "//platform/projectModel-api:projectModel_test_lib", "//platform/testFramework", "//platform/testFramework:testFramework_test_lib", + "//platform/util:util-ui", + "//platform/util:util-ui_test_lib", "//plugins/kotlin/base/frontend-agnostic", "//plugins/kotlin/base/frontend-agnostic:frontend-agnostic_test_lib", "//plugins/kotlin/base/plugin", diff --git a/plugins/kotlin/base/test/kotlin.base.test.iml b/plugins/kotlin/base/test/kotlin.base.test.iml index de947f484955..66d60b0c5c84 100644 --- a/plugins/kotlin/base/test/kotlin.base.test.iml +++ b/plugins/kotlin/base/test/kotlin.base.test.iml @@ -15,10 +15,15 @@ + + + + + diff --git a/plugins/kotlin/base/util/BUILD.bazel b/plugins/kotlin/base/util/BUILD.bazel index 7cb71df65261..ce5064ab9155 100644 --- a/plugins/kotlin/base/util/BUILD.bazel +++ b/plugins/kotlin/base/util/BUILD.bazel @@ -33,17 +33,21 @@ jvm_library( "//plugins/kotlin/base/frontend-agnostic", "//platform/platform-impl:ide-impl", "//platform/ide-core-impl", + "//platform/ide-core", "//platform/external-system-api:externalSystem", "//platform/lang-core", "//platform/indexing-api:indexing", + "//java/java-psi-api:psi", "//java/java-psi-impl:psi-impl", "//java/java-analysis-impl:analysis-impl", "//platform/workspace/jps", "//platform/backend/workspace", "//libraries/gson", "//platform/core-ui", + "//platform/core-impl", "//plugins/kotlin/base/resources:kotlin-base-resources", "@lib//:kotlinc-analysis-api", + "//platform/util:util-ui", ] ) @@ -64,9 +68,11 @@ jvm_library( "//plugins/kotlin/base/frontend-agnostic:frontend-agnostic_test_lib", "//platform/platform-impl:ide-impl_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/external-system-api:externalSystem_test_lib", "//platform/lang-core:lang-core_test_lib", "//platform/indexing-api:indexing_test_lib", + "//java/java-psi-api:psi_test_lib", "//java/java-psi-impl:psi-impl_test_lib", "@lib//:kotlin-test-junit", "@lib//:kotlin-test", @@ -76,7 +82,9 @@ jvm_library( "//platform/backend/workspace:workspace_test_lib", "//libraries/gson:gson_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl:core-impl_test_lib", "//plugins/kotlin/base/resources:kotlin-base-resources_test_lib", + "//platform/util:util-ui_test_lib", ] ) ### auto-generated section `build intellij.kotlin.base.util` end diff --git a/plugins/kotlin/base/util/intellij.kotlin.base.util.iml b/plugins/kotlin/base/util/intellij.kotlin.base.util.iml index 5f1afb39df6b..98a350bf1e39 100644 --- a/plugins/kotlin/base/util/intellij.kotlin.base.util.iml +++ b/plugins/kotlin/base/util/intellij.kotlin.base.util.iml @@ -35,9 +35,11 @@ + + @@ -47,7 +49,9 @@ + + \ No newline at end of file diff --git a/plugins/kotlin/code-insight/fixes-k2/BUILD.bazel b/plugins/kotlin/code-insight/fixes-k2/BUILD.bazel index 2b8a00bcf41e..938b41a31461 100644 --- a/plugins/kotlin/code-insight/fixes-k2/BUILD.bazel +++ b/plugins/kotlin/code-insight/fixes-k2/BUILD.bazel @@ -47,6 +47,7 @@ jvm_library( "//java/java-analysis-impl:analysis-impl", "//platform/projectModel-api:projectModel", "//platform/refactoring", + "//platform/ide-core", "//plugins/kotlin/base/analysis-api/analysis-api-utils:kotlin-base-analysis-utils", "//plugins/kotlin/base/code-insight", "//plugins/kotlin/code-insight/utils", @@ -67,6 +68,7 @@ jvm_library( "//plugins/kotlin/base/kdoc", "//plugins/kotlin/code-insight/kotlin.code-insight.k2:kotlin-codeInsight", "//java/java-impl:impl", + "//java/java-frontback-psi-api:frontback-psi", "//plugins/kotlin/kotlin.searching", "//plugins/kotlin/project-configuration", "//plugins/kotlin/base/plugin", @@ -94,6 +96,7 @@ jvm_library( "//java/java-analysis-impl:analysis-impl_test_lib", "//platform/projectModel-api:projectModel_test_lib", "//platform/refactoring:refactoring_test_lib", + "//platform/ide-core:ide-core_test_lib", "//plugins/kotlin/base/analysis-api/analysis-api-utils:kotlin-base-analysis-utils_test_lib", "//plugins/kotlin/base/code-insight:code-insight_test_lib", "//plugins/kotlin/code-insight/utils:utils_test_lib", @@ -114,6 +117,7 @@ jvm_library( "//plugins/kotlin/base/kdoc:kdoc_test_lib", "//plugins/kotlin/code-insight/kotlin.code-insight.k2:kotlin-codeInsight_test_lib", "//java/java-impl:impl_test_lib", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//plugins/kotlin/kotlin.searching:kotlin.searching_test_lib", "//plugins/kotlin/project-configuration:project-configuration_test_lib", "//plugins/kotlin/base/plugin:plugin_test_lib", diff --git a/plugins/kotlin/code-insight/fixes-k2/intellij.kotlin.codeInsight.fixes.iml b/plugins/kotlin/code-insight/fixes-k2/intellij.kotlin.codeInsight.fixes.iml index da0d3d93b21f..23a0865bd0fa 100644 --- a/plugins/kotlin/code-insight/fixes-k2/intellij.kotlin.codeInsight.fixes.iml +++ b/plugins/kotlin/code-insight/fixes-k2/intellij.kotlin.codeInsight.fixes.iml @@ -43,6 +43,7 @@ + @@ -63,6 +64,7 @@ + diff --git a/plugins/kotlin/code-insight/fixes-k2/tests/BUILD.bazel b/plugins/kotlin/code-insight/fixes-k2/tests/BUILD.bazel index d8ac9b79baf2..e8c20c9cb3d1 100644 --- a/plugins/kotlin/code-insight/fixes-k2/tests/BUILD.bazel +++ b/plugins/kotlin/code-insight/fixes-k2/tests/BUILD.bazel @@ -17,6 +17,8 @@ jvm_library( "@lib//:kotlin-stdlib", "//java/testFramework", "//java/testFramework:testFramework_test_lib", + "//java/java-psi-api:psi", + "//java/java-psi-api:psi_test_lib", "@lib//:kotlinc-kotlin-compiler-tests", "@lib//:kotlinc-kotlin-compiler-common", "//platform/analysis-api:analysis", @@ -27,6 +29,10 @@ jvm_library( "//platform/lang-core:lang-core_test_lib", "//platform/core-ui", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", + "//platform/editor-ui-api:editor-ui", + "//platform/editor-ui-api:editor-ui_test_lib", "//plugins/kotlin/plugin/k2", "//plugins/kotlin/plugin/k2:k2_test_lib", "//plugins/kotlin/base/test", diff --git a/plugins/kotlin/code-insight/fixes-k2/tests/intellij.kotlin.codeInsight.fixes.tests.iml b/plugins/kotlin/code-insight/fixes-k2/tests/intellij.kotlin.codeInsight.fixes.tests.iml index 8adbab736d64..36007f4df43c 100644 --- a/plugins/kotlin/code-insight/fixes-k2/tests/intellij.kotlin.codeInsight.fixes.tests.iml +++ b/plugins/kotlin/code-insight/fixes-k2/tests/intellij.kotlin.codeInsight.fixes.tests.iml @@ -9,12 +9,15 @@ + + + diff --git a/plugins/kotlin/code-insight/impl-base/BUILD.bazel b/plugins/kotlin/code-insight/impl-base/BUILD.bazel index 9f3e94dce710..fcc8203fbcb8 100644 --- a/plugins/kotlin/code-insight/impl-base/BUILD.bazel +++ b/plugins/kotlin/code-insight/impl-base/BUILD.bazel @@ -52,6 +52,7 @@ jvm_library( "//plugins/kotlin/base/code-insight", "//plugins/kotlin/base/analysis-api/analysis-api-utils:kotlin-base-analysis-utils", "//platform/platform-impl:ide-impl", + "//platform/ide-core", "//plugins/kotlin/base/project-structure", "//plugins/kotlin/formatter", "//plugins/kotlin/code-insight/api", @@ -67,15 +68,19 @@ jvm_library( "//plugins/kotlin/base/indices", "//java/execution/impl", "//platform/util/jdom", + "//platform/util:util-ui", "//platform/vcs-api:vcs", "//plugins/kotlin/base/analysis", "//java/openapi:java", + "//java/java-frontback-psi-api:frontback-psi", "//plugins/kotlin/refactorings/kotlin.refactorings.common:kotlin-refactorings-common", "//platform/core-ui", + "//platform/core-impl", "//plugins/kotlin/base/facet", "//plugins/kotlin/base/plugin", "//plugins/kotlin/project-configuration", "//libraries/fastutil", + "//platform/lang-api:lang", ] ) @@ -104,6 +109,7 @@ jvm_library( "//plugins/kotlin/base/code-insight:code-insight_test_lib", "//plugins/kotlin/base/analysis-api/analysis-api-utils:kotlin-base-analysis-utils_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//plugins/kotlin/base/project-structure:project-structure_test_lib", "//plugins/kotlin/formatter:formatter_test_lib", "//plugins/kotlin/code-insight/api:api_test_lib", @@ -119,15 +125,19 @@ jvm_library( "//plugins/kotlin/base/indices:indices_test_lib", "//java/execution/impl:impl_test_lib", "//platform/util/jdom:jdom_test_lib", + "//platform/util:util-ui_test_lib", "//platform/vcs-api:vcs_test_lib", "//plugins/kotlin/base/analysis:analysis_test_lib", "//java/openapi:java_test_lib", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//plugins/kotlin/refactorings/kotlin.refactorings.common:kotlin-refactorings-common_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl:core-impl_test_lib", "//plugins/kotlin/base/facet:facet_test_lib", "//plugins/kotlin/base/plugin:plugin_test_lib", "//plugins/kotlin/project-configuration:project-configuration_test_lib", "//libraries/fastutil:fastutil_test_lib", + "//platform/lang-api:lang_test_lib", ] ) ### auto-generated section `build intellij.kotlin.codeInsight.shared` end diff --git a/plugins/kotlin/code-insight/impl-base/intellij.kotlin.codeInsight.shared.iml b/plugins/kotlin/code-insight/impl-base/intellij.kotlin.codeInsight.shared.iml index 40e3b92069b3..20368bdae115 100644 --- a/plugins/kotlin/code-insight/impl-base/intellij.kotlin.codeInsight.shared.iml +++ b/plugins/kotlin/code-insight/impl-base/intellij.kotlin.codeInsight.shared.iml @@ -48,6 +48,7 @@ + @@ -63,14 +64,18 @@ + + + + \ No newline at end of file diff --git a/plugins/kotlin/code-insight/inspections-k2/BUILD.bazel b/plugins/kotlin/code-insight/inspections-k2/BUILD.bazel index d6f9bfdb0a3c..ca619e6a5113 100644 --- a/plugins/kotlin/code-insight/inspections-k2/BUILD.bazel +++ b/plugins/kotlin/code-insight/inspections-k2/BUILD.bazel @@ -37,6 +37,7 @@ jvm_library( "//platform/analysis-api:analysis", "//platform/core-api:core", "//platform/indexing-api:indexing", + "//platform/lang-api:lang", "//platform/projectModel-api:projectModel", "//platform/refactoring", "//plugins/kotlin/base/util", @@ -66,8 +67,10 @@ jvm_library( "//plugins/kotlin/refactorings/kotlin.refactorings.common:kotlin-refactorings-common", "//plugins/kotlin/refactorings/kotlin.refactorings.k2:kotlin-refactorings", "//platform/util/jdom", + "//platform/util:util-ui", "//plugins/kotlin/refactorings/kotlin.refactorings.move.k2:kotlin-refactorings-move", "//java/openapi:java", + "//java/java-frontback-psi-api:frontback-psi", "//plugins/kotlin/code-insight/kotlin.code-insight.k2:kotlin-codeInsight", "//plugins/kotlin/base/plugin", "//plugins/kotlin/code-insight/override-implement-k2:kotlin-codeInsight-overrideImplement", @@ -76,7 +79,9 @@ jvm_library( "//platform/external-system-api:externalSystem", "//plugins/kotlin/formatter/minimal", "//platform/ide-core", + "//platform/progress/shared:ide-progress", "//platform/core-ui", + "//platform/core-impl", "//plugins/kotlin/base/kdoc", "//platform/code-style-api:codeStyle", "//plugins/kotlin/base/statistics", @@ -95,6 +100,7 @@ jvm_library( "//platform/analysis-api:analysis_test_lib", "//platform/core-api:core_test_lib", "//platform/indexing-api:indexing_test_lib", + "//platform/lang-api:lang_test_lib", "//platform/projectModel-api:projectModel_test_lib", "//platform/refactoring:refactoring_test_lib", "//plugins/kotlin/base/util:util_test_lib", @@ -124,8 +130,10 @@ jvm_library( "//plugins/kotlin/refactorings/kotlin.refactorings.common:kotlin-refactorings-common_test_lib", "//plugins/kotlin/refactorings/kotlin.refactorings.k2:kotlin-refactorings_test_lib", "//platform/util/jdom:jdom_test_lib", + "//platform/util:util-ui_test_lib", "//plugins/kotlin/refactorings/kotlin.refactorings.move.k2:kotlin-refactorings-move_test_lib", "//java/openapi:java_test_lib", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//plugins/kotlin/code-insight/kotlin.code-insight.k2:kotlin-codeInsight_test_lib", "//plugins/kotlin/base/plugin:plugin_test_lib", "//plugins/kotlin/code-insight/override-implement-k2:kotlin-codeInsight-overrideImplement_test_lib", @@ -133,7 +141,9 @@ jvm_library( "//platform/external-system-api:externalSystem_test_lib", "//plugins/kotlin/formatter/minimal:minimal_test_lib", "//platform/ide-core:ide-core_test_lib", + "//platform/progress/shared:ide-progress_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl:core-impl_test_lib", "//plugins/kotlin/base/kdoc:kdoc_test_lib", "//platform/code-style-api:codeStyle_test_lib", "//plugins/kotlin/base/statistics:statistics_test_lib", diff --git a/plugins/kotlin/code-insight/inspections-k2/intellij.kotlin.codeInsight.inspections.iml b/plugins/kotlin/code-insight/inspections-k2/intellij.kotlin.codeInsight.inspections.iml index 9469f27196f2..7faa2812d349 100644 --- a/plugins/kotlin/code-insight/inspections-k2/intellij.kotlin.codeInsight.inspections.iml +++ b/plugins/kotlin/code-insight/inspections-k2/intellij.kotlin.codeInsight.inspections.iml @@ -33,6 +33,7 @@ + @@ -62,8 +63,10 @@ + + @@ -72,7 +75,9 @@ + + diff --git a/plugins/kotlin/code-insight/inspections-k2/tests/BUILD.bazel b/plugins/kotlin/code-insight/inspections-k2/tests/BUILD.bazel index 0666663c46d7..9200021e9f0f 100644 --- a/plugins/kotlin/code-insight/inspections-k2/tests/BUILD.bazel +++ b/plugins/kotlin/code-insight/inspections-k2/tests/BUILD.bazel @@ -75,6 +75,8 @@ jvm_library( "//plugins/kotlin/test-framework:test-framework_test_lib", "//platform/util/jdom", "//platform/util/jdom:jdom_test_lib", + "//platform/ide-core", + "//platform/progress/shared:ide-progress", "//plugins/kotlin/base/project-structure", "//plugins/kotlin/base/project-structure:project-structure_test_lib", "@lib//:kotlinc-kotlin-scripting-common", @@ -90,7 +92,11 @@ jvm_library( "//plugins/kotlin/fir/testFramework", "//plugins/kotlin/fir/testFramework:testFramework_test_lib", ], - runtime_deps = [":tests"] + runtime_deps = [ + ":tests", + "//platform/ide-core:ide-core_test_lib", + "//platform/progress/shared:ide-progress_test_lib", + ] ) ### auto-generated section `build intellij.kotlin.codeInsight.inspections.tests` end diff --git a/plugins/kotlin/code-insight/inspections-k2/tests/intellij.kotlin.codeInsight.inspections.tests.iml b/plugins/kotlin/code-insight/inspections-k2/tests/intellij.kotlin.codeInsight.inspections.tests.iml index 875a8f16b79e..46097aedf569 100644 --- a/plugins/kotlin/code-insight/inspections-k2/tests/intellij.kotlin.codeInsight.inspections.tests.iml +++ b/plugins/kotlin/code-insight/inspections-k2/tests/intellij.kotlin.codeInsight.inspections.tests.iml @@ -39,6 +39,8 @@ + + diff --git a/plugins/kotlin/code-insight/inspections-shared/BUILD.bazel b/plugins/kotlin/code-insight/inspections-shared/BUILD.bazel index a15ae67042e3..4f380b836092 100644 --- a/plugins/kotlin/code-insight/inspections-shared/BUILD.bazel +++ b/plugins/kotlin/code-insight/inspections-shared/BUILD.bazel @@ -55,12 +55,14 @@ jvm_library( "//java/java-analysis-impl:analysis-impl", "//platform/lang-impl", "//platform/util/jdom", + "//platform/util:util-ui", "//platform/platform-impl:ide-impl", "//plugins/kotlin/refactorings/kotlin.refactorings.common:kotlin-refactorings-common", "//java/java-impl:impl", "//plugins/kotlin/project-configuration", "//plugins/kotlin/base/facet", "//platform/core-api:core", + "//platform/statistics", "//plugins/kotlin/base/analysis", "//plugins/kotlin/base/indices", "//plugins/kotlin/base/analysis-api/analysis-api-utils:kotlin-base-analysis-utils", @@ -101,12 +103,14 @@ jvm_library( "//java/java-analysis-impl:analysis-impl_test_lib", "//platform/lang-impl:lang-impl_test_lib", "//platform/util/jdom:jdom_test_lib", + "//platform/util:util-ui_test_lib", "//platform/platform-impl:ide-impl_test_lib", "//plugins/kotlin/refactorings/kotlin.refactorings.common:kotlin-refactorings-common_test_lib", "//java/java-impl:impl_test_lib", "//plugins/kotlin/project-configuration:project-configuration_test_lib", "//plugins/kotlin/base/facet:facet_test_lib", "//platform/core-api:core_test_lib", + "//platform/statistics:statistics_test_lib", "//plugins/kotlin/base/analysis:analysis_test_lib", "//plugins/kotlin/base/indices:indices_test_lib", "//plugins/kotlin/base/analysis-api/analysis-api-utils:kotlin-base-analysis-utils_test_lib", diff --git a/plugins/kotlin/code-insight/inspections-shared/kotlin.code-insight.inspections.shared.iml b/plugins/kotlin/code-insight/inspections-shared/kotlin.code-insight.inspections.shared.iml index 99ff7cbc603e..ece1aaca6f49 100644 --- a/plugins/kotlin/code-insight/inspections-shared/kotlin.code-insight.inspections.shared.iml +++ b/plugins/kotlin/code-insight/inspections-shared/kotlin.code-insight.inspections.shared.iml @@ -51,12 +51,14 @@ + + diff --git a/plugins/kotlin/code-insight/intentions-k2/BUILD.bazel b/plugins/kotlin/code-insight/intentions-k2/BUILD.bazel index 0cf5d0ed6d56..37f9a56916f7 100644 --- a/plugins/kotlin/code-insight/intentions-k2/BUILD.bazel +++ b/plugins/kotlin/code-insight/intentions-k2/BUILD.bazel @@ -41,6 +41,8 @@ jvm_library( "//plugins/kotlin/base/util", "//plugins/kotlin/base/psi", "//platform/platform-impl:ide-impl", + "//platform/ide-core", + "//platform/progress/shared:ide-progress", "//platform/editor-ui-api:editor-ui", "//platform/lang-api:lang", "//platform/core-impl", @@ -56,6 +58,7 @@ jvm_library( "//plugins/kotlin/refactorings/kotlin.refactorings.common:kotlin-refactorings-common", "//platform/lang-impl", "//platform/core-ui", + "//platform/util:util-ui", "//java/java-impl:impl", "//java/execution/impl", "//plugins/kotlin/refactorings/kotlin.refactorings.k2:kotlin-refactorings", @@ -89,6 +92,8 @@ jvm_library( "//plugins/kotlin/base/util:util_test_lib", "//plugins/kotlin/base/psi:psi_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", + "//platform/progress/shared:ide-progress_test_lib", "//platform/editor-ui-api:editor-ui_test_lib", "//platform/lang-api:lang_test_lib", "//platform/core-impl:core-impl_test_lib", @@ -103,6 +108,7 @@ jvm_library( "//plugins/kotlin/refactorings/kotlin.refactorings.common:kotlin-refactorings-common_test_lib", "//platform/lang-impl:lang-impl_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/util:util-ui_test_lib", "//java/java-impl:impl_test_lib", "//java/execution/impl:impl_test_lib", "//plugins/kotlin/refactorings/kotlin.refactorings.k2:kotlin-refactorings_test_lib", diff --git a/plugins/kotlin/code-insight/intentions-k2/intellij.kotlin.codeInsight.intentions.iml b/plugins/kotlin/code-insight/intentions-k2/intellij.kotlin.codeInsight.intentions.iml index d6e45f60fb1f..e5b399b8b31c 100644 --- a/plugins/kotlin/code-insight/intentions-k2/intellij.kotlin.codeInsight.intentions.iml +++ b/plugins/kotlin/code-insight/intentions-k2/intellij.kotlin.codeInsight.intentions.iml @@ -37,6 +37,8 @@ + + @@ -52,6 +54,7 @@ + diff --git a/plugins/kotlin/code-insight/kotlin.code-insight.k2/BUILD.bazel b/plugins/kotlin/code-insight/kotlin.code-insight.k2/BUILD.bazel index cf767b48077a..7a4333b7a68e 100644 --- a/plugins/kotlin/code-insight/kotlin.code-insight.k2/BUILD.bazel +++ b/plugins/kotlin/code-insight/kotlin.code-insight.k2/BUILD.bazel @@ -60,6 +60,7 @@ jvm_library( "//platform/lang-core", "//platform/platform-impl:ide-impl", "//platform/core-ui", + "//platform/core-impl", "//platform/util:util-ui", "//java/java-psi-api:psi", "//java/java-psi-impl:psi-impl", @@ -76,8 +77,11 @@ jvm_library( "//plugins/kotlin/formatter/minimal", "//plugins/kotlin/refactorings/kotlin.refactorings.k2:kotlin-refactorings", "//java/openapi:java", + "//java/java-frontback-psi-api:frontback-psi", "//plugins/kotlin/kotlin.searching/base", "//platform/ide-core-impl", + "//platform/ide-core", + "//platform/progress/shared:ide-progress", "//plugins/kotlin/base/indices", "//plugins/kotlin/kotlin.ide", "//libraries/velocity", @@ -90,6 +94,8 @@ jvm_library( "//plugins/kotlin/base/statistics", "//platform/editor-ui-ex:editor-ex", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", + "//platform/lang-api:lang", + "//platform/statistics", ":plugins_kotlin_code-insight_descriptions_provided", ] ) @@ -126,6 +132,7 @@ jvm_library( "//platform/lang-core:lang-core_test_lib", "//platform/platform-impl:ide-impl_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl:core-impl_test_lib", "//platform/util:util-ui_test_lib", "//java/java-psi-api:psi_test_lib", "//java/java-psi-impl:psi-impl_test_lib", @@ -140,8 +147,11 @@ jvm_library( "//plugins/kotlin/formatter/minimal:minimal_test_lib", "//plugins/kotlin/refactorings/kotlin.refactorings.k2:kotlin-refactorings_test_lib", "//java/openapi:java_test_lib", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//plugins/kotlin/kotlin.searching/base:base_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", + "//platform/progress/shared:ide-progress_test_lib", "//plugins/kotlin/base/indices:indices_test_lib", "//plugins/kotlin/kotlin.ide:kotlin.ide_test_lib", "//libraries/velocity:velocity_test_lib", @@ -156,6 +166,8 @@ jvm_library( "//plugins/kotlin/code-insight/descriptions", "//plugins/kotlin/code-insight/descriptions:descriptions_test_lib", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", + "//platform/lang-api:lang_test_lib", + "//platform/statistics:statistics_test_lib", ] ) ### auto-generated section `build intellij.kotlin.codeInsight` end @@ -252,9 +264,13 @@ jvm_library( "//platform/lang-impl:lang-impl_test_lib", "//platform/lang-core", "//platform/lang-core:lang-core_test_lib", + "//platform/lang-api:lang", + "//platform/lang-api:lang_test_lib", "//platform/platform-impl:ide-impl", "//platform/core-ui", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", "//platform/util:util-ui", "//platform/util:util-ui_test_lib", "//java/java-psi-api:psi", @@ -288,6 +304,7 @@ jvm_library( "//plugins/kotlin/kotlin.searching/base", "//plugins/kotlin/kotlin.searching/base:base_test_lib", "//platform/ide-core-impl", + "//platform/ide-core", "//platform/testFramework", "//platform/testFramework:testFramework_test_lib", "//plugins/kotlin/base/indices", @@ -333,6 +350,7 @@ jvm_library( ":kotlin-codeInsight-tests", "//platform/platform-impl:ide-impl_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", ] ) ### auto-generated section `build intellij.kotlin.codeInsight.tests` end diff --git a/plugins/kotlin/code-insight/kotlin.code-insight.k2/intellij.kotlin.codeInsight.iml b/plugins/kotlin/code-insight/kotlin.code-insight.k2/intellij.kotlin.codeInsight.iml index 586f64fe0e98..6c9f508e7fcd 100644 --- a/plugins/kotlin/code-insight/kotlin.code-insight.k2/intellij.kotlin.codeInsight.iml +++ b/plugins/kotlin/code-insight/kotlin.code-insight.k2/intellij.kotlin.codeInsight.iml @@ -52,6 +52,7 @@ + @@ -68,8 +69,11 @@ + + + @@ -83,5 +87,7 @@ + + \ No newline at end of file diff --git a/plugins/kotlin/code-insight/kotlin.code-insight.k2/intellij.kotlin.codeInsight.tests.iml b/plugins/kotlin/code-insight/kotlin.code-insight.k2/intellij.kotlin.codeInsight.tests.iml index 7ac8e7cd097f..a90920683485 100644 --- a/plugins/kotlin/code-insight/kotlin.code-insight.k2/intellij.kotlin.codeInsight.tests.iml +++ b/plugins/kotlin/code-insight/kotlin.code-insight.k2/intellij.kotlin.codeInsight.tests.iml @@ -54,8 +54,10 @@ + + @@ -74,6 +76,7 @@ + diff --git a/plugins/kotlin/code-insight/line-markers-shared/BUILD.bazel b/plugins/kotlin/code-insight/line-markers-shared/BUILD.bazel index dc94e8c2c5ea..eba4913e7ba8 100644 --- a/plugins/kotlin/code-insight/line-markers-shared/BUILD.bazel +++ b/plugins/kotlin/code-insight/line-markers-shared/BUILD.bazel @@ -32,6 +32,7 @@ jvm_library( "//platform/lang-api:lang", "//platform/lang-impl", "//platform/execution-impl", + "//platform/util:util-ui", "//java/java-psi-api:psi", "//plugins/kotlin/base/project-structure", "//plugins/kotlin/kotlin.searching", @@ -61,6 +62,7 @@ jvm_library( "//platform/lang-api:lang_test_lib", "//platform/lang-impl:lang-impl_test_lib", "//platform/execution-impl:execution-impl_test_lib", + "//platform/util:util-ui_test_lib", "//java/java-psi-api:psi_test_lib", "//plugins/kotlin/base/project-structure:project-structure_test_lib", "//plugins/kotlin/kotlin.searching:kotlin.searching_test_lib", diff --git a/plugins/kotlin/code-insight/line-markers-shared/kotlin.code-insight.line-markers.shared.iml b/plugins/kotlin/code-insight/line-markers-shared/kotlin.code-insight.line-markers.shared.iml index ebfff9d7a8f9..38947c6ba6f8 100644 --- a/plugins/kotlin/code-insight/line-markers-shared/kotlin.code-insight.line-markers.shared.iml +++ b/plugins/kotlin/code-insight/line-markers-shared/kotlin.code-insight.line-markers.shared.iml @@ -26,6 +26,7 @@ + diff --git a/plugins/kotlin/code-insight/line-markers/BUILD.bazel b/plugins/kotlin/code-insight/line-markers/BUILD.bazel index 1e48cd871901..74959f20aa24 100644 --- a/plugins/kotlin/code-insight/line-markers/BUILD.bazel +++ b/plugins/kotlin/code-insight/line-markers/BUILD.bazel @@ -47,11 +47,13 @@ jvm_library( "//plugins/kotlin/highlighting/highlighting-shared:kotlin-highlighting-shared", "//plugins/kotlin/highlighting/highlighting-k2:kotlin-highlighting", "//platform/platform-impl:ide-impl", + "//platform/ide-core", "//plugins/kotlin/base/indices", "//plugins/kotlin/code-insight/line-markers-shared:kotlin-code-insight-line-markers-shared", "//java/java-indexing-api:indexing", "//plugins/kotlin/base/project-structure", "//platform/lang-api:lang", + "//platform/util:util-ui", ] ) @@ -82,11 +84,13 @@ jvm_library( "//plugins/kotlin/highlighting/highlighting-shared:kotlin-highlighting-shared_test_lib", "//plugins/kotlin/highlighting/highlighting-k2:kotlin-highlighting_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//plugins/kotlin/base/indices:indices_test_lib", "//plugins/kotlin/code-insight/line-markers-shared:kotlin-code-insight-line-markers-shared_test_lib", "//java/java-indexing-api:indexing_test_lib", "//plugins/kotlin/base/project-structure:project-structure_test_lib", "//platform/lang-api:lang_test_lib", + "//platform/util:util-ui_test_lib", ] ) ### auto-generated section `build intellij.kotlin.codeInsight.lineMarkers` end diff --git a/plugins/kotlin/code-insight/line-markers/intellij.kotlin.codeInsight.lineMarkers.iml b/plugins/kotlin/code-insight/line-markers/intellij.kotlin.codeInsight.lineMarkers.iml index f1973f9a71ff..ea4cac6a3c24 100644 --- a/plugins/kotlin/code-insight/line-markers/intellij.kotlin.codeInsight.lineMarkers.iml +++ b/plugins/kotlin/code-insight/line-markers/intellij.kotlin.codeInsight.lineMarkers.iml @@ -46,10 +46,12 @@ + + \ No newline at end of file diff --git a/plugins/kotlin/code-insight/live-templates-shared/BUILD.bazel b/plugins/kotlin/code-insight/live-templates-shared/BUILD.bazel index 257532b90355..6ec9f89e8182 100644 --- a/plugins/kotlin/code-insight/live-templates-shared/BUILD.bazel +++ b/plugins/kotlin/code-insight/live-templates-shared/BUILD.bazel @@ -42,6 +42,7 @@ jvm_library( "//platform/core-impl", "//platform/analysis-api:analysis", "//java/java-impl:impl", + "//java/java-psi-api:psi", "//platform/lang-api:lang", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", ] @@ -70,6 +71,7 @@ jvm_library( "//platform/core-impl:core-impl_test_lib", "//platform/analysis-api:analysis_test_lib", "//java/java-impl:impl_test_lib", + "//java/java-psi-api:psi_test_lib", "//plugins/kotlin/base/test", "//plugins/kotlin/base/test:test_test_lib", "//platform/testFramework", @@ -157,6 +159,8 @@ jvm_library( "//java/testFramework:testFramework_test_lib", "//platform/lang-api:lang", "//platform/lang-api:lang_test_lib", + "//platform/util:util-ui", + "//platform/util:util-ui_test_lib", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", ], diff --git a/plugins/kotlin/code-insight/live-templates-shared/kotlin.code-insight.live-templates.shared.iml b/plugins/kotlin/code-insight/live-templates-shared/kotlin.code-insight.live-templates.shared.iml index 9976c685562b..609bd8f7d57f 100644 --- a/plugins/kotlin/code-insight/live-templates-shared/kotlin.code-insight.live-templates.shared.iml +++ b/plugins/kotlin/code-insight/live-templates-shared/kotlin.code-insight.live-templates.shared.iml @@ -41,6 +41,7 @@ + diff --git a/plugins/kotlin/code-insight/live-templates-shared/kotlin.code-insight.live-templates.shared.tests.iml b/plugins/kotlin/code-insight/live-templates-shared/kotlin.code-insight.live-templates.shared.tests.iml index f620f4971c03..5a3d05a4162f 100644 --- a/plugins/kotlin/code-insight/live-templates-shared/kotlin.code-insight.live-templates.shared.tests.iml +++ b/plugins/kotlin/code-insight/live-templates-shared/kotlin.code-insight.live-templates.shared.tests.iml @@ -45,6 +45,7 @@ + diff --git a/plugins/kotlin/code-insight/override-implement-shared/BUILD.bazel b/plugins/kotlin/code-insight/override-implement-shared/BUILD.bazel index 2f1a87deee14..874d2a3e4f4a 100644 --- a/plugins/kotlin/code-insight/override-implement-shared/BUILD.bazel +++ b/plugins/kotlin/code-insight/override-implement-shared/BUILD.bazel @@ -16,7 +16,9 @@ jvm_library( "//plugins/kotlin/base/util", "//platform/lang-impl", "//platform/core-ui", + "//platform/core-impl", "//java/java-impl:impl", + "//java/java-psi-api:psi", "//plugins/kotlin/base/resources:kotlin-base-resources", "//platform/lang-api:lang", ] @@ -36,7 +38,9 @@ jvm_library( "//plugins/kotlin/base/util:util_test_lib", "//platform/lang-impl:lang-impl_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl:core-impl_test_lib", "//java/java-impl:impl_test_lib", + "//java/java-psi-api:psi_test_lib", "//plugins/kotlin/base/resources:kotlin-base-resources_test_lib", "//platform/lang-api:lang_test_lib", ] diff --git a/plugins/kotlin/code-insight/override-implement-shared/kotlin.code-insight.override-implement.shared.iml b/plugins/kotlin/code-insight/override-implement-shared/kotlin.code-insight.override-implement.shared.iml index 02168df97dd7..3bb0de285b0a 100644 --- a/plugins/kotlin/code-insight/override-implement-shared/kotlin.code-insight.override-implement.shared.iml +++ b/plugins/kotlin/code-insight/override-implement-shared/kotlin.code-insight.override-implement.shared.iml @@ -16,7 +16,9 @@ + + diff --git a/plugins/kotlin/code-insight/structural-search-k1/BUILD.bazel b/plugins/kotlin/code-insight/structural-search-k1/BUILD.bazel index 5c2d58149bdf..ced6c82c7d06 100644 --- a/plugins/kotlin/code-insight/structural-search-k1/BUILD.bazel +++ b/plugins/kotlin/code-insight/structural-search-k1/BUILD.bazel @@ -33,6 +33,7 @@ jvm_library( "//platform/editor-ui-api:editor-ui", "//plugins/kotlin/base/util", "//platform/platform-impl:ide-impl", + "//platform/ide-core", "//plugins/kotlin/base/psi", "//plugins/kotlin/base/indices", "//plugins/kotlin/base/resources:kotlin-base-resources", @@ -44,9 +45,11 @@ jvm_library( "//plugins/kotlin/idea", "//platform/lang-impl", "//platform/core-ui", + "//platform/core-impl", "//platform/structuralsearch:structuralSearch", "//platform/duplicates-analysis", "//java/java-indexing-impl:indexing-impl", + "//java/java-psi-api:psi", ] ) @@ -64,6 +67,7 @@ jvm_library( "//platform/editor-ui-api:editor-ui_test_lib", "//plugins/kotlin/base/util:util_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//plugins/kotlin/base/psi:psi_test_lib", "//plugins/kotlin/base/indices:indices_test_lib", "//plugins/kotlin/base/resources:kotlin-base-resources_test_lib", @@ -75,9 +79,11 @@ jvm_library( "//plugins/kotlin/idea:idea_test_lib", "//platform/lang-impl:lang-impl_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl:core-impl_test_lib", "//platform/structuralsearch:structuralSearch_test_lib", "//platform/duplicates-analysis:duplicates-analysis_test_lib", "//java/java-indexing-impl:indexing-impl_test_lib", + "//java/java-psi-api:psi_test_lib", ] ) ### auto-generated section `build kotlin.code-insight.structural-search.k1` end diff --git a/plugins/kotlin/code-insight/structural-search-k1/kotlin.code-insight.structural-search.k1.iml b/plugins/kotlin/code-insight/structural-search-k1/kotlin.code-insight.structural-search.k1.iml index 21ecf77141be..093374119d07 100644 --- a/plugins/kotlin/code-insight/structural-search-k1/kotlin.code-insight.structural-search.k1.iml +++ b/plugins/kotlin/code-insight/structural-search-k1/kotlin.code-insight.structural-search.k1.iml @@ -33,6 +33,7 @@ + @@ -44,8 +45,10 @@ + + \ No newline at end of file diff --git a/plugins/kotlin/code-insight/structural-search-k2/tests/BUILD.bazel b/plugins/kotlin/code-insight/structural-search-k2/tests/BUILD.bazel index 2cab0b157d4a..d7a4ebcc056d 100644 --- a/plugins/kotlin/code-insight/structural-search-k2/tests/BUILD.bazel +++ b/plugins/kotlin/code-insight/structural-search-k2/tests/BUILD.bazel @@ -22,10 +22,16 @@ jvm_library( "//platform/code-style-api:codeStyle_test_lib", "//platform/core-api:core", "//platform/core-api:core_test_lib", + "//java/java-psi-api:psi", + "//java/java-psi-api:psi_test_lib", "//platform/core-ui", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", "//platform/lang-core", "//platform/lang-core:lang-core_test_lib", + "//platform/lang-api:lang", + "//platform/lang-api:lang_test_lib", "//platform/projectModel-api:projectModel", "//platform/projectModel-api:projectModel_test_lib", "//plugins/kotlin/plugin/k2", diff --git a/plugins/kotlin/code-insight/structural-search-k2/tests/intellij.kotlin.codeInsight.structuralSearch.tests.iml b/plugins/kotlin/code-insight/structural-search-k2/tests/intellij.kotlin.codeInsight.structuralSearch.tests.iml index abb687487e1f..5c022751347b 100644 --- a/plugins/kotlin/code-insight/structural-search-k2/tests/intellij.kotlin.codeInsight.structuralSearch.tests.iml +++ b/plugins/kotlin/code-insight/structural-search-k2/tests/intellij.kotlin.codeInsight.structuralSearch.tests.iml @@ -11,8 +11,11 @@ + + + diff --git a/plugins/kotlin/compiler-plugins/allopen/common-k1/BUILD.bazel b/plugins/kotlin/compiler-plugins/allopen/common-k1/BUILD.bazel index 08c5617613e9..af52c8bcc983 100644 --- a/plugins/kotlin/compiler-plugins/allopen/common-k1/BUILD.bazel +++ b/plugins/kotlin/compiler-plugins/allopen/common-k1/BUILD.bazel @@ -26,6 +26,7 @@ jvm_library( "//plugins/kotlin/compiler-plugins/compiler-plugin-support/common:kotlin-compilerPlugins-support", "//platform/util", "//java/java-psi-api:psi", + "//java/java-frontback-psi-api:frontback-psi", "//platform/core-impl", ] ) @@ -43,6 +44,7 @@ jvm_library( "//plugins/kotlin/compiler-plugins/compiler-plugin-support/common:kotlin-compilerPlugins-support_test_lib", "//platform/util:util_test_lib", "//java/java-psi-api:psi_test_lib", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//platform/core-impl:core-impl_test_lib", ] ) diff --git a/plugins/kotlin/compiler-plugins/allopen/common-k1/kotlin.compiler-plugins.allopen.common.k1.iml b/plugins/kotlin/compiler-plugins/allopen/common-k1/kotlin.compiler-plugins.allopen.common.k1.iml index 2ad39f7eea42..fac5eb2be17b 100644 --- a/plugins/kotlin/compiler-plugins/allopen/common-k1/kotlin.compiler-plugins.allopen.common.k1.iml +++ b/plugins/kotlin/compiler-plugins/allopen/common-k1/kotlin.compiler-plugins.allopen.common.k1.iml @@ -32,6 +32,7 @@ + \ No newline at end of file diff --git a/plugins/kotlin/compiler-plugins/noarg/common/BUILD.bazel b/plugins/kotlin/compiler-plugins/noarg/common/BUILD.bazel index 5d7058552611..7de3915fad59 100644 --- a/plugins/kotlin/compiler-plugins/noarg/common/BUILD.bazel +++ b/plugins/kotlin/compiler-plugins/noarg/common/BUILD.bazel @@ -16,6 +16,7 @@ jvm_library( "//plugins/kotlin/compiler-plugins/compiler-plugin-support/common:kotlin-compilerPlugins-support", "//platform/core-impl", "//java/java-psi-impl:psi-impl", + "//java/java-psi-api:psi", ] ) @@ -31,6 +32,7 @@ jvm_library( "//plugins/kotlin/compiler-plugins/compiler-plugin-support/common:kotlin-compilerPlugins-support_test_lib", "//platform/core-impl:core-impl_test_lib", "//java/java-psi-impl:psi-impl_test_lib", + "//java/java-psi-api:psi_test_lib", ] ) ### auto-generated section `build kotlin.compiler-plugins.noarg.common` end diff --git a/plugins/kotlin/compiler-plugins/noarg/common/kotlin.compiler-plugins.noarg.common.iml b/plugins/kotlin/compiler-plugins/noarg/common/kotlin.compiler-plugins.noarg.common.iml index cda9cb5261dc..eda3b0f427f3 100644 --- a/plugins/kotlin/compiler-plugins/noarg/common/kotlin.compiler-plugins.noarg.common.iml +++ b/plugins/kotlin/compiler-plugins/noarg/common/kotlin.compiler-plugins.noarg.common.iml @@ -16,5 +16,6 @@ + \ No newline at end of file diff --git a/plugins/kotlin/compiler-plugins/noarg/tests/BUILD.bazel b/plugins/kotlin/compiler-plugins/noarg/tests/BUILD.bazel index efa0e488eb7d..24dc4ccb5d1e 100644 --- a/plugins/kotlin/compiler-plugins/noarg/tests/BUILD.bazel +++ b/plugins/kotlin/compiler-plugins/noarg/tests/BUILD.bazel @@ -46,6 +46,8 @@ jvm_library( "//platform/projectModel-api:projectModel_test_lib", "//plugins/kotlin/plugin/k1", "//plugins/kotlin/plugin/k1:k1_test_lib", + "//java/java-psi-api:psi", + "//java/java-psi-api:psi_test_lib", "//plugins/kotlin/tests-common:common-tests", "//plugins/kotlin/tests-common:common-tests_test_lib", "//plugins/kotlin/base/plugin", diff --git a/plugins/kotlin/compiler-plugins/noarg/tests/kotlin.compiler-plugins.noarg.tests.iml b/plugins/kotlin/compiler-plugins/noarg/tests/kotlin.compiler-plugins.noarg.tests.iml index 02222932a770..98bd386269ee 100644 --- a/plugins/kotlin/compiler-plugins/noarg/tests/kotlin.compiler-plugins.noarg.tests.iml +++ b/plugins/kotlin/compiler-plugins/noarg/tests/kotlin.compiler-plugins.noarg.tests.iml @@ -17,6 +17,7 @@ + diff --git a/plugins/kotlin/compiler-plugins/parcelize/common/BUILD.bazel b/plugins/kotlin/compiler-plugins/parcelize/common/BUILD.bazel index e0d6b94ff822..826bc97add01 100644 --- a/plugins/kotlin/compiler-plugins/parcelize/common/BUILD.bazel +++ b/plugins/kotlin/compiler-plugins/parcelize/common/BUILD.bazel @@ -28,6 +28,7 @@ jvm_library( "//java/java-psi-impl:psi-impl", "//platform/analysis-api:analysis", "//platform/core-api:core", + "//platform/core-impl", "//platform/projectModel-api:projectModel", "//plugins/kotlin/base/psi", "//plugins/kotlin/base/util", @@ -55,6 +56,7 @@ jvm_library( "//java/java-psi-impl:psi-impl_test_lib", "//platform/analysis-api:analysis_test_lib", "//platform/core-api:core_test_lib", + "//platform/core-impl:core-impl_test_lib", "//platform/projectModel-api:projectModel_test_lib", "//plugins/kotlin/base/psi:psi_test_lib", "//plugins/kotlin/base/util:util_test_lib", diff --git a/plugins/kotlin/compiler-plugins/parcelize/common/intellij.kotlin.compilerPlugins.parcelize.common.iml b/plugins/kotlin/compiler-plugins/parcelize/common/intellij.kotlin.compilerPlugins.parcelize.common.iml index 90de6cacd131..7f9d7cd81125 100644 --- a/plugins/kotlin/compiler-plugins/parcelize/common/intellij.kotlin.compilerPlugins.parcelize.common.iml +++ b/plugins/kotlin/compiler-plugins/parcelize/common/intellij.kotlin.compilerPlugins.parcelize.common.iml @@ -31,6 +31,7 @@ + diff --git a/plugins/kotlin/compiler-plugins/parcelize/k1/BUILD.bazel b/plugins/kotlin/compiler-plugins/parcelize/k1/BUILD.bazel index eb9eb9f9f68d..7c994906cf38 100644 --- a/plugins/kotlin/compiler-plugins/parcelize/k1/BUILD.bazel +++ b/plugins/kotlin/compiler-plugins/parcelize/k1/BUILD.bazel @@ -35,6 +35,7 @@ jvm_library( "//java/java-psi-impl:psi-impl", "//platform/analysis-api:analysis", "//platform/core-api:core", + "//platform/core-impl", "//plugins/kotlin/base/fe10/analysis", "//plugins/kotlin/base/fe10/code-insight", "//plugins/kotlin/base/project-structure", @@ -62,6 +63,7 @@ jvm_library( "//java/java-psi-impl:psi-impl_test_lib", "//platform/analysis-api:analysis_test_lib", "//platform/core-api:core_test_lib", + "//platform/core-impl:core-impl_test_lib", "//plugins/kotlin/base/fe10/analysis:analysis_test_lib", "//plugins/kotlin/base/fe10/code-insight:code-insight_test_lib", "//plugins/kotlin/base/project-structure:project-structure_test_lib", diff --git a/plugins/kotlin/compiler-plugins/parcelize/k1/kotlin.compiler-plugins.parcelize.k1.iml b/plugins/kotlin/compiler-plugins/parcelize/k1/kotlin.compiler-plugins.parcelize.k1.iml index ff7b3964e5ff..a5a4b3144956 100644 --- a/plugins/kotlin/compiler-plugins/parcelize/k1/kotlin.compiler-plugins.parcelize.k1.iml +++ b/plugins/kotlin/compiler-plugins/parcelize/k1/kotlin.compiler-plugins.parcelize.k1.iml @@ -33,6 +33,7 @@ + diff --git a/plugins/kotlin/compiler-plugins/parcelize/tests/k2/BUILD.bazel b/plugins/kotlin/compiler-plugins/parcelize/tests/k2/BUILD.bazel index ef278d05a46d..349cb5a4d1eb 100644 --- a/plugins/kotlin/compiler-plugins/parcelize/tests/k2/BUILD.bazel +++ b/plugins/kotlin/compiler-plugins/parcelize/tests/k2/BUILD.bazel @@ -21,6 +21,8 @@ jvm_library( "@lib//:kotlinc-parcelize-compiler-plugin", "//platform/core-api:core", "//platform/core-api:core_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", "//plugins/kotlin/plugin/k2", "//plugins/kotlin/plugin/k2:k2_test_lib", "//plugins/kotlin/code-insight/inspections-k2/tests", @@ -37,6 +39,8 @@ jvm_library( "//plugins/kotlin/tests-common:common-tests_test_lib", "//java/testFramework", "//java/testFramework:testFramework_test_lib", + "//java/java-psi-api:psi", + "//java/java-psi-api:psi_test_lib", "//plugins/kotlin/base/plugin", "//plugins/kotlin/base/plugin:plugin_test_lib", "//plugins/kotlin/intellij.kotlin.base.test:base-test", diff --git a/plugins/kotlin/compiler-plugins/parcelize/tests/k2/intellij.kotlin.compilerPlugins.parcelize.tests.iml b/plugins/kotlin/compiler-plugins/parcelize/tests/k2/intellij.kotlin.compilerPlugins.parcelize.tests.iml index 642286a772f3..7c9c6b3572ee 100644 --- a/plugins/kotlin/compiler-plugins/parcelize/tests/k2/intellij.kotlin.compilerPlugins.parcelize.tests.iml +++ b/plugins/kotlin/compiler-plugins/parcelize/tests/k2/intellij.kotlin.compilerPlugins.parcelize.tests.iml @@ -13,6 +13,7 @@ + @@ -21,6 +22,7 @@ + diff --git a/plugins/kotlin/compiler-reference-index/BUILD.bazel b/plugins/kotlin/compiler-reference-index/BUILD.bazel index 6d55ba03de3e..a8efea57b805 100644 --- a/plugins/kotlin/compiler-reference-index/BUILD.bazel +++ b/plugins/kotlin/compiler-reference-index/BUILD.bazel @@ -32,10 +32,14 @@ jvm_library( "//plugins/kotlin/base/analysis", "//platform/lang-impl", "//platform/core-ui", + "//platform/core-impl", "//jps/jps-builders:build", "//java/java-indexing-impl:indexing-impl", "//java/compiler/impl", + "//java/java-psi-api:psi", + "//java/java-frontback-psi-api:frontback-psi", "//platform/external-system-impl:externalSystem-impl", + "//platform/util:util-ui", "//plugins/gradle", "//plugins/kotlin/gradle/gradle", ], @@ -65,10 +69,14 @@ jvm_library( "//plugins/kotlin/base/analysis:analysis_test_lib", "//platform/lang-impl:lang-impl_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl:core-impl_test_lib", "//jps/jps-builders:build_test_lib", "//java/java-indexing-impl:indexing-impl_test_lib", "//java/compiler/impl:impl_test_lib", + "//java/java-psi-api:psi_test_lib", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//platform/external-system-impl:externalSystem-impl_test_lib", + "//platform/util:util-ui_test_lib", "//plugins/gradle:gradle_test_lib", "//plugins/kotlin/gradle/gradle:gradle_test_lib", ] diff --git a/plugins/kotlin/compiler-reference-index/intellij.kotlin.compilerReferenceIndex.iml b/plugins/kotlin/compiler-reference-index/intellij.kotlin.compilerReferenceIndex.iml index 0a5c685b219c..dacfb53e445b 100644 --- a/plugins/kotlin/compiler-reference-index/intellij.kotlin.compilerReferenceIndex.iml +++ b/plugins/kotlin/compiler-reference-index/intellij.kotlin.compilerReferenceIndex.iml @@ -28,10 +28,14 @@ + + + + diff --git a/plugins/kotlin/completion/impl-k1/BUILD.bazel b/plugins/kotlin/completion/impl-k1/BUILD.bazel index d4aeb2e44e73..8ae50a854870 100644 --- a/plugins/kotlin/completion/impl-k1/BUILD.bazel +++ b/plugins/kotlin/completion/impl-k1/BUILD.bazel @@ -29,6 +29,7 @@ jvm_library( "//libraries/kotlinx/coroutines/core", "//libraries/guava", "//java/java-indexing-api:indexing", + "//java/java-psi-api:psi", "//platform/analysis-api:analysis", "//platform/lang-api:lang", "//platform/code-style-api:codeStyle", @@ -62,6 +63,7 @@ jvm_library( "//java/java-impl:impl", "//plugins/kotlin/code-insight/api", "//platform/util/text-matching", + "//platform/util:util-ui", "//platform/ml-impl", "//plugins/kotlin/base/plugin", "//plugins/kotlin/highlighting/highlighting-k1:kotlin-highlighting-k1", @@ -81,6 +83,7 @@ jvm_library( "//libraries/kotlinx/coroutines/core:core_test_lib", "//libraries/guava:guava_test_lib", "//java/java-indexing-api:indexing_test_lib", + "//java/java-psi-api:psi_test_lib", "//platform/analysis-api:analysis_test_lib", "//platform/lang-api:lang_test_lib", "//platform/code-style-api:codeStyle_test_lib", @@ -114,6 +117,7 @@ jvm_library( "//java/java-impl:impl_test_lib", "//plugins/kotlin/code-insight/api:api_test_lib", "//platform/util/text-matching:text-matching_test_lib", + "//platform/util:util-ui_test_lib", "//platform/ml-impl:ml-impl_test_lib", "//plugins/kotlin/base/plugin:plugin_test_lib", "//plugins/kotlin/highlighting/highlighting-k1:kotlin-highlighting-k1_test_lib", diff --git a/plugins/kotlin/completion/impl-k1/kotlin.completion.impl.k1.iml b/plugins/kotlin/completion/impl-k1/kotlin.completion.impl.k1.iml index 9fb0ece8dc7c..5fb2bd4af9f7 100644 --- a/plugins/kotlin/completion/impl-k1/kotlin.completion.impl.k1.iml +++ b/plugins/kotlin/completion/impl-k1/kotlin.completion.impl.k1.iml @@ -32,6 +32,7 @@ + @@ -65,6 +66,7 @@ + diff --git a/plugins/kotlin/completion/impl-k2/BUILD.bazel b/plugins/kotlin/completion/impl-k2/BUILD.bazel index 4e79c87ef5b9..f79bf8e42b9b 100644 --- a/plugins/kotlin/completion/impl-k2/BUILD.bazel +++ b/plugins/kotlin/completion/impl-k2/BUILD.bazel @@ -42,6 +42,7 @@ jvm_library( "//plugins/kotlin/base/util", "//plugins/kotlin/base/psi", "//platform/platform-impl:ide-impl", + "//platform/progress/shared:ide-progress", "//plugins/kotlin/base/facet", "//plugins/kotlin/base/project-structure", "//plugins/kotlin/base/analysis", @@ -57,12 +58,15 @@ jvm_library( "//platform/lang-api:lang", "//platform/lang-impl", "//platform/core-ui", + "//platform/core-impl", "//java/java-psi-api:psi", "//libraries/fastutil", "//platform/util/text-matching", + "//platform/util:util-ui", "//plugins/kotlin/code-insight/utils", "//java/java-psi-impl:psi-impl", "//java/java-impl:impl", + "//java/java-frontback-psi-api:frontback-psi", "@lib//:kotlinc-analysis-api-platform-interface", "//plugins/kotlin/jvm-debugger/evaluation", "//libraries/kotlinx/serialization/core", @@ -91,6 +95,7 @@ jvm_library( "//plugins/kotlin/base/util:util_test_lib", "//plugins/kotlin/base/psi:psi_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/progress/shared:ide-progress_test_lib", "//plugins/kotlin/base/facet:facet_test_lib", "//plugins/kotlin/base/project-structure:project-structure_test_lib", "//plugins/kotlin/base/analysis:analysis_test_lib", @@ -106,12 +111,15 @@ jvm_library( "//platform/lang-api:lang_test_lib", "//platform/lang-impl:lang-impl_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl:core-impl_test_lib", "//java/java-psi-api:psi_test_lib", "//libraries/fastutil:fastutil_test_lib", "//platform/util/text-matching:text-matching_test_lib", + "//platform/util:util-ui_test_lib", "//plugins/kotlin/code-insight/utils:utils_test_lib", "//java/java-psi-impl:psi-impl_test_lib", "//java/java-impl:impl_test_lib", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//plugins/kotlin/jvm-debugger/evaluation:evaluation_test_lib", "//libraries/kotlinx/serialization/core:core_test_lib", "//libraries/kotlinx/serialization/json:json_test_lib", diff --git a/plugins/kotlin/completion/impl-k2/intellij.kotlin.completion.impl.iml b/plugins/kotlin/completion/impl-k2/intellij.kotlin.completion.impl.iml index aa06c62399a4..e21ee253c02e 100644 --- a/plugins/kotlin/completion/impl-k2/intellij.kotlin.completion.impl.iml +++ b/plugins/kotlin/completion/impl-k2/intellij.kotlin.completion.impl.iml @@ -44,6 +44,7 @@ + @@ -59,12 +60,15 @@ + + + diff --git a/plugins/kotlin/completion/impl-shared/BUILD.bazel b/plugins/kotlin/completion/impl-shared/BUILD.bazel index c78dd9a0d721..578ff746b1fa 100644 --- a/plugins/kotlin/completion/impl-shared/BUILD.bazel +++ b/plugins/kotlin/completion/impl-shared/BUILD.bazel @@ -36,8 +36,10 @@ jvm_library( "//platform/analysis-impl", "//platform/lang-impl", "//platform/core-ui", + "//platform/core-impl", "//platform/editor-ui-api:editor-ui", "//java/java-impl:impl", + "//java/java-psi-api:psi", "//plugins/kotlin/base/code-insight", "//plugins/kotlin/code-insight/impl-base:kotlin-codeInsight-shared", "//plugins/kotlin/base/resources:kotlin-base-resources", @@ -46,6 +48,7 @@ jvm_library( "//libraries/kotlinx/serialization/json", "//plugins/kotlin/base/kotlin.base.serialization", "//platform/lang-api:lang", + "//platform/util:util-ui", ] ) @@ -72,8 +75,10 @@ jvm_library( "//platform/analysis-impl:analysis-impl_test_lib", "//platform/lang-impl:lang-impl_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl:core-impl_test_lib", "//platform/editor-ui-api:editor-ui_test_lib", "//java/java-impl:impl_test_lib", + "//java/java-psi-api:psi_test_lib", "//plugins/kotlin/base/code-insight:code-insight_test_lib", "//plugins/kotlin/code-insight/impl-base:kotlin-codeInsight-shared_test_lib", "//plugins/kotlin/base/resources:kotlin-base-resources_test_lib", @@ -82,6 +87,7 @@ jvm_library( "//libraries/kotlinx/serialization/json:json_test_lib", "//plugins/kotlin/base/kotlin.base.serialization:kotlin.base.serialization_test_lib", "//platform/lang-api:lang_test_lib", + "//platform/util:util-ui_test_lib", ] ) ### auto-generated section `build kotlin.completion.impl.shared` end diff --git a/plugins/kotlin/completion/impl-shared/kotlin.completion.impl.shared.iml b/plugins/kotlin/completion/impl-shared/kotlin.completion.impl.shared.iml index 4e341dad0932..e696a3439db9 100644 --- a/plugins/kotlin/completion/impl-shared/kotlin.completion.impl.shared.iml +++ b/plugins/kotlin/completion/impl-shared/kotlin.completion.impl.shared.iml @@ -46,8 +46,10 @@ + + @@ -56,5 +58,6 @@ + \ No newline at end of file diff --git a/plugins/kotlin/completion/tests-k1/BUILD.bazel b/plugins/kotlin/completion/tests-k1/BUILD.bazel index 8f6bd1f5d2d6..674f13958333 100644 --- a/plugins/kotlin/completion/tests-k1/BUILD.bazel +++ b/plugins/kotlin/completion/tests-k1/BUILD.bazel @@ -51,6 +51,8 @@ jvm_library( "//platform/editor-ui-api:editor-ui_test_lib", "//platform/lang-core", "//platform/lang-core:lang-core_test_lib", + "//platform/lang-api:lang", + "//platform/lang-api:lang_test_lib", "//platform/execution", "//platform/execution:execution_test_lib", "//platform/projectModel-api:projectModel", diff --git a/plugins/kotlin/completion/tests-k1/kotlin.completion.tests.k1.iml b/plugins/kotlin/completion/tests-k1/kotlin.completion.tests.k1.iml index 550f4703b385..26bdad841d92 100644 --- a/plugins/kotlin/completion/tests-k1/kotlin.completion.tests.k1.iml +++ b/plugins/kotlin/completion/tests-k1/kotlin.completion.tests.k1.iml @@ -28,6 +28,7 @@ + diff --git a/plugins/kotlin/completion/tests-shared/BUILD.bazel b/plugins/kotlin/completion/tests-shared/BUILD.bazel index d036ecde5d87..465e610fdab0 100644 --- a/plugins/kotlin/completion/tests-shared/BUILD.bazel +++ b/plugins/kotlin/completion/tests-shared/BUILD.bazel @@ -39,12 +39,18 @@ jvm_library( "//platform/code-style-api:codeStyle_test_lib", "//platform/core-api:core", "//platform/core-api:core_test_lib", + "//java/java-psi-api:psi", + "//java/java-psi-api:psi_test_lib", "//platform/core-ui", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", "//platform/editor-ui-api:editor-ui", "//platform/editor-ui-api:editor-ui_test_lib", "//platform/projectModel-api:projectModel", "//platform/projectModel-api:projectModel_test_lib", + "//platform/lang-api:lang", + "//platform/lang-api:lang_test_lib", "//platform/testFramework", "//platform/testFramework:testFramework_test_lib", "//plugins/kotlin/base/test", @@ -79,6 +85,8 @@ jvm_library( "//plugins/kotlin/intellij.kotlin.base.test:base-test_test_lib", "//jps/model-api:model", "//jps/model-api:model_test_lib", + "//platform/util:util-ui", + "//platform/util:util-ui_test_lib", ], runtime_deps = [":kotlin-completion-tests-shared"] ) diff --git a/plugins/kotlin/completion/tests-shared/kotlin.completion.tests.shared.iml b/plugins/kotlin/completion/tests-shared/kotlin.completion.tests.shared.iml index 3013a02c3ce8..1a39dc9d8390 100644 --- a/plugins/kotlin/completion/tests-shared/kotlin.completion.tests.shared.iml +++ b/plugins/kotlin/completion/tests-shared/kotlin.completion.tests.shared.iml @@ -14,9 +14,12 @@ + + + @@ -34,5 +37,6 @@ + \ No newline at end of file diff --git a/plugins/kotlin/core/BUILD.bazel b/plugins/kotlin/core/BUILD.bazel index 57d4f30b4219..926a291f0d25 100644 --- a/plugins/kotlin/core/BUILD.bazel +++ b/plugins/kotlin/core/BUILD.bazel @@ -57,6 +57,7 @@ jvm_library( "//plugins/kotlin/frontend-independent", "//platform/statistics", "//java/openapi:java", + "//java/java-psi-api:psi", "//java/java-indexing-impl:indexing-impl", "//xml/xml-psi-api:psi", "//platform/lang-impl", @@ -67,6 +68,7 @@ jvm_library( "//java/java-impl:impl", "//xml/xml-psi-impl:psi-impl", "//platform/core-ui", + "//platform/core-impl", "//platform/code-style-impl:codeStyle-impl", "//java/manifest", "//platform/util-class-loader:util-classLoader", @@ -75,6 +77,7 @@ jvm_library( "//plugins/kotlin/code-insight/api", "//plugins/kotlin/refactorings/kotlin.refactorings.common:kotlin-refactorings-common", "//java/codeserver/core", + "//java/java-frontback-psi-api:frontback-psi", ] ) @@ -113,6 +116,7 @@ jvm_library( "//plugins/kotlin/frontend-independent:frontend-independent_test_lib", "//platform/statistics:statistics_test_lib", "//java/openapi:java_test_lib", + "//java/java-psi-api:psi_test_lib", "//java/java-indexing-impl:indexing-impl_test_lib", "//xml/xml-psi-api:psi_test_lib", "//platform/lang-impl:lang-impl_test_lib", @@ -123,6 +127,7 @@ jvm_library( "//java/java-impl:impl_test_lib", "//xml/xml-psi-impl:psi-impl_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl:core-impl_test_lib", "//platform/code-style-impl:codeStyle-impl_test_lib", "//java/manifest:manifest_test_lib", "//platform/util-class-loader:util-classLoader_test_lib", @@ -131,6 +136,7 @@ jvm_library( "//plugins/kotlin/code-insight/api:api_test_lib", "//plugins/kotlin/refactorings/kotlin.refactorings.common:kotlin-refactorings-common_test_lib", "//java/codeserver/core:core_test_lib", + "//java/java-frontback-psi-api:frontback-psi_test_lib", ] ) ### auto-generated section `build kotlin.core` end diff --git a/plugins/kotlin/core/kotlin.core.iml b/plugins/kotlin/core/kotlin.core.iml index 8dae226277c0..cab9944f7603 100644 --- a/plugins/kotlin/core/kotlin.core.iml +++ b/plugins/kotlin/core/kotlin.core.iml @@ -63,6 +63,7 @@ + @@ -73,6 +74,7 @@ + @@ -81,5 +83,6 @@ + \ No newline at end of file diff --git a/plugins/kotlin/coverage/BUILD.bazel b/plugins/kotlin/coverage/BUILD.bazel index e033f9265093..9c22800dc491 100644 --- a/plugins/kotlin/coverage/BUILD.bazel +++ b/plugins/kotlin/coverage/BUILD.bazel @@ -31,6 +31,7 @@ jvm_library( "//platform/execution-impl", "//java/execution/impl", "//plugins/coverage", + "//java/java-psi-api:psi", "//platform/execution", ] ) @@ -56,6 +57,7 @@ jvm_library( "//platform/execution-impl:execution-impl_test_lib", "//java/execution/impl:impl_test_lib", "//plugins/coverage:coverage_test_lib", + "//java/java-psi-api:psi_test_lib", "//platform/execution:execution_test_lib", ] ) diff --git a/plugins/kotlin/coverage/intellij.kotlin.coverage.iml b/plugins/kotlin/coverage/intellij.kotlin.coverage.iml index 8f1872f6101e..f69c06159a45 100644 --- a/plugins/kotlin/coverage/intellij.kotlin.coverage.iml +++ b/plugins/kotlin/coverage/intellij.kotlin.coverage.iml @@ -25,6 +25,7 @@ + \ No newline at end of file diff --git a/plugins/kotlin/features-trainer/BUILD.bazel b/plugins/kotlin/features-trainer/BUILD.bazel index 8f2924f1fb01..fcdee9603183 100644 --- a/plugins/kotlin/features-trainer/BUILD.bazel +++ b/plugins/kotlin/features-trainer/BUILD.bazel @@ -27,6 +27,7 @@ jvm_library( "//platform/analysis-impl", "//platform/editor-ui-api:editor-ui", "//platform/platform-impl:ide-impl", + "//platform/ide-core", "@lib//:kotlinc-kotlin-compiler-common", "//plugins/kotlin/base/util", "//plugins/kotlin/base/facet", @@ -62,6 +63,7 @@ jvm_library( "//platform/analysis-impl:analysis-impl_test_lib", "//platform/editor-ui-api:editor-ui_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//plugins/kotlin/base/util:util_test_lib", "//plugins/kotlin/base/facet:facet_test_lib", "//plugins/kotlin/formatter:formatter_test_lib", diff --git a/plugins/kotlin/features-trainer/intellij.kotlin.featuresTrainer.iml b/plugins/kotlin/features-trainer/intellij.kotlin.featuresTrainer.iml index 894ce202416d..a3b4c4cfcfe3 100644 --- a/plugins/kotlin/features-trainer/intellij.kotlin.featuresTrainer.iml +++ b/plugins/kotlin/features-trainer/intellij.kotlin.featuresTrainer.iml @@ -21,6 +21,7 @@ + diff --git a/plugins/kotlin/fir/testFramework/BUILD.bazel b/plugins/kotlin/fir/testFramework/BUILD.bazel index 0758e82fee56..c193404488ec 100644 --- a/plugins/kotlin/fir/testFramework/BUILD.bazel +++ b/plugins/kotlin/fir/testFramework/BUILD.bazel @@ -36,8 +36,12 @@ jvm_library( "//plugins/kotlin/plugin/k2:k2_test_lib", "//plugins/kotlin/test-framework", "//plugins/kotlin/test-framework:test-framework_test_lib", + "//java/java-psi-api:psi", + "//java/java-psi-api:psi_test_lib", "//platform/core-api:core", "//platform/core-api:core_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", "//platform/testFramework/core", "//platform/testFramework/core:core_test_lib", "//plugins/kotlin/base/test", diff --git a/plugins/kotlin/fir/testFramework/kotlin.fir.testFramework.iml b/plugins/kotlin/fir/testFramework/kotlin.fir.testFramework.iml index 71eedd25b9e9..e1b4a5c3397f 100644 --- a/plugins/kotlin/fir/testFramework/kotlin.fir.testFramework.iml +++ b/plugins/kotlin/fir/testFramework/kotlin.fir.testFramework.iml @@ -34,7 +34,9 @@ + + diff --git a/plugins/kotlin/fir/tests/BUILD.bazel b/plugins/kotlin/fir/tests/BUILD.bazel index d4cbe99ca59e..e5a484d4ae86 100644 --- a/plugins/kotlin/fir/tests/BUILD.bazel +++ b/plugins/kotlin/fir/tests/BUILD.bazel @@ -21,6 +21,7 @@ jvm_library( runtime_deps = [ "@lib//:kotlinc-analysis-api", "//java/testFramework", + "//java/java-psi-api:psi", "@lib//:kotlinc-kotlin-compiler-common", "@lib//:kotlinc-low-level-api-fir", "@lib//:kotlinc-analysis-api-platform-interface", @@ -59,11 +60,15 @@ jvm_library( "//java/java-indexing-api:indexing_test_lib", "//java/testFramework", "//java/testFramework:testFramework_test_lib", + "//java/java-psi-api:psi", + "//java/java-psi-api:psi_test_lib", "@lib//:kotlinc-kotlin-compiler-common", "@lib//:kotlinc-low-level-api-fir", "@lib//:kotlinc-kotlin-compiler-tests", "//platform/util/jdom", "//platform/util/jdom:jdom_test_lib", + "//platform/util:util-ui", + "//platform/util:util-ui_test_lib", "@lib//:kotlinc-analysis-api-platform-interface", "//plugins/kotlin/code-insight/api", "//plugins/kotlin/code-insight/api:api_test_lib", @@ -85,6 +90,8 @@ jvm_library( "//jps/model-api:model_test_lib", "//platform/lang-core", "//platform/lang-core:lang-core_test_lib", + "//platform/lang-api:lang", + "//platform/lang-api:lang_test_lib", "//platform/projectModel-api:projectModel", "//platform/projectModel-api:projectModel_test_lib", "//platform/refactoring", @@ -93,6 +100,8 @@ jvm_library( "//platform/usageView:usageView_test_lib", "//platform/core-api:core", "//platform/core-api:core_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", "//platform/testFramework", "//platform/testFramework:testFramework_test_lib", "//plugins/kotlin/base/analysis", @@ -171,6 +180,8 @@ jvm_library( "//platform/smRunner:smRunner_test_lib", "//java/java-runtime:rt", "//java/java-runtime:rt_test_lib", + "//java/java-frontback-psi-api:frontback-psi", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//plugins/kotlin/kotlin.searching", "//plugins/kotlin/kotlin.searching:kotlin.searching_test_lib", "//plugins/kotlin/run-configurations/junit", @@ -221,10 +232,13 @@ jvm_library( "//plugins/kotlin/formatter:formatter_test_lib", "//platform/platform-tests:tests", "//platform/platform-tests:tests_test_lib", + "//platform/ide-core", "//plugins/kotlin/kotlin.ide", "//plugins/kotlin/kotlin.ide:kotlin.ide_test_lib", "//platform/vcs-impl/shared", "//platform/vcs-impl/shared:shared_test_lib", + "//platform/testRunner", + "//platform/testRunner:testRunner_test_lib", "//plugins/kotlin/code-insight/inspections-k2:kotlin-codeInsight-inspections", "//plugins/kotlin/code-insight/inspections-k2:kotlin-codeInsight-inspections_test_lib", "//plugins/kotlin/base/resources:kotlin-base-resources", @@ -234,7 +248,10 @@ jvm_library( "//plugins/kotlin/base/scripting/scripting.shared", "//plugins/kotlin/base/scripting/scripting.shared:scripting.shared_test_lib", ], - runtime_deps = [":tests"] + runtime_deps = [ + ":tests", + "//platform/ide-core:ide-core_test_lib", + ] ) ### auto-generated section `build kotlin.fir.tests` end diff --git a/plugins/kotlin/fir/tests/kotlin.fir.tests.iml b/plugins/kotlin/fir/tests/kotlin.fir.tests.iml index 7255ee5fa49c..d7e2306012b1 100644 --- a/plugins/kotlin/fir/tests/kotlin.fir.tests.iml +++ b/plugins/kotlin/fir/tests/kotlin.fir.tests.iml @@ -32,10 +32,12 @@ + + @@ -47,10 +49,12 @@ + + @@ -90,6 +94,7 @@ + @@ -115,8 +120,10 @@ + + diff --git a/plugins/kotlin/formatter/BUILD.bazel b/plugins/kotlin/formatter/BUILD.bazel index 097a9850d3b0..4c71406efdeb 100644 --- a/plugins/kotlin/formatter/BUILD.bazel +++ b/plugins/kotlin/formatter/BUILD.bazel @@ -32,6 +32,7 @@ jvm_library( "//platform/lang-impl", "//platform/code-style-impl:codeStyle-impl", "//platform/statistics", + "//platform/ide-core", "//plugins/kotlin/formatter/minimal", ], exports = ["//plugins/kotlin/formatter/minimal"] @@ -64,6 +65,7 @@ jvm_library( "//platform/lang-impl:lang-impl_test_lib", "//platform/code-style-impl:codeStyle-impl_test_lib", "//platform/statistics:statistics_test_lib", + "//platform/ide-core:ide-core_test_lib", "//plugins/kotlin/formatter/minimal:minimal_test_lib", ] ) diff --git a/plugins/kotlin/formatter/intellij.kotlin.formatter.iml b/plugins/kotlin/formatter/intellij.kotlin.formatter.iml index c445dd33ec04..0a22deeb0d65 100644 --- a/plugins/kotlin/formatter/intellij.kotlin.formatter.iml +++ b/plugins/kotlin/formatter/intellij.kotlin.formatter.iml @@ -26,6 +26,7 @@ + \ No newline at end of file diff --git a/plugins/kotlin/formatter/minimal/BUILD.bazel b/plugins/kotlin/formatter/minimal/BUILD.bazel index 6405efe1b3cc..d3760517fbdb 100644 --- a/plugins/kotlin/formatter/minimal/BUILD.bazel +++ b/plugins/kotlin/formatter/minimal/BUILD.bazel @@ -32,6 +32,8 @@ jvm_library( "//platform/util", "//platform/code-style-api:codeStyle", "//platform/platform-impl:ide-impl", + "//platform/ide-core", + "//platform/util:util-ui", "//platform/projectModel-api:projectModel", "@lib//:kotlinc-kotlin-compiler-common", "//platform/lang-impl", @@ -60,6 +62,8 @@ jvm_library( "//platform/util:util_test_lib", "//platform/code-style-api:codeStyle_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", + "//platform/util:util-ui_test_lib", "//platform/projectModel-api:projectModel_test_lib", "//platform/lang-impl:lang-impl_test_lib", "//platform/util/jdom:jdom_test_lib", diff --git a/plugins/kotlin/formatter/minimal/intellij.kotlin.formatter.minimal.iml b/plugins/kotlin/formatter/minimal/intellij.kotlin.formatter.minimal.iml index e3a072ea83e8..49bd64434dca 100644 --- a/plugins/kotlin/formatter/minimal/intellij.kotlin.formatter.minimal.iml +++ b/plugins/kotlin/formatter/minimal/intellij.kotlin.formatter.minimal.iml @@ -18,6 +18,8 @@ + + diff --git a/plugins/kotlin/frontend-independent/BUILD.bazel b/plugins/kotlin/frontend-independent/BUILD.bazel index d7c33e151121..860095d98b66 100644 --- a/plugins/kotlin/frontend-independent/BUILD.bazel +++ b/plugins/kotlin/frontend-independent/BUILD.bazel @@ -20,6 +20,7 @@ jvm_library( "//platform/core-api:core", "//platform/editor-ui-api:editor-ui", "//platform/ide-core-impl", + "//platform/ide-core", "//libraries/kotlin/reflect", "@lib//:kotlinc-kotlin-compiler-common", "@lib//:kotlinc-kotlin-jps-common", @@ -31,6 +32,7 @@ jvm_library( "//platform/projectModel-api:projectModel", "//platform/refactoring", "//xml/xml-psi-api:psi", + "//xml/xml-parser:parser", "//plugins/kotlin/base/frontend-agnostic", "//plugins/kotlin/base/facet", "//plugins/kotlin/base/util", @@ -40,16 +42,21 @@ jvm_library( "//plugins/kotlin/base/code-insight", "//platform/lang-api:lang", "//platform/platform-impl:ide-impl", + "//platform/progress/shared:ide-progress", "//java/java-analysis-impl:analysis-impl", "//java/openapi:java", "//java/java-impl:impl", + "//java/java-psi-api:psi", + "//java/java-frontback-psi-api:frontback-psi", "//xml/xml-psi-impl:psi-impl", "//platform/core-ui", + "//platform/core-impl", "//plugins/kotlin/code-insight/api", "//plugins/kotlin/base/resources:kotlin-base-resources", "//plugins/kotlin/code-insight/impl-base:kotlin-codeInsight-shared", "//plugins/kotlin/code-insight/utils", "//platform/util", + "//platform/util:util-ui", "//platform/external-system-api:externalSystem", "//plugins/kotlin/base/plugin", "//plugins/kotlin/base/project-structure", @@ -71,6 +78,7 @@ jvm_library( "//platform/core-api:core_test_lib", "//platform/editor-ui-api:editor-ui_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//libraries/kotlin/reflect:reflect_test_lib", "//libraries/guava:guava_test_lib", "//platform/indexing-api:indexing_test_lib", @@ -79,6 +87,7 @@ jvm_library( "//platform/projectModel-api:projectModel_test_lib", "//platform/refactoring:refactoring_test_lib", "//xml/xml-psi-api:psi_test_lib", + "//xml/xml-parser:parser_test_lib", "//plugins/kotlin/base/frontend-agnostic:frontend-agnostic_test_lib", "//plugins/kotlin/base/facet:facet_test_lib", "//plugins/kotlin/base/util:util_test_lib", @@ -88,16 +97,21 @@ jvm_library( "//plugins/kotlin/base/code-insight:code-insight_test_lib", "//platform/lang-api:lang_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/progress/shared:ide-progress_test_lib", "//java/java-analysis-impl:analysis-impl_test_lib", "//java/openapi:java_test_lib", "//java/java-impl:impl_test_lib", + "//java/java-psi-api:psi_test_lib", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//xml/xml-psi-impl:psi-impl_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl:core-impl_test_lib", "//plugins/kotlin/code-insight/api:api_test_lib", "//plugins/kotlin/base/resources:kotlin-base-resources_test_lib", "//plugins/kotlin/code-insight/impl-base:kotlin-codeInsight-shared_test_lib", "//plugins/kotlin/code-insight/utils:utils_test_lib", "//platform/util:util_test_lib", + "//platform/util:util-ui_test_lib", "//platform/external-system-api:externalSystem_test_lib", "//plugins/kotlin/base/plugin:plugin_test_lib", "//plugins/kotlin/base/project-structure:project-structure_test_lib", diff --git a/plugins/kotlin/frontend-independent/kotlin.fir.frontend-independent.iml b/plugins/kotlin/frontend-independent/kotlin.fir.frontend-independent.iml index f84ae815a6f6..b149315e951f 100644 --- a/plugins/kotlin/frontend-independent/kotlin.fir.frontend-independent.iml +++ b/plugins/kotlin/frontend-independent/kotlin.fir.frontend-independent.iml @@ -14,6 +14,7 @@ + @@ -25,6 +26,7 @@ + @@ -34,16 +36,21 @@ + + + + + diff --git a/plugins/kotlin/gradle/code-insight-common/BUILD.bazel b/plugins/kotlin/gradle/code-insight-common/BUILD.bazel index f3d6c6875de6..76c27d4a1e24 100644 --- a/plugins/kotlin/gradle/code-insight-common/BUILD.bazel +++ b/plugins/kotlin/gradle/code-insight-common/BUILD.bazel @@ -27,6 +27,7 @@ jvm_library( "//jps/model-api:model", "//plugins/kotlin/base/frontend-agnostic", "//platform/observable", + "//platform/ide-core", "//plugins/kotlin/base/util", "//platform/smRunner", "//plugins/kotlin/base/plugin", @@ -45,6 +46,7 @@ jvm_library( "//platform/projectModel-api:projectModel", "//platform/external-system-api:externalSystem", "//java/java-impl:impl", + "//java/java-psi-api:psi", "//plugins/gradle:gradle-common", "//plugins/kotlin/project-wizard/core", "//plugins/gradle/java", @@ -55,6 +57,7 @@ jvm_library( "//platform/execution", "//platform/lang-api:lang", "//platform/backend/observation", + "//platform/testRunner", ] ) @@ -73,6 +76,7 @@ jvm_library( "//jps/model-api:model_test_lib", "//plugins/kotlin/base/frontend-agnostic:frontend-agnostic_test_lib", "//platform/observable:observable_test_lib", + "//platform/ide-core:ide-core_test_lib", "//plugins/kotlin/base/util:util_test_lib", "//platform/smRunner:smRunner_test_lib", "//plugins/kotlin/base/plugin:plugin_test_lib", @@ -91,6 +95,7 @@ jvm_library( "//platform/projectModel-api:projectModel_test_lib", "//platform/external-system-api:externalSystem_test_lib", "//java/java-impl:impl_test_lib", + "//java/java-psi-api:psi_test_lib", "//plugins/gradle:gradle-common_test_lib", "//plugins/kotlin/project-wizard/core:core_test_lib", "//plugins/gradle/java:java_test_lib", @@ -101,6 +106,7 @@ jvm_library( "//platform/execution:execution_test_lib", "//platform/lang-api:lang_test_lib", "//platform/backend/observation:observation_test_lib", + "//platform/testRunner:testRunner_test_lib", ] ) ### auto-generated section `build intellij.kotlin.gradle.codeInsight.common` end diff --git a/plugins/kotlin/gradle/code-insight-common/intellij.kotlin.gradle.codeInsight.common.iml b/plugins/kotlin/gradle/code-insight-common/intellij.kotlin.gradle.codeInsight.common.iml index 66b638bbe6b5..054d2ee59d51 100644 --- a/plugins/kotlin/gradle/code-insight-common/intellij.kotlin.gradle.codeInsight.common.iml +++ b/plugins/kotlin/gradle/code-insight-common/intellij.kotlin.gradle.codeInsight.common.iml @@ -21,6 +21,7 @@ + @@ -39,6 +40,7 @@ + @@ -49,5 +51,6 @@ + \ No newline at end of file diff --git a/plugins/kotlin/gradle/code-insight-groovy/BUILD.bazel b/plugins/kotlin/gradle/code-insight-groovy/BUILD.bazel index c66f7d6c4add..4bf86d9b26f7 100644 --- a/plugins/kotlin/gradle/code-insight-groovy/BUILD.bazel +++ b/plugins/kotlin/gradle/code-insight-groovy/BUILD.bazel @@ -39,6 +39,7 @@ jvm_library( "//platform/external-system-api:externalSystem", "//platform/external-system-impl:externalSystem-impl", "//java/java-impl:impl", + "//java/java-psi-api:psi", "//plugins/groovy/groovy-psi:psi", "//plugins/kotlin/project-wizard/core", "//plugins/kotlin/gradle/gradle-java", @@ -75,6 +76,7 @@ jvm_library( "//platform/external-system-api:externalSystem_test_lib", "//platform/external-system-impl:externalSystem-impl_test_lib", "//java/java-impl:impl_test_lib", + "//java/java-psi-api:psi_test_lib", "//plugins/groovy/groovy-psi:psi_test_lib", "//plugins/kotlin/project-wizard/core:core_test_lib", "//plugins/kotlin/gradle/gradle-java:gradle-java_test_lib", diff --git a/plugins/kotlin/gradle/code-insight-groovy/intellij.kotlin.gradle.codeInsight.groovy.iml b/plugins/kotlin/gradle/code-insight-groovy/intellij.kotlin.gradle.codeInsight.groovy.iml index 269393476d07..1aef34381201 100644 --- a/plugins/kotlin/gradle/code-insight-groovy/intellij.kotlin.gradle.codeInsight.groovy.iml +++ b/plugins/kotlin/gradle/code-insight-groovy/intellij.kotlin.gradle.codeInsight.groovy.iml @@ -33,6 +33,7 @@ + diff --git a/plugins/kotlin/gradle/code-insight-toml/BUILD.bazel b/plugins/kotlin/gradle/code-insight-toml/BUILD.bazel index 3d88e7aaba0e..04d065080ff1 100644 --- a/plugins/kotlin/gradle/code-insight-toml/BUILD.bazel +++ b/plugins/kotlin/gradle/code-insight-toml/BUILD.bazel @@ -21,6 +21,7 @@ jvm_library( "//plugins/kotlin/base/plugin", "//platform/analysis-api:analysis", "//platform/core-impl", + "//java/java-psi-api:psi", "//uast/uast-common:uast", "//platform/util", "//platform/editor-ui-api:editor-ui", @@ -44,6 +45,7 @@ jvm_library( "//plugins/kotlin/base/plugin:plugin_test_lib", "//platform/analysis-api:analysis_test_lib", "//platform/core-impl:core-impl_test_lib", + "//java/java-psi-api:psi_test_lib", "//uast/uast-common:uast_test_lib", "//platform/util:util_test_lib", "//platform/editor-ui-api:editor-ui_test_lib", diff --git a/plugins/kotlin/gradle/code-insight-toml/intellij.kotlin.gradle.codeInsight.toml.iml b/plugins/kotlin/gradle/code-insight-toml/intellij.kotlin.gradle.codeInsight.toml.iml index 91e25fbcfd3e..d3808f28dda5 100644 --- a/plugins/kotlin/gradle/code-insight-toml/intellij.kotlin.gradle.codeInsight.toml.iml +++ b/plugins/kotlin/gradle/code-insight-toml/intellij.kotlin.gradle.codeInsight.toml.iml @@ -15,6 +15,7 @@ + diff --git a/plugins/kotlin/gradle/gradle-java/BUILD.bazel b/plugins/kotlin/gradle/gradle-java/BUILD.bazel index 8395e8e5cce9..e1bd5023f528 100644 --- a/plugins/kotlin/gradle/gradle-java/BUILD.bazel +++ b/plugins/kotlin/gradle/gradle-java/BUILD.bazel @@ -36,6 +36,7 @@ jvm_library( "//platform/execution-impl", "//platform/external-system-impl:externalSystem-impl", "//platform/ide-core-impl", + "//platform/ide-core", "@lib//:kotlin-tooling-core", "@lib//:kotlin-gradle-plugin-idea-proto", "@lib//:kotlin-gradle-plugin-idea", @@ -75,8 +76,11 @@ jvm_library( "//platform/platform-impl:ide-impl", "//platform/xdebugger-api:debugger", "//platform/core-ui", + "//platform/core-impl", "//platform/platform-util-io:ide-util-io", "//java/java-impl:impl", + "//java/java-psi-api:psi", + "//java/java-syntax:syntax", "//java/idea-ui:ui", "//java/execution/impl", "//java/compiler/impl", @@ -94,6 +98,9 @@ jvm_library( "//platform/execution", "//plugins/kotlin/base/indices", "//platform/util/jdom", + "//platform/util:util-ui", + "//platform/statistics", + "//platform/testRunner", ] ) @@ -112,6 +119,7 @@ jvm_library( "//platform/execution-impl:execution-impl_test_lib", "//platform/external-system-impl:externalSystem-impl_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//libraries/kotlinx/coroutines/core:core_test_lib", "//libraries/guava:guava_test_lib", "//jps/model-api:model_test_lib", @@ -147,8 +155,11 @@ jvm_library( "//platform/platform-impl:ide-impl_test_lib", "//platform/xdebugger-api:debugger_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl:core-impl_test_lib", "//platform/platform-util-io:ide-util-io_test_lib", "//java/java-impl:impl_test_lib", + "//java/java-psi-api:psi_test_lib", + "//java/java-syntax:syntax_test_lib", "//java/idea-ui:ui_test_lib", "//java/execution/impl:impl_test_lib", "//java/compiler/impl:impl_test_lib", @@ -167,6 +178,9 @@ jvm_library( "//platform/execution:execution_test_lib", "//plugins/kotlin/base/indices:indices_test_lib", "//platform/util/jdom:jdom_test_lib", + "//platform/util:util-ui_test_lib", + "//platform/statistics:statistics_test_lib", + "//platform/testRunner:testRunner_test_lib", ] ) ### auto-generated section `build kotlin.gradle.gradle-java` end diff --git a/plugins/kotlin/gradle/gradle-java/k1/BUILD.bazel b/plugins/kotlin/gradle/gradle-java/k1/BUILD.bazel index 28e34b4ab385..c811f877a078 100644 --- a/plugins/kotlin/gradle/gradle-java/k1/BUILD.bazel +++ b/plugins/kotlin/gradle/gradle-java/k1/BUILD.bazel @@ -163,6 +163,8 @@ jvm_library( "//java/openapi:java_test_lib", "//jps/model-api:model", "//jps/model-api:model_test_lib", + "//java/java-syntax:syntax", + "//java/java-syntax:syntax_test_lib", "//platform/lang-core", "//platform/lang-core:lang-core_test_lib", "//platform/projectModel-api:projectModel", @@ -260,6 +262,7 @@ jvm_library( "//plugins/kotlin/base/indices", "//plugins/kotlin/base/indices:indices_test_lib", "//platform/platform-util-io:ide-util-io", + "//platform/ide-core", "//platform/backend/workspace", "//platform/backend/workspace:workspace_test_lib", "@lib//:assert_j", @@ -283,6 +286,7 @@ jvm_library( runtime_deps = [ ":kotlin-gradle-gradle-java-k1-tests", "//platform/platform-util-io:ide-util-io_test_lib", + "//platform/ide-core:ide-core_test_lib", ] ) ### auto-generated section `build kotlin.gradle.gradle-java.k1.tests` end diff --git a/plugins/kotlin/gradle/gradle-java/k1/kotlin.gradle.gradle-java.k1.tests.iml b/plugins/kotlin/gradle/gradle-java/k1/kotlin.gradle.gradle-java.k1.tests.iml index 3714a089d259..e9e1807d4e11 100644 --- a/plugins/kotlin/gradle/gradle-java/k1/kotlin.gradle.gradle-java.k1.tests.iml +++ b/plugins/kotlin/gradle/gradle-java/k1/kotlin.gradle.gradle-java.k1.tests.iml @@ -36,6 +36,7 @@ + @@ -87,6 +88,7 @@ + diff --git a/plugins/kotlin/gradle/gradle-java/k2/BUILD.bazel b/plugins/kotlin/gradle/gradle-java/k2/BUILD.bazel index f02dae2642f4..bf9a1f57cabd 100644 --- a/plugins/kotlin/gradle/gradle-java/k2/BUILD.bazel +++ b/plugins/kotlin/gradle/gradle-java/k2/BUILD.bazel @@ -63,6 +63,8 @@ jvm_library( "//platform/analysis-api:analysis_test_lib", "//platform/core-api:core", "//platform/core-api:core_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", "//platform/indexing-api:indexing", "//platform/indexing-api:indexing_test_lib", "//platform/projectModel-api:projectModel", @@ -116,6 +118,7 @@ jvm_library( "//plugins/kotlin/fir/testFramework:testFramework_test_lib", "//jps/model-api:model", "//jps/model-api:model_test_lib", + "//platform/ide-core", "//plugins/groovy:groovy-tests", "//plugins/groovy:groovy-tests_test_lib", "//plugins/gradle/tooling-extension-impl:toolingExtension-tests", @@ -123,7 +126,10 @@ jvm_library( "//java/java-runtime:rt", "//java/java-runtime:rt_test_lib", ], - runtime_deps = [":kotlin-gradle-java-tests"] + runtime_deps = [ + ":kotlin-gradle-java-tests", + "//platform/ide-core:ide-core_test_lib", + ] ) ### auto-generated section `build intellij.kotlin.gradle.java.tests` end diff --git a/plugins/kotlin/gradle/gradle-java/k2/intellij.kotlin.gradle.java.tests.iml b/plugins/kotlin/gradle/gradle-java/k2/intellij.kotlin.gradle.java.tests.iml index 765f3c9fb5ec..913ce6dceb72 100644 --- a/plugins/kotlin/gradle/gradle-java/k2/intellij.kotlin.gradle.java.tests.iml +++ b/plugins/kotlin/gradle/gradle-java/k2/intellij.kotlin.gradle.java.tests.iml @@ -8,6 +8,7 @@ + @@ -39,6 +40,7 @@ + diff --git a/plugins/kotlin/gradle/gradle-java/kotlin.gradle.gradle-java.iml b/plugins/kotlin/gradle/gradle-java/kotlin.gradle.gradle-java.iml index fd08a677d97f..bb8abb5344d7 100644 --- a/plugins/kotlin/gradle/gradle-java/kotlin.gradle.gradle-java.iml +++ b/plugins/kotlin/gradle/gradle-java/kotlin.gradle.gradle-java.iml @@ -35,6 +35,7 @@ + @@ -74,8 +75,11 @@ + + + @@ -95,5 +99,8 @@ + + + \ No newline at end of file diff --git a/plugins/kotlin/gradle/gradle-java/tests.shared/BUILD.bazel b/plugins/kotlin/gradle/gradle-java/tests.shared/BUILD.bazel index 109a4795be2f..9a549078ff0c 100644 --- a/plugins/kotlin/gradle/gradle-java/tests.shared/BUILD.bazel +++ b/plugins/kotlin/gradle/gradle-java/tests.shared/BUILD.bazel @@ -38,6 +38,8 @@ jvm_library( "//platform/core-api:core_test_lib", "//platform/core-ui", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", "//platform/editor-ui-api:editor-ui", "//platform/editor-ui-api:editor-ui_test_lib", "//platform/execution-impl", @@ -45,6 +47,7 @@ jvm_library( "//platform/external-system-impl:externalSystem-impl", "//platform/external-system-impl:externalSystem-impl_test_lib", "//platform/platform-util-io:ide-util-io", + "//platform/ide-core", "//platform/indexing-api:indexing", "//platform/indexing-api:indexing_test_lib", "//platform/lang-core", @@ -154,10 +157,18 @@ jvm_library( "//java/openapi:java_test_lib", "//plugins/kotlin/jvm-debugger/coroutines", "//plugins/kotlin/jvm-debugger/coroutines:coroutines_test_lib", + "//java/java-syntax:syntax", + "//java/java-syntax:syntax_test_lib", + "//java/java-psi-api:psi", + "//java/java-psi-api:psi_test_lib", "//java/java-runtime:rt", "//java/java-runtime:rt_test_lib", "//platform/execution", "//platform/execution:execution_test_lib", + "//platform/util:util-ui", + "//platform/util:util-ui_test_lib", + "//platform/testRunner", + "//platform/testRunner:testRunner_test_lib", "//plugins/junit", "//plugins/junit:junit_test_lib", "//plugins/groovy:groovy-tests", @@ -167,6 +178,7 @@ jvm_library( runtime_deps = [ ":tests.shared", "//platform/platform-util-io:ide-util-io_test_lib", + "//platform/ide-core:ide-core_test_lib", ] ) ### auto-generated section `build kotlin.gradle.gradle-java.tests.shared` end diff --git a/plugins/kotlin/gradle/gradle-java/tests.shared/kotlin.gradle.gradle-java.tests.shared.iml b/plugins/kotlin/gradle/gradle-java/tests.shared/kotlin.gradle.gradle-java.tests.shared.iml index 96d89554b088..1c50c9b2ed4e 100644 --- a/plugins/kotlin/gradle/gradle-java/tests.shared/kotlin.gradle.gradle-java.tests.shared.iml +++ b/plugins/kotlin/gradle/gradle-java/tests.shared/kotlin.gradle.gradle-java.tests.shared.iml @@ -14,10 +14,12 @@ + + @@ -76,8 +78,12 @@ + + + + diff --git a/plugins/kotlin/gradle/gradle/BUILD.bazel b/plugins/kotlin/gradle/gradle/BUILD.bazel index b46192c9df15..f6d5548bf09d 100644 --- a/plugins/kotlin/gradle/gradle/BUILD.bazel +++ b/plugins/kotlin/gradle/gradle/BUILD.bazel @@ -72,6 +72,7 @@ jvm_library( "//platform/xdebugger-api:debugger", "//platform/core-ui", "//platform/platform-util-io:ide-util-io", + "//platform/ide-core", "//java/java-impl:impl", "//java/idea-ui:ui", "//java/execution/impl", @@ -81,7 +82,9 @@ jvm_library( "//plugins/kotlin/base/project-structure", "//plugins/kotlin/base/facet", "//platform/util/jdom", + "//platform/util-ex", "//platform/lang-api:lang", + "//platform/statistics", ] ) @@ -121,6 +124,7 @@ jvm_library( "//platform/xdebugger-api:debugger_test_lib", "//platform/core-ui:core-ui_test_lib", "//platform/platform-util-io:ide-util-io_test_lib", + "//platform/ide-core:ide-core_test_lib", "//java/java-impl:impl_test_lib", "//java/idea-ui:ui_test_lib", "//java/execution/impl:impl_test_lib", @@ -130,7 +134,9 @@ jvm_library( "//plugins/kotlin/base/project-structure:project-structure_test_lib", "//plugins/kotlin/base/facet:facet_test_lib", "//platform/util/jdom:jdom_test_lib", + "//platform/util-ex:util-ex_test_lib", "//platform/lang-api:lang_test_lib", + "//platform/statistics:statistics_test_lib", ] ) ### auto-generated section `build intellij.kotlin.gradle.gradle` end diff --git a/plugins/kotlin/gradle/gradle/intellij.kotlin.gradle.gradle.iml b/plugins/kotlin/gradle/gradle/intellij.kotlin.gradle.gradle.iml index 8120024048c9..f8f46f8143a8 100644 --- a/plugins/kotlin/gradle/gradle/intellij.kotlin.gradle.gradle.iml +++ b/plugins/kotlin/gradle/gradle/intellij.kotlin.gradle.gradle.iml @@ -65,6 +65,7 @@ + @@ -74,6 +75,8 @@ + + \ No newline at end of file diff --git a/plugins/kotlin/gradle/gradle/tests/BUILD.bazel b/plugins/kotlin/gradle/gradle/tests/BUILD.bazel index fecb432b9edc..d6321ebb21dc 100644 --- a/plugins/kotlin/gradle/gradle/tests/BUILD.bazel +++ b/plugins/kotlin/gradle/gradle/tests/BUILD.bazel @@ -142,6 +142,8 @@ jvm_library( "//platform/testFramework:testFramework_test_lib", "//platform/testFramework/junit5", "//platform/testFramework/junit5:junit5_test_lib", + "//platform/util-ex", + "//platform/util-ex:util-ex_test_lib", ], exports = ["@lib//:kotlin-tooling-core"], runtime_deps = [ diff --git a/plugins/kotlin/gradle/gradle/tests/intellij.kotlin.gradle.gradle.tests.iml b/plugins/kotlin/gradle/gradle/tests/intellij.kotlin.gradle.gradle.tests.iml index ae2c25e1d968..9672479be314 100644 --- a/plugins/kotlin/gradle/gradle/tests/intellij.kotlin.gradle.gradle.tests.iml +++ b/plugins/kotlin/gradle/gradle/tests/intellij.kotlin.gradle.gradle.tests.iml @@ -54,5 +54,6 @@ + \ No newline at end of file diff --git a/plugins/kotlin/gradle/multiplatform-tests-k2/BUILD.bazel b/plugins/kotlin/gradle/multiplatform-tests-k2/BUILD.bazel index 5aad1582775d..f90cdfe32783 100644 --- a/plugins/kotlin/gradle/multiplatform-tests-k2/BUILD.bazel +++ b/plugins/kotlin/gradle/multiplatform-tests-k2/BUILD.bazel @@ -38,6 +38,8 @@ jvm_library( "//platform/analysis-api:analysis_test_lib", "//platform/core-api:core", "//platform/core-api:core_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", "//platform/editor-ui-api:editor-ui", "//platform/editor-ui-api:editor-ui_test_lib", "//plugins/kotlin/base/util", @@ -50,6 +52,8 @@ jvm_library( "//plugins/kotlin/base/facet:facet_test_lib", "//java/testFramework", "//java/testFramework:testFramework_test_lib", + "//java/java-psi-api:psi", + "//java/java-psi-api:psi_test_lib", "//plugins/kotlin/base/analysis", "//plugins/kotlin/base/analysis:analysis_test_lib", "//platform/external-system-impl:externalSystem-tests", @@ -98,6 +102,10 @@ jvm_library( "//RegExpSupport:regexp-tests_test_lib", "//platform/xdebugger-impl:debugger-impl-tests", "//platform/xdebugger-impl:debugger-impl-tests_test_lib", + "//platform/util:util-ui", + "//platform/util:util-ui_test_lib", + "//platform/util-ex", + "//platform/util-ex:util-ex_test_lib", ], runtime_deps = [":kotlin-gradle-multiplatform-tests"] ) diff --git a/plugins/kotlin/gradle/multiplatform-tests-k2/intellij.kotlin.gradle.multiplatform.tests.iml b/plugins/kotlin/gradle/multiplatform-tests-k2/intellij.kotlin.gradle.multiplatform.tests.iml index 5440a40d74af..99fdd71f50ec 100644 --- a/plugins/kotlin/gradle/multiplatform-tests-k2/intellij.kotlin.gradle.multiplatform.tests.iml +++ b/plugins/kotlin/gradle/multiplatform-tests-k2/intellij.kotlin.gradle.multiplatform.tests.iml @@ -13,12 +13,14 @@ + + @@ -46,5 +48,7 @@ + + \ No newline at end of file diff --git a/plugins/kotlin/gradle/scripting/kotlin.gradle.scripting.k1/BUILD.bazel b/plugins/kotlin/gradle/scripting/kotlin.gradle.scripting.k1/BUILD.bazel index a63a9ac01dfe..5d6b5ae803c2 100644 --- a/plugins/kotlin/gradle/scripting/kotlin.gradle.scripting.k1/BUILD.bazel +++ b/plugins/kotlin/gradle/scripting/kotlin.gradle.scripting.k1/BUILD.bazel @@ -40,6 +40,7 @@ jvm_library( "@lib//:kotlinc-kotlin-compiler-common", "@lib//:kotlinc-kotlin-scripting-compiler-impl", "//platform/ide-core-impl", + "//platform/ide-core", "//plugins/kotlin/base/plugin", "//platform/core-impl", "//java/java-psi-api:psi", @@ -72,6 +73,7 @@ jvm_library( "//java/idea-ui:ui_test_lib", "//platform/util:util-ui_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//plugins/kotlin/base/plugin:plugin_test_lib", "//platform/core-impl:core-impl_test_lib", "//java/java-psi-api:psi_test_lib", diff --git a/plugins/kotlin/gradle/scripting/kotlin.gradle.scripting.k1/kotlin.gradle.scripting.k1.iml b/plugins/kotlin/gradle/scripting/kotlin.gradle.scripting.k1/kotlin.gradle.scripting.k1.iml index 50ec0b49bc0d..25340b68434f 100644 --- a/plugins/kotlin/gradle/scripting/kotlin.gradle.scripting.k1/kotlin.gradle.scripting.k1.iml +++ b/plugins/kotlin/gradle/scripting/kotlin.gradle.scripting.k1/kotlin.gradle.scripting.k1.iml @@ -40,6 +40,7 @@ + diff --git a/plugins/kotlin/gradle/scripting/kotlin.gradle.scripting.k2/BUILD.bazel b/plugins/kotlin/gradle/scripting/kotlin.gradle.scripting.k2/BUILD.bazel index 3202faf31f6f..2f950bd9193e 100644 --- a/plugins/kotlin/gradle/scripting/kotlin.gradle.scripting.k2/BUILD.bazel +++ b/plugins/kotlin/gradle/scripting/kotlin.gradle.scripting.k2/BUILD.bazel @@ -70,9 +70,11 @@ jvm_library( "//plugins/kotlin/base/psi", "//plugins/kotlin/base/plugin", "//platform/core-api:core", + "//platform/core-impl", "//plugins/kotlin/base/scripting/scripting.shared", "//java/openapi:java", "//platform/platform-impl:ide-impl", + "//platform/ide-core", "//plugins/kotlin/gradle/gradle-tooling/impl", "//plugins/kotlin/highlighting/highlighting-shared:kotlin-highlighting-shared", "//platform/eel-provider", @@ -119,9 +121,11 @@ jvm_library( "//plugins/kotlin/base/psi:psi_test_lib", "//plugins/kotlin/base/plugin:plugin_test_lib", "//platform/core-api:core_test_lib", + "//platform/core-impl:core-impl_test_lib", "//plugins/kotlin/base/scripting/scripting.shared:scripting.shared_test_lib", "//java/openapi:java_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//plugins/kotlin/gradle/gradle-tooling/impl:impl_test_lib", "//plugins/kotlin/highlighting/highlighting-shared:kotlin-highlighting-shared_test_lib", "//platform/eel-provider:eel-provider_test_lib", @@ -232,6 +236,8 @@ jvm_library( "//plugins/kotlin/base/plugin:plugin_test_lib", "//platform/core-api:core", "//platform/core-api:core_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", "//platform/testFramework/junit5", "//platform/testFramework/junit5:junit5_test_lib", "//platform/testFramework", diff --git a/plugins/kotlin/gradle/scripting/kotlin.gradle.scripting.k2/intellij.kotlin.gradle.scripting.iml b/plugins/kotlin/gradle/scripting/kotlin.gradle.scripting.k2/intellij.kotlin.gradle.scripting.iml index 9c9b1724fac0..05f1dcf5126a 100644 --- a/plugins/kotlin/gradle/scripting/kotlin.gradle.scripting.k2/intellij.kotlin.gradle.scripting.iml +++ b/plugins/kotlin/gradle/scripting/kotlin.gradle.scripting.k2/intellij.kotlin.gradle.scripting.iml @@ -60,9 +60,11 @@ + + diff --git a/plugins/kotlin/gradle/scripting/kotlin.gradle.scripting.k2/intellij.kotlin.gradle.scripting.tests.iml b/plugins/kotlin/gradle/scripting/kotlin.gradle.scripting.k2/intellij.kotlin.gradle.scripting.tests.iml index f988f36d8c6f..99a758c0bc45 100644 --- a/plugins/kotlin/gradle/scripting/kotlin.gradle.scripting.k2/intellij.kotlin.gradle.scripting.tests.iml +++ b/plugins/kotlin/gradle/scripting/kotlin.gradle.scripting.k2/intellij.kotlin.gradle.scripting.tests.iml @@ -58,6 +58,7 @@ + diff --git a/plugins/kotlin/gradle/scripting/kotlin.gradle.scripting.shared/BUILD.bazel b/plugins/kotlin/gradle/scripting/kotlin.gradle.scripting.shared/BUILD.bazel index 60f184a8cad0..b41171756646 100644 --- a/plugins/kotlin/gradle/scripting/kotlin.gradle.scripting.shared/BUILD.bazel +++ b/plugins/kotlin/gradle/scripting/kotlin.gradle.scripting.shared/BUILD.bazel @@ -29,6 +29,7 @@ jvm_library( "//platform/backend/observation", "@lib//:kotlinc-kotlin-compiler-common", "//platform/ide-core-impl", + "//platform/ide-core", "//platform/platform-api:ide", "@lib//:kotlinc-kotlin-scripting-jvm", "@lib//:kotlinc-kotlin-scripting-compiler-impl", @@ -74,6 +75,7 @@ jvm_library( "//platform/analysis-api:analysis_test_lib", "//platform/backend/observation:observation_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/platform-api:ide_test_lib", "//plugins/kotlin/gradle/gradle-tooling/impl:impl_test_lib", "//platform/workspace/storage:storage_test_lib", diff --git a/plugins/kotlin/gradle/scripting/kotlin.gradle.scripting.shared/kotlin.gradle.scripting.shared.iml b/plugins/kotlin/gradle/scripting/kotlin.gradle.scripting.shared/kotlin.gradle.scripting.shared.iml index 4761111389d9..44c2a0240f93 100644 --- a/plugins/kotlin/gradle/scripting/kotlin.gradle.scripting.shared/kotlin.gradle.scripting.shared.iml +++ b/plugins/kotlin/gradle/scripting/kotlin.gradle.scripting.shared/kotlin.gradle.scripting.shared.iml @@ -24,6 +24,7 @@ + diff --git a/plugins/kotlin/grazie/intellij.kotlin.grazie.tests/BUILD.bazel b/plugins/kotlin/grazie/intellij.kotlin.grazie.tests/BUILD.bazel index 390de16fb907..786e285e0742 100644 --- a/plugins/kotlin/grazie/intellij.kotlin.grazie.tests/BUILD.bazel +++ b/plugins/kotlin/grazie/intellij.kotlin.grazie.tests/BUILD.bazel @@ -30,6 +30,8 @@ jvm_library( "//plugins/kotlin/base/test:test_test_lib", "//platform/core-api:core", "//platform/core-api:core_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", "//platform/analysis-api:analysis", "//platform/analysis-api:analysis_test_lib", "//plugins/kotlin/test-framework", diff --git a/plugins/kotlin/grazie/intellij.kotlin.grazie.tests/intellij.kotlin.grazie.tests.iml b/plugins/kotlin/grazie/intellij.kotlin.grazie.tests/intellij.kotlin.grazie.tests.iml index 770ca87a182a..428bb9a3ad7e 100644 --- a/plugins/kotlin/grazie/intellij.kotlin.grazie.tests/intellij.kotlin.grazie.tests.iml +++ b/plugins/kotlin/grazie/intellij.kotlin.grazie.tests/intellij.kotlin.grazie.tests.iml @@ -15,6 +15,7 @@ + diff --git a/plugins/kotlin/highlighting/highlighting-k1/BUILD.bazel b/plugins/kotlin/highlighting/highlighting-k1/BUILD.bazel index f5975c452fa3..33946a487aeb 100644 --- a/plugins/kotlin/highlighting/highlighting-k1/BUILD.bazel +++ b/plugins/kotlin/highlighting/highlighting-k1/BUILD.bazel @@ -37,9 +37,11 @@ jvm_library( "//plugins/kotlin/base/project-structure", "//platform/editor-ui-api:editor-ui", "//platform/platform-api:ide", + "//platform/lang-api:lang", "//java/java-analysis-impl:analysis-impl", "//platform/lang-impl", "//platform/core-ui", + "//platform/core-impl", "//plugins/kotlin/base/resources:kotlin-base-resources", "//plugins/kotlin/base/psi", "//plugins/kotlin/base/analysis", @@ -48,6 +50,9 @@ jvm_library( "//plugins/kotlin/base/compiler-configuration", "//plugins/kotlin/base/facet", "//platform/platform-impl:ide-impl", + "//platform/ide-core", + "//platform/statistics", + "//platform/util:util-ui", "//plugins/kotlin/base/fe10/analysis", "//java/java-psi-api:psi", "//plugins/kotlin/base/code-insight", @@ -78,9 +83,11 @@ jvm_library( "//plugins/kotlin/base/project-structure:project-structure_test_lib", "//platform/editor-ui-api:editor-ui_test_lib", "//platform/platform-api:ide_test_lib", + "//platform/lang-api:lang_test_lib", "//java/java-analysis-impl:analysis-impl_test_lib", "//platform/lang-impl:lang-impl_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl:core-impl_test_lib", "//plugins/kotlin/base/resources:kotlin-base-resources_test_lib", "//plugins/kotlin/base/psi:psi_test_lib", "//plugins/kotlin/base/analysis:analysis_test_lib", @@ -88,6 +95,9 @@ jvm_library( "//plugins/kotlin/base/compiler-configuration:compiler-configuration_test_lib", "//plugins/kotlin/base/facet:facet_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", + "//platform/statistics:statistics_test_lib", + "//platform/util:util-ui_test_lib", "//plugins/kotlin/base/fe10/analysis:analysis_test_lib", "//java/java-psi-api:psi_test_lib", "//plugins/kotlin/base/code-insight:code-insight_test_lib", diff --git a/plugins/kotlin/highlighting/highlighting-k1/kotlin.highlighting.k1.iml b/plugins/kotlin/highlighting/highlighting-k1/kotlin.highlighting.k1.iml index bd037f40384d..113c0ee0e5a7 100644 --- a/plugins/kotlin/highlighting/highlighting-k1/kotlin.highlighting.k1.iml +++ b/plugins/kotlin/highlighting/highlighting-k1/kotlin.highlighting.k1.iml @@ -36,9 +36,11 @@ + + @@ -47,6 +49,9 @@ + + + diff --git a/plugins/kotlin/highlighting/highlighting-minimal/BUILD.bazel b/plugins/kotlin/highlighting/highlighting-minimal/BUILD.bazel index 5947f31db500..ca82a8269d71 100644 --- a/plugins/kotlin/highlighting/highlighting-minimal/BUILD.bazel +++ b/plugins/kotlin/highlighting/highlighting-minimal/BUILD.bazel @@ -20,11 +20,13 @@ jvm_library( "//platform/editor-ui-api:editor-ui", "//platform/analysis-impl", "//platform/core-ui", + "//platform/core-impl", "//plugins/kotlin/base/resources:kotlin-base-resources", "//platform/util:util-ui", "//platform/lang-impl", "//java/java-frontback-psi-impl:frontback-psi-impl", "//platform/platform-api:ide", + "//platform/ide-core", ], runtime_deps = ["//plugins/kotlin/base/frontend-agnostic"] ) @@ -41,12 +43,14 @@ jvm_library( "//platform/editor-ui-api:editor-ui_test_lib", "//platform/analysis-impl:analysis-impl_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl:core-impl_test_lib", "//plugins/kotlin/base/resources:kotlin-base-resources_test_lib", "//platform/util:util-ui_test_lib", "//platform/lang-impl:lang-impl_test_lib", "//plugins/kotlin/base/frontend-agnostic:frontend-agnostic_test_lib", "//java/java-frontback-psi-impl:frontback-psi-impl_test_lib", "//platform/platform-api:ide_test_lib", + "//platform/ide-core:ide-core_test_lib", ] ) ### auto-generated section `build intellij.kotlin.highlighting.minimal` end diff --git a/plugins/kotlin/highlighting/highlighting-minimal/intellij.kotlin.highlighting.minimal.iml b/plugins/kotlin/highlighting/highlighting-minimal/intellij.kotlin.highlighting.minimal.iml index b72972ba5339..0a750bd3ac73 100644 --- a/plugins/kotlin/highlighting/highlighting-minimal/intellij.kotlin.highlighting.minimal.iml +++ b/plugins/kotlin/highlighting/highlighting-minimal/intellij.kotlin.highlighting.minimal.iml @@ -14,11 +14,13 @@ + + \ No newline at end of file diff --git a/plugins/kotlin/highlighting/highlighting-shared/BUILD.bazel b/plugins/kotlin/highlighting/highlighting-shared/BUILD.bazel index af6441a78f5d..940d94875bda 100644 --- a/plugins/kotlin/highlighting/highlighting-shared/BUILD.bazel +++ b/plugins/kotlin/highlighting/highlighting-shared/BUILD.bazel @@ -29,10 +29,12 @@ jvm_library( "//platform/lang-api:lang", "//platform/lang-impl", "//platform/core-ui", + "//platform/core-impl", "//plugins/kotlin/base/resources:kotlin-base-resources", "//plugins/kotlin/base/psi", "//libraries/markdown", "//java/java-impl:impl", + "//java/java-psi-api:psi", "//plugins/kotlin/highlighting/highlighting-minimal:kotlin-highlighting-minimal", "//plugins/kotlin/code-insight/utils", "@lib//:kotlinc-analysis-api", @@ -64,10 +66,12 @@ jvm_library( "//platform/lang-api:lang_test_lib", "//platform/lang-impl:lang-impl_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl:core-impl_test_lib", "//plugins/kotlin/base/resources:kotlin-base-resources_test_lib", "//plugins/kotlin/base/psi:psi_test_lib", "//libraries/markdown:markdown_test_lib", "//java/java-impl:impl_test_lib", + "//java/java-psi-api:psi_test_lib", "//plugins/kotlin/highlighting/highlighting-minimal:kotlin-highlighting-minimal_test_lib", "//plugins/kotlin/code-insight/utils:utils_test_lib", ] diff --git a/plugins/kotlin/highlighting/highlighting-shared/kotlin.highlighting.shared.iml b/plugins/kotlin/highlighting/highlighting-shared/kotlin.highlighting.shared.iml index be8501e84ad8..328edbae8c8b 100644 --- a/plugins/kotlin/highlighting/highlighting-shared/kotlin.highlighting.shared.iml +++ b/plugins/kotlin/highlighting/highlighting-shared/kotlin.highlighting.shared.iml @@ -23,10 +23,12 @@ + + diff --git a/plugins/kotlin/highlighting/highlighting-shared/tests/BUILD.bazel b/plugins/kotlin/highlighting/highlighting-shared/tests/BUILD.bazel index 2a42d4c30f66..f2ebf076e5c6 100644 --- a/plugins/kotlin/highlighting/highlighting-shared/tests/BUILD.bazel +++ b/plugins/kotlin/highlighting/highlighting-shared/tests/BUILD.bazel @@ -18,14 +18,20 @@ jvm_library( "//platform/core-api:core_test_lib", "//platform/core-ui", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", "//jps/model-api:model", "//jps/model-api:model_test_lib", "//platform/projectModel-api:projectModel", "//platform/projectModel-api:projectModel_test_lib", + "//platform/editor-ui-api:editor-ui", + "//platform/editor-ui-api:editor-ui_test_lib", "//platform/testFramework", "//platform/testFramework:testFramework_test_lib", "//java/testFramework", "//java/testFramework:testFramework_test_lib", + "//java/java-psi-api:psi", + "//java/java-psi-api:psi_test_lib", "//plugins/kotlin/tests-common:common-tests", "//plugins/kotlin/tests-common:common-tests_test_lib", "@lib//:kotlinc-kotlin-compiler-common", @@ -33,12 +39,16 @@ jvm_library( "//plugins/kotlin/highlighting/highlighting-shared:kotlin-highlighting-shared_test_lib", "//platform/diff-impl", "//platform/diff-impl:diff-impl_test_lib", + "//platform/ide-core", "//plugins/kotlin/base/test", "//plugins/kotlin/base/test:test_test_lib", "//plugins/kotlin/base/plugin", "//plugins/kotlin/base/plugin:plugin_test_lib", ], - runtime_deps = [":tests"] + runtime_deps = [ + ":tests", + "//platform/ide-core:ide-core_test_lib", + ] ) ### auto-generated section `build kotlin.highlighting.shared.tests` end diff --git a/plugins/kotlin/highlighting/highlighting-shared/tests/kotlin.highlighting.shared.tests.iml b/plugins/kotlin/highlighting/highlighting-shared/tests/kotlin.highlighting.shared.tests.iml index 78361417e829..eb30baf0cc68 100644 --- a/plugins/kotlin/highlighting/highlighting-shared/tests/kotlin.highlighting.shared.tests.iml +++ b/plugins/kotlin/highlighting/highlighting-shared/tests/kotlin.highlighting.shared.tests.iml @@ -9,14 +9,18 @@ + + + + diff --git a/plugins/kotlin/i18n/BUILD.bazel b/plugins/kotlin/i18n/BUILD.bazel index 705e0cbd9a43..6beeaf7bf500 100644 --- a/plugins/kotlin/i18n/BUILD.bazel +++ b/plugins/kotlin/i18n/BUILD.bazel @@ -18,6 +18,7 @@ jvm_library( "@lib//:kotlinc-kotlin-compiler-common", "//platform/analysis-api:analysis", "//platform/core-api:core", + "//platform/core-impl", "//plugins/kotlin/frontend-independent", "//plugins/java-i18n", "//plugins/properties/properties-psi-impl:backend-psi", @@ -35,6 +36,7 @@ jvm_library( ":i18n", "//platform/analysis-api:analysis_test_lib", "//platform/core-api:core_test_lib", + "//platform/core-impl:core-impl_test_lib", "//plugins/kotlin/frontend-independent:frontend-independent_test_lib", "//plugins/java-i18n:java-i18n_test_lib", "//plugins/properties/properties-psi-impl:backend-psi_test_lib", diff --git a/plugins/kotlin/i18n/intellij.kotlin.i18n.iml b/plugins/kotlin/i18n/intellij.kotlin.i18n.iml index 0ca202af1be5..228d6ffd1a7c 100644 --- a/plugins/kotlin/i18n/intellij.kotlin.i18n.iml +++ b/plugins/kotlin/i18n/intellij.kotlin.i18n.iml @@ -12,6 +12,7 @@ + diff --git a/plugins/kotlin/i18n/tests/BUILD.bazel b/plugins/kotlin/i18n/tests/BUILD.bazel index f16ff48b9754..3e9e566d09a0 100644 --- a/plugins/kotlin/i18n/tests/BUILD.bazel +++ b/plugins/kotlin/i18n/tests/BUILD.bazel @@ -28,6 +28,8 @@ jvm_library( "@lib//:junit4", "//java/testFramework", "//java/testFramework:testFramework_test_lib", + "//java/java-psi-api:psi", + "//java/java-psi-api:psi_test_lib", "//platform/analysis-api:analysis", "//platform/analysis-api:analysis_test_lib", "//platform/core-api:core", diff --git a/plugins/kotlin/i18n/tests/intellij.kotlin.i18n.tests.iml b/plugins/kotlin/i18n/tests/intellij.kotlin.i18n.tests.iml index 9af7a2442a78..0d28b014668e 100644 --- a/plugins/kotlin/i18n/tests/intellij.kotlin.i18n.tests.iml +++ b/plugins/kotlin/i18n/tests/intellij.kotlin.i18n.tests.iml @@ -12,6 +12,7 @@ + diff --git a/plugins/kotlin/idea/BUILD.bazel b/plugins/kotlin/idea/BUILD.bazel index 4ecfd8dfa401..92c40a37230f 100644 --- a/plugins/kotlin/idea/BUILD.bazel +++ b/plugins/kotlin/idea/BUILD.bazel @@ -54,7 +54,9 @@ jvm_library( "//libraries/kotlinx/coroutines/core", "//libraries/guava", "//java/java-indexing-api:indexing", + "//java/java-psi-api:psi", "//platform/analysis-api:analysis", + "//platform/lang-api:lang", "//platform/code-style-api:codeStyle", "//platform/editor-ui-api:editor-ui", "//platform/indexing-api:indexing", @@ -120,6 +122,7 @@ jvm_library( "//platform/statistics", "//jvm/jvm-analysis-api:analysis", "//java/openapi:java", + "//java/java-syntax:syntax", "//java/java-impl:impl", "//java/idea-ui:ui", "//java/execution/openapi:java-execution", @@ -136,10 +139,12 @@ jvm_library( "//platform/built-in-server:builtInServer-impl", "//platform/ide-core", "//platform/platform-util-io-impl:ide-util-io-impl", + "//platform/platform-util-io:ide-util-io", "//libraries/jsoup", "//platform/workspace/storage", "//java/java-impl-refactorings:impl-refactorings", "//java/execution/impl", + "//java/java-frontback-psi-api:frontback-psi", "//plugins/kotlin/code-insight/api", "//plugins/kotlin/code-insight/utils", "//plugins/kotlin/code-insight/impl-base:kotlin-codeInsight-shared", @@ -156,10 +161,13 @@ jvm_library( "//plugins/kotlin/code-insight/intentions-shared:kotlin-code-insight-intentions-shared", "//plugins/kotlin/kotlin.searching/base", "//platform/util/text-matching", + "//platform/util:util-ui", + "//platform/util-ex", "//plugins/kotlin/code-insight/line-markers-shared:kotlin-code-insight-line-markers-shared", "//platform/workspace/jps", "//platform/backend/workspace", "//platform/core-api:core", + "//platform/core-impl", "//plugins/kotlin/base/analysis-api/analysis-api-utils:kotlin-base-analysis-utils", "//plugins/kotlin/code-insight/inspections-shared:kotlin-code-insight-inspections-shared", "//plugins/kotlin/kotlin.ide", @@ -171,7 +179,6 @@ jvm_library( exports = [ "//plugins/kotlin/highlighting/highlighting-k1:kotlin-highlighting-k1", "//plugins/kotlin/frontend-independent", - "//platform/statistics", ] ) @@ -186,8 +193,6 @@ jvm_library( "//plugins/kotlin/highlighting/highlighting-k1:kotlin-highlighting-k1_test_lib", "//plugins/kotlin/frontend-independent", "//plugins/kotlin/frontend-independent:frontend-independent_test_lib", - "//platform/statistics", - "//platform/statistics:statistics_test_lib", ], runtime_deps = [ ":idea", @@ -195,7 +200,9 @@ jvm_library( "//libraries/kotlinx/coroutines/core:core_test_lib", "//libraries/guava:guava_test_lib", "//java/java-indexing-api:indexing_test_lib", + "//java/java-psi-api:psi_test_lib", "//platform/analysis-api:analysis_test_lib", + "//platform/lang-api:lang_test_lib", "//platform/code-style-api:codeStyle_test_lib", "//platform/editor-ui-api:editor-ui_test_lib", "//platform/indexing-api:indexing_test_lib", @@ -254,6 +261,7 @@ jvm_library( "//platform/statistics:statistics_test_lib", "//jvm/jvm-analysis-api:analysis_test_lib", "//java/openapi:java_test_lib", + "//java/java-syntax:syntax_test_lib", "//java/java-impl:impl_test_lib", "//java/idea-ui:ui_test_lib", "//java/execution/openapi:java-execution_test_lib", @@ -269,10 +277,12 @@ jvm_library( "//platform/built-in-server:builtInServer-impl_test_lib", "//platform/ide-core:ide-core_test_lib", "//platform/platform-util-io-impl:ide-util-io-impl_test_lib", + "//platform/platform-util-io:ide-util-io_test_lib", "//libraries/jsoup:jsoup_test_lib", "//platform/workspace/storage:storage_test_lib", "//java/java-impl-refactorings:impl-refactorings_test_lib", "//java/execution/impl:impl_test_lib", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//plugins/kotlin/code-insight/api:api_test_lib", "//plugins/kotlin/code-insight/utils:utils_test_lib", "//plugins/kotlin/code-insight/impl-base:kotlin-codeInsight-shared_test_lib", @@ -287,10 +297,13 @@ jvm_library( "//plugins/kotlin/code-insight/intentions-shared:kotlin-code-insight-intentions-shared_test_lib", "//plugins/kotlin/kotlin.searching/base:base_test_lib", "//platform/util/text-matching:text-matching_test_lib", + "//platform/util:util-ui_test_lib", + "//platform/util-ex:util-ex_test_lib", "//plugins/kotlin/code-insight/line-markers-shared:kotlin-code-insight-line-markers-shared_test_lib", "//platform/workspace/jps:jps_test_lib", "//platform/backend/workspace:workspace_test_lib", "//platform/core-api:core_test_lib", + "//platform/core-impl:core-impl_test_lib", "//plugins/kotlin/base/analysis-api/analysis-api-utils:kotlin-base-analysis-utils_test_lib", "//plugins/kotlin/code-insight/inspections-shared:kotlin-code-insight-inspections-shared_test_lib", "//plugins/kotlin/kotlin.ide:kotlin.ide_test_lib", diff --git a/plugins/kotlin/idea/kotlin.idea.iml b/plugins/kotlin/idea/kotlin.idea.iml index 580bd43b83fa..292afa6dc919 100644 --- a/plugins/kotlin/idea/kotlin.idea.iml +++ b/plugins/kotlin/idea/kotlin.idea.iml @@ -34,7 +34,9 @@ + + @@ -97,9 +99,10 @@ - + + @@ -116,10 +119,12 @@ + + @@ -136,10 +141,13 @@ + + + diff --git a/plugins/kotlin/idea/tests/BUILD.bazel b/plugins/kotlin/idea/tests/BUILD.bazel index 384278c36b22..ea3f1cb89f0e 100644 --- a/plugins/kotlin/idea/tests/BUILD.bazel +++ b/plugins/kotlin/idea/tests/BUILD.bazel @@ -102,14 +102,19 @@ jvm_library( "//platform/external-system-impl:externalSystem-impl", "//platform/external-system-impl:externalSystem-impl_test_lib", "//platform/ide-core-impl", + "//platform/ide-core", "//platform/core-api:core", "//platform/core-api:core_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", "//platform/indexing-api:indexing", "//platform/indexing-api:indexing_test_lib", "//jps/model-api:model", "//jps/model-api:model_test_lib", "//platform/lang-core", "//platform/lang-core:lang-core_test_lib", + "//platform/lang-api:lang", + "//platform/lang-api:lang_test_lib", "//platform/refactoring", "//platform/refactoring:refactoring_test_lib", "//platform/smRunner", @@ -189,6 +194,8 @@ jvm_library( "@lib//:kotlinc-kotlin-compiler-common", "//java/testFramework", "//java/testFramework:testFramework_test_lib", + "//java/java-psi-api:psi", + "//java/java-psi-api:psi_test_lib", "@lib//:kotlinc-kotlin-compiler-fe10", "@lib//:kotlinc-kotlin-compiler-cli", "@lib//:kotlinc-kotlin-compiler-ir", @@ -216,6 +223,7 @@ jvm_library( "//RegExpSupport:regexp", "//RegExpSupport:regexp_test_lib", "//platform/platform-util-io:ide-util-io", + "//platform/progress/shared:ide-progress", "//platform/duplicates-analysis", "//platform/duplicates-analysis:duplicates-analysis_test_lib", "//spellchecker", @@ -298,12 +306,18 @@ jvm_library( "//java/java-tests:tests_test_lib", "//java/java-impl-inspections:impl-inspections", "//java/java-impl-inspections:impl-inspections_test_lib", + "//java/java-syntax:syntax", + "//java/java-syntax:syntax_test_lib", "//java/java-impl-refactorings:impl-refactorings", "//java/java-impl-refactorings:impl-refactorings_test_lib", "//platform/diff-impl", "//platform/diff-impl:diff-impl_test_lib", "//platform/util/jdom", "//platform/util/jdom:jdom_test_lib", + "//platform/util:util-ui", + "//platform/util:util-ui_test_lib", + "//platform/util-ex", + "//platform/util-ex:util-ex_test_lib", "//plugins/kotlin/base/resources:kotlin-base-resources", "//plugins/kotlin/base/resources:kotlin-base-resources_test_lib", "//plugins/kotlin/code-insight/utils", @@ -318,6 +332,8 @@ jvm_library( "//plugins/kotlin/j2k/k1.old.post-processing:k1.old.post-processing_test_lib", "//java/ide-customization", "//java/ide-customization:ide-customization_test_lib", + "//java/java-frontback-psi-api:frontback-psi", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//plugins/kotlin/refactorings/kotlin.refactorings.common:kotlin-refactorings-common", "//plugins/kotlin/refactorings/kotlin.refactorings.common:kotlin-refactorings-common_test_lib", "//plugins/kotlin/base/test", @@ -369,12 +385,16 @@ jvm_library( "//plugins/kotlin/intellij.kotlin.base.test:base-test_test_lib", "//platform/platform-tests:tests", "//platform/platform-tests:tests_test_lib", + "//platform/testRunner", + "//platform/testRunner:testRunner_test_lib", "//plugins/kotlin/base/fe10/project-structure", "//plugins/kotlin/base/fe10/project-structure:project-structure_test_lib", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", "//plugins/kotlin/base/plugin:kotlin-base-plugin-tests", "//plugins/kotlin/base/plugin:kotlin-base-plugin-tests_test_lib", + "//xml/xml-parser:parser", + "//xml/xml-parser:parser_test_lib", ], exports = [ "//plugins/kotlin/intellij.kotlin.base.test:base-test", @@ -383,6 +403,7 @@ jvm_library( runtime_deps = [ ":tests", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//plugins/kotlin/gradle/gradle:gradle_test_lib", "//plugins/kotlin/compiler-plugins/sam-with-receiver/common:common_test_lib", "//plugins/kotlin/compiler-plugins/sam-with-receiver/gradle:gradle_test_lib", @@ -403,6 +424,7 @@ jvm_library( "//plugins/kotlin/compiler-plugins/parcelize/common:common_test_lib", "//plugins/kotlin/compiler-plugins/parcelize/gradle:gradle_test_lib", "//platform/platform-util-io:ide-util-io_test_lib", + "//platform/progress/shared:ide-progress_test_lib", ] ) ### auto-generated section `build kotlin.idea.tests` end diff --git a/plugins/kotlin/idea/tests/kotlin.idea.tests.iml b/plugins/kotlin/idea/tests/kotlin.idea.tests.iml index 99a3589c033f..0258e976b21f 100644 --- a/plugins/kotlin/idea/tests/kotlin.idea.tests.iml +++ b/plugins/kotlin/idea/tests/kotlin.idea.tests.iml @@ -32,10 +32,13 @@ + + + @@ -77,6 +80,7 @@ + @@ -114,6 +118,7 @@ + @@ -156,9 +161,12 @@ + + + @@ -166,6 +174,7 @@ + @@ -195,8 +204,10 @@ + + \ No newline at end of file diff --git a/plugins/kotlin/injection/base/tests/BUILD.bazel b/plugins/kotlin/injection/base/tests/BUILD.bazel index 0881bbc4ffb8..dbb459271075 100644 --- a/plugins/kotlin/injection/base/tests/BUILD.bazel +++ b/plugins/kotlin/injection/base/tests/BUILD.bazel @@ -26,6 +26,8 @@ jvm_library( "//platform/analysis-api:analysis_test_lib", "//platform/core-api:core", "//platform/core-api:core_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", "//platform/editor-ui-api:editor-ui", "//platform/editor-ui-api:editor-ui_test_lib", "//platform/projectModel-api:projectModel", @@ -38,6 +40,8 @@ jvm_library( "//plugins/kotlin/test-framework:test-framework_test_lib", "//java/testFramework", "//java/testFramework:testFramework_test_lib", + "//java/java-psi-api:psi", + "//java/java-psi-api:psi_test_lib", "//platform/editor-ui-ex:editor-ex", "//platform/editor-ui-ex:editor-ex_test_lib", "@lib//:kotlinc-analysis-api", @@ -50,8 +54,14 @@ jvm_library( "@lib//:kotlinc-kotlin-compiler-common", "//plugins/IntelliLang/backend", "//plugins/IntelliLang/backend:backend_test_lib", + "//platform/ide-core", + "//xml/xml-parser:parser", + "//xml/xml-parser:parser_test_lib", ], - runtime_deps = [":tests"] + runtime_deps = [ + ":tests", + "//platform/ide-core:ide-core_test_lib", + ] ) ### auto-generated section `build kotlin.base.injection.tests` end diff --git a/plugins/kotlin/injection/base/tests/kotlin.base.injection.tests.iml b/plugins/kotlin/injection/base/tests/kotlin.base.injection.tests.iml index e67197be81f1..516f9a97264e 100644 --- a/plugins/kotlin/injection/base/tests/kotlin.base.injection.tests.iml +++ b/plugins/kotlin/injection/base/tests/kotlin.base.injection.tests.iml @@ -25,12 +25,14 @@ + + @@ -38,5 +40,7 @@ + + \ No newline at end of file diff --git a/plugins/kotlin/injection/k2/tests/BUILD.bazel b/plugins/kotlin/injection/k2/tests/BUILD.bazel index 952a63526c87..c119b715e20e 100644 --- a/plugins/kotlin/injection/k2/tests/BUILD.bazel +++ b/plugins/kotlin/injection/k2/tests/BUILD.bazel @@ -23,6 +23,8 @@ jvm_library( deps = [ "//platform/core-api:core", "//platform/core-api:core_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", "//plugins/kotlin/plugin/k2", "//plugins/kotlin/plugin/k2:k2_test_lib", "//plugins/kotlin/test-framework", @@ -41,6 +43,8 @@ jvm_library( "//plugins/kotlin/base/test:test_test_lib", "//java/testFramework", "//java/testFramework:testFramework_test_lib", + "//java/java-psi-api:psi", + "//java/java-psi-api:psi_test_lib", "@lib//:kotlinc-kotlin-compiler-tests", "@lib//:kotlinc-kotlin-compiler-common", "@lib//:kotlinc-analysis-api", diff --git a/plugins/kotlin/injection/k2/tests/intellij.kotlin.injection.tests.iml b/plugins/kotlin/injection/k2/tests/intellij.kotlin.injection.tests.iml index 996005c89e60..a5928e2684cb 100644 --- a/plugins/kotlin/injection/k2/tests/intellij.kotlin.injection.tests.iml +++ b/plugins/kotlin/injection/k2/tests/intellij.kotlin.injection.tests.iml @@ -24,6 +24,7 @@ + @@ -33,6 +34,7 @@ + diff --git a/plugins/kotlin/inspections-fe10/BUILD.bazel b/plugins/kotlin/inspections-fe10/BUILD.bazel index 78619fef5e31..3682b240a9e8 100644 --- a/plugins/kotlin/inspections-fe10/BUILD.bazel +++ b/plugins/kotlin/inspections-fe10/BUILD.bazel @@ -40,7 +40,9 @@ jvm_library( "//platform/core-impl", "//platform/editor-ui-api:editor-ui", "//java/openapi:java", + "//java/java-syntax:syntax", "//java/java-impl:impl", + "//java/java-psi-api:psi", ] ) @@ -65,7 +67,9 @@ jvm_library( "//platform/core-impl:core-impl_test_lib", "//platform/editor-ui-api:editor-ui_test_lib", "//java/openapi:java_test_lib", + "//java/java-syntax:syntax_test_lib", "//java/java-impl:impl_test_lib", + "//java/java-psi-api:psi_test_lib", ] ) ### auto-generated section `build kotlin.inspections-fe10` end diff --git a/plugins/kotlin/inspections-fe10/kotlin.inspections-fe10.iml b/plugins/kotlin/inspections-fe10/kotlin.inspections-fe10.iml index f6c4f2d77fef..c6aeb5e6da88 100644 --- a/plugins/kotlin/inspections-fe10/kotlin.inspections-fe10.iml +++ b/plugins/kotlin/inspections-fe10/kotlin.inspections-fe10.iml @@ -40,6 +40,8 @@ + + \ No newline at end of file diff --git a/plugins/kotlin/intellij.kotlin.base.test/BUILD.bazel b/plugins/kotlin/intellij.kotlin.base.test/BUILD.bazel index 96fe8a20bc00..2475e8c7d12f 100644 --- a/plugins/kotlin/intellij.kotlin.base.test/BUILD.bazel +++ b/plugins/kotlin/intellij.kotlin.base.test/BUILD.bazel @@ -49,12 +49,20 @@ jvm_library( "//plugins/kotlin/kotlin.searching/base:base_test_lib", "//platform/core-ui", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", "//libraries/fastutil", "//libraries/fastutil:fastutil_test_lib", "//platform/analysis-api:analysis", "//platform/analysis-api:analysis_test_lib", + "//platform/editor-ui-api:editor-ui", + "//platform/editor-ui-api:editor-ui_test_lib", "//platform/util/jdom", "//platform/util/jdom:jdom_test_lib", + "//platform/util:util-ui", + "//platform/util:util-ui_test_lib", + "//platform/util-ex", + "//platform/util-ex:util-ex_test_lib", "//plugins/kotlin/highlighting/highlighting-minimal:kotlin-highlighting-minimal", "//plugins/kotlin/highlighting/highlighting-minimal:kotlin-highlighting-minimal_test_lib", "//platform/projectModel-api:projectModel", @@ -68,6 +76,8 @@ jvm_library( "//plugins/kotlin/base/facet:facet_test_lib", "//platform/lang-core", "//platform/lang-core:lang-core_test_lib", + "//platform/lang-api:lang", + "//platform/lang-api:lang_test_lib", "@lib//:kotlinc-kotlin-jps-common", "//java/java-runtime:rt", "//java/java-runtime:rt_test_lib", @@ -110,11 +120,15 @@ jvm_library( "//java/execution/impl", "//java/execution/impl:impl_test_lib", "//platform/platform-util-io:ide-util-io", + "//platform/ide-core", + "//platform/progress/shared:ide-progress", "@lib//:kotlin-test", "//java/openapi:java", "//java/openapi:java_test_lib", "//java/idea-ui:ui", "//java/idea-ui:ui_test_lib", + "//java/java-syntax:syntax", + "//java/java-syntax:syntax_test_lib", "@lib//:jet_check", "//platform/structure-view-impl:structureView-impl", "//platform/structure-view-impl:structureView-impl_test_lib", @@ -140,6 +154,8 @@ jvm_library( "//plugins/kotlin/base/platforms:platforms_test_lib", "//plugins/kotlin/base/psi", "//plugins/kotlin/base/psi:psi_test_lib", + "//java/java-psi-api:psi", + "//java/java-psi-api:psi_test_lib", "//platform/util/concurrency", "//platform/util/concurrency:concurrency_test_lib", "//platform/navbar/testFramework", @@ -160,16 +176,24 @@ jvm_library( "//jps/jps-builders:build_test_lib", "//java/java-indexing-api:indexing", "//java/java-indexing-api:indexing_test_lib", + "//java/java-frontback-psi-api:frontback-psi", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", "//jps/model-api:model", "//jps/model-api:model_test_lib", + "//platform/statistics", + "//platform/statistics:statistics_test_lib", + "//platform/testRunner", + "//platform/testRunner:testRunner_test_lib", "//plugins/kotlin/base/plugin:kotlin-base-plugin-tests", "//plugins/kotlin/base/plugin:kotlin-base-plugin-tests_test_lib", ], runtime_deps = [ ":base-test", "//platform/platform-util-io:ide-util-io_test_lib", + "//platform/ide-core:ide-core_test_lib", + "//platform/progress/shared:ide-progress_test_lib", ] ) ### auto-generated section `build intellij.kotlin.base.test` end diff --git a/plugins/kotlin/intellij.kotlin.base.test/intellij.kotlin.base.test.iml b/plugins/kotlin/intellij.kotlin.base.test/intellij.kotlin.base.test.iml index a9f616966d57..6f72c4e52f50 100644 --- a/plugins/kotlin/intellij.kotlin.base.test/intellij.kotlin.base.test.iml +++ b/plugins/kotlin/intellij.kotlin.base.test/intellij.kotlin.base.test.iml @@ -25,9 +25,13 @@ + + + + @@ -35,6 +39,7 @@ + @@ -58,9 +63,12 @@ + + + @@ -74,6 +82,7 @@ + @@ -84,8 +93,11 @@ + + + \ No newline at end of file diff --git a/plugins/kotlin/internal/BUILD.bazel b/plugins/kotlin/internal/BUILD.bazel index 5d662851a883..aa7a9068d759 100644 --- a/plugins/kotlin/internal/BUILD.bazel +++ b/plugins/kotlin/internal/BUILD.bazel @@ -26,6 +26,8 @@ jvm_library( "//plugins/kotlin/base/analysis", "@lib//:kotlinc-analysis-api-platform-interface", "//platform/platform-impl:ide-impl", + "//platform/ide-core", + "//platform/util:util-ui", "//plugins/kotlin/base/resources:kotlin-base-resources", "//plugins/kotlin/base/project-structure", ] @@ -47,6 +49,8 @@ jvm_library( "//plugins/kotlin/base/plugin:plugin_test_lib", "//plugins/kotlin/base/analysis:analysis_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", + "//platform/util:util-ui_test_lib", "//plugins/kotlin/base/resources:kotlin-base-resources_test_lib", "//plugins/kotlin/base/project-structure:project-structure_test_lib", ] diff --git a/plugins/kotlin/internal/intellij.kotlin.internal.iml b/plugins/kotlin/internal/intellij.kotlin.internal.iml index 5a6350b4be60..4faa4049cc02 100644 --- a/plugins/kotlin/internal/intellij.kotlin.internal.iml +++ b/plugins/kotlin/internal/intellij.kotlin.internal.iml @@ -20,6 +20,8 @@ + + diff --git a/plugins/kotlin/j2k/k1.new/BUILD.bazel b/plugins/kotlin/j2k/k1.new/BUILD.bazel index 58650419cf49..09d8ce08b7b3 100644 --- a/plugins/kotlin/j2k/k1.new/BUILD.bazel +++ b/plugins/kotlin/j2k/k1.new/BUILD.bazel @@ -20,7 +20,9 @@ jvm_library( kotlinc_opts = ":custom_k1.new", deps = [ "//java/java-indexing-api:indexing", + "//java/java-psi-api:psi", "//platform/core-api:core", + "//platform/core-impl", "//platform/lang-api:lang", "@lib//:kotlin-stdlib", "@lib//:kotlinc-kotlin-compiler-common", @@ -32,6 +34,7 @@ jvm_library( "//plugins/kotlin/base/indices", "//plugins/kotlin/base/project-structure", "//java/java-impl:impl", + "//java/java-frontback-psi-api:frontback-psi", "//plugins/kotlin/base/fe10/analysis", "//plugins/kotlin/base/fe10/code-insight", "//plugins/kotlin/core", @@ -53,7 +56,9 @@ jvm_library( runtime_deps = [ ":k1.new", "//java/java-indexing-api:indexing_test_lib", + "//java/java-psi-api:psi_test_lib", "//platform/core-api:core_test_lib", + "//platform/core-impl:core-impl_test_lib", "//platform/lang-api:lang_test_lib", "//platform/editor-ui-api:editor-ui_test_lib", "//plugins/kotlin/base/util:util_test_lib", @@ -61,6 +66,7 @@ jvm_library( "//plugins/kotlin/base/indices:indices_test_lib", "//plugins/kotlin/base/project-structure:project-structure_test_lib", "//java/java-impl:impl_test_lib", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//plugins/kotlin/base/fe10/analysis:analysis_test_lib", "//plugins/kotlin/base/fe10/code-insight:code-insight_test_lib", "//plugins/kotlin/core:core_test_lib", diff --git a/plugins/kotlin/j2k/k1.new/kotlin.j2k.k1.new.iml b/plugins/kotlin/j2k/k1.new/kotlin.j2k.k1.new.iml index 61a10115d9d8..ec33dafe0e3c 100644 --- a/plugins/kotlin/j2k/k1.new/kotlin.j2k.k1.new.iml +++ b/plugins/kotlin/j2k/k1.new/kotlin.j2k.k1.new.iml @@ -24,7 +24,9 @@ + + @@ -36,6 +38,7 @@ + diff --git a/plugins/kotlin/j2k/k1.new/tests/BUILD.bazel b/plugins/kotlin/j2k/k1.new/tests/BUILD.bazel index 4429b7d764a4..9f06775b4089 100644 --- a/plugins/kotlin/j2k/k1.new/tests/BUILD.bazel +++ b/plugins/kotlin/j2k/k1.new/tests/BUILD.bazel @@ -38,6 +38,8 @@ jvm_library( "//platform/code-style-api:codeStyle_test_lib", "//platform/core-api:core", "//platform/core-api:core_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", "@lib//:kotlin-stdlib", "@lib//:kotlinc-kotlin-compiler-common", "@lib//:kotlinc-kotlin-compiler-fe10", diff --git a/plugins/kotlin/j2k/k1.new/tests/kotlin.j2k.k1.new.tests.iml b/plugins/kotlin/j2k/k1.new/tests/kotlin.j2k.k1.new.tests.iml index 1183527cce14..e67f79cc6eba 100644 --- a/plugins/kotlin/j2k/k1.new/tests/kotlin.j2k.k1.new.tests.iml +++ b/plugins/kotlin/j2k/k1.new/tests/kotlin.j2k.k1.new.tests.iml @@ -25,6 +25,7 @@ + diff --git a/plugins/kotlin/j2k/k1.old.post-processing/BUILD.bazel b/plugins/kotlin/j2k/k1.old.post-processing/BUILD.bazel index 06569a27b36e..145725a9fac1 100644 --- a/plugins/kotlin/j2k/k1.old.post-processing/BUILD.bazel +++ b/plugins/kotlin/j2k/k1.old.post-processing/BUILD.bazel @@ -35,6 +35,7 @@ jvm_library( "@lib//:kotlinc-kotlin-compiler-fe10", "//platform/analysis-api:analysis", "//platform/core-api:core", + "//platform/core-impl", "//platform/editor-ui-api:editor-ui", "//platform/indexing-api:indexing", "//plugins/kotlin/base/util", @@ -67,6 +68,7 @@ jvm_library( ":k1.old.post-processing", "//platform/analysis-api:analysis_test_lib", "//platform/core-api:core_test_lib", + "//platform/core-impl:core-impl_test_lib", "//platform/editor-ui-api:editor-ui_test_lib", "//platform/indexing-api:indexing_test_lib", "//plugins/kotlin/base/util:util_test_lib", diff --git a/plugins/kotlin/j2k/k1.old.post-processing/kotlin.j2k.k1.old.post-processing.iml b/plugins/kotlin/j2k/k1.old.post-processing/kotlin.j2k.k1.old.post-processing.iml index b046f0a75fc8..eead4310a0d8 100644 --- a/plugins/kotlin/j2k/k1.old.post-processing/kotlin.j2k.k1.old.post-processing.iml +++ b/plugins/kotlin/j2k/k1.old.post-processing/kotlin.j2k.k1.old.post-processing.iml @@ -30,6 +30,7 @@ + diff --git a/plugins/kotlin/j2k/k1.old/BUILD.bazel b/plugins/kotlin/j2k/k1.old/BUILD.bazel index 15c8ab1a6152..af7c5a0e4c21 100644 --- a/plugins/kotlin/j2k/k1.old/BUILD.bazel +++ b/plugins/kotlin/j2k/k1.old/BUILD.bazel @@ -30,6 +30,7 @@ jvm_library( "@lib//:kotlinc-kotlin-compiler-fe10", "@lib//:kotlinc-analysis-api", "//platform/core-api:core", + "//platform/core-impl", "//platform/editor-ui-api:editor-ui", "//plugins/kotlin/base/util", "//plugins/kotlin/core", @@ -37,9 +38,11 @@ jvm_library( "//plugins/kotlin/frontend-independent", "//platform/lang-api:lang", "//java/java-psi-impl:psi-impl", + "//java/java-psi-api:psi", "//plugins/kotlin/j2k/shared", "//plugins/kotlin/base/fe10/analysis", "//java/java-analysis-impl:analysis-impl", + "//java/java-frontback-psi-api:frontback-psi", "//plugins/kotlin/base/plugin", "//plugins/kotlin/base/fe10/code-insight", "//plugins/kotlin/j2k/k1.new", @@ -55,6 +58,7 @@ jvm_library( runtime_deps = [ ":k1.old", "//platform/core-api:core_test_lib", + "//platform/core-impl:core-impl_test_lib", "//platform/editor-ui-api:editor-ui_test_lib", "//plugins/kotlin/base/util:util_test_lib", "//plugins/kotlin/core:core_test_lib", @@ -62,9 +66,11 @@ jvm_library( "//plugins/kotlin/frontend-independent:frontend-independent_test_lib", "//platform/lang-api:lang_test_lib", "//java/java-psi-impl:psi-impl_test_lib", + "//java/java-psi-api:psi_test_lib", "//plugins/kotlin/j2k/shared:shared_test_lib", "//plugins/kotlin/base/fe10/analysis:analysis_test_lib", "//java/java-analysis-impl:analysis-impl_test_lib", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//plugins/kotlin/base/plugin:plugin_test_lib", "//plugins/kotlin/base/fe10/code-insight:code-insight_test_lib", "//plugins/kotlin/j2k/k1.new:k1.new_test_lib", diff --git a/plugins/kotlin/j2k/k1.old/kotlin.j2k.k1.old.iml b/plugins/kotlin/j2k/k1.old/kotlin.j2k.k1.old.iml index 623079ae7416..343e0e8768b7 100644 --- a/plugins/kotlin/j2k/k1.old/kotlin.j2k.k1.old.iml +++ b/plugins/kotlin/j2k/k1.old/kotlin.j2k.k1.old.iml @@ -29,6 +29,7 @@ + @@ -36,9 +37,11 @@ + + diff --git a/plugins/kotlin/j2k/k2/BUILD.bazel b/plugins/kotlin/j2k/k2/BUILD.bazel index ee167c6afd25..81d8f862ed28 100644 --- a/plugins/kotlin/j2k/k2/BUILD.bazel +++ b/plugins/kotlin/j2k/k2/BUILD.bazel @@ -49,6 +49,7 @@ jvm_library( "//platform/refactoring", "//java/java-analysis-impl:analysis-impl", "//java/java-indexing-api:indexing", + "//java/java-frontback-psi-api:frontback-psi", "//platform/lang-impl", "//plugins/kotlin/refactorings/kotlin.refactorings.common:kotlin-refactorings-common", "//plugins/kotlin/code-insight/kotlin.code-insight.k2:kotlin-codeInsight", @@ -82,6 +83,7 @@ jvm_library( "//platform/refactoring:refactoring_test_lib", "//java/java-analysis-impl:analysis-impl_test_lib", "//java/java-indexing-api:indexing_test_lib", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//platform/lang-impl:lang-impl_test_lib", "//plugins/kotlin/refactorings/kotlin.refactorings.common:kotlin-refactorings-common_test_lib", "//plugins/kotlin/code-insight/kotlin.code-insight.k2:kotlin-codeInsight_test_lib", diff --git a/plugins/kotlin/j2k/k2/intellij.kotlin.j2k.iml b/plugins/kotlin/j2k/k2/intellij.kotlin.j2k.iml index 811d5e34a35f..7239ee84647e 100644 --- a/plugins/kotlin/j2k/k2/intellij.kotlin.j2k.iml +++ b/plugins/kotlin/j2k/k2/intellij.kotlin.j2k.iml @@ -46,6 +46,7 @@ + diff --git a/plugins/kotlin/j2k/k2/tests/BUILD.bazel b/plugins/kotlin/j2k/k2/tests/BUILD.bazel index 3b4b25fad5e7..8974ded1c6ad 100644 --- a/plugins/kotlin/j2k/k2/tests/BUILD.bazel +++ b/plugins/kotlin/j2k/k2/tests/BUILD.bazel @@ -70,6 +70,8 @@ jvm_library( "//plugins/kotlin/tests-common:common-tests_test_lib", "//platform/core-ui", "//platform/core-ui:core-ui_test_lib", + "//platform/editor-ui-api:editor-ui", + "//platform/editor-ui-api:editor-ui_test_lib", ], runtime_deps = [":tests"] ) diff --git a/plugins/kotlin/j2k/k2/tests/intellij.kotlin.j2k.tests.iml b/plugins/kotlin/j2k/k2/tests/intellij.kotlin.j2k.tests.iml index 0c9087f9ae7a..fe249ad05ea1 100644 --- a/plugins/kotlin/j2k/k2/tests/intellij.kotlin.j2k.tests.iml +++ b/plugins/kotlin/j2k/k2/tests/intellij.kotlin.j2k.tests.iml @@ -45,5 +45,6 @@ + \ No newline at end of file diff --git a/plugins/kotlin/j2k/shared/BUILD.bazel b/plugins/kotlin/j2k/shared/BUILD.bazel index beae2668240a..f83e7e8da2a9 100644 --- a/plugins/kotlin/j2k/shared/BUILD.bazel +++ b/plugins/kotlin/j2k/shared/BUILD.bazel @@ -45,13 +45,17 @@ jvm_library( "//plugins/kotlin/base/plugin", "//plugins/kotlin/base/project-structure", "//platform/platform-impl:ide-impl", + "//platform/ide-core", + "//platform/progress/shared:ide-progress", "//plugins/kotlin/base/psi", "//plugins/kotlin/base/util", "//platform/forms_rt:java-guiForms-rt", + "//java/java-frontback-psi-api:frontback-psi", "//plugins/kotlin/frontend-independent", "//plugins/kotlin/code-insight/utils", "//platform/core-api:core", "//platform/util", + "//platform/util:util-ui", "//plugins/kotlin/project-configuration", "//plugins/kotlin/preferences", "//plugins/kotlin/base/statistics", @@ -60,6 +64,7 @@ jvm_library( "//platform/core-ui", "//platform/util/concurrency", "//platform/backend/observation", + "//platform/statistics", ] ) @@ -86,13 +91,17 @@ jvm_library( "//plugins/kotlin/base/plugin:plugin_test_lib", "//plugins/kotlin/base/project-structure:project-structure_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", + "//platform/progress/shared:ide-progress_test_lib", "//plugins/kotlin/base/psi:psi_test_lib", "//plugins/kotlin/base/util:util_test_lib", "//platform/forms_rt:java-guiForms-rt_test_lib", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//plugins/kotlin/frontend-independent:frontend-independent_test_lib", "//plugins/kotlin/code-insight/utils:utils_test_lib", "//platform/core-api:core_test_lib", "//platform/util:util_test_lib", + "//platform/util:util-ui_test_lib", "//plugins/kotlin/project-configuration:project-configuration_test_lib", "//plugins/kotlin/preferences:preferences_test_lib", "//plugins/kotlin/base/statistics:statistics_test_lib", @@ -101,6 +110,7 @@ jvm_library( "//platform/core-ui:core-ui_test_lib", "//platform/util/concurrency:concurrency_test_lib", "//platform/backend/observation:observation_test_lib", + "//platform/statistics:statistics_test_lib", ] ) ### auto-generated section `build kotlin.j2k.shared` end diff --git a/plugins/kotlin/j2k/shared/kotlin.j2k.shared.iml b/plugins/kotlin/j2k/shared/kotlin.j2k.shared.iml index 9a166019ae2d..960d9be2d978 100644 --- a/plugins/kotlin/j2k/shared/kotlin.j2k.shared.iml +++ b/plugins/kotlin/j2k/shared/kotlin.j2k.shared.iml @@ -42,13 +42,17 @@ + + + + @@ -57,5 +61,6 @@ + \ No newline at end of file diff --git a/plugins/kotlin/j2k/shared/tests/BUILD.bazel b/plugins/kotlin/j2k/shared/tests/BUILD.bazel index b9d5fb8560ca..53df45286753 100644 --- a/plugins/kotlin/j2k/shared/tests/BUILD.bazel +++ b/plugins/kotlin/j2k/shared/tests/BUILD.bazel @@ -35,10 +35,14 @@ jvm_library( "@lib//:kotlin-test", "//java/java-psi-api:psi", "//java/java-psi-api:psi_test_lib", + "//java/java-frontback-psi-api:frontback-psi", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//platform/code-style-api:codeStyle", "//platform/code-style-api:codeStyle_test_lib", "//platform/core-api:core", "//platform/core-api:core_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", "//platform/editor-ui-api:editor-ui", "//platform/editor-ui-api:editor-ui_test_lib", "//platform/indexing-api:indexing", @@ -53,6 +57,10 @@ jvm_library( "//plugins/kotlin/test-framework:test-framework_test_lib", "//platform/testFramework", "//platform/testFramework:testFramework_test_lib", + "//platform/ide-core", + "//platform/progress/shared:ide-progress", + "//platform/util:util-ui", + "//platform/util:util-ui_test_lib", "//plugins/kotlin/tests-common:common-tests", "//plugins/kotlin/tests-common:common-tests_test_lib", "//plugins/kotlin/base/analysis", @@ -70,7 +78,11 @@ jvm_library( "//plugins/kotlin/base/code-insight/minimal", "//plugins/kotlin/base/code-insight/minimal:minimal_test_lib", ], - runtime_deps = [":tests"] + runtime_deps = [ + ":tests", + "//platform/ide-core:ide-core_test_lib", + "//platform/progress/shared:ide-progress_test_lib", + ] ) ### auto-generated section `build kotlin.j2k.shared.tests` end diff --git a/plugins/kotlin/j2k/shared/tests/kotlin.j2k.shared.tests.iml b/plugins/kotlin/j2k/shared/tests/kotlin.j2k.shared.tests.iml index f395859159b2..7efd40dae559 100644 --- a/plugins/kotlin/j2k/shared/tests/kotlin.j2k.shared.tests.iml +++ b/plugins/kotlin/j2k/shared/tests/kotlin.j2k.shared.tests.iml @@ -30,8 +30,10 @@ + + @@ -39,6 +41,9 @@ + + + diff --git a/plugins/kotlin/jvm-debugger/core-fe10/BUILD.bazel b/plugins/kotlin/jvm-debugger/core-fe10/BUILD.bazel index fb2e275c8a02..5dbb5c0372e1 100644 --- a/plugins/kotlin/jvm-debugger/core-fe10/BUILD.bazel +++ b/plugins/kotlin/jvm-debugger/core-fe10/BUILD.bazel @@ -50,9 +50,11 @@ jvm_library( "//platform/lang-impl", "//java/openapi:java", "//java/java-psi-impl:psi-impl", + "//java/java-psi-api:psi", "//java/debugger/impl", "//java/execution/openapi:java-execution", "//platform/core-ui", + "//platform/core-impl", "//platform/platform-util-io:ide-util-io", "//platform/util/jdom", "@lib//:jb-jdi", @@ -98,9 +100,11 @@ jvm_library( "//platform/lang-impl:lang-impl_test_lib", "//java/openapi:java_test_lib", "//java/java-psi-impl:psi-impl_test_lib", + "//java/java-psi-api:psi_test_lib", "//java/debugger/impl:impl_test_lib", "//java/execution/openapi:java-execution_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl:core-impl_test_lib", "//platform/platform-util-io:ide-util-io_test_lib", "//platform/util/jdom:jdom_test_lib", "//plugins/kotlin/code-insight/utils:utils_test_lib", diff --git a/plugins/kotlin/jvm-debugger/core-fe10/kotlin.jvm-debugger.core-fe10.iml b/plugins/kotlin/jvm-debugger/core-fe10/kotlin.jvm-debugger.core-fe10.iml index dbfe7502960b..7b22cdb2b614 100644 --- a/plugins/kotlin/jvm-debugger/core-fe10/kotlin.jvm-debugger.core-fe10.iml +++ b/plugins/kotlin/jvm-debugger/core-fe10/kotlin.jvm-debugger.core-fe10.iml @@ -54,9 +54,11 @@ + + diff --git a/plugins/kotlin/jvm-debugger/core/BUILD.bazel b/plugins/kotlin/jvm-debugger/core/BUILD.bazel index b2ac23a2a80f..87a57f624155 100644 --- a/plugins/kotlin/jvm-debugger/core/BUILD.bazel +++ b/plugins/kotlin/jvm-debugger/core/BUILD.bazel @@ -34,6 +34,7 @@ jvm_library( "//platform/analysis-api:analysis", "//platform/util/concurrency", "//platform/core-api:core", + "//platform/lang-api:lang", "//platform/editor-ui-api:editor-ui", "//platform/indexing-api:indexing", "//platform/projectModel-api:projectModel", @@ -48,6 +49,7 @@ jvm_library( "//plugins/kotlin/base/code-insight", "//plugins/kotlin/jvm-debugger/base/util", "//platform/core-ui", + "//platform/core-impl", "//platform/xdebugger-impl:debugger-impl", "//platform/xdebugger-impl/shared", "//platform/xdebugger-impl/ui", @@ -58,7 +60,10 @@ jvm_library( "//java/debugger/openapi:java-debugger", "//platform/lang-impl", "//platform/platform-util-io-impl:ide-util-io-impl", + "//platform/ide-core", + "//platform/progress/shared:ide-progress", "//java/openapi:java", + "//java/java-psi-api:psi", "//platform/util/progress", "//java/execution/openapi:java-execution", "//java/debugger/impl", @@ -74,6 +79,7 @@ jvm_library( "@lib//:kotlin-metadata", "//platform/execution", "//platform/forms_rt:java-guiForms-rt", + "//java/java-frontback-psi-api:frontback-psi", ] ) @@ -89,6 +95,7 @@ jvm_library( "//platform/analysis-api:analysis_test_lib", "//platform/util/concurrency:concurrency_test_lib", "//platform/core-api:core_test_lib", + "//platform/lang-api:lang_test_lib", "//platform/editor-ui-api:editor-ui_test_lib", "//platform/indexing-api:indexing_test_lib", "//platform/projectModel-api:projectModel_test_lib", @@ -103,6 +110,7 @@ jvm_library( "//plugins/kotlin/base/code-insight:code-insight_test_lib", "//plugins/kotlin/jvm-debugger/base/util:util_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl:core-impl_test_lib", "//platform/xdebugger-impl:debugger-impl_test_lib", "//platform/xdebugger-impl/shared:shared_test_lib", "//platform/xdebugger-impl/ui:ui_test_lib", @@ -113,7 +121,10 @@ jvm_library( "//java/debugger/openapi:java-debugger_test_lib", "//platform/lang-impl:lang-impl_test_lib", "//platform/platform-util-io-impl:ide-util-io-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", + "//platform/progress/shared:ide-progress_test_lib", "//java/openapi:java_test_lib", + "//java/java-psi-api:psi_test_lib", "//platform/util/progress:progress_test_lib", "//java/execution/openapi:java-execution_test_lib", "//java/debugger/impl:impl_test_lib", @@ -128,6 +139,7 @@ jvm_library( "//java/java-runtime:rt_test_lib", "//platform/execution:execution_test_lib", "//platform/forms_rt:java-guiForms-rt_test_lib", + "//java/java-frontback-psi-api:frontback-psi_test_lib", ] ) ### auto-generated section `build intellij.kotlin.jvm.debugger.core` end diff --git a/plugins/kotlin/jvm-debugger/core/intellij.kotlin.jvm.debugger.core.iml b/plugins/kotlin/jvm-debugger/core/intellij.kotlin.jvm.debugger.core.iml index 5cd427d7eecd..8fe0bb861ebd 100644 --- a/plugins/kotlin/jvm-debugger/core/intellij.kotlin.jvm.debugger.core.iml +++ b/plugins/kotlin/jvm-debugger/core/intellij.kotlin.jvm.debugger.core.iml @@ -33,6 +33,7 @@ + @@ -47,6 +48,7 @@ + @@ -57,7 +59,10 @@ + + + @@ -73,5 +78,6 @@ + \ No newline at end of file diff --git a/plugins/kotlin/jvm-debugger/coroutines/BUILD.bazel b/plugins/kotlin/jvm-debugger/coroutines/BUILD.bazel index 35d8e1210026..d2a952ed7457 100644 --- a/plugins/kotlin/jvm-debugger/coroutines/BUILD.bazel +++ b/plugins/kotlin/jvm-debugger/coroutines/BUILD.bazel @@ -54,11 +54,13 @@ jvm_library( "//platform/execution-impl", "//platform/external-system-impl:externalSystem-impl", "//platform/core-ui", + "//platform/core-impl", "//platform/platform-util-io:ide-util-io", "//platform/smRunner", "//platform/threadDumpParser", "//java/java-psi-api:psi", "//platform/platform-impl:ide-impl", + "//platform/ide-core", "//java/execution/impl", "//java/debugger/impl", "//plugins/kotlin/code-insight/utils", @@ -70,6 +72,8 @@ jvm_library( "//java/debugger/shared", "//platform/xdebugger-impl/rpc", "//platform/execution", + "//platform/statistics", + "//platform/util:util-ui", ] ) @@ -107,11 +111,13 @@ jvm_library( "//platform/execution-impl:execution-impl_test_lib", "//platform/external-system-impl:externalSystem-impl_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl:core-impl_test_lib", "//platform/platform-util-io:ide-util-io_test_lib", "//platform/smRunner:smRunner_test_lib", "//platform/threadDumpParser:threadDumpParser_test_lib", "//java/java-psi-api:psi_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//java/execution/impl:impl_test_lib", "//java/debugger/impl:impl_test_lib", "//plugins/kotlin/code-insight/utils:utils_test_lib", @@ -123,6 +129,8 @@ jvm_library( "//java/debugger/shared:shared_test_lib", "//platform/xdebugger-impl/rpc:rpc_test_lib", "//platform/execution:execution_test_lib", + "//platform/statistics:statistics_test_lib", + "//platform/util:util-ui_test_lib", ] ) ### auto-generated section `build intellij.kotlin.jvm.debugger.coroutines` end diff --git a/plugins/kotlin/jvm-debugger/coroutines/intellij.kotlin.jvm.debugger.coroutines.iml b/plugins/kotlin/jvm-debugger/coroutines/intellij.kotlin.jvm.debugger.coroutines.iml index 09f3df98d7bd..626c63d65415 100644 --- a/plugins/kotlin/jvm-debugger/coroutines/intellij.kotlin.jvm.debugger.coroutines.iml +++ b/plugins/kotlin/jvm-debugger/coroutines/intellij.kotlin.jvm.debugger.coroutines.iml @@ -59,11 +59,13 @@ + + @@ -75,5 +77,7 @@ + + \ No newline at end of file diff --git a/plugins/kotlin/jvm-debugger/evaluation/BUILD.bazel b/plugins/kotlin/jvm-debugger/evaluation/BUILD.bazel index 859a1107500c..55d525b616a6 100644 --- a/plugins/kotlin/jvm-debugger/evaluation/BUILD.bazel +++ b/plugins/kotlin/jvm-debugger/evaluation/BUILD.bazel @@ -21,6 +21,7 @@ jvm_library( "@lib//:kotlinc-analysis-api-platform-interface", "//platform/util", "//platform/core-api:core", + "//platform/core-impl", "//plugins/kotlin/base/util", "//plugins/kotlin/base/project-structure", "//plugins/kotlin/base/analysis", @@ -32,8 +33,11 @@ jvm_library( "//plugins/kotlin/jvm-debugger/core", "//platform/xdebugger-impl:debugger-impl", "//platform/xdebugger-impl/shared", + "//java/java-psi-api:psi", "//java/java-psi-impl:psi-impl", + "//java/java-syntax:syntax", "//java/debugger/impl", + "//java/java-frontback-psi-api:frontback-psi", "//plugins/kotlin/jvm-debugger/coroutines", "//platform/statistics", "//plugins/kotlin/base/facet", @@ -54,6 +58,7 @@ jvm_library( "//libraries/asm:asm_test_lib", "//platform/util:util_test_lib", "//platform/core-api:core_test_lib", + "//platform/core-impl:core-impl_test_lib", "//plugins/kotlin/base/util:util_test_lib", "//plugins/kotlin/base/project-structure:project-structure_test_lib", "//plugins/kotlin/base/analysis:analysis_test_lib", @@ -65,8 +70,11 @@ jvm_library( "//plugins/kotlin/jvm-debugger/core:core_test_lib", "//platform/xdebugger-impl:debugger-impl_test_lib", "//platform/xdebugger-impl/shared:shared_test_lib", + "//java/java-psi-api:psi_test_lib", "//java/java-psi-impl:psi-impl_test_lib", + "//java/java-syntax:syntax_test_lib", "//java/debugger/impl:impl_test_lib", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//plugins/kotlin/jvm-debugger/coroutines:coroutines_test_lib", "//platform/statistics:statistics_test_lib", "//plugins/kotlin/base/facet:facet_test_lib", diff --git a/plugins/kotlin/jvm-debugger/evaluation/k1/BUILD.bazel b/plugins/kotlin/jvm-debugger/evaluation/k1/BUILD.bazel index daef4504bcb5..ea8e13971979 100644 --- a/plugins/kotlin/jvm-debugger/evaluation/k1/BUILD.bazel +++ b/plugins/kotlin/jvm-debugger/evaluation/k1/BUILD.bazel @@ -20,9 +20,11 @@ jvm_library( deps = [ "//platform/analysis-api:analysis", "//platform/core-api:core", + "//platform/core-impl", "//platform/editor-ui-api:editor-ui", "//plugins/kotlin/base/fe10/analysis", "//java/debugger/openapi:java-debugger", + "//java/java-psi-api:psi", "//plugins/kotlin/jvm-debugger/evaluation", "//plugins/kotlin/jvm-debugger/base/util", "//plugins/kotlin/jvm-debugger/core", @@ -35,6 +37,7 @@ jvm_library( "//plugins/kotlin/j2k/k1.old", "//plugins/kotlin/idea", "//java/java-analysis-impl:analysis-impl", + "//java/java-frontback-psi-api:frontback-psi", "//plugins/kotlin/base/psi", "//plugins/kotlin/j2k/shared", "//plugins/kotlin/base/plugin", @@ -51,6 +54,7 @@ jvm_library( "@lib//:kotlinc-scripting-compiler-plugin", "//platform/xdebugger-impl/rpc", "//platform/lang-api:lang", + "//platform/statistics", ] ) @@ -64,9 +68,11 @@ jvm_library( ":k1", "//platform/analysis-api:analysis_test_lib", "//platform/core-api:core_test_lib", + "//platform/core-impl:core-impl_test_lib", "//platform/editor-ui-api:editor-ui_test_lib", "//plugins/kotlin/base/fe10/analysis:analysis_test_lib", "//java/debugger/openapi:java-debugger_test_lib", + "//java/java-psi-api:psi_test_lib", "//plugins/kotlin/jvm-debugger/evaluation:evaluation_test_lib", "//plugins/kotlin/jvm-debugger/base/util:util_test_lib", "//plugins/kotlin/jvm-debugger/core:core_test_lib", @@ -79,6 +85,7 @@ jvm_library( "//plugins/kotlin/j2k/k1.old:k1.old_test_lib", "//plugins/kotlin/idea:idea_test_lib", "//java/java-analysis-impl:analysis-impl_test_lib", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//plugins/kotlin/base/psi:psi_test_lib", "//plugins/kotlin/j2k/shared:shared_test_lib", "//plugins/kotlin/base/plugin:plugin_test_lib", @@ -89,6 +96,7 @@ jvm_library( "//plugins/kotlin/jvm-debugger/eval4j:eval4j_test_lib", "//platform/xdebugger-impl/rpc:rpc_test_lib", "//platform/lang-api:lang_test_lib", + "//platform/statistics:statistics_test_lib", ] ) ### auto-generated section `build kotlin.jvm-debugger.evaluation.k1` end diff --git a/plugins/kotlin/jvm-debugger/evaluation/k1/kotlin.jvm-debugger.evaluation.k1.iml b/plugins/kotlin/jvm-debugger/evaluation/k1/kotlin.jvm-debugger.evaluation.k1.iml index 7b149bb7bbcd..44fb30805260 100644 --- a/plugins/kotlin/jvm-debugger/evaluation/k1/kotlin.jvm-debugger.evaluation.k1.iml +++ b/plugins/kotlin/jvm-debugger/evaluation/k1/kotlin.jvm-debugger.evaluation.k1.iml @@ -25,9 +25,11 @@ + + @@ -40,6 +42,7 @@ + @@ -56,5 +59,6 @@ + \ No newline at end of file diff --git a/plugins/kotlin/jvm-debugger/evaluation/k2/BUILD.bazel b/plugins/kotlin/jvm-debugger/evaluation/k2/BUILD.bazel index b34682015599..29c7688824f0 100644 --- a/plugins/kotlin/jvm-debugger/evaluation/k2/BUILD.bazel +++ b/plugins/kotlin/jvm-debugger/evaluation/k2/BUILD.bazel @@ -16,6 +16,7 @@ jvm_library( deps = [ "//platform/analysis-api:analysis", "//platform/core-api:core", + "//platform/core-impl", "//plugins/kotlin/code-insight/inspections-k2:kotlin-codeInsight-inspections", "//java/debugger/impl", "@lib//:kotlinc-kotlin-compiler-common", @@ -30,6 +31,7 @@ jvm_library( "//platform/xdebugger-impl:debugger-impl", "//plugins/kotlin/code-insight/impl-base:kotlin-codeInsight-shared", "//plugins/kotlin/base/psi", + "//java/java-psi-api:psi", "//platform/util", "//platform/util/multiplatform", "//plugins/kotlin/jvm-debugger/core", @@ -45,6 +47,7 @@ jvm_library( ":kotlin-jvm-debugger-evaluation", "//platform/analysis-api:analysis_test_lib", "//platform/core-api:core_test_lib", + "//platform/core-impl:core-impl_test_lib", "//plugins/kotlin/code-insight/inspections-k2:kotlin-codeInsight-inspections_test_lib", "//java/debugger/impl:impl_test_lib", "//java/debugger/openapi:java-debugger_test_lib", @@ -56,6 +59,7 @@ jvm_library( "//platform/xdebugger-impl:debugger-impl_test_lib", "//plugins/kotlin/code-insight/impl-base:kotlin-codeInsight-shared_test_lib", "//plugins/kotlin/base/psi:psi_test_lib", + "//java/java-psi-api:psi_test_lib", "//platform/util:util_test_lib", "//platform/util/multiplatform:multiplatform_test_lib", "//plugins/kotlin/jvm-debugger/core:core_test_lib", diff --git a/plugins/kotlin/jvm-debugger/evaluation/k2/intellij.kotlin.jvm.debugger.evaluation.iml b/plugins/kotlin/jvm-debugger/evaluation/k2/intellij.kotlin.jvm.debugger.evaluation.iml index dd078886ca5f..6227f7df53a8 100644 --- a/plugins/kotlin/jvm-debugger/evaluation/k2/intellij.kotlin.jvm.debugger.evaluation.iml +++ b/plugins/kotlin/jvm-debugger/evaluation/k2/intellij.kotlin.jvm.debugger.evaluation.iml @@ -10,6 +10,7 @@ + @@ -24,6 +25,7 @@ + diff --git a/plugins/kotlin/jvm-debugger/evaluation/kotlin.jvm-debugger.evaluation.iml b/plugins/kotlin/jvm-debugger/evaluation/kotlin.jvm-debugger.evaluation.iml index a8bd503daab5..f72e40cd3f85 100644 --- a/plugins/kotlin/jvm-debugger/evaluation/kotlin.jvm-debugger.evaluation.iml +++ b/plugins/kotlin/jvm-debugger/evaluation/kotlin.jvm-debugger.evaluation.iml @@ -15,6 +15,7 @@ + @@ -26,8 +27,11 @@ + + + diff --git a/plugins/kotlin/jvm-debugger/test/BUILD.bazel b/plugins/kotlin/jvm-debugger/test/BUILD.bazel index afd41bf9600b..99dc5ad50efa 100644 --- a/plugins/kotlin/jvm-debugger/test/BUILD.bazel +++ b/plugins/kotlin/jvm-debugger/test/BUILD.bazel @@ -63,6 +63,8 @@ jvm_library( "//platform/indexing-api:indexing_test_lib", "//platform/lang-core", "//platform/lang-core:lang-core_test_lib", + "//platform/lang-api:lang", + "//platform/lang-api:lang_test_lib", "//platform/projectModel-api:projectModel", "//platform/projectModel-api:projectModel_test_lib", "//plugins/kotlin/tests-common:common-tests", diff --git a/plugins/kotlin/jvm-debugger/test/compose/BUILD.bazel b/plugins/kotlin/jvm-debugger/test/compose/BUILD.bazel index e78c77d8fbf9..d79ed877fb20 100644 --- a/plugins/kotlin/jvm-debugger/test/compose/BUILD.bazel +++ b/plugins/kotlin/jvm-debugger/test/compose/BUILD.bazel @@ -42,6 +42,8 @@ jvm_library( deps = [ "//platform/core-ui", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", "//plugins/kotlin/plugin/k2", "//plugins/kotlin/plugin/k2:k2_test_lib", "//plugins/kotlin/base/test", diff --git a/plugins/kotlin/jvm-debugger/test/compose/intellij.kotlin.jvm.debugger.test.compose.iml b/plugins/kotlin/jvm-debugger/test/compose/intellij.kotlin.jvm.debugger.test.compose.iml index d34a817b1624..eea139bad9cf 100644 --- a/plugins/kotlin/jvm-debugger/test/compose/intellij.kotlin.jvm.debugger.test.compose.iml +++ b/plugins/kotlin/jvm-debugger/test/compose/intellij.kotlin.jvm.debugger.test.compose.iml @@ -9,6 +9,7 @@ + diff --git a/plugins/kotlin/jvm-debugger/test/k2/testFramework/BUILD.bazel b/plugins/kotlin/jvm-debugger/test/k2/testFramework/BUILD.bazel index 327e5fdd5cbe..0a582c2ef881 100644 --- a/plugins/kotlin/jvm-debugger/test/k2/testFramework/BUILD.bazel +++ b/plugins/kotlin/jvm-debugger/test/k2/testFramework/BUILD.bazel @@ -29,6 +29,8 @@ jvm_library( "//platform/core-api:core_test_lib", "//platform/core-ui", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", "//platform/testFramework", "//platform/testFramework:testFramework_test_lib", "//plugins/kotlin/base/test", diff --git a/plugins/kotlin/jvm-debugger/test/k2/testFramework/intellij.kotlin.jvm.debugger.test.testFramework.iml b/plugins/kotlin/jvm-debugger/test/k2/testFramework/intellij.kotlin.jvm.debugger.test.testFramework.iml index 93633de94685..226c550a90c3 100644 --- a/plugins/kotlin/jvm-debugger/test/k2/testFramework/intellij.kotlin.jvm.debugger.test.testFramework.iml +++ b/plugins/kotlin/jvm-debugger/test/k2/testFramework/intellij.kotlin.jvm.debugger.test.testFramework.iml @@ -14,6 +14,7 @@ + diff --git a/plugins/kotlin/jvm-debugger/test/kotlin.jvm-debugger.test.iml b/plugins/kotlin/jvm-debugger/test/kotlin.jvm-debugger.test.iml index 49998d217211..7f5c34c1602f 100644 --- a/plugins/kotlin/jvm-debugger/test/kotlin.jvm-debugger.test.iml +++ b/plugins/kotlin/jvm-debugger/test/kotlin.jvm-debugger.test.iml @@ -18,6 +18,7 @@ + diff --git a/plugins/kotlin/jvm-debugger/test/kotlin.jvm-debugger.test.k1/testFramework/BUILD.bazel b/plugins/kotlin/jvm-debugger/test/kotlin.jvm-debugger.test.k1/testFramework/BUILD.bazel index 3f99a3a87f61..7c7f3854e076 100644 --- a/plugins/kotlin/jvm-debugger/test/kotlin.jvm-debugger.test.k1/testFramework/BUILD.bazel +++ b/plugins/kotlin/jvm-debugger/test/kotlin.jvm-debugger.test.k1/testFramework/BUILD.bazel @@ -54,6 +54,8 @@ jvm_library( "//platform/core-api:core_test_lib", "//platform/core-ui", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", "//platform/execution", "//platform/execution:execution_test_lib", "//platform/external-system-api:externalSystem", diff --git a/plugins/kotlin/jvm-debugger/test/kotlin.jvm-debugger.test.k1/testFramework/kotlin.jvm-debugger.test.k1.testFramework.iml b/plugins/kotlin/jvm-debugger/test/kotlin.jvm-debugger.test.k1/testFramework/kotlin.jvm-debugger.test.k1.testFramework.iml index 9f401e517a19..af9142bc584c 100644 --- a/plugins/kotlin/jvm-debugger/test/kotlin.jvm-debugger.test.k1/testFramework/kotlin.jvm-debugger.test.k1.testFramework.iml +++ b/plugins/kotlin/jvm-debugger/test/kotlin.jvm-debugger.test.k1/testFramework/kotlin.jvm-debugger.test.k1.testFramework.iml @@ -39,6 +39,7 @@ + diff --git a/plugins/kotlin/jvm-debugger/test/parcelize/BUILD.bazel b/plugins/kotlin/jvm-debugger/test/parcelize/BUILD.bazel index 4a7c0d5bf5d4..d587a70cb5f8 100644 --- a/plugins/kotlin/jvm-debugger/test/parcelize/BUILD.bazel +++ b/plugins/kotlin/jvm-debugger/test/parcelize/BUILD.bazel @@ -35,6 +35,8 @@ jvm_library( deps = [ "//platform/core-ui", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", "//plugins/kotlin/plugin/k2", "//plugins/kotlin/plugin/k2:k2_test_lib", "//plugins/kotlin/base/test", diff --git a/plugins/kotlin/jvm-debugger/test/parcelize/intellij.kotlin.jvm.debugger.test.parcelize.iml b/plugins/kotlin/jvm-debugger/test/parcelize/intellij.kotlin.jvm.debugger.test.parcelize.iml index 1bb74b6ecae8..81bb30d26379 100644 --- a/plugins/kotlin/jvm-debugger/test/parcelize/intellij.kotlin.jvm.debugger.test.parcelize.iml +++ b/plugins/kotlin/jvm-debugger/test/parcelize/intellij.kotlin.jvm.debugger.test.parcelize.iml @@ -8,6 +8,7 @@ + diff --git a/plugins/kotlin/jvm-debugger/testFramework/BUILD.bazel b/plugins/kotlin/jvm-debugger/testFramework/BUILD.bazel index afc40c32712a..5075e2304eef 100644 --- a/plugins/kotlin/jvm-debugger/testFramework/BUILD.bazel +++ b/plugins/kotlin/jvm-debugger/testFramework/BUILD.bazel @@ -30,8 +30,12 @@ jvm_library( "//java/debugger/impl:impl_test_lib", "//java/debugger/shared", "//java/debugger/shared:shared_test_lib", + "//java/java-psi-api:psi", + "//java/java-psi-api:psi_test_lib", "//java/execution/openapi:java-execution", "//java/execution/openapi:java-execution_test_lib", + "//java/java-syntax:syntax", + "//java/java-syntax:syntax_test_lib", "//java/execution/impl", "//java/execution/impl:impl_test_lib", "//java/idea-ui:ui", @@ -74,10 +78,14 @@ jvm_library( "//platform/core-api:core_test_lib", "//platform/core-ui", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", "//platform/xdebugger-api:debugger", "//platform/xdebugger-api:debugger_test_lib", "//platform/xdebugger-impl:debugger-impl", "//platform/xdebugger-impl:debugger-impl_test_lib", + "//platform/editor-ui-api:editor-ui", + "//platform/editor-ui-api:editor-ui_test_lib", "//platform/xdebugger-impl/shared", "//platform/xdebugger-impl/shared:shared_test_lib", "//platform/xdebugger-impl/ui", @@ -89,16 +97,21 @@ jvm_library( "//platform/external-system-api:externalSystem", "//platform/external-system-api:externalSystem_test_lib", "//platform/platform-util-io:ide-util-io", + "//platform/ide-core", "//jps/model-api:model", "//jps/model-api:model_test_lib", "//platform/lang-core", "//platform/lang-core:lang-core_test_lib", + "//platform/lang-api:lang", + "//platform/lang-api:lang_test_lib", "//platform/projectModel-api:projectModel", "//platform/projectModel-api:projectModel_test_lib", "//platform/script-debugger/debugger-ui:scriptDebugger-ui", "//platform/script-debugger/debugger-ui:scriptDebugger-ui_test_lib", "//platform/testFramework", "//platform/testFramework:testFramework_test_lib", + "//platform/util-ex", + "//platform/util-ex:util-ex_test_lib", "//plugins/kotlin/base/test", "//plugins/kotlin/base/test:test_test_lib", "//plugins/kotlin/jvm-debugger/evaluation", @@ -113,6 +126,7 @@ jvm_library( runtime_deps = [ ":testFramework", "//platform/platform-util-io:ide-util-io_test_lib", + "//platform/ide-core:ide-core_test_lib", ] ) ### auto-generated section `build kotlin.jvm-debugger.testFramework` end diff --git a/plugins/kotlin/jvm-debugger/testFramework/kotlin.jvm-debugger.testFramework.iml b/plugins/kotlin/jvm-debugger/testFramework/kotlin.jvm-debugger.testFramework.iml index ed351d4c7a26..bdf01b20acef 100644 --- a/plugins/kotlin/jvm-debugger/testFramework/kotlin.jvm-debugger.testFramework.iml +++ b/plugins/kotlin/jvm-debugger/testFramework/kotlin.jvm-debugger.testFramework.iml @@ -17,7 +17,9 @@ + + @@ -39,19 +41,24 @@ + + + + + diff --git a/plugins/kotlin/jvm-decompiler/BUILD.bazel b/plugins/kotlin/jvm-decompiler/BUILD.bazel index 320d5f72e9c3..1ac06f265fa5 100644 --- a/plugins/kotlin/jvm-decompiler/BUILD.bazel +++ b/plugins/kotlin/jvm-decompiler/BUILD.bazel @@ -20,6 +20,7 @@ jvm_library( "//platform/analysis-api:analysis", "//platform/core-api:core", "//platform/editor-ui-api:editor-ui", + "//platform/platform-api:ide", "//platform/projectModel-api:projectModel", "//plugins/kotlin/base/util", "//plugins/kotlin/base/project-structure", @@ -27,7 +28,9 @@ jvm_library( "//plugins/kotlin/frontend-independent", "//plugins/kotlin/jvm/shared", "//platform/core-ui", + "//platform/core-impl", "//java/openapi:java", + "//java/java-psi-api:psi", "//java/java-psi-impl:psi-impl", "//plugins/java-decompiler/plugin:java-decompiler", "//plugins/kotlin/highlighting/highlighting-shared:kotlin-highlighting-shared", @@ -46,6 +49,7 @@ jvm_library( "//platform/analysis-api:analysis_test_lib", "//platform/core-api:core_test_lib", "//platform/editor-ui-api:editor-ui_test_lib", + "//platform/platform-api:ide_test_lib", "//platform/projectModel-api:projectModel_test_lib", "//plugins/kotlin/base/util:util_test_lib", "//plugins/kotlin/base/project-structure:project-structure_test_lib", @@ -53,7 +57,9 @@ jvm_library( "//plugins/kotlin/frontend-independent:frontend-independent_test_lib", "//plugins/kotlin/jvm/shared:shared_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl:core-impl_test_lib", "//java/openapi:java_test_lib", + "//java/java-psi-api:psi_test_lib", "//java/java-psi-impl:psi-impl_test_lib", "//plugins/java-decompiler/plugin:java-decompiler_test_lib", "//plugins/kotlin/highlighting/highlighting-shared:kotlin-highlighting-shared_test_lib", diff --git a/plugins/kotlin/jvm-decompiler/intellij.kotlin.jvm.decompiler.iml b/plugins/kotlin/jvm-decompiler/intellij.kotlin.jvm.decompiler.iml index 2cbc6217e739..533d63b161a7 100644 --- a/plugins/kotlin/jvm-decompiler/intellij.kotlin.jvm.decompiler.iml +++ b/plugins/kotlin/jvm-decompiler/intellij.kotlin.jvm.decompiler.iml @@ -14,6 +14,7 @@ + @@ -21,7 +22,9 @@ + + diff --git a/plugins/kotlin/jvm/k1/BUILD.bazel b/plugins/kotlin/jvm/k1/BUILD.bazel index 6e1502f04d78..9c159f700e59 100644 --- a/plugins/kotlin/jvm/k1/BUILD.bazel +++ b/plugins/kotlin/jvm/k1/BUILD.bazel @@ -42,6 +42,7 @@ jvm_library( "//plugins/kotlin/code-insight/api", "//platform/analysis-api:analysis", "//java/java-impl:impl", + "//java/java-psi-api:psi", "//plugins/kotlin/idea", "//plugins/kotlin/base/util", "//plugins/kotlin/base/compiler-configuration", @@ -52,16 +53,20 @@ jvm_library( "@lib//:kotlinc-analysis-api", "//plugins/kotlin/base/psi", "//platform/platform-util-io:ide-util-io", + "//platform/ide-core", "//plugins/kotlin/repl", "//platform/vcs-impl", "//java/execution/impl", "@lib//:kotlinc-kotlin-scripting-compiler-impl", "//plugins/kotlin/base/resources:kotlin-base-resources", "//platform/core-ui", + "//platform/core-impl", "//plugins/kotlin/base/scripting/scripting.k1", "//plugins/kotlin/base/scripting/scripting.shared", "//platform/execution", "//platform/lang-api:lang", + "//platform/statistics", + "//platform/util:util-ui", "//plugins/kotlin/base/statistics", ] ) @@ -88,6 +93,7 @@ jvm_library( "//plugins/kotlin/code-insight/api:api_test_lib", "//platform/analysis-api:analysis_test_lib", "//java/java-impl:impl_test_lib", + "//java/java-psi-api:psi_test_lib", "//plugins/kotlin/idea:idea_test_lib", "//plugins/kotlin/base/util:util_test_lib", "//plugins/kotlin/base/compiler-configuration:compiler-configuration_test_lib", @@ -96,17 +102,21 @@ jvm_library( "//platform/platform-impl:ide-impl_test_lib", "//plugins/kotlin/base/psi:psi_test_lib", "//platform/platform-util-io:ide-util-io_test_lib", + "//platform/ide-core:ide-core_test_lib", "//plugins/kotlin/repl:repl_test_lib", "//platform/vcs-impl:vcs-impl_test_lib", "//java/execution/impl:impl_test_lib", "//plugins/kotlin/base/resources:kotlin-base-resources_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl:core-impl_test_lib", "//plugins/kotlin/base/scripting/scripting.k1:scripting.k1_test_lib", "//plugins/kotlin/base/scripting/scripting.shared:scripting.shared_test_lib", "//platform/execution:execution_test_lib", "//platform/lang-api:lang_test_lib", "//platform/testFramework", "//platform/testFramework:testFramework_test_lib", + "//platform/statistics:statistics_test_lib", + "//platform/util:util-ui_test_lib", "//plugins/kotlin/base/test", "//plugins/kotlin/base/test:test_test_lib", "//plugins/kotlin/tests-common:common-tests", @@ -163,6 +173,7 @@ jvm_library( "//plugins/kotlin/code-insight/api", "//platform/analysis-api:analysis", "//java/java-impl:impl", + "//java/java-psi-api:psi", "//plugins/kotlin/idea", "//plugins/kotlin/base/util", "//plugins/kotlin/base/compiler-configuration", @@ -227,6 +238,8 @@ jvm_library( "//platform/analysis-api:analysis_test_lib", "//java/java-impl:impl", "//java/java-impl:impl_test_lib", + "//java/java-psi-api:psi", + "//java/java-psi-api:psi_test_lib", "//plugins/kotlin/idea", "//plugins/kotlin/idea:idea_test_lib", "//plugins/kotlin/base/util", @@ -254,6 +267,8 @@ jvm_library( "//plugins/kotlin/base/resources:kotlin-base-resources_test_lib", "//platform/core-ui", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", "//plugins/kotlin/base/scripting/scripting.k1", "//plugins/kotlin/base/scripting/scripting.k1:scripting.k1_test_lib", "//plugins/kotlin/base/scripting/scripting.shared", @@ -264,6 +279,8 @@ jvm_library( "//platform/lang-api:lang_test_lib", "//platform/testFramework", "//platform/testFramework:testFramework_test_lib", + "//platform/util:util-ui", + "//platform/util:util-ui_test_lib", "//plugins/kotlin/base/test", "//plugins/kotlin/base/test:test_test_lib", "//plugins/kotlin/tests-common:common-tests", diff --git a/plugins/kotlin/jvm/k1/kotlin.jvm.k1.iml b/plugins/kotlin/jvm/k1/kotlin.jvm.k1.iml index 19da654488e7..8a887c8cfdf1 100644 --- a/plugins/kotlin/jvm/k1/kotlin.jvm.k1.iml +++ b/plugins/kotlin/jvm/k1/kotlin.jvm.k1.iml @@ -42,6 +42,7 @@ + @@ -52,17 +53,21 @@ + + + + diff --git a/plugins/kotlin/jvm/k1/kotlin.jvm.k1.tests.iml b/plugins/kotlin/jvm/k1/kotlin.jvm.k1.tests.iml index c87cd7ef4536..8ac99b7a5698 100644 --- a/plugins/kotlin/jvm/k1/kotlin.jvm.k1.tests.iml +++ b/plugins/kotlin/jvm/k1/kotlin.jvm.k1.tests.iml @@ -42,6 +42,7 @@ + @@ -58,11 +59,13 @@ + + diff --git a/plugins/kotlin/jvm/k2/BUILD.bazel b/plugins/kotlin/jvm/k2/BUILD.bazel index f2361772dacb..2cd798277530 100644 --- a/plugins/kotlin/jvm/k2/BUILD.bazel +++ b/plugins/kotlin/jvm/k2/BUILD.bazel @@ -32,6 +32,7 @@ jvm_library( "//platform/editor-ui-api:editor-ui", "//platform/lang-api:lang", "//platform/core-ui", + "//platform/core-impl", "//platform/lang-impl", "//platform/platform-impl:ide-impl", "//platform/util/coroutines", @@ -43,9 +44,12 @@ jvm_library( "//java/java-frontback-psi-api:frontback-psi", "//platform/vcs-impl", "//platform/platform-util-io:ide-util-io", + "//platform/ide-core", + "//platform/progress/shared:ide-progress", "//plugins/kotlin/base/resources:kotlin-base-resources", "//plugins/kotlin/base/project-structure", "//java/java-frontback-psi-impl:frontback-psi-impl", + "//java/java-psi-api:psi", "//plugins/kotlin/base/code-insight", "//java/java-psi-impl:psi-impl", "//plugins/kotlin/base/scripting/scripting.k2:kotlin-base-scripting", @@ -53,6 +57,7 @@ jvm_library( "@lib//:kotlinc-analysis-api-platform-interface", "//plugins/kotlin/base/scripting/scripting.shared", "//platform/util/jdom", + "//platform/statistics", "@lib//:kotlinc-kotlin-scripting-compiler-impl", "@lib//:kotlinc-kotlin-scripting-common", "//plugins/kotlin/base/scripting/scripting.scratch.definition", @@ -81,6 +86,7 @@ jvm_library( "//platform/editor-ui-api:editor-ui_test_lib", "//platform/lang-api:lang_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl:core-impl_test_lib", "//platform/lang-impl:lang-impl_test_lib", "//platform/platform-impl:ide-impl_test_lib", "//platform/util/coroutines:coroutines_test_lib", @@ -92,14 +98,18 @@ jvm_library( "//java/java-frontback-psi-api:frontback-psi_test_lib", "//platform/vcs-impl:vcs-impl_test_lib", "//platform/platform-util-io:ide-util-io_test_lib", + "//platform/ide-core:ide-core_test_lib", + "//platform/progress/shared:ide-progress_test_lib", "//plugins/kotlin/base/resources:kotlin-base-resources_test_lib", "//plugins/kotlin/base/project-structure:project-structure_test_lib", "//java/java-frontback-psi-impl:frontback-psi-impl_test_lib", + "//java/java-psi-api:psi_test_lib", "//plugins/kotlin/base/code-insight:code-insight_test_lib", "//java/java-psi-impl:psi-impl_test_lib", "//plugins/kotlin/base/scripting/scripting.k2:kotlin-base-scripting_test_lib", "//plugins/kotlin/base/scripting/scripting.shared:scripting.shared_test_lib", "//platform/util/jdom:jdom_test_lib", + "//platform/statistics:statistics_test_lib", "//plugins/kotlin/base/scripting/scripting.scratch.definition:scripting.scratch.definition_test_lib", "//plugins/kotlin/code-insight/kotlin.code-insight.k2:kotlin-codeInsight_test_lib", "//plugins/kotlin/code-insight/impl-base:kotlin-codeInsight-shared_test_lib", @@ -164,10 +174,18 @@ jvm_library( "//platform/projectModel-api:projectModel_test_lib", "//platform/core-ui", "//platform/core-ui:core-ui_test_lib", + "//platform/editor-ui-api:editor-ui", + "//platform/editor-ui-api:editor-ui_test_lib", "//platform/execution", "//platform/execution:execution_test_lib", + "//platform/ide-core", + "//platform/util:util-ui", + "//platform/util:util-ui_test_lib", ], - runtime_deps = [":kotlin-jvm-tests"] + runtime_deps = [ + ":kotlin-jvm-tests", + "//platform/ide-core:ide-core_test_lib", + ] ) ### auto-generated section `build intellij.kotlin.jvm.tests` end diff --git a/plugins/kotlin/jvm/k2/intellij.kotlin.jvm.iml b/plugins/kotlin/jvm/k2/intellij.kotlin.jvm.iml index 2044de01c3a1..1308f77b1375 100644 --- a/plugins/kotlin/jvm/k2/intellij.kotlin.jvm.iml +++ b/plugins/kotlin/jvm/k2/intellij.kotlin.jvm.iml @@ -34,6 +34,7 @@ + @@ -45,9 +46,12 @@ + + + @@ -55,6 +59,7 @@ + diff --git a/plugins/kotlin/jvm/k2/intellij.kotlin.jvm.tests.iml b/plugins/kotlin/jvm/k2/intellij.kotlin.jvm.tests.iml index a72b1e13571b..51bf5b642683 100644 --- a/plugins/kotlin/jvm/k2/intellij.kotlin.jvm.tests.iml +++ b/plugins/kotlin/jvm/k2/intellij.kotlin.jvm.tests.iml @@ -24,6 +24,9 @@ + + + \ No newline at end of file diff --git a/plugins/kotlin/jvm/shared/BUILD.bazel b/plugins/kotlin/jvm/shared/BUILD.bazel index adeab8859de8..04f064e06f4d 100644 --- a/plugins/kotlin/jvm/shared/BUILD.bazel +++ b/plugins/kotlin/jvm/shared/BUILD.bazel @@ -32,6 +32,7 @@ jvm_library( "//jps/model-api:model", "//platform/lang-core", "//platform/lvcs-api:lvcs", + "//platform/lang-api:lang", "//platform/projectModel-api:projectModel", "//platform/util/jdom", "//libraries/gson", @@ -64,6 +65,7 @@ jvm_library( "//platform/vcs-impl", "//platform/external-system-impl:externalSystem-impl", "//platform/lvcs-impl", + "//java/java-psi-api:psi", "//java/java-psi-impl:psi-impl", "//java/execution/impl", "//java/compiler/impl", @@ -79,14 +81,17 @@ jvm_library( "//plugins/kotlin/jsr223", "//platform/util/coroutines", "//platform/core-api:core", + "//platform/core-impl", "@lib//:kotlinc-analysis-api", "//libraries/asm", "//platform/ide-core-impl", "//platform/ide-core", "//platform/util", + "//platform/util:util-ui", "//platform/editor-ui-api:editor-ui", "//plugins/kotlin/base/scripting/scripting.shared", "//platform/execution", + "//platform/statistics", "//plugins/kotlin/code-insight/impl-base:kotlin-codeInsight-shared", ] ) @@ -104,6 +109,7 @@ jvm_library( "//jps/model-api:model_test_lib", "//platform/lang-core:lang-core_test_lib", "//platform/lvcs-api:lvcs_test_lib", + "//platform/lang-api:lang_test_lib", "//platform/projectModel-api:projectModel_test_lib", "//platform/util/jdom:jdom_test_lib", "//libraries/gson:gson_test_lib", @@ -134,6 +140,7 @@ jvm_library( "//platform/vcs-impl:vcs-impl_test_lib", "//platform/external-system-impl:externalSystem-impl_test_lib", "//platform/lvcs-impl:lvcs-impl_test_lib", + "//java/java-psi-api:psi_test_lib", "//java/java-psi-impl:psi-impl_test_lib", "//java/execution/impl:impl_test_lib", "//java/compiler/impl:impl_test_lib", @@ -149,13 +156,16 @@ jvm_library( "//plugins/kotlin/jsr223:jsr223_test_lib", "//platform/util/coroutines:coroutines_test_lib", "//platform/core-api:core_test_lib", + "//platform/core-impl:core-impl_test_lib", "//libraries/asm:asm_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", "//platform/ide-core:ide-core_test_lib", "//platform/util:util_test_lib", + "//platform/util:util-ui_test_lib", "//platform/editor-ui-api:editor-ui_test_lib", "//plugins/kotlin/base/scripting/scripting.shared:scripting.shared_test_lib", "//platform/execution:execution_test_lib", + "//platform/statistics:statistics_test_lib", "//plugins/kotlin/code-insight/impl-base:kotlin-codeInsight-shared_test_lib", ] ) diff --git a/plugins/kotlin/jvm/shared/kotlin.jvm.shared.iml b/plugins/kotlin/jvm/shared/kotlin.jvm.shared.iml index 8487a73c8344..1fb8ff00d347 100644 --- a/plugins/kotlin/jvm/shared/kotlin.jvm.shared.iml +++ b/plugins/kotlin/jvm/shared/kotlin.jvm.shared.iml @@ -30,6 +30,7 @@ + @@ -62,6 +63,7 @@ + @@ -77,14 +79,17 @@ + + + \ No newline at end of file diff --git a/plugins/kotlin/kotlin.ide/BUILD.bazel b/plugins/kotlin/kotlin.ide/BUILD.bazel index 1d10bd1b6e47..102e9e44de79 100644 --- a/plugins/kotlin/kotlin.ide/BUILD.bazel +++ b/plugins/kotlin/kotlin.ide/BUILD.bazel @@ -12,9 +12,11 @@ jvm_library( "//platform/indexing-api:indexing", "//jps/model-api:model", "//platform/lang-core", + "//platform/lang-api:lang", "//platform/projectModel-api:projectModel", "//platform/refactoring", "//platform/core-ui", + "//platform/core-impl", "//platform/analysis-api:analysis", "//platform/lang-impl", "@lib//:kotlinc-kotlin-compiler-common", @@ -24,8 +26,10 @@ jvm_library( "//platform/platform-impl:ide-impl", "//plugins/kotlin/base/statistics", "//platform/ide-core-impl", + "//platform/ide-core", "//plugins/kotlin/project-configuration", "//java/java-impl:impl", + "//java/java-psi-api:psi", "//plugins/kotlin/base/code-insight/minimal", "//plugins/kotlin/base/util", "//plugins/kotlin/base/analysis", @@ -34,6 +38,7 @@ jvm_library( "//java/openapi:java", "//platform/analysis-impl", "//platform/util/jdom", + "//platform/util:util-ui", "//plugins/kotlin/code-insight/impl-base:kotlin-codeInsight-shared", "//platform/diff-impl", "@lib//:kotlinc-kotlin-scripting-common", @@ -41,6 +46,7 @@ jvm_library( "//plugins/kotlin/base/scripting/scripting.shared", "//libraries/gson", "//platform/structure-view-impl:structureView-impl", + "//platform/statistics", ], runtime_deps = ["//plugins/kotlin/base/frontend-agnostic"] ) @@ -57,10 +63,12 @@ jvm_library( "//platform/indexing-api:indexing_test_lib", "//jps/model-api:model_test_lib", "//platform/lang-core:lang-core_test_lib", + "//platform/lang-api:lang_test_lib", "//platform/projectModel-api:projectModel_test_lib", "//platform/refactoring:refactoring_test_lib", "//plugins/kotlin/base/frontend-agnostic:frontend-agnostic_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl:core-impl_test_lib", "//platform/analysis-api:analysis_test_lib", "//platform/lang-impl:lang-impl_test_lib", "//plugins/kotlin/base/project-structure:project-structure_test_lib", @@ -69,8 +77,10 @@ jvm_library( "//platform/platform-impl:ide-impl_test_lib", "//plugins/kotlin/base/statistics:statistics_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//plugins/kotlin/project-configuration:project-configuration_test_lib", "//java/java-impl:impl_test_lib", + "//java/java-psi-api:psi_test_lib", "//plugins/kotlin/base/code-insight/minimal:minimal_test_lib", "//plugins/kotlin/base/util:util_test_lib", "//plugins/kotlin/base/analysis:analysis_test_lib", @@ -79,11 +89,13 @@ jvm_library( "//java/openapi:java_test_lib", "//platform/analysis-impl:analysis-impl_test_lib", "//platform/util/jdom:jdom_test_lib", + "//platform/util:util-ui_test_lib", "//plugins/kotlin/code-insight/impl-base:kotlin-codeInsight-shared_test_lib", "//platform/diff-impl:diff-impl_test_lib", "//plugins/kotlin/base/scripting/scripting.shared:scripting.shared_test_lib", "//libraries/gson:gson_test_lib", "//platform/structure-view-impl:structureView-impl_test_lib", + "//platform/statistics:statistics_test_lib", ] ) ### auto-generated section `build intellij.kotlin.ide` end diff --git a/plugins/kotlin/kotlin.ide/intellij.kotlin.ide.iml b/plugins/kotlin/kotlin.ide/intellij.kotlin.ide.iml index 6ca6bfb0ae77..f730b86ffe8d 100644 --- a/plugins/kotlin/kotlin.ide/intellij.kotlin.ide.iml +++ b/plugins/kotlin/kotlin.ide/intellij.kotlin.ide.iml @@ -12,10 +12,12 @@ + + @@ -25,8 +27,10 @@ + + @@ -35,6 +39,7 @@ + @@ -42,5 +47,6 @@ + \ No newline at end of file diff --git a/plugins/kotlin/kotlin.lombok.tests/BUILD.bazel b/plugins/kotlin/kotlin.lombok.tests/BUILD.bazel index 2fa5d2e23997..9e52ce6f1c36 100644 --- a/plugins/kotlin/kotlin.lombok.tests/BUILD.bazel +++ b/plugins/kotlin/kotlin.lombok.tests/BUILD.bazel @@ -16,6 +16,8 @@ jvm_library( deps = [ "//platform/core-api:core", "//platform/core-api:core_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", "//platform/lang-core", "//platform/lang-core:lang-core_test_lib", "//platform/projectModel-api:projectModel", @@ -30,6 +32,8 @@ jvm_library( "//plugins/kotlin/test-framework:test-framework_test_lib", "//java/testFramework", "//java/testFramework:testFramework_test_lib", + "//java/java-psi-api:psi", + "//java/java-psi-api:psi_test_lib", "//plugins/lombok", "//plugins/lombok:lombok_test_lib", "//plugins/kotlin/base/test", diff --git a/plugins/kotlin/kotlin.lombok.tests/intellij.kotlin.lombok.tests.iml b/plugins/kotlin/kotlin.lombok.tests/intellij.kotlin.lombok.tests.iml index 6ad003b496ce..92248f9d7d6f 100644 --- a/plugins/kotlin/kotlin.lombok.tests/intellij.kotlin.lombok.tests.iml +++ b/plugins/kotlin/kotlin.lombok.tests/intellij.kotlin.lombok.tests.iml @@ -8,6 +8,7 @@ + @@ -15,6 +16,7 @@ + diff --git a/plugins/kotlin/kotlin.performanceExtendedPlugin/BUILD.bazel b/plugins/kotlin/kotlin.performanceExtendedPlugin/BUILD.bazel index 01527adf11b0..e04894f4c8f4 100644 --- a/plugins/kotlin/kotlin.performanceExtendedPlugin/BUILD.bazel +++ b/plugins/kotlin/kotlin.performanceExtendedPlugin/BUILD.bazel @@ -26,6 +26,7 @@ jvm_library( "//platform/refactoring", "//plugins/kotlin/frontend-independent", "//platform/ide-core-impl", + "//platform/ide-core", "//plugins/kotlin/base/analysis", "@lib//:kotlinc-analysis-api-platform-interface-provided", "@lib//:kotlinc-analysis-api-provided", @@ -35,6 +36,7 @@ jvm_library( "//plugins/kotlin/kotlin.searching/base", "//java/java-analysis-impl:analysis-impl", "//java/openapi:java", + "//java/java-psi-api:psi", "//plugins/kotlin/base/resources:kotlin-base-resources", "//plugins/kotlin/base/util", "//platform/diagnostic/telemetry", @@ -43,6 +45,7 @@ jvm_library( "//plugins/kotlin/kotlin.ide", "//platform/lang-impl", "//platform/core-ui", + "//platform/core-impl", "//plugins/kotlin/base/compiler-configuration", "//plugins/performanceTesting/vcs", "@lib//:kotlinc-kotlin-compiler-common", @@ -69,6 +72,7 @@ jvm_library( "//platform/refactoring:refactoring_test_lib", "//plugins/kotlin/frontend-independent:frontend-independent_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//plugins/kotlin/base/analysis:analysis_test_lib", "@lib//:kotlinc-analysis-api-platform-interface-provided", "@lib//:kotlinc-analysis-api-provided", @@ -76,6 +80,7 @@ jvm_library( "//plugins/kotlin/kotlin.searching/base:base_test_lib", "//java/java-analysis-impl:analysis-impl_test_lib", "//java/openapi:java_test_lib", + "//java/java-psi-api:psi_test_lib", "//plugins/kotlin/base/resources:kotlin-base-resources_test_lib", "//plugins/kotlin/base/util:util_test_lib", "//platform/diagnostic/telemetry:telemetry_test_lib", @@ -84,6 +89,7 @@ jvm_library( "//plugins/kotlin/kotlin.ide:kotlin.ide_test_lib", "//platform/lang-impl:lang-impl_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl:core-impl_test_lib", "//plugins/kotlin/base/compiler-configuration:compiler-configuration_test_lib", "//plugins/performanceTesting/vcs:vcs_test_lib", "//plugins/kotlin/base/project-structure:project-structure_test_lib", diff --git a/plugins/kotlin/kotlin.performanceExtendedPlugin/intellij.kotlin.performanceExtendedPlugin.iml b/plugins/kotlin/kotlin.performanceExtendedPlugin/intellij.kotlin.performanceExtendedPlugin.iml index 4a39570cd858..2665740112bf 100644 --- a/plugins/kotlin/kotlin.performanceExtendedPlugin/intellij.kotlin.performanceExtendedPlugin.iml +++ b/plugins/kotlin/kotlin.performanceExtendedPlugin/intellij.kotlin.performanceExtendedPlugin.iml @@ -20,6 +20,7 @@ + @@ -29,6 +30,7 @@ + @@ -37,6 +39,7 @@ + diff --git a/plugins/kotlin/kotlin.searching/BUILD.bazel b/plugins/kotlin/kotlin.searching/BUILD.bazel index b0673b9f0805..0d5a2da98ceb 100644 --- a/plugins/kotlin/kotlin.searching/BUILD.bazel +++ b/plugins/kotlin/kotlin.searching/BUILD.bazel @@ -31,6 +31,7 @@ jvm_library( "//java/java-indexing-api:indexing", "@lib//:kotlinc-kotlin-compiler-common", "//platform/core-api:core", + "//platform/core-impl", "//platform/indexing-api:indexing", "//platform/lang-impl", "//platform/platform-api:ide", @@ -64,6 +65,7 @@ jvm_library( "//java/java-indexing-api:indexing_test_lib", "//plugins/kotlin/base/frontend-agnostic:frontend-agnostic_test_lib", "//platform/core-api:core_test_lib", + "//platform/core-impl:core-impl_test_lib", "//platform/indexing-api:indexing_test_lib", "//platform/lang-impl:lang-impl_test_lib", "//platform/platform-api:ide_test_lib", diff --git a/plugins/kotlin/kotlin.searching/base/BUILD.bazel b/plugins/kotlin/kotlin.searching/base/BUILD.bazel index ed4e7d71fdd3..50ad005a3b90 100644 --- a/plugins/kotlin/kotlin.searching/base/BUILD.bazel +++ b/plugins/kotlin/kotlin.searching/base/BUILD.bazel @@ -39,6 +39,8 @@ jvm_library( "//java/java-analysis-api:analysis", "//platform/platform-impl:ide-impl", "//java/openapi:java", + "//java/java-psi-api:psi", + "//java/java-frontback-psi-api:frontback-psi", "//plugins/kotlin/base/psi", "@lib//:kotlinc-analysis-api", "//plugins/kotlin/base/project-structure", @@ -46,6 +48,8 @@ jvm_library( "//plugins/kotlin/base/facet", "//plugins/kotlin/base/frontend-agnostic", "//platform/util/concurrency", + "//platform/statistics", + "//platform/util:util-ui", ] ) @@ -76,12 +80,16 @@ jvm_library( "//java/java-analysis-api:analysis_test_lib", "//platform/platform-impl:ide-impl_test_lib", "//java/openapi:java_test_lib", + "//java/java-psi-api:psi_test_lib", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//plugins/kotlin/base/psi:psi_test_lib", "//plugins/kotlin/base/project-structure:project-structure_test_lib", "//plugins/kotlin/base/indices:indices_test_lib", "//plugins/kotlin/base/facet:facet_test_lib", "//plugins/kotlin/base/frontend-agnostic:frontend-agnostic_test_lib", "//platform/util/concurrency:concurrency_test_lib", + "//platform/statistics:statistics_test_lib", + "//platform/util:util-ui_test_lib", ] ) ### auto-generated section `build intellij.kotlin.searching.base` end diff --git a/plugins/kotlin/kotlin.searching/base/intellij.kotlin.searching.base.iml b/plugins/kotlin/kotlin.searching/base/intellij.kotlin.searching.base.iml index ad181ac9a21e..4063760e82b6 100644 --- a/plugins/kotlin/kotlin.searching/base/intellij.kotlin.searching.base.iml +++ b/plugins/kotlin/kotlin.searching/base/intellij.kotlin.searching.base.iml @@ -44,6 +44,8 @@ + + @@ -51,5 +53,7 @@ + + \ No newline at end of file diff --git a/plugins/kotlin/kotlin.searching/intellij.kotlin.searching.iml b/plugins/kotlin/kotlin.searching/intellij.kotlin.searching.iml index c0ae4d8efe7d..409b5f6e2759 100644 --- a/plugins/kotlin/kotlin.searching/intellij.kotlin.searching.iml +++ b/plugins/kotlin/kotlin.searching/intellij.kotlin.searching.iml @@ -30,6 +30,7 @@ + diff --git a/plugins/kotlin/kotlin.searching/kotlin.searching.test.k2/BUILD.bazel b/plugins/kotlin/kotlin.searching/kotlin.searching.test.k2/BUILD.bazel index 0ae924d6739c..2fa4acef5ae1 100644 --- a/plugins/kotlin/kotlin.searching/kotlin.searching.test.k2/BUILD.bazel +++ b/plugins/kotlin/kotlin.searching/kotlin.searching.test.k2/BUILD.bazel @@ -26,10 +26,14 @@ jvm_library( "//java/java-indexing-api:indexing_test_lib", "//platform/core-api:core", "//platform/core-api:core_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", "//platform/editor-ui-api:editor-ui", "//platform/editor-ui-api:editor-ui_test_lib", "//platform/indexing-api:indexing", "//platform/indexing-api:indexing_test_lib", + "//java/java-psi-api:psi", + "//java/java-psi-api:psi_test_lib", "//plugins/kotlin/plugin/k2", "//plugins/kotlin/plugin/k2:k2_test_lib", "//plugins/kotlin/test-framework", diff --git a/plugins/kotlin/kotlin.searching/kotlin.searching.test.k2/intellij.kotlin.searching.test.iml b/plugins/kotlin/kotlin.searching/kotlin.searching.test.k2/intellij.kotlin.searching.test.iml index 455331de07a3..356f51aad633 100644 --- a/plugins/kotlin/kotlin.searching/kotlin.searching.test.k2/intellij.kotlin.searching.test.iml +++ b/plugins/kotlin/kotlin.searching/kotlin.searching.test.k2/intellij.kotlin.searching.test.iml @@ -11,8 +11,10 @@ + + diff --git a/plugins/kotlin/maven/BUILD.bazel b/plugins/kotlin/maven/BUILD.bazel index a7c423b01a27..7c949e933690 100644 --- a/plugins/kotlin/maven/BUILD.bazel +++ b/plugins/kotlin/maven/BUILD.bazel @@ -21,6 +21,7 @@ jvm_library( "//platform/analysis-api:analysis", "//platform/editor-ui-api:editor-ui", "//platform/indexing-api:indexing", + "//platform/lang-api:lang", "//platform/lang-core", "//platform/projectModel-api:projectModel", "//platform/workspace/storage", @@ -29,6 +30,7 @@ jvm_library( "//platform/observable", "//plugins/kotlin/base/util", "//platform/platform-impl:ide-impl", + "//platform/ide-core", "//plugins/kotlin/base/compiler-configuration", "//plugins/kotlin/base/plugin", "//plugins/kotlin/base/platforms", @@ -46,14 +48,17 @@ jvm_library( "//jps/model-api:model", "//platform/projectModel-impl", "//java/java-impl:impl", + "//java/java-psi-api:psi", "//plugins/maven", "//platform/util/jdom", "//plugins/kotlin/base/resources:kotlin-base-resources", "//platform/core-api:core", + "//platform/core-impl", "//platform/workspace/jps", "//platform/backend/observation", "//platform/util/progress", "//platform/vcs-api/vcs-api-core:vcs-core", + "//platform/statistics", ] ) @@ -68,6 +73,7 @@ jvm_library( "//platform/analysis-api:analysis_test_lib", "//platform/editor-ui-api:editor-ui_test_lib", "//platform/indexing-api:indexing_test_lib", + "//platform/lang-api:lang_test_lib", "//platform/lang-core:lang-core_test_lib", "//platform/projectModel-api:projectModel_test_lib", "//platform/workspace/storage:storage_test_lib", @@ -76,6 +82,7 @@ jvm_library( "//platform/observable:observable_test_lib", "//plugins/kotlin/base/util:util_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//plugins/kotlin/base/compiler-configuration:compiler-configuration_test_lib", "//plugins/kotlin/base/plugin:plugin_test_lib", "//plugins/kotlin/base/platforms:platforms_test_lib", @@ -93,14 +100,17 @@ jvm_library( "//jps/model-api:model_test_lib", "//platform/projectModel-impl:projectModel-impl_test_lib", "//java/java-impl:impl_test_lib", + "//java/java-psi-api:psi_test_lib", "//plugins/maven:maven_test_lib", "//platform/util/jdom:jdom_test_lib", "//plugins/kotlin/base/resources:kotlin-base-resources_test_lib", "//platform/core-api:core_test_lib", + "//platform/core-impl:core-impl_test_lib", "//platform/workspace/jps:jps_test_lib", "//platform/backend/observation:observation_test_lib", "//platform/util/progress:progress_test_lib", "//platform/vcs-api/vcs-api-core:vcs-core_test_lib", + "//platform/statistics:statistics_test_lib", ] ) ### auto-generated section `build intellij.kotlin.maven` end diff --git a/plugins/kotlin/maven/intellij.kotlin.maven.iml b/plugins/kotlin/maven/intellij.kotlin.maven.iml index ca3e1d1666dc..a07196947254 100644 --- a/plugins/kotlin/maven/intellij.kotlin.maven.iml +++ b/plugins/kotlin/maven/intellij.kotlin.maven.iml @@ -15,6 +15,7 @@ + @@ -23,6 +24,7 @@ + @@ -40,13 +42,16 @@ + + + \ No newline at end of file diff --git a/plugins/kotlin/maven/tests/BUILD.bazel b/plugins/kotlin/maven/tests/BUILD.bazel index 0e21de7e8dc4..ebebf22c99a6 100644 --- a/plugins/kotlin/maven/tests/BUILD.bazel +++ b/plugins/kotlin/maven/tests/BUILD.bazel @@ -57,6 +57,8 @@ jvm_library( "//platform/core-api:core_test_lib", "//platform/core-ui", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", "//platform/indexing-api:indexing", "//platform/indexing-api:indexing_test_lib", "//jps/model-api:model", @@ -114,6 +116,7 @@ jvm_library( "//plugins/maven/testFramework:testFramework_test_lib", "//platform/util/jdom", "//platform/util/jdom:jdom_test_lib", + "//platform/ide-core", "//java/java-runtime:rt", "//java/java-runtime:rt_test_lib", "//plugins/kotlin/intellij.kotlin.base.test:base-test", @@ -131,6 +134,7 @@ jvm_library( "//plugins/kotlin/compiler-plugins/assignment/maven:maven_test_lib", "//plugins/kotlin/compiler-plugins/kotlinx-serialization/maven:maven_test_lib", "//plugins/kotlin/compiler-plugins/kotlin-dataframe/maven:maven_test_lib", + "//platform/ide-core:ide-core_test_lib", ] ) ### auto-generated section `build intellij.kotlin.maven.tests` end diff --git a/plugins/kotlin/maven/tests/intellij.kotlin.maven.tests.iml b/plugins/kotlin/maven/tests/intellij.kotlin.maven.tests.iml index d11d6f4edf87..36444939a735 100644 --- a/plugins/kotlin/maven/tests/intellij.kotlin.maven.tests.iml +++ b/plugins/kotlin/maven/tests/intellij.kotlin.maven.tests.iml @@ -15,6 +15,7 @@ + @@ -51,6 +52,7 @@ + diff --git a/plugins/kotlin/navigation/tests/BUILD.bazel b/plugins/kotlin/navigation/tests/BUILD.bazel index 3e4dda1c228b..5c03f2a245f2 100644 --- a/plugins/kotlin/navigation/tests/BUILD.bazel +++ b/plugins/kotlin/navigation/tests/BUILD.bazel @@ -27,6 +27,8 @@ jvm_library( "@lib//:kotlin-stdlib", "//java/openapi:java", "//java/openapi:java_test_lib", + "//java/java-psi-api:psi", + "//java/java-psi-api:psi_test_lib", "//plugins/kotlin/navigation", "//plugins/kotlin/navigation:navigation_test_lib", "//java/testFramework", @@ -47,6 +49,7 @@ jvm_library( "//platform/core-impl:core-impl_test_lib", "//platform/testFramework", "//platform/testFramework:testFramework_test_lib", + "//platform/ide-core", "@lib//:kotlinc-kotlin-compiler-tests", "@lib//:kotlinc-kotlin-compiler-common", "@lib//:kotlinc-analysis-api", @@ -58,7 +61,10 @@ jvm_library( "//plugins/kotlin/intellij.kotlin.base.test:base-test", "//plugins/kotlin/intellij.kotlin.base.test:base-test_test_lib", ], - runtime_deps = [":tests"] + runtime_deps = [ + ":tests", + "//platform/ide-core:ide-core_test_lib", + ] ) ### auto-generated section `build intellij.kotlin.navigation.tests` end diff --git a/plugins/kotlin/navigation/tests/intellij.kotlin.navigation.tests.iml b/plugins/kotlin/navigation/tests/intellij.kotlin.navigation.tests.iml index b0af79e8605c..9c6be40072e1 100644 --- a/plugins/kotlin/navigation/tests/intellij.kotlin.navigation.tests.iml +++ b/plugins/kotlin/navigation/tests/intellij.kotlin.navigation.tests.iml @@ -14,6 +14,7 @@ + @@ -24,6 +25,7 @@ + diff --git a/plugins/kotlin/onboarding-gradle/BUILD.bazel b/plugins/kotlin/onboarding-gradle/BUILD.bazel index be2195446f60..390ba3af08cb 100644 --- a/plugins/kotlin/onboarding-gradle/BUILD.bazel +++ b/plugins/kotlin/onboarding-gradle/BUILD.bazel @@ -24,6 +24,8 @@ jvm_library( "//platform/feedback", "//platform/platform-api:ide", "//platform/platform-impl:ide-impl", + "//platform/ide-core", + "//platform/util:util-ui", "//plugins/kotlin/base/plugin", "//libraries/kotlinx/datetime", "//libraries/kotlinx/serialization/core", @@ -55,6 +57,8 @@ jvm_library( "//platform/testFramework:testFramework_test_lib", "//platform/platform-api:ide_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", + "//platform/util:util-ui_test_lib", "//plugins/kotlin/base/plugin:plugin_test_lib", "//libraries/kotlinx/datetime:datetime_test_lib", "//libraries/kotlinx/serialization/core:core_test_lib", diff --git a/plugins/kotlin/onboarding-gradle/intellij.kotlin.onboarding.gradle.iml b/plugins/kotlin/onboarding-gradle/intellij.kotlin.onboarding.gradle.iml index ece4258ec4a2..812a1d8fa9fb 100644 --- a/plugins/kotlin/onboarding-gradle/intellij.kotlin.onboarding.gradle.iml +++ b/plugins/kotlin/onboarding-gradle/intellij.kotlin.onboarding.gradle.iml @@ -40,6 +40,8 @@ + + diff --git a/plugins/kotlin/onboarding-promoter/BUILD.bazel b/plugins/kotlin/onboarding-promoter/BUILD.bazel index 750a3640cfc5..5cc1cc879ce9 100644 --- a/plugins/kotlin/onboarding-promoter/BUILD.bazel +++ b/plugins/kotlin/onboarding-promoter/BUILD.bazel @@ -18,10 +18,12 @@ jvm_library( "//platform/core-api:core", "//platform/core-ui", "//platform/platform-impl:ide-impl", + "//platform/ide-core", "//plugins/ide-features-trainer:featuresTrainer", "//java/java-features-trainer:featuresTrainer", "//plugins/kotlin/features-trainer", "//platform/statistics", + "//platform/util:util-ui", ] ) @@ -35,10 +37,12 @@ jvm_library( "//platform/core-api:core_test_lib", "//platform/core-ui:core-ui_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//plugins/ide-features-trainer:featuresTrainer_test_lib", "//java/java-features-trainer:featuresTrainer_test_lib", "//plugins/kotlin/features-trainer:features-trainer_test_lib", "//platform/statistics:statistics_test_lib", + "//platform/util:util-ui_test_lib", ] ) ### auto-generated section `build intellij.kotlin.onboarding.promoter` end diff --git a/plugins/kotlin/onboarding-promoter/intellij.kotlin.onboarding.promoter.iml b/plugins/kotlin/onboarding-promoter/intellij.kotlin.onboarding.promoter.iml index 5ba0a34ec58a..992a83ce8cca 100644 --- a/plugins/kotlin/onboarding-promoter/intellij.kotlin.onboarding.promoter.iml +++ b/plugins/kotlin/onboarding-promoter/intellij.kotlin.onboarding.promoter.iml @@ -12,9 +12,11 @@ + + \ No newline at end of file diff --git a/plugins/kotlin/onboarding/BUILD.bazel b/plugins/kotlin/onboarding/BUILD.bazel index 75f878b6f991..59bc092faaea 100644 --- a/plugins/kotlin/onboarding/BUILD.bazel +++ b/plugins/kotlin/onboarding/BUILD.bazel @@ -26,12 +26,14 @@ jvm_library( "//platform/feedback", "//platform/platform-api:ide", "//platform/platform-impl:ide-impl", + "//platform/ide-core", "//plugins/kotlin/base/plugin", "//libraries/kotlinx/datetime", "//libraries/kotlinx/serialization/core", "//libraries/kotlinx/serialization/json", "//platform/external-system-api:externalSystem", "//platform/external-system-impl:externalSystem-impl", + "//platform/util:util-ui", "//plugins/kotlin/project-configuration", "//plugins/kotlin/base/facet", "//plugins/kotlin/base/util", @@ -57,6 +59,7 @@ jvm_library( "//platform/feedback:feedback_test_lib", "//platform/platform-api:ide_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//plugins/kotlin/base/plugin:plugin_test_lib", "//libraries/kotlinx/datetime:datetime_test_lib", "//libraries/kotlinx/serialization/core:core_test_lib", @@ -73,6 +76,7 @@ jvm_library( "//platform/external-system-impl:externalSystem-impl_test_lib", "//platform/testFramework", "//platform/testFramework:testFramework_test_lib", + "//platform/util:util-ui_test_lib", "//plugins/kotlin/project-configuration:project-configuration_test_lib", "//plugins/kotlin/base/facet:facet_test_lib", "//plugins/kotlin/base/util:util_test_lib", diff --git a/plugins/kotlin/onboarding/intellij.kotlin.onboarding.iml b/plugins/kotlin/onboarding/intellij.kotlin.onboarding.iml index 961898ff2de8..7bbb18ebca06 100644 --- a/plugins/kotlin/onboarding/intellij.kotlin.onboarding.iml +++ b/plugins/kotlin/onboarding/intellij.kotlin.onboarding.iml @@ -41,6 +41,7 @@ + @@ -53,6 +54,7 @@ + diff --git a/plugins/kotlin/plugin-updater/BUILD.bazel b/plugins/kotlin/plugin-updater/BUILD.bazel index 4678279c72e4..0e9de59087ef 100644 --- a/plugins/kotlin/plugin-updater/BUILD.bazel +++ b/plugins/kotlin/plugin-updater/BUILD.bazel @@ -29,9 +29,11 @@ jvm_library( "//plugins/kotlin/base/resources:kotlin-base-resources", "//plugins/kotlin/project-configuration", "//platform/util/jdom", + "//platform/util:util-ui", "//platform/core-impl", "//platform/core-ui", "//platform/platform-impl:ide-impl", + "//platform/ide-core", "//java/compiler/openapi:java-compiler", "//platform/statistics", ] @@ -56,9 +58,11 @@ jvm_library( "//plugins/kotlin/base/resources:kotlin-base-resources_test_lib", "//plugins/kotlin/project-configuration:project-configuration_test_lib", "//platform/util/jdom:jdom_test_lib", + "//platform/util:util-ui_test_lib", "//platform/core-impl:core-impl_test_lib", "//platform/core-ui:core-ui_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//java/compiler/openapi:java-compiler_test_lib", "//platform/statistics:statistics_test_lib", ] diff --git a/plugins/kotlin/plugin-updater/intellij.kotlin.plugin.updater.iml b/plugins/kotlin/plugin-updater/intellij.kotlin.plugin.updater.iml index 2c7419749034..0277e3898bae 100644 --- a/plugins/kotlin/plugin-updater/intellij.kotlin.plugin.updater.iml +++ b/plugins/kotlin/plugin-updater/intellij.kotlin.plugin.updater.iml @@ -23,9 +23,11 @@ + + diff --git a/plugins/kotlin/preferences/BUILD.bazel b/plugins/kotlin/preferences/BUILD.bazel index 5c54dba9fb66..82fd9cbd0d35 100644 --- a/plugins/kotlin/preferences/BUILD.bazel +++ b/plugins/kotlin/preferences/BUILD.bazel @@ -24,7 +24,9 @@ jvm_library( "//plugins/kotlin/base/plugin", "//plugins/kotlin/plugin-updater", "//platform/platform-impl:ide-impl", + "//platform/ide-core", "//platform/core-ui", + "//platform/util:util-ui", ] ) @@ -44,7 +46,9 @@ jvm_library( "//plugins/kotlin/base/plugin:plugin_test_lib", "//plugins/kotlin/plugin-updater:plugin-updater_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/util:util-ui_test_lib", ] ) ### auto-generated section `build intellij.kotlin.preferences` end diff --git a/plugins/kotlin/preferences/intellij.kotlin.preferences.iml b/plugins/kotlin/preferences/intellij.kotlin.preferences.iml index d18962f6517e..d38bcb1e80ab 100644 --- a/plugins/kotlin/preferences/intellij.kotlin.preferences.iml +++ b/plugins/kotlin/preferences/intellij.kotlin.preferences.iml @@ -18,6 +18,8 @@ + + \ No newline at end of file diff --git a/plugins/kotlin/project-configuration/BUILD.bazel b/plugins/kotlin/project-configuration/BUILD.bazel index 0cd9e638668a..4ee0c2e7b986 100644 --- a/plugins/kotlin/project-configuration/BUILD.bazel +++ b/plugins/kotlin/project-configuration/BUILD.bazel @@ -19,6 +19,7 @@ jvm_library( "@lib//:kotlinc-kotlin-jps-common", "//libraries/asm", "//platform/analysis-api:analysis", + "//platform/lang-api:lang", "//platform/diff-api:diff", "//platform/editor-ui-api:editor-ui", "//platform/platform-impl:ide-impl", @@ -31,6 +32,8 @@ jvm_library( "//platform/observable", "//libraries/gson", "//platform/ide-core-impl", + "//platform/ide-core", + "//platform/progress/shared:ide-progress", "//plugins/kotlin/base/frontend-agnostic", "//plugins/kotlin/base/util", "//platform/util/progress", @@ -48,6 +51,8 @@ jvm_library( "//platform/core-ui", "//platform/external-system-api:externalSystem", "//java/openapi:java", + "//java/java-psi-api:psi", + "//java/java-syntax:syntax", "//java/idea-ui:ui", "//java/java-impl:impl", "//java/compiler/openapi:java-compiler", @@ -55,9 +60,11 @@ jvm_library( "//platform/vcs-impl", "//platform/diff-impl", "//platform/core-api:core", + "//platform/core-impl", "//platform/util/coroutines", "//libraries/maven-resolver-provider", "//platform/util", + "//platform/util:util-ui", "//platform/workspace/storage", "//platform/vcs-impl/shared", "//platform/backend/workspace", @@ -67,6 +74,7 @@ jvm_library( "@lib//:kotlinc-analysis-api", "//platform/backend/observation", "//platform/util/concurrency", + "//platform/statistics", ] ) @@ -79,6 +87,7 @@ jvm_library( ":project-configuration", "//libraries/asm:asm_test_lib", "//platform/analysis-api:analysis_test_lib", + "//platform/lang-api:lang_test_lib", "//platform/diff-api:diff_test_lib", "//platform/editor-ui-api:editor-ui_test_lib", "//platform/platform-impl:ide-impl_test_lib", @@ -91,6 +100,8 @@ jvm_library( "//platform/observable:observable_test_lib", "//libraries/gson:gson_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", + "//platform/progress/shared:ide-progress_test_lib", "//plugins/kotlin/base/frontend-agnostic:frontend-agnostic_test_lib", "//plugins/kotlin/base/util:util_test_lib", "//platform/util/progress:progress_test_lib", @@ -108,6 +119,8 @@ jvm_library( "//platform/core-ui:core-ui_test_lib", "//platform/external-system-api:externalSystem_test_lib", "//java/openapi:java_test_lib", + "//java/java-psi-api:psi_test_lib", + "//java/java-syntax:syntax_test_lib", "//java/idea-ui:ui_test_lib", "//java/java-impl:impl_test_lib", "//java/compiler/openapi:java-compiler_test_lib", @@ -115,9 +128,11 @@ jvm_library( "//platform/vcs-impl:vcs-impl_test_lib", "//platform/diff-impl:diff-impl_test_lib", "//platform/core-api:core_test_lib", + "//platform/core-impl:core-impl_test_lib", "//platform/util/coroutines:coroutines_test_lib", "//libraries/maven-resolver-provider:maven-resolver-provider_test_lib", "//platform/util:util_test_lib", + "//platform/util:util-ui_test_lib", "//platform/workspace/storage:storage_test_lib", "//platform/vcs-impl/shared:shared_test_lib", "//platform/backend/workspace:workspace_test_lib", @@ -125,6 +140,7 @@ jvm_library( "//platform/execution:execution_test_lib", "//platform/backend/observation:observation_test_lib", "//platform/util/concurrency:concurrency_test_lib", + "//platform/statistics:statistics_test_lib", ] ) ### auto-generated section `build intellij.kotlin.projectConfiguration` end diff --git a/plugins/kotlin/project-configuration/intellij.kotlin.projectConfiguration.iml b/plugins/kotlin/project-configuration/intellij.kotlin.projectConfiguration.iml index 71b75b73992b..56069b1813fa 100644 --- a/plugins/kotlin/project-configuration/intellij.kotlin.projectConfiguration.iml +++ b/plugins/kotlin/project-configuration/intellij.kotlin.projectConfiguration.iml @@ -13,6 +13,7 @@ + @@ -25,6 +26,8 @@ + + @@ -42,6 +45,8 @@ + + @@ -49,9 +54,11 @@ + + @@ -61,5 +68,6 @@ + \ No newline at end of file diff --git a/plugins/kotlin/project-wizard/compose/BUILD.bazel b/plugins/kotlin/project-wizard/compose/BUILD.bazel index 4202c3a30ad8..dad5ba92ad7d 100644 --- a/plugins/kotlin/project-wizard/compose/BUILD.bazel +++ b/plugins/kotlin/project-wizard/compose/BUILD.bazel @@ -17,16 +17,20 @@ jvm_library( "@lib//:kotlin-stdlib", "//platform/core-api:core", "//platform/lang-core", + "//platform/lang-api:lang", "//platform/projectModel-api:projectModel", "//plugins/kotlin/base/frontend-agnostic", "//plugins/kotlin/base/resources:kotlin-base-resources", "//java/idea-ui:ui", "//platform/util", + "//platform/util:util-ui", "//platform/lang-impl", "//platform/platform-impl:ide-impl", "//platform/ide-core-impl", + "//platform/ide-core", "//platform/core-ui", "//java/openapi:java", + "//java/java-syntax:syntax", "//plugins/kotlin/project-wizard/core", ] ) @@ -40,6 +44,7 @@ jvm_library( ":compose", "//platform/core-api:core_test_lib", "//platform/lang-core:lang-core_test_lib", + "//platform/lang-api:lang_test_lib", "//platform/projectModel-api:projectModel_test_lib", "//plugins/kotlin/base/frontend-agnostic:frontend-agnostic_test_lib", "//plugins/kotlin/base/resources:kotlin-base-resources_test_lib", @@ -47,11 +52,14 @@ jvm_library( "//platform/testFramework:testFramework_test_lib", "//java/idea-ui:ui_test_lib", "//platform/util:util_test_lib", + "//platform/util:util-ui_test_lib", "//platform/lang-impl:lang-impl_test_lib", "//platform/platform-impl:ide-impl_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/core-ui:core-ui_test_lib", "//java/openapi:java_test_lib", + "//java/java-syntax:syntax_test_lib", "//java/testFramework", "//java/testFramework:testFramework_test_lib", "//java/java-tests:tests", diff --git a/plugins/kotlin/project-wizard/compose/intellij.kotlin.projectWizard.compose.iml b/plugins/kotlin/project-wizard/compose/intellij.kotlin.projectWizard.compose.iml index a59f5860a7f2..f4decbe8da8b 100644 --- a/plugins/kotlin/project-wizard/compose/intellij.kotlin.projectWizard.compose.iml +++ b/plugins/kotlin/project-wizard/compose/intellij.kotlin.projectWizard.compose.iml @@ -11,17 +11,21 @@ + + + + diff --git a/plugins/kotlin/project-wizard/core/BUILD.bazel b/plugins/kotlin/project-wizard/core/BUILD.bazel index a60a1c7c62c8..70136af25b6f 100644 --- a/plugins/kotlin/project-wizard/core/BUILD.bazel +++ b/plugins/kotlin/project-wizard/core/BUILD.bazel @@ -23,6 +23,7 @@ jvm_library( "//platform/lang-core", "//plugins/kotlin/base/frontend-agnostic", "//platform/core-api:core", + "//platform/core-impl", "//plugins/kotlin/base/plugin", "//plugins/kotlin/base/resources:kotlin-base-resources", "//platform/editor-ui-api:editor-ui", @@ -32,6 +33,7 @@ jvm_library( "//plugins/gradle:gradle-common", "//java/idea-ui:ui", "//platform/platform-impl:ide-impl", + "//platform/ide-core", "@lib//:kotlinc-kotlin-compiler-common", "//java/java-psi-api:psi", "//java/java-impl:impl", @@ -59,6 +61,7 @@ jvm_library( "//platform/lang-core:lang-core_test_lib", "//plugins/kotlin/base/frontend-agnostic:frontend-agnostic_test_lib", "//platform/core-api:core_test_lib", + "//platform/core-impl:core-impl_test_lib", "//plugins/kotlin/base/plugin:plugin_test_lib", "//plugins/kotlin/base/resources:kotlin-base-resources_test_lib", "//platform/editor-ui-api:editor-ui_test_lib", @@ -67,6 +70,7 @@ jvm_library( "//plugins/gradle:gradle-common_test_lib", "//java/idea-ui:ui_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//java/java-psi-api:psi_test_lib", "//java/java-impl:impl_test_lib", "//plugins/kotlin/project-configuration:project-configuration_test_lib", diff --git a/plugins/kotlin/project-wizard/core/intellij.kotlin.projectWizard.core.iml b/plugins/kotlin/project-wizard/core/intellij.kotlin.projectWizard.core.iml index ac5260a916b4..962d8c939231 100644 --- a/plugins/kotlin/project-wizard/core/intellij.kotlin.projectWizard.core.iml +++ b/plugins/kotlin/project-wizard/core/intellij.kotlin.projectWizard.core.iml @@ -21,6 +21,7 @@ + @@ -30,6 +31,7 @@ + diff --git a/plugins/kotlin/project-wizard/gradle/BUILD.bazel b/plugins/kotlin/project-wizard/gradle/BUILD.bazel index b2253ff964a0..7deb7fc89518 100644 --- a/plugins/kotlin/project-wizard/gradle/BUILD.bazel +++ b/plugins/kotlin/project-wizard/gradle/BUILD.bazel @@ -23,6 +23,7 @@ jvm_library( "//platform/observable", "//plugins/kotlin/project-wizard/idea", "//platform/platform-impl:ide-impl", + "//platform/ide-core", "//plugins/gradle:gradle-common", "//platform/lang-core", "//plugins/gradle/java", @@ -30,6 +31,7 @@ jvm_library( "//platform/lang-impl", "//plugins/kotlin/base/plugin", "//java/openapi:java", + "//java/java-syntax:syntax", "//plugins/kotlin/gradle/code-insight-common:kotlin-gradle-codeInsight-common", "//plugins/kotlin/project-configuration", "//plugins/kotlin/gradle/gradle-java", @@ -57,6 +59,7 @@ jvm_library( "//platform/observable:observable_test_lib", "//plugins/kotlin/project-wizard/idea:idea_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//plugins/gradle:gradle-common_test_lib", "//platform/lang-core:lang-core_test_lib", "//plugins/gradle/java:java_test_lib", @@ -64,6 +67,7 @@ jvm_library( "//platform/lang-impl:lang-impl_test_lib", "//plugins/kotlin/base/plugin:plugin_test_lib", "//java/openapi:java_test_lib", + "//java/java-syntax:syntax_test_lib", "//plugins/kotlin/gradle/code-insight-common:kotlin-gradle-codeInsight-common_test_lib", "//plugins/kotlin/project-configuration:project-configuration_test_lib", "//plugins/kotlin/gradle/gradle-java:gradle-java_test_lib", diff --git a/plugins/kotlin/project-wizard/gradle/intellij.kotlin.projectWizard.gradle.iml b/plugins/kotlin/project-wizard/gradle/intellij.kotlin.projectWizard.gradle.iml index 1ecf9d467b7d..a082bbef50d6 100644 --- a/plugins/kotlin/project-wizard/gradle/intellij.kotlin.projectWizard.gradle.iml +++ b/plugins/kotlin/project-wizard/gradle/intellij.kotlin.projectWizard.gradle.iml @@ -17,6 +17,7 @@ + @@ -24,6 +25,7 @@ + diff --git a/plugins/kotlin/project-wizard/idea/BUILD.bazel b/plugins/kotlin/project-wizard/idea/BUILD.bazel index 6ca60061a6d2..466d16fda8e8 100644 --- a/plugins/kotlin/project-wizard/idea/BUILD.bazel +++ b/plugins/kotlin/project-wizard/idea/BUILD.bazel @@ -31,6 +31,7 @@ jvm_library( "//platform/projectModel-api:projectModel", "//plugins/kotlin/base/frontend-agnostic", "//platform/ide-core-impl", + "//platform/ide-core", "//plugins/kotlin/base/util", "//plugins/kotlin/base/compiler-configuration", "//plugins/kotlin/base/plugin", @@ -42,6 +43,7 @@ jvm_library( "//plugins/kotlin/formatter", "//plugins/kotlin/project-wizard/core", "//platform/core-ui", + "//platform/core-impl", "//platform/lang-impl", "//platform/vcs-impl", "//platform/external-system-api:externalSystem", @@ -54,7 +56,11 @@ jvm_library( "//plugins/gradle", "//plugins/kotlin/base/indices", "//platform/platform-api:ide", + "//platform/progress/shared:ide-progress", "//plugins/kotlin/code-insight/api", + "//platform/lang-api:lang", + "//platform/statistics", + "//platform/util:util-ui", ] ) @@ -78,6 +84,7 @@ jvm_library( "//platform/projectModel-api:projectModel_test_lib", "//plugins/kotlin/base/frontend-agnostic:frontend-agnostic_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//plugins/kotlin/base/util:util_test_lib", "//plugins/kotlin/base/compiler-configuration:compiler-configuration_test_lib", "//plugins/kotlin/base/plugin:plugin_test_lib", @@ -89,6 +96,7 @@ jvm_library( "//plugins/kotlin/formatter:formatter_test_lib", "//plugins/kotlin/project-wizard/core:core_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl:core-impl_test_lib", "//platform/lang-impl:lang-impl_test_lib", "//platform/vcs-impl:vcs-impl_test_lib", "//platform/external-system-api:externalSystem_test_lib", @@ -101,7 +109,11 @@ jvm_library( "//plugins/gradle:gradle_test_lib", "//plugins/kotlin/base/indices:indices_test_lib", "//platform/platform-api:ide_test_lib", + "//platform/progress/shared:ide-progress_test_lib", "//plugins/kotlin/code-insight/api:api_test_lib", + "//platform/lang-api:lang_test_lib", + "//platform/statistics:statistics_test_lib", + "//platform/util:util-ui_test_lib", ] ) ### auto-generated section `build intellij.kotlin.projectWizard.idea` end diff --git a/plugins/kotlin/project-wizard/idea/intellij.kotlin.projectWizard.idea.iml b/plugins/kotlin/project-wizard/idea/intellij.kotlin.projectWizard.idea.iml index 60b8b95d8f1b..9d864fae3f57 100644 --- a/plugins/kotlin/project-wizard/idea/intellij.kotlin.projectWizard.idea.iml +++ b/plugins/kotlin/project-wizard/idea/intellij.kotlin.projectWizard.idea.iml @@ -25,6 +25,7 @@ + @@ -36,6 +37,7 @@ + @@ -48,6 +50,10 @@ + + + + \ No newline at end of file diff --git a/plugins/kotlin/project-wizard/maven/BUILD.bazel b/plugins/kotlin/project-wizard/maven/BUILD.bazel index c10e474dc20e..92afedbeef8f 100644 --- a/plugins/kotlin/project-wizard/maven/BUILD.bazel +++ b/plugins/kotlin/project-wizard/maven/BUILD.bazel @@ -20,6 +20,7 @@ jvm_library( "//platform/core-api:core", "//platform/external-system-impl:externalSystem-impl", "//platform/lang-core", + "//platform/lang-api:lang", "//platform/projectModel-api:projectModel", "//plugins/kotlin/base/frontend-agnostic", "//plugins/kotlin/base/util", @@ -28,6 +29,7 @@ jvm_library( "//platform/editor-ui-api:editor-ui", "//platform/observable", "//platform/platform-impl:ide-impl", + "//platform/util:util-ui", "//plugins/maven", "//plugins/kotlin/base/plugin", "//plugins/kotlin/maven", @@ -45,6 +47,7 @@ jvm_library( "//platform/core-api:core_test_lib", "//platform/external-system-impl:externalSystem-impl_test_lib", "//platform/lang-core:lang-core_test_lib", + "//platform/lang-api:lang_test_lib", "//platform/projectModel-api:projectModel_test_lib", "//plugins/kotlin/base/frontend-agnostic:frontend-agnostic_test_lib", "//plugins/kotlin/base/util:util_test_lib", @@ -53,6 +56,7 @@ jvm_library( "//platform/editor-ui-api:editor-ui_test_lib", "//platform/observable:observable_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/util:util-ui_test_lib", "//plugins/maven:maven_test_lib", "//plugins/kotlin/base/plugin:plugin_test_lib", "//plugins/kotlin/maven:maven_test_lib", diff --git a/plugins/kotlin/project-wizard/maven/intellij.kotlin.projectWizard.maven.iml b/plugins/kotlin/project-wizard/maven/intellij.kotlin.projectWizard.maven.iml index 8128a95f0a9d..f1a7ccb818f3 100644 --- a/plugins/kotlin/project-wizard/maven/intellij.kotlin.projectWizard.maven.iml +++ b/plugins/kotlin/project-wizard/maven/intellij.kotlin.projectWizard.maven.iml @@ -14,6 +14,7 @@ + @@ -22,6 +23,7 @@ + diff --git a/plugins/kotlin/project-wizard/tests/BUILD.bazel b/plugins/kotlin/project-wizard/tests/BUILD.bazel index e9860e5eeb8e..19351ec205dd 100644 --- a/plugins/kotlin/project-wizard/tests/BUILD.bazel +++ b/plugins/kotlin/project-wizard/tests/BUILD.bazel @@ -47,6 +47,8 @@ jvm_library( "//platform/core-api:core_test_lib", "//platform/core-ui", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", "//platform/editor-ui-api:editor-ui", "//platform/editor-ui-api:editor-ui_test_lib", "//platform/external-system-impl:externalSystem-impl", @@ -143,16 +145,24 @@ jvm_library( "//platform/workspace/storage:storage_test_lib", "//platform/util/jdom", "//platform/util/jdom:jdom_test_lib", + "//platform/util:util-ui", + "//platform/util:util-ui_test_lib", + "//platform/ide-core", "//plugins/kotlin/base/statistics", "//plugins/kotlin/base/statistics:statistics_test_lib", "//plugins/kotlin/gradle/scripting/kotlin.gradle.scripting.k2:kotlin-gradle-scripting", "//plugins/kotlin/gradle/scripting/kotlin.gradle.scripting.k2:kotlin-gradle-scripting_test_lib", "//plugins/kotlin/base/plugin:kotlin-base-plugin-tests", "//plugins/kotlin/base/plugin:kotlin-base-plugin-tests_test_lib", + "//java/java-syntax:syntax", + "//java/java-syntax:syntax_test_lib", + "//java/java-psi-api:psi", + "//java/java-psi-api:psi_test_lib", ], runtime_deps = [ ":tests", "//plugins/kotlin/plugin/k2:k2_test_lib", + "//platform/ide-core:ide-core_test_lib", ] ) ### auto-generated section `build kotlin.project-wizard.tests` end diff --git a/plugins/kotlin/project-wizard/tests/kotlin.project-wizard.tests.iml b/plugins/kotlin/project-wizard/tests/kotlin.project-wizard.tests.iml index df35b1162465..1c06dfbe2005 100644 --- a/plugins/kotlin/project-wizard/tests/kotlin.project-wizard.tests.iml +++ b/plugins/kotlin/project-wizard/tests/kotlin.project-wizard.tests.iml @@ -16,6 +16,7 @@ + @@ -67,8 +68,12 @@ + + + + \ No newline at end of file diff --git a/plugins/kotlin/refactorings/kotlin.refactorings.common.tests/BUILD.bazel b/plugins/kotlin/refactorings/kotlin.refactorings.common.tests/BUILD.bazel index 0f65e244d28c..483659f7b44a 100644 --- a/plugins/kotlin/refactorings/kotlin.refactorings.common.tests/BUILD.bazel +++ b/plugins/kotlin/refactorings/kotlin.refactorings.common.tests/BUILD.bazel @@ -28,10 +28,14 @@ jvm_library( "//platform/code-style-api:codeStyle_test_lib", "//platform/core-api:core", "//platform/core-api:core_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", "//platform/editor-ui-api:editor-ui", "//platform/editor-ui-api:editor-ui_test_lib", "//platform/indexing-api:indexing", "//platform/indexing-api:indexing_test_lib", + "//java/java-psi-api:psi", + "//java/java-psi-api:psi_test_lib", "//platform/refactoring", "//platform/refactoring:refactoring_test_lib", "//plugins/kotlin/base/test", diff --git a/plugins/kotlin/refactorings/kotlin.refactorings.common.tests/kotlin.refactorings.common.tests.iml b/plugins/kotlin/refactorings/kotlin.refactorings.common.tests/kotlin.refactorings.common.tests.iml index 4e6c4675fd33..21977ca49ce3 100644 --- a/plugins/kotlin/refactorings/kotlin.refactorings.common.tests/kotlin.refactorings.common.tests.iml +++ b/plugins/kotlin/refactorings/kotlin.refactorings.common.tests/kotlin.refactorings.common.tests.iml @@ -10,8 +10,10 @@ + + diff --git a/plugins/kotlin/refactorings/kotlin.refactorings.common/BUILD.bazel b/plugins/kotlin/refactorings/kotlin.refactorings.common/BUILD.bazel index 0f8b56ab49c0..cfce3636f06e 100644 --- a/plugins/kotlin/refactorings/kotlin.refactorings.common/BUILD.bazel +++ b/plugins/kotlin/refactorings/kotlin.refactorings.common/BUILD.bazel @@ -22,6 +22,7 @@ jvm_library( deps = [ "//java/java-indexing-api:indexing", "//platform/analysis-api:analysis", + "//platform/lang-api:lang", "//platform/code-style-api:codeStyle", "//platform/editor-ui-api:editor-ui", "//platform/foldings", @@ -35,20 +36,25 @@ jvm_library( "//platform/core-api:core", "//platform/core-impl", "//platform/ide-core-impl", + "//platform/ide-core", "//platform/lang-impl", "//java/java-impl-refactorings:impl-refactorings", "@lib//:kotlinc-analysis-api", "@lib//:kotlinc-kotlin-compiler-common", "//java/openapi:java", "//platform/platform-impl:ide-impl", + "//platform/progress/shared:ide-progress", "//platform/usageView", "//plugins/kotlin/base/resources:kotlin-base-resources", "//platform/core-ui", + "//platform/statistics", + "//platform/util:util-ui", "//plugins/kotlin/base/analysis", "//plugins/kotlin/base/project-structure", "//plugins/kotlin/base/code-insight", "//plugins/kotlin/base/kdoc", "//java/java-impl:impl", + "//java/java-frontback-psi-api:frontback-psi", "//plugins/kotlin/code-insight/utils", "//libraries/guava", "//plugins/kotlin/kotlin.searching/base", @@ -67,6 +73,7 @@ jvm_library( ":kotlin-refactorings-common", "//java/java-indexing-api:indexing_test_lib", "//platform/analysis-api:analysis_test_lib", + "//platform/lang-api:lang_test_lib", "//platform/code-style-api:codeStyle_test_lib", "//platform/editor-ui-api:editor-ui_test_lib", "//platform/foldings:foldings_test_lib", @@ -80,20 +87,25 @@ jvm_library( "//platform/core-api:core_test_lib", "//platform/core-impl:core-impl_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/lang-impl:lang-impl_test_lib", "@lib//:kotlinc-kotlin-compiler-tests", "//java/java-impl-refactorings:impl-refactorings_test_lib", "//java/openapi:java_test_lib", "//plugins/kotlin/base/frontend-agnostic:frontend-agnostic_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/progress/shared:ide-progress_test_lib", "//platform/usageView:usageView_test_lib", "//plugins/kotlin/base/resources:kotlin-base-resources_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/statistics:statistics_test_lib", + "//platform/util:util-ui_test_lib", "//plugins/kotlin/base/analysis:analysis_test_lib", "//plugins/kotlin/base/project-structure:project-structure_test_lib", "//plugins/kotlin/base/code-insight:code-insight_test_lib", "//plugins/kotlin/base/kdoc:kdoc_test_lib", "//java/java-impl:impl_test_lib", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//plugins/kotlin/code-insight/utils:utils_test_lib", "//libraries/guava:guava_test_lib", "//plugins/kotlin/kotlin.searching/base:base_test_lib", diff --git a/plugins/kotlin/refactorings/kotlin.refactorings.common/kotlin.refactorings.common.iml b/plugins/kotlin/refactorings/kotlin.refactorings.common/kotlin.refactorings.common.iml index 1ba2f6ed6f73..ea5c783fc11b 100644 --- a/plugins/kotlin/refactorings/kotlin.refactorings.common/kotlin.refactorings.common.iml +++ b/plugins/kotlin/refactorings/kotlin.refactorings.common/kotlin.refactorings.common.iml @@ -25,6 +25,7 @@ + @@ -38,6 +39,7 @@ + @@ -46,14 +48,18 @@ + + + + diff --git a/plugins/kotlin/refactorings/kotlin.refactorings.k2/BUILD.bazel b/plugins/kotlin/refactorings/kotlin.refactorings.k2/BUILD.bazel index 00b6eba2032b..c07d858e2b88 100644 --- a/plugins/kotlin/refactorings/kotlin.refactorings.k2/BUILD.bazel +++ b/plugins/kotlin/refactorings/kotlin.refactorings.k2/BUILD.bazel @@ -38,6 +38,7 @@ jvm_library( "//platform/refactoring", "//plugins/kotlin/base/psi", "//platform/usageView", + "//platform/lang-api:lang", "//plugins/kotlin/base/util", "//java/java-psi-api:psi", "//platform/core-api:core", @@ -69,13 +70,18 @@ jvm_library( "//libraries/guava", "//plugins/kotlin/refactorings/kotlin.refactorings.move.k2:kotlin-refactorings-move", "//platform/util/text-matching", + "//platform/util:util-ui", "//plugins/kotlin/base/indices", "//libraries/fastutil", "//plugins/kotlin/j2k/shared", "//platform/ide-core-impl", + "//platform/ide-core", + "//platform/progress/shared:ide-progress", "//plugins/kotlin/kotlin.ide", "//platform/forms_rt:java-guiForms-rt", + "//java/java-frontback-psi-api:frontback-psi", "//platform/util/concurrency", + "//platform/statistics", ] ) @@ -96,6 +102,7 @@ jvm_library( "//platform/refactoring:refactoring_test_lib", "//plugins/kotlin/base/psi:psi_test_lib", "//platform/usageView:usageView_test_lib", + "//platform/lang-api:lang_test_lib", "//plugins/kotlin/base/util:util_test_lib", "//java/java-psi-api:psi_test_lib", "//platform/core-api:core_test_lib", @@ -123,13 +130,18 @@ jvm_library( "//libraries/guava:guava_test_lib", "//plugins/kotlin/refactorings/kotlin.refactorings.move.k2:kotlin-refactorings-move_test_lib", "//platform/util/text-matching:text-matching_test_lib", + "//platform/util:util-ui_test_lib", "//plugins/kotlin/base/indices:indices_test_lib", "//libraries/fastutil:fastutil_test_lib", "//plugins/kotlin/j2k/shared:shared_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", + "//platform/progress/shared:ide-progress_test_lib", "//plugins/kotlin/kotlin.ide:kotlin.ide_test_lib", "//platform/forms_rt:java-guiForms-rt_test_lib", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//platform/util/concurrency:concurrency_test_lib", + "//platform/statistics:statistics_test_lib", ] ) ### auto-generated section `build intellij.kotlin.refactorings` end diff --git a/plugins/kotlin/refactorings/kotlin.refactorings.k2/intellij.kotlin.refactorings.iml b/plugins/kotlin/refactorings/kotlin.refactorings.k2/intellij.kotlin.refactorings.iml index c7b0f1aed201..c4401f55f960 100644 --- a/plugins/kotlin/refactorings/kotlin.refactorings.k2/intellij.kotlin.refactorings.iml +++ b/plugins/kotlin/refactorings/kotlin.refactorings.k2/intellij.kotlin.refactorings.iml @@ -33,6 +33,7 @@ + @@ -65,12 +66,17 @@ + + + + + \ No newline at end of file diff --git a/plugins/kotlin/refactorings/kotlin.refactorings.move.k2/BUILD.bazel b/plugins/kotlin/refactorings/kotlin.refactorings.move.k2/BUILD.bazel index 32ef80d53dca..b2f961fc878e 100644 --- a/plugins/kotlin/refactorings/kotlin.refactorings.move.k2/BUILD.bazel +++ b/plugins/kotlin/refactorings/kotlin.refactorings.move.k2/BUILD.bazel @@ -34,13 +34,16 @@ jvm_library( "//platform/editor-ui-api:editor-ui", "//platform/indexing-api:indexing", "//platform/lang-core", + "//platform/lang-api:lang", "//platform/projectModel-api:projectModel", "//platform/refactoring", "//platform/lang-impl", "//platform/platform-impl:ide-impl", "//platform/core-ui", "//platform/core-api:core", + "//platform/core-impl", "//java/java-impl:impl", + "//java/java-psi-api:psi", "//plugins/kotlin/frontend-independent", "//plugins/kotlin/base/util", "//plugins/kotlin/fir", @@ -58,9 +61,11 @@ jvm_library( "//plugins/kotlin/base/facet", "//platform/observable", "//java/openapi:java", + "//java/java-frontback-psi-api:frontback-psi", "@lib//:kotlinc-analysis-api-platform-interface", "//plugins/kotlin/base/external-build-system:kotlin-base-externalSystem", "//platform/util/jdom", + "//platform/util:util-ui", ] ) @@ -76,13 +81,16 @@ jvm_library( "//platform/editor-ui-api:editor-ui_test_lib", "//platform/indexing-api:indexing_test_lib", "//platform/lang-core:lang-core_test_lib", + "//platform/lang-api:lang_test_lib", "//platform/projectModel-api:projectModel_test_lib", "//platform/refactoring:refactoring_test_lib", "//platform/lang-impl:lang-impl_test_lib", "//platform/platform-impl:ide-impl_test_lib", "//platform/core-ui:core-ui_test_lib", "//platform/core-api:core_test_lib", + "//platform/core-impl:core-impl_test_lib", "//java/java-impl:impl_test_lib", + "//java/java-psi-api:psi_test_lib", "//plugins/kotlin/frontend-independent:frontend-independent_test_lib", "//plugins/kotlin/base/util:util_test_lib", "//plugins/kotlin/fir:fir_test_lib", @@ -100,8 +108,10 @@ jvm_library( "//plugins/kotlin/base/facet:facet_test_lib", "//platform/observable:observable_test_lib", "//java/openapi:java_test_lib", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//plugins/kotlin/base/external-build-system:kotlin-base-externalSystem_test_lib", "//platform/util/jdom:jdom_test_lib", + "//platform/util:util-ui_test_lib", ] ) ### auto-generated section `build intellij.kotlin.refactorings.move` end @@ -153,6 +163,8 @@ jvm_library( "//platform/editor-ui-api:editor-ui_test_lib", "//platform/indexing-api:indexing", "//platform/indexing-api:indexing_test_lib", + "//java/java-psi-api:psi", + "//java/java-psi-api:psi_test_lib", "//jps/model-api:model", "//jps/model-api:model_test_lib", "//platform/lang-core", @@ -170,6 +182,8 @@ jvm_library( "//platform/core-ui:core-ui_test_lib", "//platform/core-api:core", "//platform/core-api:core_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", "//java/java-impl:impl", "//java/java-impl:impl_test_lib", "//plugins/kotlin/frontend-independent", diff --git a/plugins/kotlin/refactorings/kotlin.refactorings.move.k2/intellij.kotlin.refactorings.move.iml b/plugins/kotlin/refactorings/kotlin.refactorings.move.k2/intellij.kotlin.refactorings.move.iml index 373698ef0d44..d98fbe1fdc21 100644 --- a/plugins/kotlin/refactorings/kotlin.refactorings.move.k2/intellij.kotlin.refactorings.move.iml +++ b/plugins/kotlin/refactorings/kotlin.refactorings.move.k2/intellij.kotlin.refactorings.move.iml @@ -31,13 +31,16 @@ + + + @@ -55,8 +58,10 @@ + + \ No newline at end of file diff --git a/plugins/kotlin/refactorings/kotlin.refactorings.move.k2/intellij.kotlin.refactorings.move.tests.iml b/plugins/kotlin/refactorings/kotlin.refactorings.move.k2/intellij.kotlin.refactorings.move.tests.iml index 5171ec046384..461157880332 100644 --- a/plugins/kotlin/refactorings/kotlin.refactorings.move.k2/intellij.kotlin.refactorings.move.tests.iml +++ b/plugins/kotlin/refactorings/kotlin.refactorings.move.k2/intellij.kotlin.refactorings.move.tests.iml @@ -31,6 +31,7 @@ + @@ -40,6 +41,7 @@ + diff --git a/plugins/kotlin/refactorings/kotlin.refactorings.tests.k2/BUILD.bazel b/plugins/kotlin/refactorings/kotlin.refactorings.tests.k2/BUILD.bazel index 71a46d41f8c5..35a0bdfbf0e7 100644 --- a/plugins/kotlin/refactorings/kotlin.refactorings.tests.k2/BUILD.bazel +++ b/plugins/kotlin/refactorings/kotlin.refactorings.tests.k2/BUILD.bazel @@ -41,12 +41,16 @@ jvm_library( "//platform/refactoring:refactoring_test_lib", "//platform/lang-core", "//platform/lang-core:lang-core_test_lib", + "//platform/lang-api:lang", + "//platform/lang-api:lang_test_lib", "//plugins/kotlin/plugin/k2", "//plugins/kotlin/plugin/k2:k2_test_lib", "//plugins/kotlin/fir", "//plugins/kotlin/fir:fir_test_lib", "//java/testFramework", "//java/testFramework:testFramework_test_lib", + "//java/java-psi-api:psi", + "//java/java-psi-api:psi_test_lib", "//plugins/kotlin/base/test", "//plugins/kotlin/base/test:test_test_lib", "//plugins/kotlin/tests-common:common-tests", @@ -79,14 +83,20 @@ jvm_library( "//plugins/kotlin/base/code-insight:code-insight_test_lib", "//platform/core-api:core", "//platform/core-api:core_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", "//platform/testFramework", "//platform/testFramework:testFramework_test_lib", + "//platform/ide-core", "//libraries/gson", "//libraries/gson:gson_test_lib", "//plugins/kotlin/intellij.kotlin.base.test:base-test", "//plugins/kotlin/intellij.kotlin.base.test:base-test_test_lib", ], - runtime_deps = [":kotlin-refactorings-tests"] + runtime_deps = [ + ":kotlin-refactorings-tests", + "//platform/ide-core:ide-core_test_lib", + ] ) ### auto-generated section `build intellij.kotlin.refactorings.tests` end diff --git a/plugins/kotlin/refactorings/kotlin.refactorings.tests.k2/intellij.kotlin.refactorings.tests.iml b/plugins/kotlin/refactorings/kotlin.refactorings.tests.k2/intellij.kotlin.refactorings.tests.iml index 439b6e747660..cbc012fc5f66 100644 --- a/plugins/kotlin/refactorings/kotlin.refactorings.tests.k2/intellij.kotlin.refactorings.tests.iml +++ b/plugins/kotlin/refactorings/kotlin.refactorings.tests.k2/intellij.kotlin.refactorings.tests.iml @@ -32,9 +32,11 @@ + + @@ -51,7 +53,9 @@ + + diff --git a/plugins/kotlin/repl/BUILD.bazel b/plugins/kotlin/repl/BUILD.bazel index e653275a5072..cb408a0de1b7 100644 --- a/plugins/kotlin/repl/BUILD.bazel +++ b/plugins/kotlin/repl/BUILD.bazel @@ -52,10 +52,12 @@ jvm_library( "//plugins/kotlin/idea", "//platform/editor-ui-api:editor-ui", "//platform/platform-util-io:ide-util-io", + "//platform/ide-core", "//platform/lang-impl", "//java/java-psi-api:psi", "//java/compiler/openapi:java-compiler", "//java/execution/openapi:java-execution", + "//java/java-syntax:syntax", "//platform/core-ui", "//java/execution/impl", "//platform/execution-impl", @@ -63,6 +65,7 @@ jvm_library( "//plugins/kotlin/base/scripting/scripting.k1", "//platform/execution", "//platform/lang-api:lang", + "//platform/util:util-ui", "//plugins/kotlin/base/fe10/project-structure", ] ) @@ -95,10 +98,12 @@ jvm_library( "//plugins/kotlin/idea:idea_test_lib", "//platform/editor-ui-api:editor-ui_test_lib", "//platform/platform-util-io:ide-util-io_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/lang-impl:lang-impl_test_lib", "//java/java-psi-api:psi_test_lib", "//java/compiler/openapi:java-compiler_test_lib", "//java/execution/openapi:java-execution_test_lib", + "//java/java-syntax:syntax_test_lib", "//platform/core-ui:core-ui_test_lib", "//java/execution/impl:impl_test_lib", "//platform/execution-impl:execution-impl_test_lib", @@ -106,6 +111,7 @@ jvm_library( "//plugins/kotlin/base/scripting/scripting.k1:scripting.k1_test_lib", "//platform/execution:execution_test_lib", "//platform/lang-api:lang_test_lib", + "//platform/util:util-ui_test_lib", "//plugins/kotlin/base/fe10/project-structure:project-structure_test_lib", ] ) diff --git a/plugins/kotlin/repl/kotlin.repl.iml b/plugins/kotlin/repl/kotlin.repl.iml index f0ff6cd7279e..f43bea5eec2f 100644 --- a/plugins/kotlin/repl/kotlin.repl.iml +++ b/plugins/kotlin/repl/kotlin.repl.iml @@ -51,10 +51,12 @@ + + @@ -62,6 +64,7 @@ + \ No newline at end of file diff --git a/plugins/kotlin/run-configurations/junit/BUILD.bazel b/plugins/kotlin/run-configurations/junit/BUILD.bazel index 26b974464abc..25f7095c924c 100644 --- a/plugins/kotlin/run-configurations/junit/BUILD.bazel +++ b/plugins/kotlin/run-configurations/junit/BUILD.bazel @@ -18,6 +18,7 @@ jvm_library( "@lib//:kotlinc-kotlin-compiler-common", "//java/java-indexing-api:indexing", "//platform/core-api:core", + "//platform/core-impl", "//platform/execution-impl", "//platform/execution", "//platform/indexing-api:indexing", @@ -30,10 +31,14 @@ jvm_library( "//plugins/kotlin/base/indices", "//plugins/kotlin/run-configurations/jvm", "//platform/lang-api:lang", + "//platform/ide-core", + "//platform/testRunner", "//java/execution/impl", "//java/java-analysis-impl:analysis-impl", "//plugins/junit", "//java/java-impl:impl", + "//java/java-psi-api:psi", + "//java/java-frontback-psi-api:frontback-psi", "//plugins/kotlin/code-insight/impl-base:kotlin-codeInsight-shared", "//plugins/kotlin/base/plugin", ] @@ -48,6 +53,7 @@ jvm_library( ":junit", "//java/java-indexing-api:indexing_test_lib", "//platform/core-api:core_test_lib", + "//platform/core-impl:core-impl_test_lib", "//platform/execution-impl:execution-impl_test_lib", "//platform/execution:execution_test_lib", "//platform/indexing-api:indexing_test_lib", @@ -60,10 +66,14 @@ jvm_library( "//plugins/kotlin/base/indices:indices_test_lib", "//plugins/kotlin/run-configurations/jvm:jvm_test_lib", "//platform/lang-api:lang_test_lib", + "//platform/ide-core:ide-core_test_lib", + "//platform/testRunner:testRunner_test_lib", "//java/execution/impl:impl_test_lib", "//java/java-analysis-impl:analysis-impl_test_lib", "//plugins/junit:junit_test_lib", "//java/java-impl:impl_test_lib", + "//java/java-psi-api:psi_test_lib", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//plugins/kotlin/code-insight/impl-base:kotlin-codeInsight-shared_test_lib", "//plugins/kotlin/base/plugin:plugin_test_lib", ] diff --git a/plugins/kotlin/run-configurations/junit/intellij.kotlin.runConfigurations.junit.iml b/plugins/kotlin/run-configurations/junit/intellij.kotlin.runConfigurations.junit.iml index fc0be6cbadad..3ef5be481787 100644 --- a/plugins/kotlin/run-configurations/junit/intellij.kotlin.runConfigurations.junit.iml +++ b/plugins/kotlin/run-configurations/junit/intellij.kotlin.runConfigurations.junit.iml @@ -12,6 +12,7 @@ + @@ -24,10 +25,14 @@ + + + + diff --git a/plugins/kotlin/run-configurations/jvm/BUILD.bazel b/plugins/kotlin/run-configurations/jvm/BUILD.bazel index a1e3cd380562..12f59ad8ce30 100644 --- a/plugins/kotlin/run-configurations/jvm/BUILD.bazel +++ b/plugins/kotlin/run-configurations/jvm/BUILD.bazel @@ -21,9 +21,11 @@ jvm_library( "//platform/editor-ui-api:editor-ui", "//platform/execution-impl", "//platform/indexing-api:indexing", + "//platform/lang-api:lang", "//jps/model-api:model", "//platform/lang-core", "//platform/util/jdom", + "//platform/util:util-ui", "//platform/platform-impl:ide-impl", "//plugins/kotlin/base/frontend-agnostic", "//plugins/kotlin/base/util", @@ -42,9 +44,12 @@ jvm_library( "//platform/ide-core", "//platform/platform-util-io:ide-util-io", "//java/openapi:java", + "//java/java-syntax:syntax", "//java/java-impl:impl", + "//java/java-psi-api:psi", "//java/execution/impl", "//platform/core-ui", + "//platform/core-impl", "//plugins/kotlin/base/scripting/scripting.shared", "@lib//:kotlinc-kotlin-scripting-common", "@lib//:kotlinc-kotlin-scripting-compiler-impl", @@ -64,9 +69,11 @@ jvm_library( "//platform/editor-ui-api:editor-ui_test_lib", "//platform/execution-impl:execution-impl_test_lib", "//platform/indexing-api:indexing_test_lib", + "//platform/lang-api:lang_test_lib", "//jps/model-api:model_test_lib", "//platform/lang-core:lang-core_test_lib", "//platform/util/jdom:jdom_test_lib", + "//platform/util:util-ui_test_lib", "//platform/platform-impl:ide-impl_test_lib", "//plugins/kotlin/base/frontend-agnostic:frontend-agnostic_test_lib", "//plugins/kotlin/base/util:util_test_lib", @@ -85,9 +92,12 @@ jvm_library( "//platform/ide-core:ide-core_test_lib", "//platform/platform-util-io:ide-util-io_test_lib", "//java/openapi:java_test_lib", + "//java/java-syntax:syntax_test_lib", "//java/java-impl:impl_test_lib", + "//java/java-psi-api:psi_test_lib", "//java/execution/impl:impl_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl:core-impl_test_lib", "//plugins/kotlin/base/scripting/scripting.shared:scripting.shared_test_lib", "//platform/forms_rt:java-guiForms-rt_test_lib", "//platform/util/concurrency:concurrency_test_lib", diff --git a/plugins/kotlin/run-configurations/jvm/intellij.kotlin.runConfigurations.jvm.iml b/plugins/kotlin/run-configurations/jvm/intellij.kotlin.runConfigurations.jvm.iml index ca8873fbe06c..39347ce5fde6 100644 --- a/plugins/kotlin/run-configurations/jvm/intellij.kotlin.runConfigurations.jvm.iml +++ b/plugins/kotlin/run-configurations/jvm/intellij.kotlin.runConfigurations.jvm.iml @@ -15,9 +15,11 @@ + + @@ -36,9 +38,12 @@ + + + diff --git a/plugins/kotlin/run-configurations/testng/BUILD.bazel b/plugins/kotlin/run-configurations/testng/BUILD.bazel index a31424e77406..d556fcc6219b 100644 --- a/plugins/kotlin/run-configurations/testng/BUILD.bazel +++ b/plugins/kotlin/run-configurations/testng/BUILD.bazel @@ -34,6 +34,8 @@ jvm_library( "//java/java-impl:impl", "//plugins/kotlin/base/plugin", "//platform/execution", + "//platform/ide-core", + "//platform/testRunner", ] ) @@ -62,6 +64,8 @@ jvm_library( "//java/java-impl:impl_test_lib", "//plugins/kotlin/base/plugin:plugin_test_lib", "//platform/execution:execution_test_lib", + "//platform/ide-core:ide-core_test_lib", + "//platform/testRunner:testRunner_test_lib", ] ) ### auto-generated section `build intellij.kotlin.runConfigurations.testng` end diff --git a/plugins/kotlin/run-configurations/testng/intellij.kotlin.runConfigurations.testng.iml b/plugins/kotlin/run-configurations/testng/intellij.kotlin.runConfigurations.testng.iml index eecdbabf507d..f7010986b714 100644 --- a/plugins/kotlin/run-configurations/testng/intellij.kotlin.runConfigurations.testng.iml +++ b/plugins/kotlin/run-configurations/testng/intellij.kotlin.runConfigurations.testng.iml @@ -28,5 +28,7 @@ + + \ No newline at end of file diff --git a/plugins/kotlin/test-framework/BUILD.bazel b/plugins/kotlin/test-framework/BUILD.bazel index 4827fdaacf6c..0dce88be7452 100644 --- a/plugins/kotlin/test-framework/BUILD.bazel +++ b/plugins/kotlin/test-framework/BUILD.bazel @@ -38,6 +38,8 @@ jvm_library( "@lib//:kotlinc-kotlin-compiler-tests", "//java/idea-ui:ui", "//java/idea-ui:ui_test_lib", + "//java/java-syntax:syntax", + "//java/java-syntax:syntax_test_lib", "//platform/code-style-api:codeStyle", "//platform/code-style-api:codeStyle_test_lib", "//platform/core-api:core", @@ -55,6 +57,8 @@ jvm_library( "//platform/execution:execution_test_lib", "//platform/lang-core", "//platform/lang-core:lang-core_test_lib", + "//platform/lang-api:lang", + "//platform/lang-api:lang_test_lib", "//platform/testFramework", "//platform/testFramework:testFramework_test_lib", "@lib//:kotlinc-kotlin-jps-common", @@ -62,12 +66,15 @@ jvm_library( "//libraries/kotlinx/coroutines/core", "//libraries/kotlinx/coroutines/core:core_test_lib", "//platform/ide-core-impl", + "//platform/ide-core", "//plugins/kotlin/base/util", "//plugins/kotlin/base/util:util_test_lib", "//plugins/kotlin/base/compiler-configuration", "//plugins/kotlin/base/compiler-configuration:compiler-configuration_test_lib", "//java/openapi:java", "//java/openapi:java_test_lib", + "//java/java-psi-api:psi", + "//java/java-psi-api:psi_test_lib", "//plugins/kotlin/base/plugin", "//plugins/kotlin/base/plugin:plugin_test_lib", "//plugins/kotlin/base/platforms", @@ -113,6 +120,10 @@ jvm_library( "@lib//:junit5Pioneer", "//platform/statistics/testFramework", "//platform/statistics/testFramework:testFramework_test_lib", + "//platform/statistics", + "//platform/statistics:statistics_test_lib", + "//platform/util-ex", + "//platform/util-ex:util-ex_test_lib", "//plugins/kotlin/base/frontend-agnostic", "//plugins/kotlin/base/frontend-agnostic:frontend-agnostic_test_lib", "//plugins/kotlin/base/plugin:kotlin-base-plugin-tests", @@ -125,6 +136,7 @@ jvm_library( runtime_deps = [ ":test-framework", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", ] ) ### auto-generated section `build intellij.kotlin.testFramework` end diff --git a/plugins/kotlin/test-framework/intellij.kotlin.testFramework.iml b/plugins/kotlin/test-framework/intellij.kotlin.testFramework.iml index f88c7891f028..8d831d9cd037 100644 --- a/plugins/kotlin/test-framework/intellij.kotlin.testFramework.iml +++ b/plugins/kotlin/test-framework/intellij.kotlin.testFramework.iml @@ -14,6 +14,7 @@ + @@ -23,14 +24,17 @@ + + + @@ -54,6 +58,8 @@ + + diff --git a/plugins/kotlin/tests-common/BUILD.bazel b/plugins/kotlin/tests-common/BUILD.bazel index 9dd3ab72b104..93cc37a8bd4e 100644 --- a/plugins/kotlin/tests-common/BUILD.bazel +++ b/plugins/kotlin/tests-common/BUILD.bazel @@ -50,10 +50,13 @@ jvm_library( "//platform/editor-ui-api:editor-ui", "//platform/editor-ui-api:editor-ui_test_lib", "//platform/ide-core-impl", + "//platform/ide-core", "@lib//:kotlin-test", "@lib//:junit4", "//platform/indexing-api:indexing", "//platform/indexing-api:indexing_test_lib", + "//platform/lang-api:lang", + "//platform/lang-api:lang_test_lib", "//platform/projectModel-api:projectModel", "//platform/projectModel-api:projectModel_test_lib", "//plugins/kotlin/base/frontend-agnostic", @@ -72,6 +75,10 @@ jvm_library( "//platform/boot:boot_test_lib", "//platform/util-class-loader:util-classLoader", "//platform/util-class-loader:util-classLoader_test_lib", + "//platform/util:util-ui", + "//platform/util:util-ui_test_lib", + "//platform/util-ex", + "//platform/util-ex:util-ex_test_lib", "//platform/code-style-impl:codeStyle-impl", "//platform/code-style-impl:codeStyle-impl_test_lib", "//platform/testFramework", @@ -80,6 +87,8 @@ jvm_library( "//java/java-psi-api:psi_test_lib", "//java/testFramework", "//java/testFramework:testFramework_test_lib", + "//java/java-frontback-psi-api:frontback-psi", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "@lib//:kotlinc-analysis-api-impl-base", "//jps/model-api:model", "//jps/model-api:model_test_lib", @@ -93,6 +102,7 @@ jvm_library( runtime_deps = [ ":common-tests", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", ] ) ### auto-generated section `build intellij.kotlin.common.tests` end diff --git a/plugins/kotlin/tests-common/intellij.kotlin.common.tests.iml b/plugins/kotlin/tests-common/intellij.kotlin.common.tests.iml index 96b13cda99eb..4c922b52fc18 100644 --- a/plugins/kotlin/tests-common/intellij.kotlin.common.tests.iml +++ b/plugins/kotlin/tests-common/intellij.kotlin.common.tests.iml @@ -18,9 +18,11 @@ + + @@ -30,10 +32,13 @@ + + + diff --git a/plugins/kotlin/tests-from-compiler/BUILD.bazel b/plugins/kotlin/tests-from-compiler/BUILD.bazel index 2f19eab1f69a..dafa9ec42703 100644 --- a/plugins/kotlin/tests-from-compiler/BUILD.bazel +++ b/plugins/kotlin/tests-from-compiler/BUILD.bazel @@ -44,6 +44,8 @@ jvm_library( "//RegExpSupport:regexp-tests_test_lib", "//platform/xdebugger-impl:debugger-impl-tests", "//platform/xdebugger-impl:debugger-impl-tests_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", "//plugins/kotlin/base/plugin:kotlin-base-plugin-tests", "//plugins/kotlin/base/plugin:kotlin-base-plugin-tests_test_lib", ], diff --git a/plugins/kotlin/tests-from-compiler/kotlin.testsFromCompiler.iml b/plugins/kotlin/tests-from-compiler/kotlin.testsFromCompiler.iml index a9516278da04..02f9ceb2b006 100644 --- a/plugins/kotlin/tests-from-compiler/kotlin.testsFromCompiler.iml +++ b/plugins/kotlin/tests-from-compiler/kotlin.testsFromCompiler.iml @@ -25,6 +25,7 @@ + \ No newline at end of file diff --git a/plugins/kotlin/uast/uast-kotlin-base/BUILD.bazel b/plugins/kotlin/uast/uast-kotlin-base/BUILD.bazel index d50b7cdd7521..6e3255b810c0 100644 --- a/plugins/kotlin/uast/uast-kotlin-base/BUILD.bazel +++ b/plugins/kotlin/uast/uast-kotlin-base/BUILD.bazel @@ -14,9 +14,14 @@ jvm_library( "@lib//:kotlinc-analysis-api", "//uast/uast-common:uast", "//platform/core-api:core", + "//platform/core-impl", "//platform/util", + "//platform/util/base", + "//java/java-psi-api:psi", "//java/java-psi-impl:psi-impl", "//uast/uast-java:java-uast", + "//java/java-syntax:syntax", + "//java/java-frontback-psi-api:frontback-psi", ] ) @@ -31,9 +36,14 @@ jvm_library( "//libraries/asm:asm_test_lib", "//uast/uast-common:uast_test_lib", "//platform/core-api:core_test_lib", + "//platform/core-impl:core-impl_test_lib", "//platform/util:util_test_lib", + "//platform/util/base:base_test_lib", + "//java/java-psi-api:psi_test_lib", "//java/java-psi-impl:psi-impl_test_lib", "//uast/uast-java:java-uast_test_lib", + "//java/java-syntax:syntax_test_lib", + "//java/java-frontback-psi-api:frontback-psi_test_lib", ] ) ### auto-generated section `build intellij.kotlin.uast.base` end diff --git a/plugins/kotlin/uast/uast-kotlin-base/intellij.kotlin.uast.base.iml b/plugins/kotlin/uast/uast-kotlin-base/intellij.kotlin.uast.base.iml index ccd0738eea55..c8cdfe601ff8 100644 --- a/plugins/kotlin/uast/uast-kotlin-base/intellij.kotlin.uast.base.iml +++ b/plugins/kotlin/uast/uast-kotlin-base/intellij.kotlin.uast.base.iml @@ -29,8 +29,13 @@ + + + + + \ No newline at end of file diff --git a/plugins/kotlin/uast/uast-kotlin-base/tests/BUILD.bazel b/plugins/kotlin/uast/uast-kotlin-base/tests/BUILD.bazel index 89c007b6c82b..7b48864dc761 100644 --- a/plugins/kotlin/uast/uast-kotlin-base/tests/BUILD.bazel +++ b/plugins/kotlin/uast/uast-kotlin-base/tests/BUILD.bazel @@ -20,6 +20,10 @@ jvm_library( deps = [ "//platform/core-api:core", "//platform/core-api:core_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", + "//java/java-psi-api:psi", + "//java/java-psi-api:psi_test_lib", "//plugins/kotlin/uast/uast-kotlin-base:kotlin-uast-base", "//plugins/kotlin/uast/uast-kotlin-base:kotlin-uast-base_test_lib", "@lib//:junit4", @@ -47,6 +51,10 @@ jvm_library( "//plugins/kotlin/base/plugin:plugin_test_lib", "//uast/uast-java:java-uast", "//uast/uast-java:java-uast_test_lib", + "//java/java-frontback-psi-api:frontback-psi", + "//java/java-frontback-psi-api:frontback-psi_test_lib", + "//uast/uast-common-ide:ide", + "//uast/uast-common-ide:ide_test_lib", ], runtime_deps = [":tests"] ) diff --git a/plugins/kotlin/uast/uast-kotlin-base/tests/intellij.kotlin.uast.base.tests.iml b/plugins/kotlin/uast/uast-kotlin-base/tests/intellij.kotlin.uast.base.tests.iml index ee4e1c87e554..89126d980fb2 100644 --- a/plugins/kotlin/uast/uast-kotlin-base/tests/intellij.kotlin.uast.base.tests.iml +++ b/plugins/kotlin/uast/uast-kotlin-base/tests/intellij.kotlin.uast.base.tests.iml @@ -8,6 +8,8 @@ + + @@ -24,5 +26,7 @@ + + \ No newline at end of file diff --git a/plugins/kotlin/uast/uast-kotlin-fir/BUILD.bazel b/plugins/kotlin/uast/uast-kotlin-fir/BUILD.bazel index 6c55d8a39309..0885a4117fab 100644 --- a/plugins/kotlin/uast/uast-kotlin-fir/BUILD.bazel +++ b/plugins/kotlin/uast/uast-kotlin-fir/BUILD.bazel @@ -30,9 +30,13 @@ jvm_library( "@lib//:kotlinc-analysis-api-impl-base", "//uast/uast-common:uast", "//platform/core-api:core", + "//platform/core-impl", "//platform/util", + "//platform/util/base", + "//java/java-psi-api:psi", "//java/java-psi-impl:psi-impl", "//uast/uast-java:java-uast", + "//java/java-frontback-psi-api:frontback-psi", "@lib//:kotlinc-low-level-api-fir", "@lib//:kotlinc-analysis-api-platform-interface", "@lib//:kotlinc-symbol-light-classes", @@ -53,9 +57,13 @@ jvm_library( "//plugins/kotlin/base/test:test_test_lib", "//uast/uast-common:uast_test_lib", "//platform/core-api:core_test_lib", + "//platform/core-impl:core-impl_test_lib", "//platform/util:util_test_lib", + "//platform/util/base:base_test_lib", + "//java/java-psi-api:psi_test_lib", "//java/java-psi-impl:psi-impl_test_lib", "//uast/uast-java:java-uast_test_lib", + "//java/java-frontback-psi-api:frontback-psi_test_lib", ] ) ### auto-generated section `build intellij.kotlin.uast` end diff --git a/plugins/kotlin/uast/uast-kotlin-fir/intellij.kotlin.uast.iml b/plugins/kotlin/uast/uast-kotlin-fir/intellij.kotlin.uast.iml index 528efcc47579..363d302d626e 100644 --- a/plugins/kotlin/uast/uast-kotlin-fir/intellij.kotlin.uast.iml +++ b/plugins/kotlin/uast/uast-kotlin-fir/intellij.kotlin.uast.iml @@ -33,9 +33,13 @@ + + + + diff --git a/plugins/kotlin/uast/uast-kotlin-fir/tests/BUILD.bazel b/plugins/kotlin/uast/uast-kotlin-fir/tests/BUILD.bazel index e139e47be925..c293842d8e90 100644 --- a/plugins/kotlin/uast/uast-kotlin-fir/tests/BUILD.bazel +++ b/plugins/kotlin/uast/uast-kotlin-fir/tests/BUILD.bazel @@ -69,6 +69,10 @@ jvm_library( "//uast/uast-common:uast_test_lib", "//platform/core-api:core", "//platform/core-api:core_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", + "//java/java-psi-api:psi", + "//java/java-psi-api:psi_test_lib", "//java/java-psi-impl:psi-impl", "//java/java-psi-impl:psi-impl_test_lib", "//uast/uast-java:java-uast", diff --git a/plugins/kotlin/uast/uast-kotlin-fir/tests/intellij.kotlin.uast.tests.iml b/plugins/kotlin/uast/uast-kotlin-fir/tests/intellij.kotlin.uast.tests.iml index 502a69020ee6..ffacdae8b851 100644 --- a/plugins/kotlin/uast/uast-kotlin-fir/tests/intellij.kotlin.uast.tests.iml +++ b/plugins/kotlin/uast/uast-kotlin-fir/tests/intellij.kotlin.uast.tests.iml @@ -29,6 +29,8 @@ + + diff --git a/plugins/kotlin/uast/uast-kotlin-idea-base/BUILD.bazel b/plugins/kotlin/uast/uast-kotlin-idea-base/BUILD.bazel index a3bbf66c813c..191869cfc39a 100644 --- a/plugins/kotlin/uast/uast-kotlin-idea-base/BUILD.bazel +++ b/plugins/kotlin/uast/uast-kotlin-idea-base/BUILD.bazel @@ -19,6 +19,7 @@ jvm_library( "//platform/util", "//platform/core-impl", "//platform/projectModel-api:projectModel", + "//java/java-psi-api:psi", "//uast/uast-common:uast", "//plugins/kotlin/base/code-insight", "//uast/uast-common-ide:ide", @@ -43,6 +44,7 @@ jvm_library( "//platform/util:util_test_lib", "//platform/core-impl:core-impl_test_lib", "//platform/projectModel-api:projectModel_test_lib", + "//java/java-psi-api:psi_test_lib", "//uast/uast-common:uast_test_lib", "//plugins/kotlin/base/code-insight:code-insight_test_lib", "//uast/uast-common-ide:ide_test_lib", diff --git a/plugins/kotlin/uast/uast-kotlin-idea-base/intellij.kotlin.uast.idea.base.iml b/plugins/kotlin/uast/uast-kotlin-idea-base/intellij.kotlin.uast.idea.base.iml index f5524dbc025b..bfe0dc9b4f82 100644 --- a/plugins/kotlin/uast/uast-kotlin-idea-base/intellij.kotlin.uast.idea.base.iml +++ b/plugins/kotlin/uast/uast-kotlin-idea-base/intellij.kotlin.uast.idea.base.iml @@ -20,6 +20,7 @@ + diff --git a/plugins/kotlin/uast/uast-kotlin-idea-base/tests/BUILD.bazel b/plugins/kotlin/uast/uast-kotlin-idea-base/tests/BUILD.bazel index 9d567595359c..6c4b1e7be38b 100644 --- a/plugins/kotlin/uast/uast-kotlin-idea-base/tests/BUILD.bazel +++ b/plugins/kotlin/uast/uast-kotlin-idea-base/tests/BUILD.bazel @@ -23,6 +23,10 @@ jvm_library( "@lib//:kotlin-test", "//platform/core-api:core", "//platform/core-api:core_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", + "//java/java-psi-api:psi", + "//java/java-psi-api:psi_test_lib", "//uast/uast-common:uast", "//uast/uast-common:uast_test_lib", "//uast/testFramework", @@ -40,6 +44,8 @@ jvm_library( "@lib//:kotlinc-kotlin-compiler-tests", "//plugins/kotlin/uast/uast-kotlin-idea-base:kotlin-uast-idea-base", "//plugins/kotlin/uast/uast-kotlin-idea-base:kotlin-uast-idea-base_test_lib", + "//uast/uast-common-ide:ide", + "//uast/uast-common-ide:ide_test_lib", ], runtime_deps = [":tests"] ) diff --git a/plugins/kotlin/uast/uast-kotlin-idea-base/tests/intellij.kotlin.uast.idea.base.tests.iml b/plugins/kotlin/uast/uast-kotlin-idea-base/tests/intellij.kotlin.uast.idea.base.tests.iml index 49f31feb165a..a022a5ec80b3 100644 --- a/plugins/kotlin/uast/uast-kotlin-idea-base/tests/intellij.kotlin.uast.idea.base.tests.iml +++ b/plugins/kotlin/uast/uast-kotlin-idea-base/tests/intellij.kotlin.uast.idea.base.tests.iml @@ -11,6 +11,8 @@ + + @@ -20,5 +22,6 @@ + \ No newline at end of file diff --git a/plugins/kotlin/uast/uast-kotlin-idea-fir/BUILD.bazel b/plugins/kotlin/uast/uast-kotlin-idea-fir/BUILD.bazel index 03344f0549ba..94924e5191d0 100644 --- a/plugins/kotlin/uast/uast-kotlin-idea-fir/BUILD.bazel +++ b/plugins/kotlin/uast/uast-kotlin-idea-fir/BUILD.bazel @@ -31,6 +31,7 @@ jvm_library( "//platform/core-api:core", "//platform/core-impl", "//platform/projectModel-api:projectModel", + "//java/java-psi-api:psi", "//uast/uast-common:uast", "//plugins/kotlin/uast/uast-kotlin-fir:kotlin-uast", "//plugins/kotlin/base/util", @@ -57,6 +58,7 @@ jvm_library( "//platform/core-api:core_test_lib", "//platform/core-impl:core-impl_test_lib", "//platform/projectModel-api:projectModel_test_lib", + "//java/java-psi-api:psi_test_lib", "//uast/uast-common:uast_test_lib", "//plugins/kotlin/uast/uast-kotlin-fir:kotlin-uast_test_lib", "//plugins/kotlin/test-framework", diff --git a/plugins/kotlin/uast/uast-kotlin-idea-fir/intellij.kotlin.uast.idea.iml b/plugins/kotlin/uast/uast-kotlin-idea-fir/intellij.kotlin.uast.idea.iml index 3f98b5160a2f..891abcc6e372 100644 --- a/plugins/kotlin/uast/uast-kotlin-idea-fir/intellij.kotlin.uast.idea.iml +++ b/plugins/kotlin/uast/uast-kotlin-idea-fir/intellij.kotlin.uast.idea.iml @@ -36,6 +36,7 @@ + diff --git a/plugins/kotlin/uast/uast-kotlin-idea-fir/tests/BUILD.bazel b/plugins/kotlin/uast/uast-kotlin-idea-fir/tests/BUILD.bazel index 7bd81cc1fdd5..5109750be726 100644 --- a/plugins/kotlin/uast/uast-kotlin-idea-fir/tests/BUILD.bazel +++ b/plugins/kotlin/uast/uast-kotlin-idea-fir/tests/BUILD.bazel @@ -21,6 +21,8 @@ jvm_library( deps = [ "//platform/core-api:core", "//platform/core-api:core_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", "//plugins/kotlin/plugin/k2", "//plugins/kotlin/plugin/k2:k2_test_lib", "@lib//:junit4", diff --git a/plugins/kotlin/uast/uast-kotlin-idea-fir/tests/intellij.kotlin.uast.idea.tests.iml b/plugins/kotlin/uast/uast-kotlin-idea-fir/tests/intellij.kotlin.uast.idea.tests.iml index 6ecad288a7ee..760730cd4e88 100644 --- a/plugins/kotlin/uast/uast-kotlin-idea-fir/tests/intellij.kotlin.uast.idea.tests.iml +++ b/plugins/kotlin/uast/uast-kotlin-idea-fir/tests/intellij.kotlin.uast.idea.tests.iml @@ -8,6 +8,7 @@ + diff --git a/plugins/kotlin/uast/uast-kotlin-idea/BUILD.bazel b/plugins/kotlin/uast/uast-kotlin-idea/BUILD.bazel index 679f098b91db..bf5a44048b9e 100644 --- a/plugins/kotlin/uast/uast-kotlin-idea/BUILD.bazel +++ b/plugins/kotlin/uast/uast-kotlin-idea/BUILD.bazel @@ -37,6 +37,7 @@ jvm_library( "//platform/util-ex", "//platform/core-impl", "//platform/projectModel-api:projectModel", + "//java/java-psi-api:psi", "//uast/uast-common:uast", "//plugins/kotlin/uast/uast-kotlin", "//plugins/kotlin/idea", @@ -71,6 +72,7 @@ jvm_library( "//platform/util-ex:util-ex_test_lib", "//platform/core-impl:core-impl_test_lib", "//platform/projectModel-api:projectModel_test_lib", + "//java/java-psi-api:psi_test_lib", "//uast/uast-common:uast_test_lib", "//plugins/kotlin/uast/uast-kotlin:uast-kotlin_test_lib", "//plugins/kotlin/idea:idea_test_lib", diff --git a/plugins/kotlin/uast/uast-kotlin-idea/kotlin.uast.uast-kotlin-idea.iml b/plugins/kotlin/uast/uast-kotlin-idea/kotlin.uast.uast-kotlin-idea.iml index f850091e5897..c9b01799dc78 100644 --- a/plugins/kotlin/uast/uast-kotlin-idea/kotlin.uast.uast-kotlin-idea.iml +++ b/plugins/kotlin/uast/uast-kotlin-idea/kotlin.uast.uast-kotlin-idea.iml @@ -43,6 +43,7 @@ + diff --git a/plugins/kotlin/uast/uast-kotlin-idea/tests/BUILD.bazel b/plugins/kotlin/uast/uast-kotlin-idea/tests/BUILD.bazel index 0b45f75ffa95..89e979916cff 100644 --- a/plugins/kotlin/uast/uast-kotlin-idea/tests/BUILD.bazel +++ b/plugins/kotlin/uast/uast-kotlin-idea/tests/BUILD.bazel @@ -33,6 +33,8 @@ jvm_library( deps = [ "//platform/core-api:core", "//platform/core-api:core_test_lib", + "//platform/lang-api:lang", + "//platform/lang-api:lang_test_lib", "@lib//:kotlin-test", "@lib//:kotlin-stdlib", "@lib//:kotlinc-kotlin-compiler-common", @@ -54,6 +56,8 @@ jvm_library( "//plugins/kotlin/base/test:test_test_lib", "//java/testFramework", "//java/testFramework:testFramework_test_lib", + "//java/java-psi-api:psi", + "//java/java-psi-api:psi_test_lib", "//platform/projectModel-api:projectModel", "//platform/projectModel-api:projectModel_test_lib", "//uast/uast-common:uast", diff --git a/plugins/kotlin/uast/uast-kotlin-idea/tests/kotlin.uast.uast-kotlin-idea.tests.iml b/plugins/kotlin/uast/uast-kotlin-idea/tests/kotlin.uast.uast-kotlin-idea.tests.iml index 76bfc7535bed..5a7cb6ebffc9 100644 --- a/plugins/kotlin/uast/uast-kotlin-idea/tests/kotlin.uast.uast-kotlin-idea.tests.iml +++ b/plugins/kotlin/uast/uast-kotlin-idea/tests/kotlin.uast.uast-kotlin-idea.tests.iml @@ -8,6 +8,7 @@ + @@ -20,6 +21,7 @@ + diff --git a/plugins/kotlin/uast/uast-kotlin/BUILD.bazel b/plugins/kotlin/uast/uast-kotlin/BUILD.bazel index e4d276b58014..f58bcf418c99 100644 --- a/plugins/kotlin/uast/uast-kotlin/BUILD.bazel +++ b/plugins/kotlin/uast/uast-kotlin/BUILD.bazel @@ -9,14 +9,18 @@ jvm_library( kotlinc_opts = "@community//:k11", deps = [ "//platform/core-api:core", + "//platform/core-impl", "@lib//:kotlin-stdlib", "//libraries/asm", "@lib//:kotlinc-kotlin-compiler-common", "@lib//:kotlinc-kotlin-compiler-fe10", "//platform/util", + "//platform/util/base", "//uast/uast-common:uast", + "//java/java-psi-api:psi", "//java/java-psi-impl:psi-impl", "//uast/uast-java:java-uast", + "//java/java-frontback-psi-api:frontback-psi", "@lib//:kotlinc-analysis-api", "//plugins/kotlin/uast/uast-kotlin-base:kotlin-uast-base", ] @@ -31,11 +35,15 @@ jvm_library( runtime_deps = [ ":uast-kotlin", "//platform/core-api:core_test_lib", + "//platform/core-impl:core-impl_test_lib", "//libraries/asm:asm_test_lib", "//platform/util:util_test_lib", + "//platform/util/base:base_test_lib", "//uast/uast-common:uast_test_lib", + "//java/java-psi-api:psi_test_lib", "//java/java-psi-impl:psi-impl_test_lib", "//uast/uast-java:java-uast_test_lib", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//plugins/kotlin/uast/uast-kotlin-base:kotlin-uast-base_test_lib", ] ) diff --git a/plugins/kotlin/uast/uast-kotlin/kotlin.uast.uast-kotlin.iml b/plugins/kotlin/uast/uast-kotlin/kotlin.uast.uast-kotlin.iml index 32b253c1d886..52550f0bfa35 100644 --- a/plugins/kotlin/uast/uast-kotlin/kotlin.uast.uast-kotlin.iml +++ b/plugins/kotlin/uast/uast-kotlin/kotlin.uast.uast-kotlin.iml @@ -24,14 +24,18 @@ + + + + diff --git a/plugins/kotlin/uast/uast-kotlin/tests/BUILD.bazel b/plugins/kotlin/uast/uast-kotlin/tests/BUILD.bazel index ee46114181f6..c12464496f4e 100644 --- a/plugins/kotlin/uast/uast-kotlin/tests/BUILD.bazel +++ b/plugins/kotlin/uast/uast-kotlin/tests/BUILD.bazel @@ -18,6 +18,7 @@ jvm_library( "//uast/uast-common:uast", "//java/java-psi-impl:psi-impl", "//uast/uast-java:java-uast", + "//java/java-psi-api:psi", "@lib//:vavr", ] ) @@ -30,6 +31,8 @@ jvm_library( deps = [ "//platform/core-api:core", "//platform/core-api:core_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", "@lib//:kotlin-stdlib", "//libraries/asm", "//libraries/asm:asm_test_lib", @@ -81,6 +84,8 @@ jvm_library( "//java/java-psi-impl:psi-impl_test_lib", "//uast/uast-java:java-uast", "//uast/uast-java:java-uast_test_lib", + "//java/java-psi-api:psi", + "//java/java-psi-api:psi_test_lib", "//plugins/groovy/groovy-uast-tests:uast-tests", "//plugins/groovy/groovy-uast-tests:uast-tests_test_lib", "@lib//:vavr", diff --git a/plugins/kotlin/uast/uast-kotlin/tests/kotlin.uast.uast-kotlin.tests.iml b/plugins/kotlin/uast/uast-kotlin/tests/kotlin.uast.uast-kotlin.tests.iml index e359e206c3a1..02e6a2486366 100644 --- a/plugins/kotlin/uast/uast-kotlin/tests/kotlin.uast.uast-kotlin.tests.iml +++ b/plugins/kotlin/uast/uast-kotlin/tests/kotlin.uast.uast-kotlin.tests.iml @@ -8,6 +8,7 @@ + @@ -38,6 +39,7 @@ + diff --git a/plugins/laf/macos/BUILD.bazel b/plugins/laf/macos/BUILD.bazel index a1422d8161df..5b6a5457e76c 100644 --- a/plugins/laf/macos/BUILD.bazel +++ b/plugins/laf/macos/BUILD.bazel @@ -19,6 +19,7 @@ jvm_library( "//platform/editor-ui-api:editor-ui", "//platform/util:util-ui", "//platform/platform-impl:ide-impl", + "//platform/ide-core", "@lib//:java_compatibility", "//platform/core-ui", ] @@ -35,6 +36,7 @@ jvm_library( "//platform/editor-ui-api:editor-ui_test_lib", "//platform/util:util-ui_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/core-ui:core-ui_test_lib", ] ) diff --git a/plugins/laf/macos/intellij.laf.macos.iml b/plugins/laf/macos/intellij.laf.macos.iml index 989d04327a3d..02da922126ba 100644 --- a/plugins/laf/macos/intellij.laf.macos.iml +++ b/plugins/laf/macos/intellij.laf.macos.iml @@ -13,6 +13,7 @@ + diff --git a/plugins/laf/win10/BUILD.bazel b/plugins/laf/win10/BUILD.bazel index 38c08a557cac..e8ef92da3c32 100644 --- a/plugins/laf/win10/BUILD.bazel +++ b/plugins/laf/win10/BUILD.bazel @@ -18,8 +18,10 @@ jvm_library( "//platform/core-api:core", "//platform/editor-ui-api:editor-ui", "//platform/platform-impl:ide-impl", + "//platform/ide-core", "@lib//:java_compatibility", "//platform/core-ui", + "//platform/util:util-ui", ] ) @@ -33,7 +35,9 @@ jvm_library( "//platform/core-api:core_test_lib", "//platform/editor-ui-api:editor-ui_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/util:util-ui_test_lib", ] ) ### auto-generated section `build intellij.laf.win10` end diff --git a/plugins/laf/win10/intellij.laf.win10.iml b/plugins/laf/win10/intellij.laf.win10.iml index 3a053802bac1..016b20b05f5b 100644 --- a/plugins/laf/win10/intellij.laf.win10.iml +++ b/plugins/laf/win10/intellij.laf.win10.iml @@ -12,7 +12,9 @@ + + \ No newline at end of file diff --git a/plugins/lombok/BUILD.bazel b/plugins/lombok/BUILD.bazel index 6b0d3abd7eee..b64fd64f3b88 100644 --- a/plugins/lombok/BUILD.bazel +++ b/plugins/lombok/BUILD.bazel @@ -26,9 +26,12 @@ jvm_library( "//platform/analysis-impl", "//java/openapi:java", "//platform/platform-impl:ide-impl", + "//java/java-syntax:syntax", + "//java/java-psi-api:psi", "//java/java-analysis-impl:analysis-impl", "//java/java-impl:impl", "//platform/core-ui", + "//platform/core-impl", "//java/compiler/openapi:java-compiler", "//java/compiler/impl", "//libraries/guava", @@ -38,9 +41,12 @@ jvm_library( "//java/java-impl-inspections:impl-inspections", "//java/java-impl-refactorings:impl-refactorings", "//java/codeserver/highlighting", + "//java/java-frontback-psi-api:frontback-psi", "//platform/ide-core-impl", + "//platform/ide-core", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", "//platform/code-style-api:codeStyle", + "//platform/util:util-ui", ] ) @@ -63,9 +69,12 @@ jvm_library( "//platform/analysis-impl:analysis-impl_test_lib", "//java/openapi:java_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//java/java-syntax:syntax_test_lib", + "//java/java-psi-api:psi_test_lib", "//java/java-analysis-impl:analysis-impl_test_lib", "//java/java-impl:impl_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl:core-impl_test_lib", "//java/compiler/openapi:java-compiler_test_lib", "//java/compiler/impl:impl_test_lib", "//libraries/guava:guava_test_lib", @@ -86,7 +95,9 @@ jvm_library( "//java/java-tests:tests", "//java/java-tests:tests_test_lib", "//java/codeserver/highlighting:highlighting_test_lib", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//images:images-tests", "//images:images-tests_test_lib", "//RegExpSupport:regexp-tests", @@ -95,6 +106,7 @@ jvm_library( "//platform/xdebugger-impl:debugger-impl-tests_test_lib", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", "//platform/code-style-api:codeStyle_test_lib", + "//platform/util:util-ui_test_lib", ] ) ### auto-generated section `build intellij.lombok` end @@ -165,10 +177,16 @@ jvm_library( "//java/java-analysis-impl:analysis-impl_test_lib", "//java/java-impl:impl", "//java/java-impl:impl_test_lib", + "//java/java-psi-api:psi", + "//java/java-psi-api:psi_test_lib", "//platform/core-ui", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", "//java/compiler/openapi:java-compiler", "//java/compiler/openapi:java-compiler_test_lib", + "//java/java-syntax:syntax", + "//java/java-syntax:syntax_test_lib", "//java/compiler/impl", "//java/compiler/impl:impl_test_lib", "//libraries/guava", @@ -196,6 +214,8 @@ jvm_library( "//java/java-tests:tests_test_lib", "//java/codeserver/highlighting", "//java/codeserver/highlighting:highlighting_test_lib", + "//java/java-frontback-psi-api:frontback-psi", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//platform/ide-core-impl", "//images:images-tests", "//images:images-tests_test_lib", @@ -207,6 +227,8 @@ jvm_library( "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", "//platform/code-style-api:codeStyle", "//platform/code-style-api:codeStyle_test_lib", + "//platform/util:util-ui", + "//platform/util:util-ui_test_lib", ], runtime_deps = [ ":lombok-tests", diff --git a/plugins/lombok/intellij.lombok.iml b/plugins/lombok/intellij.lombok.iml index d55068da0646..7f593b999623 100644 --- a/plugins/lombok/intellij.lombok.iml +++ b/plugins/lombok/intellij.lombok.iml @@ -21,9 +21,12 @@ + + + @@ -39,11 +42,14 @@ + + + \ No newline at end of file diff --git a/plugins/lombok/intellij.lombok.tests.iml b/plugins/lombok/intellij.lombok.tests.iml index 54c1d7afc190..6e9ef03c4a24 100644 --- a/plugins/lombok/intellij.lombok.tests.iml +++ b/plugins/lombok/intellij.lombok.tests.iml @@ -27,8 +27,11 @@ + + + @@ -43,12 +46,14 @@ + + diff --git a/plugins/markdown/core/BUILD.bazel b/plugins/markdown/core/BUILD.bazel index f53a50cad1d1..fd7af5bbb2ad 100644 --- a/plugins/markdown/core/BUILD.bazel +++ b/plugins/markdown/core/BUILD.bazel @@ -31,6 +31,7 @@ jvm_library( "//platform/observable", "//libraries/netty/codec-http:libraries-netty-codec-http", "//platform/ide-core-impl", + "//platform/ide-core", "//platform/projectModel-api:projectModel", "//platform/refactoring", "//platform/built-in-server:builtInServer-impl", @@ -67,6 +68,7 @@ jvm_library( "//platform/platform-impl/rpc", "//platform/execution", "//platform/lang-api:lang", + "//platform/util:util-ui", ], exports = ["//platform/ui.jcef"] ) @@ -99,6 +101,7 @@ jvm_library( "//platform/observable:observable_test_lib", "//libraries/netty/codec-http:libraries-netty-codec-http_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/projectModel-api:projectModel_test_lib", "//platform/refactoring:refactoring_test_lib", "//platform/built-in-server:builtInServer-impl_test_lib", @@ -134,6 +137,7 @@ jvm_library( "//platform/platform-impl/rpc:rpc_test_lib", "//platform/execution:execution_test_lib", "//platform/lang-api:lang_test_lib", + "//platform/util:util-ui_test_lib", ] ) ### auto-generated section `build intellij.markdown` end diff --git a/plugins/markdown/core/frontend/BUILD.bazel b/plugins/markdown/core/frontend/BUILD.bazel index 5da28629145b..84dce4bbe0c9 100644 --- a/plugins/markdown/core/frontend/BUILD.bazel +++ b/plugins/markdown/core/frontend/BUILD.bazel @@ -28,6 +28,7 @@ jvm_library( "//platform/kernel/shared:kernel", "//platform/platform-impl/rpc", "//platform/platform-impl:ide-impl", + "//platform/ide-core", "//platform/core-impl", "//platform/code-style-api:codeStyle", "//libraries/miglayout-swing", @@ -59,6 +60,7 @@ jvm_library( "//platform/kernel/shared:kernel_test_lib", "//platform/platform-impl/rpc:rpc_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/core-impl:core-impl_test_lib", "//platform/code-style-api:codeStyle_test_lib", "//libraries/miglayout-swing:miglayout-swing_test_lib", diff --git a/plugins/markdown/core/frontend/intellij.markdown.frontend.iml b/plugins/markdown/core/frontend/intellij.markdown.frontend.iml index 55db2717020e..0ab5f021aeef 100644 --- a/plugins/markdown/core/frontend/intellij.markdown.frontend.iml +++ b/plugins/markdown/core/frontend/intellij.markdown.frontend.iml @@ -46,6 +46,7 @@ + diff --git a/plugins/markdown/core/intellij.markdown.iml b/plugins/markdown/core/intellij.markdown.iml index 7e3bcf455c31..d9891fb91f69 100644 --- a/plugins/markdown/core/intellij.markdown.iml +++ b/plugins/markdown/core/intellij.markdown.iml @@ -51,6 +51,7 @@ + @@ -87,5 +88,6 @@ + \ No newline at end of file diff --git a/plugins/markdown/images/BUILD.bazel b/plugins/markdown/images/BUILD.bazel index 9055cff182c7..08aaf806c8ff 100644 --- a/plugins/markdown/images/BUILD.bazel +++ b/plugins/markdown/images/BUILD.bazel @@ -26,10 +26,12 @@ jvm_library( "//xml/xml-psi-impl:psi-impl", "//platform/core-ui", "//platform/platform-impl:ide-impl", + "//platform/ide-core", "//platform/lang-impl", "//images", "//xml/xml-parser:parser", "@lib//:kotlin-stdlib", + "//platform/util:util-ui", ], runtime_deps = ["//platform/backend"] ) @@ -53,10 +55,12 @@ jvm_library( "//xml/xml-psi-impl:psi-impl_test_lib", "//platform/core-ui:core-ui_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/lang-impl:lang-impl_test_lib", "//images:images_test_lib", "//xml/xml-parser:parser_test_lib", "//platform/backend:backend_test_lib", + "//platform/util:util-ui_test_lib", ] ) ### auto-generated section `build intellij.markdown.images` end diff --git a/plugins/markdown/images/intellij.markdown.images.iml b/plugins/markdown/images/intellij.markdown.images.iml index e6431f2afd73..b8fc3bbb5801 100644 --- a/plugins/markdown/images/intellij.markdown.images.iml +++ b/plugins/markdown/images/intellij.markdown.images.iml @@ -20,10 +20,12 @@ + + \ No newline at end of file diff --git a/plugins/markdown/test/BUILD.bazel b/plugins/markdown/test/BUILD.bazel index c09264c2443e..f6e08a6e0915 100644 --- a/plugins/markdown/test/BUILD.bazel +++ b/plugins/markdown/test/BUILD.bazel @@ -109,6 +109,7 @@ jvm_library( "//platform/lang-impl", "//platform/lang-impl:lang-impl_test_lib", "//platform/platform-util-netty:ide-util-netty", + "//platform/ide-core", "//platform/testFramework", "//platform/testFramework:testFramework_test_lib", "//xml/tests", @@ -124,6 +125,8 @@ jvm_library( "@lib//:assert_j", "//platform/util-ex", "//platform/util-ex:util-ex_test_lib", + "//platform/util:util-ui", + "//platform/util:util-ui_test_lib", "//libraries/markdown", "//libraries/markdown:markdown_test_lib", "//plugins/toml", @@ -154,6 +157,7 @@ jvm_library( runtime_deps = [ ":tests", "//platform/platform-util-netty:ide-util-netty_test_lib", + "//platform/ide-core:ide-core_test_lib", ] ) ### auto-generated section `build intellij.markdown.tests` end diff --git a/plugins/markdown/test/intellij.markdown.tests.iml b/plugins/markdown/test/intellij.markdown.tests.iml index 4bbeff9cf95f..04f7706f6b04 100644 --- a/plugins/markdown/test/intellij.markdown.tests.iml +++ b/plugins/markdown/test/intellij.markdown.tests.iml @@ -37,6 +37,7 @@ + @@ -45,6 +46,7 @@ + diff --git a/plugins/maven/BUILD.bazel b/plugins/maven/BUILD.bazel index dd4937d557ca..367e63d06150 100644 --- a/plugins/maven/BUILD.bazel +++ b/plugins/maven/BUILD.bazel @@ -31,7 +31,9 @@ jvm_library( "//platform/ide-core-impl", "//platform/observable", "//java/openapi:java", + "//java/java-syntax:syntax", "//plugins/maven-server-api:maven-server", + "//java/java-psi-api:psi", "//platform/platform-impl:ide-impl", "//platform/indexing-api:indexing", "//jps/model-api:model", @@ -59,6 +61,7 @@ jvm_library( "//libraries/guava", "//platform/lang-impl", "//jps/model-impl", + "//jps/model-serialization", "//spellchecker", "//platform/vcs-api:vcs", "//plugins/properties/properties-psi-api:psi", @@ -85,13 +88,17 @@ jvm_library( "//platform/build-scripts/downloader", "//platform/util/jdom", "//platform/ide-core", + "//platform/progress/shared:ide-progress", "//platform/util/text-matching", "//platform/core-api:core", + "//platform/core-impl", "//platform/backend/workspace", "@lib//:maven-jetbrains-idea-maven-indexer-api-rt", "//libraries/commons/lang3", "//platform/backend/observation", "//platform/util/coroutines", + "//platform/util:util-ui", + "//platform/util-ex", "//platform/diagnostic/telemetry", "//platform/diagnostic/telemetry-impl", "//libraries/asm", @@ -102,10 +109,12 @@ jvm_library( "//java/debugger/shared", "//xml/xml-psi-api:psi", "//xml/xml-analysis-api:analysis", + "//xml/xml-parser:parser", "//platform/xdebugger-impl:debugger-impl", "//libraries/http-client", "//platform/execution", "//platform/projectModel-impl", + "//platform/testRunner", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", ":platform_java-guiForms-rt_provided", ":plugins_maven_artifactResolver-m31_provided", @@ -166,7 +175,9 @@ jvm_library( "//platform/ide-core-impl:ide-core-impl_test_lib", "//platform/observable:observable_test_lib", "//java/openapi:java_test_lib", + "//java/java-syntax:syntax_test_lib", "//plugins/maven-server-api:maven-server_test_lib", + "//java/java-psi-api:psi_test_lib", "//platform/platform-impl:ide-impl_test_lib", "//platform/indexing-api:indexing_test_lib", "//jps/model-api:model_test_lib", @@ -196,6 +207,7 @@ jvm_library( "//libraries/guava:guava_test_lib", "//platform/lang-impl:lang-impl_test_lib", "//jps/model-impl:model-impl_test_lib", + "//jps/model-serialization:model-serialization_test_lib", "//plugins/maven/artifact-resolver-m31:artifactResolver-m31", "//plugins/maven/artifact-resolver-m31:artifactResolver-m31_test_lib", "//spellchecker:spellchecker_test_lib", @@ -221,12 +233,16 @@ jvm_library( "//platform/build-scripts/downloader:downloader_test_lib", "//platform/util/jdom:jdom_test_lib", "//platform/ide-core:ide-core_test_lib", + "//platform/progress/shared:ide-progress_test_lib", "//platform/util/text-matching:text-matching_test_lib", "//platform/core-api:core_test_lib", + "//platform/core-impl:core-impl_test_lib", "//platform/backend/workspace:workspace_test_lib", "//libraries/commons/lang3:lang3_test_lib", "//platform/backend/observation:observation_test_lib", "//platform/util/coroutines:coroutines_test_lib", + "//platform/util:util-ui_test_lib", + "//platform/util-ex:util-ex_test_lib", "//platform/diagnostic/telemetry:telemetry_test_lib", "//platform/diagnostic/telemetry-impl:telemetry-impl_test_lib", "//libraries/asm:asm_test_lib", @@ -236,10 +252,12 @@ jvm_library( "//java/debugger/shared:shared_test_lib", "//xml/xml-psi-api:psi_test_lib", "//xml/xml-analysis-api:analysis_test_lib", + "//xml/xml-parser:parser_test_lib", "//platform/xdebugger-impl:debugger-impl_test_lib", "//libraries/http-client:http-client_test_lib", "//platform/execution:execution_test_lib", "//platform/projectModel-impl:projectModel-impl_test_lib", + "//platform/testRunner:testRunner_test_lib", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", ] ) diff --git a/plugins/maven/groovy/BUILD.bazel b/plugins/maven/groovy/BUILD.bazel index 519873aed4e4..6a5696639d60 100644 --- a/plugins/maven/groovy/BUILD.bazel +++ b/plugins/maven/groovy/BUILD.bazel @@ -21,19 +21,23 @@ jvm_library( "//plugins/groovy/jps-plugin:jps", "//platform/platform-impl:ide-impl", "//platform/observable", + "//platform/ide-core", "//platform/lang-core", "//platform/lang-impl", "//plugins/maven", "//platform/core-api:core", "//platform/analysis-api:analysis", "//xml/xml-parser:parser", + "//platform/editor-ui-api:editor-ui", "//platform/core-impl", "//xml/xml-psi-api:psi", "//plugins/repository-search/common", "//platform/projectModel-api:projectModel", "//jps/model-api:model", "//platform/util/jdom", + "//platform/util:util-ui", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", + "//java/java-psi-api:psi", ] ) @@ -50,18 +54,21 @@ jvm_library( "//plugins/groovy/jps-plugin:jps_test_lib", "//platform/platform-impl:ide-impl_test_lib", "//platform/observable:observable_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/lang-core:lang-core_test_lib", "//platform/lang-impl:lang-impl_test_lib", "//plugins/maven:maven_test_lib", "//platform/core-api:core_test_lib", "//platform/analysis-api:analysis_test_lib", "//xml/xml-parser:parser_test_lib", + "//platform/editor-ui-api:editor-ui_test_lib", "//platform/core-impl:core-impl_test_lib", "//xml/xml-psi-api:psi_test_lib", "//plugins/repository-search/common:common_test_lib", "//platform/projectModel-api:projectModel_test_lib", "//jps/model-api:model_test_lib", "//platform/util/jdom:jdom_test_lib", + "//platform/util:util-ui_test_lib", "//platform/testFramework", "//platform/testFramework:testFramework_test_lib", "//java/testFramework", @@ -71,6 +78,7 @@ jvm_library( "@lib//:assert_j", "@lib//:junit4", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", + "//java/java-psi-api:psi_test_lib", ] ) ### auto-generated section `build intellij.maven.groovy` end @@ -133,10 +141,14 @@ jvm_library( "//jps/model-api:model_test_lib", "//platform/util/jdom", "//platform/util/jdom:jdom_test_lib", + "//platform/util-ex", + "//platform/util-ex:util-ex_test_lib", "//platform/testFramework", "//platform/testFramework:testFramework_test_lib", "//java/testFramework", "//java/testFramework:testFramework_test_lib", + "//java/java-psi-api:psi", + "//java/java-psi-api:psi_test_lib", "//plugins/maven/testFramework", "//plugins/maven/testFramework:testFramework_test_lib", "@lib//:assert_j", diff --git a/plugins/maven/groovy/intellij.maven.groovy.iml b/plugins/maven/groovy/intellij.maven.groovy.iml index 6d090ad28e21..00c19fcefb4f 100644 --- a/plugins/maven/groovy/intellij.maven.groovy.iml +++ b/plugins/maven/groovy/intellij.maven.groovy.iml @@ -15,23 +15,27 @@ + + + + \ No newline at end of file diff --git a/plugins/maven/groovy/intellij.maven.groovy.tests.iml b/plugins/maven/groovy/intellij.maven.groovy.tests.iml index f7a3513457c4..ed2246241bdc 100644 --- a/plugins/maven/groovy/intellij.maven.groovy.tests.iml +++ b/plugins/maven/groovy/intellij.maven.groovy.tests.iml @@ -26,8 +26,10 @@ + + diff --git a/plugins/maven/intellij.maven.iml b/plugins/maven/intellij.maven.iml index 94322fc17854..41924614db9c 100644 --- a/plugins/maven/intellij.maven.iml +++ b/plugins/maven/intellij.maven.iml @@ -17,7 +17,9 @@ + + @@ -46,6 +48,7 @@ + @@ -90,8 +93,10 @@ + + @@ -112,6 +117,8 @@ + + @@ -122,10 +129,12 @@ + + diff --git a/plugins/maven/jps/BUILD.bazel b/plugins/maven/jps/BUILD.bazel index b1b70fff409a..e8df79c74844 100644 --- a/plugins/maven/jps/BUILD.bazel +++ b/plugins/maven/jps/BUILD.bazel @@ -22,6 +22,8 @@ jvm_library( "//jps/model-serialization", "//libraries/plexus-utils", "//platform/util/jdom", + "//platform/util/base/multiplatform", + "//platform/util/base", "//libraries/hash4j", "//libraries/fastutil", ] @@ -46,6 +48,8 @@ jvm_library( "//jps/model-serialization:model-serialization-tests", "//jps/model-serialization:model-serialization-tests_test_lib", "//platform/util/jdom:jdom_test_lib", + "//platform/util/base/multiplatform:multiplatform_test_lib", + "//platform/util/base:base_test_lib", "//jps/jps-builders:build-tests", "//jps/jps-builders:build-tests_test_lib", "//libraries/hash4j:hash4j_test_lib", diff --git a/plugins/maven/jps/intellij.maven.jps.iml b/plugins/maven/jps/intellij.maven.jps.iml index 2a4d422aceee..8b22397242f7 100644 --- a/plugins/maven/jps/intellij.maven.jps.iml +++ b/plugins/maven/jps/intellij.maven.jps.iml @@ -33,6 +33,8 @@ + + diff --git a/plugins/maven/performanceTesting/BUILD.bazel b/plugins/maven/performanceTesting/BUILD.bazel index f03138a6e2f7..1c88889bf414 100644 --- a/plugins/maven/performanceTesting/BUILD.bazel +++ b/plugins/maven/performanceTesting/BUILD.bazel @@ -21,6 +21,7 @@ jvm_library( "//platform/core-ui", "//platform/execution", "//platform/projectModel-api:projectModel", + "//platform/editor-ui-api:editor-ui", "//platform/util", "//platform/platform-impl:ide-impl", "//plugins/repository-search/common", @@ -29,8 +30,10 @@ jvm_library( "//java/java-impl:impl", "//platform/util/concurrency", "//platform/ide-core-impl", + "//platform/ide-core", "//platform/backend/workspace", "//platform/workspace/storage", + "//platform/lang-api:lang", ] ) @@ -47,6 +50,7 @@ jvm_library( "//platform/core-ui:core-ui_test_lib", "//platform/execution:execution_test_lib", "//platform/projectModel-api:projectModel_test_lib", + "//platform/editor-ui-api:editor-ui_test_lib", "//platform/util:util_test_lib", "//platform/platform-impl:ide-impl_test_lib", "//plugins/repository-search/common:common_test_lib", @@ -55,8 +59,10 @@ jvm_library( "//java/java-impl:impl_test_lib", "//platform/util/concurrency:concurrency_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/backend/workspace:workspace_test_lib", "//platform/workspace/storage:storage_test_lib", + "//platform/lang-api:lang_test_lib", ] ) ### auto-generated section `build intellij.maven.performanceTesting` end diff --git a/plugins/maven/performanceTesting/intellij.maven.performanceTesting.iml b/plugins/maven/performanceTesting/intellij.maven.performanceTesting.iml index 0268392cbc39..55bb333a9ee6 100644 --- a/plugins/maven/performanceTesting/intellij.maven.performanceTesting.iml +++ b/plugins/maven/performanceTesting/intellij.maven.performanceTesting.iml @@ -15,6 +15,7 @@ + @@ -23,7 +24,9 @@ + + \ No newline at end of file diff --git a/plugins/maven/src/test/BUILD.bazel b/plugins/maven/src/test/BUILD.bazel index bbe4ad13f3af..9011fc2dfd9d 100644 --- a/plugins/maven/src/test/BUILD.bazel +++ b/plugins/maven/src/test/BUILD.bazel @@ -38,6 +38,8 @@ jvm_library( "//platform/core-api:core_test_lib", "//platform/core-ui", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", "//platform/editor-ui-api:editor-ui", "//platform/editor-ui-api:editor-ui_test_lib", "//xml/xml-analysis-api:analysis", @@ -52,6 +54,8 @@ jvm_library( "//platform/lang-core:lang-core_test_lib", "//platform/projectModel-api:projectModel", "//platform/projectModel-api:projectModel_test_lib", + "//java/java-syntax:syntax", + "//java/java-syntax:syntax_test_lib", "//platform/refactoring", "//platform/refactoring:refactoring_test_lib", "//platform/structure-view-impl:structureView-impl", @@ -60,6 +64,8 @@ jvm_library( "//platform/testFramework:testFramework_test_lib", "//java/testFramework", "//java/testFramework:testFramework_test_lib", + "//java/java-psi-api:psi", + "//java/java-psi-api:psi_test_lib", "//platform/workspace/storage", "//platform/workspace/storage:storage_test_lib", "//plugins/repository-search", @@ -84,6 +90,7 @@ jvm_library( "//plugins/groovy/jps-plugin:jps", "//plugins/groovy/jps-plugin:jps_test_lib", "//platform/platform-util-io:ide-util-io", + "//platform/ide-core", "//jps/model-impl", "//jps/model-impl:model-impl_test_lib", "//platform/util/progress", @@ -102,6 +109,10 @@ jvm_library( "//plugins/maven/maven3-server-common:server-m3-common_test_lib", "//platform/util/jdom", "//platform/util/jdom:jdom_test_lib", + "//platform/util:util-ui", + "//platform/util:util-ui_test_lib", + "//platform/util-ex", + "//platform/util-ex:util-ex_test_lib", "//libraries/kotlinx/coroutines/core", "//libraries/kotlinx/coroutines/core:core_test_lib", "//platform/code-style-impl:codeStyle-impl", @@ -122,6 +133,8 @@ jvm_library( "//libraries/kotlinx/serialization/core:core_test_lib", "//platform/statistics/testFramework", "//platform/statistics/testFramework:testFramework_test_lib", + "//platform/statistics", + "//platform/statistics:statistics_test_lib", "//xml/xml-psi-api:psi", "//xml/xml-psi-api:psi_test_lib", "//platform/xdebugger-api:debugger", @@ -148,6 +161,7 @@ jvm_library( runtime_deps = [ ":maven-tests", "//platform/platform-util-io:ide-util-io_test_lib", + "//platform/ide-core:ide-core_test_lib", ] ) ### auto-generated section `build intellij.maven.tests` end diff --git a/plugins/maven/src/test/intellij.maven.tests.iml b/plugins/maven/src/test/intellij.maven.tests.iml index cbc8764e9e72..769dcf325024 100644 --- a/plugins/maven/src/test/intellij.maven.tests.iml +++ b/plugins/maven/src/test/intellij.maven.tests.iml @@ -14,6 +14,7 @@ + @@ -21,10 +22,12 @@ + + @@ -38,6 +41,7 @@ + @@ -47,6 +51,8 @@ + + @@ -57,6 +63,7 @@ + diff --git a/plugins/maven/testFramework/BUILD.bazel b/plugins/maven/testFramework/BUILD.bazel index b19c7ae8432e..b17427a56055 100644 --- a/plugins/maven/testFramework/BUILD.bazel +++ b/plugins/maven/testFramework/BUILD.bazel @@ -12,10 +12,12 @@ jvm_library( "//platform/util/concurrency", "//platform/core-ui", "//platform/editor-ui-api:editor-ui", + "//java/java-syntax:syntax", "//platform/external-system-impl:externalSystem-impl", "//platform/indexing-api:indexing", "//jps/model-api:model", "//platform/lang-core", + "//platform/lang-api:lang", "//platform/refactoring", "//platform/testFramework", "//plugins/maven", @@ -29,6 +31,7 @@ jvm_library( "//java/testFramework", "//platform/projectModel-api:projectModel", "//platform/core-api:core", + "//platform/core-impl", "//xml/xml-psi-api:psi", "//platform/backend/observation", "//platform/backend/workspace", @@ -40,6 +43,7 @@ jvm_library( "//xml/xml-analysis-api:analysis", "//xml/xml-analysis-impl:analysis-impl", "//platform/execution", + "//platform/ide-core", "//java/testFramework/backend", "//plugins/repository-search/common", ] @@ -57,10 +61,12 @@ jvm_library( "//platform/util/concurrency:concurrency_test_lib", "//platform/core-ui:core-ui_test_lib", "//platform/editor-ui-api:editor-ui_test_lib", + "//java/java-syntax:syntax_test_lib", "//platform/external-system-impl:externalSystem-impl_test_lib", "//platform/indexing-api:indexing_test_lib", "//jps/model-api:model_test_lib", "//platform/lang-core:lang-core_test_lib", + "//platform/lang-api:lang_test_lib", "//platform/refactoring:refactoring_test_lib", "//platform/testFramework:testFramework_test_lib", "//plugins/maven:maven_test_lib", @@ -73,6 +79,7 @@ jvm_library( "//java/testFramework:testFramework_test_lib", "//platform/projectModel-api:projectModel_test_lib", "//platform/core-api:core_test_lib", + "//platform/core-impl:core-impl_test_lib", "//xml/xml-psi-api:psi_test_lib", "//platform/backend/observation:observation_test_lib", "//platform/backend/workspace:workspace_test_lib", @@ -84,6 +91,7 @@ jvm_library( "//xml/xml-analysis-api:analysis_test_lib", "//xml/xml-analysis-impl:analysis-impl_test_lib", "//platform/execution:execution_test_lib", + "//platform/ide-core:ide-core_test_lib", "//java/testFramework/backend:backend_test_lib", "//plugins/repository-search/common:common_test_lib", ] @@ -156,6 +164,8 @@ jvm_library( "//platform/projectModel-api:projectModel_test_lib", "//platform/core-api:core", "//platform/core-api:core_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", "//xml/xml-psi-api:psi", "//xml/xml-psi-api:psi_test_lib", "//platform/backend/observation", diff --git a/plugins/maven/testFramework/intellij.maven.testFramework.iml b/plugins/maven/testFramework/intellij.maven.testFramework.iml index 54c3ff9ef6f4..eb05a8743a66 100644 --- a/plugins/maven/testFramework/intellij.maven.testFramework.iml +++ b/plugins/maven/testFramework/intellij.maven.testFramework.iml @@ -12,10 +12,12 @@ + + @@ -46,6 +48,7 @@ + @@ -57,6 +60,7 @@ + diff --git a/plugins/maven/testFramework/intellij.maven.testFramework.tests.iml b/plugins/maven/testFramework/intellij.maven.testFramework.tests.iml index b60109764b55..96e2590b0c42 100644 --- a/plugins/maven/testFramework/intellij.maven.testFramework.tests.iml +++ b/plugins/maven/testFramework/intellij.maven.testFramework.tests.iml @@ -46,6 +46,7 @@ + diff --git a/plugins/mcp-server/BUILD.bazel b/plugins/mcp-server/BUILD.bazel index fe8c916dde31..1c267361f723 100644 --- a/plugins/mcp-server/BUILD.bazel +++ b/plugins/mcp-server/BUILD.bazel @@ -59,6 +59,7 @@ jvm_library( "//platform/indexing-api:indexing", "//platform/core-impl", "//platform/ide-core-impl", + "//platform/progress/shared:ide-progress", "//plugins/mcp-server/mcpserver.stdio", "//platform/statistics", "//platform/util/concurrency", @@ -77,6 +78,8 @@ jvm_library( "//platform/diagnostic/telemetry", "//platform/util/coroutines", "//platform/util-class-loader:util-classLoader", + "//platform/util:util-ui", + "//platform/util-ex", "//platform/vcs-impl", "//platform/eel-provider", ] @@ -125,6 +128,7 @@ jvm_library( "//platform/indexing-api:indexing_test_lib", "//platform/core-impl:core-impl_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/progress/shared:ide-progress_test_lib", "//plugins/mcp-server/mcpserver.stdio:mcpserver.stdio_test_lib", "//platform/statistics:statistics_test_lib", "//platform/util/concurrency:concurrency_test_lib", @@ -142,6 +146,8 @@ jvm_library( "//platform/diagnostic/telemetry:telemetry_test_lib", "//platform/util/coroutines:coroutines_test_lib", "//platform/util-class-loader:util-classLoader_test_lib", + "//platform/util:util-ui_test_lib", + "//platform/util-ex:util-ex_test_lib", "//platform/vcs-impl:vcs-impl_test_lib", "//platform/eel-provider:eel-provider_test_lib", ] diff --git a/plugins/mcp-server/intellij.mcpserver.iml b/plugins/mcp-server/intellij.mcpserver.iml index 1d92b454c733..e5aa0defffbc 100644 --- a/plugins/mcp-server/intellij.mcpserver.iml +++ b/plugins/mcp-server/intellij.mcpserver.iml @@ -92,6 +92,7 @@ + @@ -110,6 +111,8 @@ + + diff --git a/plugins/mcp-server/tests/BUILD.bazel b/plugins/mcp-server/tests/BUILD.bazel index 72963b691bee..bfbe87507ffe 100644 --- a/plugins/mcp-server/tests/BUILD.bazel +++ b/plugins/mcp-server/tests/BUILD.bazel @@ -51,6 +51,9 @@ jvm_library( "//platform/core-impl", "//platform/core-impl:core-impl_test_lib", "//platform/platform-util-io:ide-util-io", + "//platform/ide-core", + "//platform/editor-ui-api:editor-ui", + "//platform/editor-ui-api:editor-ui_test_lib", "//platform/lang-impl", "//platform/lang-impl:lang-impl_test_lib", "//platform/projectModel-api:projectModel", @@ -71,10 +74,15 @@ jvm_library( "//platform/execution:execution_test_lib", "//platform/execution-impl", "//platform/execution-impl:execution-impl_test_lib", + "//platform/util:util-ui", + "//platform/util:util-ui_test_lib", + "//platform/util-ex", + "//platform/util-ex:util-ex_test_lib", ], runtime_deps = [ ":tests", "//platform/platform-util-io:ide-util-io_test_lib", + "//platform/ide-core:ide-core_test_lib", ] ) ### auto-generated section `build intellij.mcpserver.tests` end diff --git a/plugins/mcp-server/tests/intellij.mcpserver.tests.iml b/plugins/mcp-server/tests/intellij.mcpserver.tests.iml index c5f9447645a7..da6a10fc042d 100644 --- a/plugins/mcp-server/tests/intellij.mcpserver.tests.iml +++ b/plugins/mcp-server/tests/intellij.mcpserver.tests.iml @@ -44,6 +44,8 @@ + + @@ -54,6 +56,8 @@ + + \ No newline at end of file diff --git a/plugins/ml-local-models/BUILD.bazel b/plugins/ml-local-models/BUILD.bazel index 2a0f4d9ebb65..cfce5962c399 100644 --- a/plugins/ml-local-models/BUILD.bazel +++ b/plugins/ml-local-models/BUILD.bazel @@ -24,6 +24,7 @@ jvm_library( "//platform/indexing-api:indexing", "//platform/projectModel-api:projectModel", "//platform/lang-impl", + "//platform/util-ex", ] ) @@ -43,6 +44,7 @@ jvm_library( "//platform/indexing-api:indexing_test_lib", "//platform/projectModel-api:projectModel_test_lib", "//platform/lang-impl:lang-impl_test_lib", + "//platform/util-ex:util-ex_test_lib", ] ) ### auto-generated section `build intellij.ml.models.local` end diff --git a/plugins/ml-local-models/intellij.ml.models.local.iml b/plugins/ml-local-models/intellij.ml.models.local.iml index f7ee7864aaa6..7e7fda3d51e5 100644 --- a/plugins/ml-local-models/intellij.ml.models.local.iml +++ b/plugins/ml-local-models/intellij.ml.models.local.iml @@ -18,5 +18,6 @@ + \ No newline at end of file diff --git a/plugins/ml-local-models/java/BUILD.bazel b/plugins/ml-local-models/java/BUILD.bazel index 1242bebe2b5b..8edc3e57cef3 100644 --- a/plugins/ml-local-models/java/BUILD.bazel +++ b/plugins/ml-local-models/java/BUILD.bazel @@ -16,6 +16,8 @@ jvm_library( deps = [ "@lib//:kotlin-stdlib", "//java/java-impl:impl", + "//java/java-psi-api:psi", + "//java/java-frontback-psi-api:frontback-psi", "//platform/analysis-api:analysis", "//platform/backend/workspace", "//plugins/ml-local-models:ml-models-local", @@ -24,6 +26,7 @@ jvm_library( "//platform/workspace/storage", "//platform/workspace/jps", "//platform/lang-api:lang", + "//platform/ide-core", ] ) @@ -35,6 +38,8 @@ jvm_library( runtime_deps = [ ":java", "//java/java-impl:impl_test_lib", + "//java/java-psi-api:psi_test_lib", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//platform/analysis-api:analysis_test_lib", "//platform/backend/workspace:workspace_test_lib", "//plugins/ml-local-models:ml-models-local_test_lib", @@ -43,6 +48,7 @@ jvm_library( "//platform/workspace/storage:storage_test_lib", "//platform/workspace/jps:jps_test_lib", "//platform/lang-api:lang_test_lib", + "//platform/ide-core:ide-core_test_lib", ] ) ### auto-generated section `build intellij.ml.models.local.java` end diff --git a/plugins/ml-local-models/java/intellij.ml.models.local.java.iml b/plugins/ml-local-models/java/intellij.ml.models.local.java.iml index c7c4c4d1172c..b2f22292144a 100644 --- a/plugins/ml-local-models/java/intellij.ml.models.local.java.iml +++ b/plugins/ml-local-models/java/intellij.ml.models.local.java.iml @@ -11,6 +11,8 @@ + + @@ -19,5 +21,6 @@ + \ No newline at end of file diff --git a/plugins/performanceTesting/core/BUILD.bazel b/plugins/performanceTesting/core/BUILD.bazel index efff64d003fa..3ab400e8e03c 100644 --- a/plugins/performanceTesting/core/BUILD.bazel +++ b/plugins/performanceTesting/core/BUILD.bazel @@ -44,17 +44,20 @@ jvm_library( "//libraries/jackson/databind", "//platform/editor-ui-ex:editor-ex", "//platform/ide-core-impl", + "//platform/ide-core", "//platform/core-ui", "//platform/platform-impl/codeinsight-inline:ide-codeinsight-inline", "//platform/statistics", "//platform/execution-impl", "//platform/util-ex", + "//platform/util:util-ui", "//platform/platform-impl/internal", "@lib//:opentelemetry", "@lib//:opentelemetry-semconv", "//libraries/kotlinx/coroutines/core", "//platform/diagnostic/telemetry", "//platform/platform-impl:ide-impl", + "//platform/progress/shared:ide-progress", "//libraries/fastutil", "//platform/xdebugger-api:debugger", "//platform/xdebugger-impl:debugger-impl", @@ -114,15 +117,18 @@ jvm_library( "//libraries/jackson/databind:databind_test_lib", "//platform/editor-ui-ex:editor-ex_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/core-ui:core-ui_test_lib", "//platform/platform-impl/codeinsight-inline:ide-codeinsight-inline_test_lib", "//platform/statistics:statistics_test_lib", "//platform/execution-impl:execution-impl_test_lib", "//platform/util-ex:util-ex_test_lib", + "//platform/util:util-ui_test_lib", "//platform/platform-impl/internal:internal_test_lib", "//libraries/kotlinx/coroutines/core:core_test_lib", "//platform/diagnostic/telemetry:telemetry_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/progress/shared:ide-progress_test_lib", "//libraries/fastutil:fastutil_test_lib", "//platform/xdebugger-api:debugger_test_lib", "//platform/xdebugger-impl:debugger-impl_test_lib", diff --git a/plugins/performanceTesting/core/intellij.performanceTesting.iml b/plugins/performanceTesting/core/intellij.performanceTesting.iml index f2e11806cf35..3e967299bbbb 100644 --- a/plugins/performanceTesting/core/intellij.performanceTesting.iml +++ b/plugins/performanceTesting/core/intellij.performanceTesting.iml @@ -35,17 +35,20 @@ + + + diff --git a/plugins/performanceTesting/frontend/BUILD.bazel b/plugins/performanceTesting/frontend/BUILD.bazel index e0d649bd03c1..ecf42e504c38 100644 --- a/plugins/performanceTesting/frontend/BUILD.bazel +++ b/plugins/performanceTesting/frontend/BUILD.bazel @@ -19,6 +19,7 @@ jvm_library( "//platform/core-api:core", "//platform/editor-ui-api:editor-ui", "//platform/platform-impl:ide-impl", + "//platform/ide-core", "//platform/recentFiles/frontend", "//platform/core-ui", "//platform/lang-api:lang", @@ -30,6 +31,7 @@ jvm_library( "//platform/structure-view-impl:structureView-impl", "//platform/structure-view-impl/frontend", "//platform/util/coroutines", + "//platform/util:util-ui", "//platform/util/concurrency", ] ) @@ -45,6 +47,7 @@ jvm_library( "//platform/core-api:core_test_lib", "//platform/editor-ui-api:editor-ui_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/recentFiles/frontend:frontend_test_lib", "//platform/core-ui:core-ui_test_lib", "//platform/lang-api:lang_test_lib", @@ -54,6 +57,7 @@ jvm_library( "//platform/structure-view-impl:structureView-impl_test_lib", "//platform/structure-view-impl/frontend:frontend_test_lib", "//platform/util/coroutines:coroutines_test_lib", + "//platform/util:util-ui_test_lib", "//platform/util/concurrency:concurrency_test_lib", ] ) diff --git a/plugins/performanceTesting/frontend/intellij.performanceTesting.frontend.iml b/plugins/performanceTesting/frontend/intellij.performanceTesting.frontend.iml index faf9115c3e2f..ce63d1c4616a 100644 --- a/plugins/performanceTesting/frontend/intellij.performanceTesting.frontend.iml +++ b/plugins/performanceTesting/frontend/intellij.performanceTesting.frontend.iml @@ -13,6 +13,7 @@ + @@ -24,6 +25,7 @@ + \ No newline at end of file diff --git a/plugins/performanceTesting/remote-driver.compose/BUILD.bazel b/plugins/performanceTesting/remote-driver.compose/BUILD.bazel index e1703b2731a0..46fdd5a67c95 100644 --- a/plugins/performanceTesting/remote-driver.compose/BUILD.bazel +++ b/plugins/performanceTesting/remote-driver.compose/BUILD.bazel @@ -20,6 +20,7 @@ jvm_library( "//platform/platform-api:ide", "//platform/compose", "//platform/core-ui", + "//platform/util:util-ui", "//plugins/performanceTesting/remote-driver", ] ) @@ -36,6 +37,7 @@ jvm_library( "//platform/platform-api:ide_test_lib", "//platform/compose:compose_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/util:util-ui_test_lib", "//plugins/performanceTesting/remote-driver:remote-driver_test_lib", ] ) diff --git a/plugins/performanceTesting/remote-driver.compose/intellij.performanceTesting.remoteDriver.compose.iml b/plugins/performanceTesting/remote-driver.compose/intellij.performanceTesting.remoteDriver.compose.iml index ce25c653ed64..82a2b628abe3 100644 --- a/plugins/performanceTesting/remote-driver.compose/intellij.performanceTesting.remoteDriver.compose.iml +++ b/plugins/performanceTesting/remote-driver.compose/intellij.performanceTesting.remoteDriver.compose.iml @@ -14,6 +14,7 @@ + \ No newline at end of file diff --git a/plugins/performanceTesting/remote-driver/BUILD.bazel b/plugins/performanceTesting/remote-driver/BUILD.bazel index d1476a651457..4c877c0e400e 100644 --- a/plugins/performanceTesting/remote-driver/BUILD.bazel +++ b/plugins/performanceTesting/remote-driver/BUILD.bazel @@ -34,6 +34,7 @@ jvm_library( "//platform/platform-impl:ide-impl", "//platform/ui.jcef", "//platform/core-ui", + "//platform/util:util-ui", ], exports = [ "//platform/remote-driver/core:driver-impl", @@ -71,6 +72,7 @@ jvm_library( "//platform/platform-impl:ide-impl_test_lib", "//platform/ui.jcef:ui.jcef_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/util:util-ui_test_lib", ] ) ### auto-generated section `build intellij.performanceTesting.remoteDriver` end diff --git a/plugins/performanceTesting/remote-driver/intellij.performanceTesting.remoteDriver.iml b/plugins/performanceTesting/remote-driver/intellij.performanceTesting.remoteDriver.iml index cdf30ccbdfdb..e0ff7a153e30 100644 --- a/plugins/performanceTesting/remote-driver/intellij.performanceTesting.remoteDriver.iml +++ b/plugins/performanceTesting/remote-driver/intellij.performanceTesting.remoteDriver.iml @@ -28,5 +28,6 @@ + \ No newline at end of file diff --git a/plugins/performanceTesting/scripts-ui/BUILD.bazel b/plugins/performanceTesting/scripts-ui/BUILD.bazel index 542c60b1324d..72c365443afe 100644 --- a/plugins/performanceTesting/scripts-ui/BUILD.bazel +++ b/plugins/performanceTesting/scripts-ui/BUILD.bazel @@ -22,10 +22,12 @@ jvm_library( "//platform/analysis-impl", "//platform/platform-api:ide", "//platform/platform-impl:ide-impl", + "//platform/ide-core", "//platform/core-ui", "//platform/forms_rt:java-guiForms-rt", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", "//platform/util/concurrency", + "//platform/util:util-ui", ] ) @@ -44,12 +46,14 @@ jvm_library( "//platform/analysis-impl:analysis-impl_test_lib", "//platform/platform-api:ide_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/core-ui:core-ui_test_lib", "//platform/testFramework", "//platform/testFramework:testFramework_test_lib", "//platform/forms_rt:java-guiForms-rt_test_lib", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", "//platform/util/concurrency:concurrency_test_lib", + "//platform/util:util-ui_test_lib", ] ) ### auto-generated section `build intellij.performanceTesting.ui` end diff --git a/plugins/performanceTesting/scripts-ui/intellij.performanceTesting.ui.iml b/plugins/performanceTesting/scripts-ui/intellij.performanceTesting.ui.iml index 923a1bb03b85..c5cb211da5d3 100644 --- a/plugins/performanceTesting/scripts-ui/intellij.performanceTesting.ui.iml +++ b/plugins/performanceTesting/scripts-ui/intellij.performanceTesting.ui.iml @@ -17,10 +17,12 @@ + + \ No newline at end of file diff --git a/plugins/properties/BUILD.bazel b/plugins/properties/BUILD.bazel index f2696698d9d6..beb43e2ba590 100644 --- a/plugins/properties/BUILD.bazel +++ b/plugins/properties/BUILD.bazel @@ -36,7 +36,9 @@ jvm_library( "//platform/refactoring", "//platform/code-style-impl:codeStyle-impl", "//platform/util/jdom", + "//platform/util:util-ui", "//platform/ide-core-impl", + "//platform/ide-core", "//platform/structuralsearch:structuralSearch", "//plugins/properties/properties-common:properties", "//platform/diff-impl", @@ -79,7 +81,9 @@ jvm_library( "//platform/refactoring:refactoring_test_lib", "//platform/code-style-impl:codeStyle-impl_test_lib", "//platform/util/jdom:jdom_test_lib", + "//platform/util:util-ui_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/structuralsearch:structuralSearch_test_lib", "//plugins/properties/properties-common:properties_test_lib", "//platform/backend:backend_test_lib", diff --git a/plugins/properties/intellij.properties.backend.iml b/plugins/properties/intellij.properties.backend.iml index f658d3d224a2..52a8bcce23e7 100644 --- a/plugins/properties/intellij.properties.backend.iml +++ b/plugins/properties/intellij.properties.backend.iml @@ -30,7 +30,9 @@ + + diff --git a/plugins/properties/properties-common/BUILD.bazel b/plugins/properties/properties-common/BUILD.bazel index 5f926ed9178a..ea97ae38f4eb 100644 --- a/plugins/properties/properties-common/BUILD.bazel +++ b/plugins/properties/properties-common/BUILD.bazel @@ -28,6 +28,7 @@ jvm_library( "//platform/code-style-impl:codeStyle-impl", "//platform/lang-impl", "//platform/platform-impl:ide-impl", + "//platform/ide-core", "//platform/refactoring", "//platform/lang-api:lang", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", @@ -55,6 +56,7 @@ jvm_library( "//platform/code-style-impl:codeStyle-impl_test_lib", "//platform/lang-impl:lang-impl_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/refactoring:refactoring_test_lib", "//platform/lang-api:lang_test_lib", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", diff --git a/plugins/properties/properties-common/intellij.properties.iml b/plugins/properties/properties-common/intellij.properties.iml index 1a96aaa0b1f5..e0815d232312 100644 --- a/plugins/properties/properties-common/intellij.properties.iml +++ b/plugins/properties/properties-common/intellij.properties.iml @@ -23,6 +23,7 @@ + diff --git a/plugins/properties/properties-psi-impl/BUILD.bazel b/plugins/properties/properties-psi-impl/BUILD.bazel index cba9cf68e969..0e4101726883 100644 --- a/plugins/properties/properties-psi-impl/BUILD.bazel +++ b/plugins/properties/properties-psi-impl/BUILD.bazel @@ -28,6 +28,7 @@ jvm_library( "//platform/platform-impl:ide-impl", "//platform/indexing-impl", "//platform/ide-core-impl", + "//platform/ide-core", "//platform/analysis-impl", "//platform/lang-impl", "//platform/util/nanoxml", @@ -40,6 +41,7 @@ jvm_library( "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", "//platform/util/concurrency", "//jps/model-api:model", + "//platform/util:util-ui", ], exports = [ "//plugins/properties/properties-psi-api:psi", @@ -75,6 +77,7 @@ jvm_library( "//platform/platform-impl:ide-impl_test_lib", "//platform/indexing-impl:indexing-impl_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/analysis-impl:analysis-impl_test_lib", "//platform/lang-impl:lang-impl_test_lib", "//platform/util/nanoxml:nanoxml_test_lib", @@ -88,6 +91,7 @@ jvm_library( "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", "//platform/util/concurrency:concurrency_test_lib", "//jps/model-api:model_test_lib", + "//platform/util:util-ui_test_lib", ] ) ### auto-generated section `build intellij.properties.backend.psi` end diff --git a/plugins/properties/properties-psi-impl/intellij.properties.backend.psi.iml b/plugins/properties/properties-psi-impl/intellij.properties.backend.psi.iml index cf32426211b9..62898ea86c82 100644 --- a/plugins/properties/properties-psi-impl/intellij.properties.backend.psi.iml +++ b/plugins/properties/properties-psi-impl/intellij.properties.backend.psi.iml @@ -22,6 +22,7 @@ + @@ -35,5 +36,6 @@ + \ No newline at end of file diff --git a/plugins/properties/tests/BUILD.bazel b/plugins/properties/tests/BUILD.bazel index 767a2af2012d..bed7a36d891c 100644 --- a/plugins/properties/tests/BUILD.bazel +++ b/plugins/properties/tests/BUILD.bazel @@ -38,6 +38,7 @@ jvm_library( "//platform/lang-impl", "//platform/lang-impl:lang-impl_test_lib", "//platform/platform-impl:ide-impl", + "//platform/ide-core", "//platform/projectModel-api:projectModel", "//platform/projectModel-api:projectModel_test_lib", "//platform/refactoring", @@ -48,6 +49,8 @@ jvm_library( "//platform/testFramework:testFramework_test_lib", "//platform/util/diff", "//platform/util/diff:diff_test_lib", + "//platform/util:util-ui", + "//platform/util:util-ui_test_lib", "//spellchecker", "//spellchecker:spellchecker_test_lib", "//plugins/grazie/src:core", @@ -66,6 +69,8 @@ jvm_library( "//platform/boot:boot_test_lib", "//platform/core-ui", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", "//plugins/properties/properties-psi-impl:backend-psi", "//plugins/properties/properties-psi-impl:backend-psi_test_lib", "@lib//:assert_j", @@ -92,6 +97,7 @@ jvm_library( runtime_deps = [ ":tests", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", ] ) ### auto-generated section `build intellij.properties.tests` end diff --git a/plugins/properties/tests/intellij.properties.tests.iml b/plugins/properties/tests/intellij.properties.tests.iml index 25c761781ec0..9cfd3bb5f0a3 100644 --- a/plugins/properties/tests/intellij.properties.tests.iml +++ b/plugins/properties/tests/intellij.properties.tests.iml @@ -19,11 +19,13 @@ + + @@ -33,6 +35,7 @@ + diff --git a/plugins/rareJavaRefactorings/BUILD.bazel b/plugins/rareJavaRefactorings/BUILD.bazel index f3ccda2eb988..65a3963bba49 100644 --- a/plugins/rareJavaRefactorings/BUILD.bazel +++ b/plugins/rareJavaRefactorings/BUILD.bazel @@ -19,10 +19,14 @@ jvm_library( "//platform/code-style-api:codeStyle", "//platform/core-api:core", "//platform/core-ui", + "//platform/core-impl", "//platform/code-style-impl:codeStyle-impl", "//java/openapi:java", "//platform/editor-ui-api:editor-ui", + "//java/java-syntax:syntax", + "//java/java-psi-api:psi", "//platform/platform-impl:ide-impl", + "//platform/ide-core", "//platform/indexing-api:indexing", "//platform/projectModel-api:projectModel", "//platform/refactoring", @@ -31,10 +35,13 @@ jvm_library( "//libraries/stream", "//libraries/fastutil", "//platform/forms_rt:java-guiForms-rt", + "//java/java-frontback-psi-api:frontback-psi", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", "//platform/analysis-api:analysis", "//platform/util/concurrency", "//jps/model-api:model", + "//platform/lang-api:lang", + "//platform/util:util-ui", ] ) @@ -50,12 +57,16 @@ jvm_library( "//platform/code-style-api:codeStyle_test_lib", "//platform/core-api:core_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl:core-impl_test_lib", "//java/testFramework", "//java/testFramework:testFramework_test_lib", "//platform/code-style-impl:codeStyle-impl_test_lib", "//java/openapi:java_test_lib", "//platform/editor-ui-api:editor-ui_test_lib", + "//java/java-syntax:syntax_test_lib", + "//java/java-psi-api:psi_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/indexing-api:indexing_test_lib", "//platform/projectModel-api:projectModel_test_lib", "//platform/refactoring:refactoring_test_lib", @@ -66,10 +77,13 @@ jvm_library( "//libraries/stream:stream_test_lib", "//libraries/fastutil:fastutil_test_lib", "//platform/forms_rt:java-guiForms-rt_test_lib", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", "//platform/analysis-api:analysis_test_lib", "//platform/util/concurrency:concurrency_test_lib", "//jps/model-api:model_test_lib", + "//platform/lang-api:lang_test_lib", + "//platform/util:util-ui_test_lib", ] ) ### auto-generated section `build intellij.java.rareRefactorings` end @@ -113,6 +127,10 @@ jvm_library( "//platform/code-style-impl:codeStyle-impl_test_lib", "//java/openapi:java", "//java/openapi:java_test_lib", + "//java/java-syntax:syntax", + "//java/java-syntax:syntax_test_lib", + "//java/java-psi-api:psi", + "//java/java-psi-api:psi_test_lib", "//platform/editor-ui-api:editor-ui", "//platform/editor-ui-api:editor-ui_test_lib", "//platform/platform-impl:ide-impl", diff --git a/plugins/rareJavaRefactorings/intellij.java.rareRefactorings.iml b/plugins/rareJavaRefactorings/intellij.java.rareRefactorings.iml index b829fb94ae09..93a577706cc3 100644 --- a/plugins/rareJavaRefactorings/intellij.java.rareRefactorings.iml +++ b/plugins/rareJavaRefactorings/intellij.java.rareRefactorings.iml @@ -13,11 +13,15 @@ + + + + @@ -27,9 +31,12 @@ + + + \ No newline at end of file diff --git a/plugins/rareJavaRefactorings/intellij.java.rareRefactorings.tests.iml b/plugins/rareJavaRefactorings/intellij.java.rareRefactorings.tests.iml index 0a17dac75e18..fc6b69543ff6 100644 --- a/plugins/rareJavaRefactorings/intellij.java.rareRefactorings.tests.iml +++ b/plugins/rareJavaRefactorings/intellij.java.rareRefactorings.tests.iml @@ -15,6 +15,8 @@ + + diff --git a/plugins/remote-control/BUILD.bazel b/plugins/remote-control/BUILD.bazel index 90bdd42b8ca5..2dd2b5055bc1 100644 --- a/plugins/remote-control/BUILD.bazel +++ b/plugins/remote-control/BUILD.bazel @@ -21,6 +21,7 @@ jvm_library( "//platform/editor-ui-api:editor-ui", "//platform/platform-util-netty:ide-util-netty", "//platform/platform-impl:ide-impl", + "//platform/ide-core", "//libraries/netty/buffer", "//libraries/netty/codec-http:libraries-netty-codec-http", "//libraries/gson", @@ -43,6 +44,7 @@ jvm_library( "//platform/editor-ui-api:editor-ui_test_lib", "//platform/platform-util-netty:ide-util-netty_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//libraries/netty/buffer:buffer_test_lib", "//libraries/netty/codec-http:libraries-netty-codec-http_test_lib", "//libraries/gson:gson_test_lib", diff --git a/plugins/remote-control/intellij.remoteControl.iml b/plugins/remote-control/intellij.remoteControl.iml index 7eb149089899..7cf3a683b128 100644 --- a/plugins/remote-control/intellij.remoteControl.iml +++ b/plugins/remote-control/intellij.remoteControl.iml @@ -15,6 +15,7 @@ + diff --git a/plugins/repository-search/completion/BUILD.bazel b/plugins/repository-search/completion/BUILD.bazel index 3c0d5f703e3d..998069d5e193 100644 --- a/plugins/repository-search/completion/BUILD.bazel +++ b/plugins/repository-search/completion/BUILD.bazel @@ -17,6 +17,7 @@ jvm_library( "@lib//:kotlin-stdlib", "//libraries/kotlinx/coroutines/core", "//platform/util", + "//platform/util/base/multiplatform", "//platform/extensions", "//platform/eel", ] @@ -31,6 +32,7 @@ jvm_library( ":completion", "//libraries/kotlinx/coroutines/core:core_test_lib", "//platform/util:util_test_lib", + "//platform/util/base/multiplatform:multiplatform_test_lib", "//platform/extensions:extensions_test_lib", "//platform/eel:eel_test_lib", ] diff --git a/plugins/repository-search/completion/intellij.repository.search.completion.iml b/plugins/repository-search/completion/intellij.repository.search.completion.iml index f0864cebcdf4..13742f5143bd 100644 --- a/plugins/repository-search/completion/intellij.repository.search.completion.iml +++ b/plugins/repository-search/completion/intellij.repository.search.completion.iml @@ -11,6 +11,7 @@ + diff --git a/plugins/restructuredtext/BUILD.bazel b/plugins/restructuredtext/BUILD.bazel index 3029a4a8a55e..2580b579c183 100644 --- a/plugins/restructuredtext/BUILD.bazel +++ b/plugins/restructuredtext/BUILD.bazel @@ -43,6 +43,7 @@ jvm_library( "//platform/structure-view-impl:structureView-impl", "//platform/editor-ui-ex:editor-ex", "//platform/platform-impl:ide-impl", + "//platform/ide-core", "//platform/indexing-impl", "//libraries/jsoup", "//platform/util/jdom", @@ -80,6 +81,7 @@ jvm_library( "//platform/testFramework:testFramework_test_lib", "//platform/editor-ui-ex:editor-ex_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/indexing-impl:indexing-impl_test_lib", "//platform/core-ui", "//platform/core-ui:core-ui_test_lib", diff --git a/plugins/restructuredtext/intellij.restructuredtext.iml b/plugins/restructuredtext/intellij.restructuredtext.iml index 377776942182..107b6cba6943 100644 --- a/plugins/restructuredtext/intellij.restructuredtext.iml +++ b/plugins/restructuredtext/intellij.restructuredtext.iml @@ -21,6 +21,7 @@ + diff --git a/plugins/search-everywhere-lucene/backend/BUILD.bazel b/plugins/search-everywhere-lucene/backend/BUILD.bazel index f67c6190525a..2ce171c3b459 100644 --- a/plugins/search-everywhere-lucene/backend/BUILD.bazel +++ b/plugins/search-everywhere-lucene/backend/BUILD.bazel @@ -24,6 +24,7 @@ jvm_library( "//platform/backend", "//platform/editor-ui-api:editor-ui", "//platform/platform-api:ide", + "//platform/ide-core", "//platform/projectModel-api:projectModel", "//platform/analysis-api:analysis", "//platform/searchEverywhere/shared:searchEverywhere", @@ -50,6 +51,7 @@ jvm_library( "//platform/backend:backend_test_lib", "//platform/editor-ui-api:editor-ui_test_lib", "//platform/platform-api:ide_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/projectModel-api:projectModel_test_lib", "//platform/analysis-api:analysis_test_lib", "//platform/searchEverywhere/shared:searchEverywhere_test_lib", diff --git a/plugins/search-everywhere-lucene/backend/intellij.searchEverywhereLucene.backend.iml b/plugins/search-everywhere-lucene/backend/intellij.searchEverywhereLucene.backend.iml index 5bb247e54569..f761ea5ca141 100644 --- a/plugins/search-everywhere-lucene/backend/intellij.searchEverywhereLucene.backend.iml +++ b/plugins/search-everywhere-lucene/backend/intellij.searchEverywhereLucene.backend.iml @@ -18,6 +18,7 @@ + diff --git a/plugins/search-everywhere-ml/ranking/core/BUILD.bazel b/plugins/search-everywhere-ml/ranking/core/BUILD.bazel index 0a8eb2371bbe..ab8e1e8027a6 100644 --- a/plugins/search-everywhere-ml/ranking/core/BUILD.bazel +++ b/plugins/search-everywhere-ml/ranking/core/BUILD.bazel @@ -35,6 +35,7 @@ jvm_library( "//platform/statistics", "//platform/ml-impl", "//platform/platform-impl/internal", + "//platform/ide-core", "//platform/core-ui", "//platform/execution-impl", "//json/backend", @@ -50,8 +51,8 @@ jvm_library( "//plugins/search-everywhere-ml", "//platform/execution", "//platform/searchEverywhere/frontend", - ], - exports = ["//platform/statistics"] + "//platform/util:util-ui", + ] ) jvm_library( @@ -59,10 +60,6 @@ jvm_library( module_name = "intellij.searchEverywhereMl.ranking.core", visibility = ["//visibility:public"], srcs = glob([], allow_empty = True), - exports = [ - "//platform/statistics", - "//platform/statistics:statistics_test_lib", - ], runtime_deps = [ ":core", "//libraries/jackson/jackson:jackson_test_lib", @@ -87,6 +84,7 @@ jvm_library( "//platform/statistics:statistics_test_lib", "//platform/ml-impl:ml-impl_test_lib", "//platform/platform-impl/internal:internal_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/core-ui:core-ui_test_lib", "//platform/execution-impl:execution-impl_test_lib", "//json/backend:backend_test_lib", @@ -102,6 +100,7 @@ jvm_library( "//platform/statistics/testFramework:testFramework_test_lib", "//platform/execution:execution_test_lib", "//platform/searchEverywhere/frontend:frontend_test_lib", + "//platform/util:util-ui_test_lib", ] ) ### auto-generated section `build intellij.searchEverywhereMl.ranking.core` end @@ -117,8 +116,7 @@ jvm_library( name = "searchEverywhereMl-ranking-core-tests", module_name = "intellij.searchEverywhereMl.ranking.core.tests", visibility = ["//visibility:public"], - srcs = glob([], allow_empty = True), - exports = ["//platform/statistics"] + srcs = glob([], allow_empty = True) ) jvm_library( @@ -201,10 +199,8 @@ jvm_library( "//platform/execution:execution_test_lib", "//platform/searchEverywhere/frontend", "//platform/searchEverywhere/frontend:frontend_test_lib", - ], - exports = [ - "//platform/statistics", - "//platform/statistics:statistics_test_lib", + "//platform/util:util-ui", + "//platform/util:util-ui_test_lib", ], runtime_deps = [ ":searchEverywhereMl-ranking-core-tests", diff --git a/plugins/search-everywhere-ml/ranking/core/intellij.searchEverywhereMl.ranking.core.iml b/plugins/search-everywhere-ml/ranking/core/intellij.searchEverywhereMl.ranking.core.iml index 8584e98efed5..de8b76342f16 100644 --- a/plugins/search-everywhere-ml/ranking/core/intellij.searchEverywhereMl.ranking.core.iml +++ b/plugins/search-everywhere-ml/ranking/core/intellij.searchEverywhereMl.ranking.core.iml @@ -27,9 +27,10 @@ - + + @@ -185,5 +186,6 @@ + \ No newline at end of file diff --git a/plugins/search-everywhere-ml/ranking/core/intellij.searchEverywhereMl.ranking.core.tests.iml b/plugins/search-everywhere-ml/ranking/core/intellij.searchEverywhereMl.ranking.core.tests.iml index 0d1a9bf28a63..646cefd08cb0 100644 --- a/plugins/search-everywhere-ml/ranking/core/intellij.searchEverywhereMl.ranking.core.tests.iml +++ b/plugins/search-everywhere-ml/ranking/core/intellij.searchEverywhereMl.ranking.core.tests.iml @@ -26,7 +26,7 @@ - + @@ -184,6 +184,7 @@ + diff --git a/plugins/search-everywhere-ml/ranking/java/BUILD.bazel b/plugins/search-everywhere-ml/ranking/java/BUILD.bazel index fd799a23dc62..72eae5882b7b 100644 --- a/plugins/search-everywhere-ml/ranking/java/BUILD.bazel +++ b/plugins/search-everywhere-ml/ranking/java/BUILD.bazel @@ -19,6 +19,7 @@ jvm_library( "//platform/lang-api:lang", "//plugins/search-everywhere-ml/ranking/core", "//platform/lang-impl", + "//platform/statistics", "//java/java-psi-api:psi", ] ) @@ -34,6 +35,7 @@ jvm_library( "//platform/lang-api:lang_test_lib", "//plugins/search-everywhere-ml/ranking/core:core_test_lib", "//platform/lang-impl:lang-impl_test_lib", + "//platform/statistics:statistics_test_lib", "//java/java-psi-api:psi_test_lib", ] ) diff --git a/plugins/search-everywhere-ml/ranking/java/intellij.searchEverywhereMl.ranking.java.iml b/plugins/search-everywhere-ml/ranking/java/intellij.searchEverywhereMl.ranking.java.iml index f25d8f912893..974e7a95917f 100644 --- a/plugins/search-everywhere-ml/ranking/java/intellij.searchEverywhereMl.ranking.java.iml +++ b/plugins/search-everywhere-ml/ranking/java/intellij.searchEverywhereMl.ranking.java.iml @@ -13,6 +13,7 @@ + \ No newline at end of file diff --git a/plugins/search-everywhere-ml/ranking/vcs/BUILD.bazel b/plugins/search-everywhere-ml/ranking/vcs/BUILD.bazel index 89ac69a8b603..23d70035d642 100644 --- a/plugins/search-everywhere-ml/ranking/vcs/BUILD.bazel +++ b/plugins/search-everywhere-ml/ranking/vcs/BUILD.bazel @@ -23,6 +23,7 @@ jvm_library( "//plugins/search-everywhere-ml/ranking/core", "//plugins/search-everywhere-ml/ranking/ext", "//platform/vcs-log/impl", + "//platform/statistics", ] ) @@ -41,6 +42,7 @@ jvm_library( "//plugins/search-everywhere-ml/ranking/core:core_test_lib", "//plugins/search-everywhere-ml/ranking/ext:ext_test_lib", "//platform/vcs-log/impl:impl_test_lib", + "//platform/statistics:statistics_test_lib", ] ) ### auto-generated section `build intellij.searchEverywhereMl.ranking.vcs` end diff --git a/plugins/search-everywhere-ml/ranking/vcs/intellij.searchEverywhereMl.ranking.vcs.iml b/plugins/search-everywhere-ml/ranking/vcs/intellij.searchEverywhereMl.ranking.vcs.iml index 952dd063ab77..dba551814401 100644 --- a/plugins/search-everywhere-ml/ranking/vcs/intellij.searchEverywhereMl.ranking.vcs.iml +++ b/plugins/search-everywhere-ml/ranking/vcs/intellij.searchEverywhereMl.ranking.vcs.iml @@ -17,5 +17,6 @@ + \ No newline at end of file diff --git a/plugins/search-everywhere-ml/ranking/yaml/BUILD.bazel b/plugins/search-everywhere-ml/ranking/yaml/BUILD.bazel index 0906b4d04fa8..57f6cf870e59 100644 --- a/plugins/search-everywhere-ml/ranking/yaml/BUILD.bazel +++ b/plugins/search-everywhere-ml/ranking/yaml/BUILD.bazel @@ -22,6 +22,7 @@ jvm_library( "//platform/core-api:core", "//platform/platform-impl:ide-impl", "//platform/lang-impl", + "//platform/statistics", "//plugins/search-everywhere-ml/ranking/core", ] ) @@ -40,6 +41,7 @@ jvm_library( "//platform/core-api:core_test_lib", "//platform/platform-impl:ide-impl_test_lib", "//platform/lang-impl:lang-impl_test_lib", + "//platform/statistics:statistics_test_lib", "//plugins/search-everywhere-ml/ranking/core:core_test_lib", ] ) diff --git a/plugins/search-everywhere-ml/ranking/yaml/intellij.searchEverywhereMl.ranking.yaml.iml b/plugins/search-everywhere-ml/ranking/yaml/intellij.searchEverywhereMl.ranking.yaml.iml index b0acdc091baa..ca8c4ce305cc 100644 --- a/plugins/search-everywhere-ml/ranking/yaml/intellij.searchEverywhereMl.ranking.yaml.iml +++ b/plugins/search-everywhere-ml/ranking/yaml/intellij.searchEverywhereMl.ranking.yaml.iml @@ -16,6 +16,7 @@ + \ No newline at end of file diff --git a/plugins/search-everywhere-ml/typos/BUILD.bazel b/plugins/search-everywhere-ml/typos/BUILD.bazel index c5bb06a2c154..e57e2b56809d 100644 --- a/plugins/search-everywhere-ml/typos/BUILD.bazel +++ b/plugins/search-everywhere-ml/typos/BUILD.bazel @@ -25,6 +25,8 @@ jvm_library( "//plugins/grazie/src:core", "//platform/projectModel-api:projectModel", "//platform/platform-impl:ide-impl", + "//platform/ide-core", + "//platform/progress/shared:ide-progress", "//libraries/ai.grazie.spell.gec.engine.local", "//platform/statistics", "//plugins/search-everywhere-ml", @@ -55,6 +57,8 @@ jvm_library( "//platform/testFramework", "//platform/testFramework:testFramework_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", + "//platform/progress/shared:ide-progress_test_lib", "//libraries/ai.grazie.spell.gec.engine.local:ai.grazie.spell.gec.engine.local_test_lib", "//platform/statistics:statistics_test_lib", "//plugins/search-everywhere-ml:search-everywhere-ml_test_lib", @@ -111,6 +115,7 @@ jvm_library( "//platform/testFramework", "//platform/testFramework:testFramework_test_lib", "//platform/platform-impl:ide-impl", + "//platform/ide-core", "//libraries/ai.grazie.spell.gec.engine.local", "//libraries/ai.grazie.spell.gec.engine.local:ai.grazie.spell.gec.engine.local_test_lib", "//platform/statistics", @@ -121,11 +126,14 @@ jvm_library( "//libraries/fastutil:fastutil_test_lib", "//platform/ml-impl", "//platform/ml-impl:ml-impl_test_lib", + "//platform/util:util-ui", + "//platform/util:util-ui_test_lib", "@lib//:search_everywhere_ml-typos-tests-ai-grazie-spell-gec-engine-local-jvm", ], runtime_deps = [ ":searchEverywhereMl-typos-tests", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", ] ) ### auto-generated section `build intellij.searchEverywhereMl.typos.tests` end diff --git a/plugins/search-everywhere-ml/typos/intellij.searchEverywhereMl.typos.iml b/plugins/search-everywhere-ml/typos/intellij.searchEverywhereMl.typos.iml index b82768dbdcd4..6ca7401c2498 100644 --- a/plugins/search-everywhere-ml/typos/intellij.searchEverywhereMl.typos.iml +++ b/plugins/search-everywhere-ml/typos/intellij.searchEverywhereMl.typos.iml @@ -21,6 +21,8 @@ + + diff --git a/plugins/search-everywhere-ml/typos/intellij.searchEverywhereMl.typos.tests.iml b/plugins/search-everywhere-ml/typos/intellij.searchEverywhereMl.typos.tests.iml index 8321d169491c..50ef66a755ea 100644 --- a/plugins/search-everywhere-ml/typos/intellij.searchEverywhereMl.typos.tests.iml +++ b/plugins/search-everywhere-ml/typos/intellij.searchEverywhereMl.typos.tests.iml @@ -20,11 +20,13 @@ + + diff --git a/plugins/settings-repository/BUILD.bazel b/plugins/settings-repository/BUILD.bazel index 1a318ced2985..3e646305afa8 100644 --- a/plugins/settings-repository/BUILD.bazel +++ b/plugins/settings-repository/BUILD.bazel @@ -41,9 +41,13 @@ jvm_library( "//platform/core-ui", "//libraries/caffeine", "//platform/platform-util-io:ide-util-io", + "//platform/ide-core", + "//platform/progress/shared:ide-progress", "//platform/util/coroutines", "//platform/credential-store-impl:credentialStore-impl", "@lib//:apache-sshd-osgi", + "//platform/util:util-ui", + "//platform/util-ex", ], exports = [ "@lib//:jetbrains-intellij-deps-eclipse-jgit", @@ -85,8 +89,12 @@ jvm_library( "//platform/core-ui:core-ui_test_lib", "//libraries/caffeine:caffeine_test_lib", "//platform/platform-util-io:ide-util-io_test_lib", + "//platform/ide-core:ide-core_test_lib", + "//platform/progress/shared:ide-progress_test_lib", "//platform/util/coroutines:coroutines_test_lib", "//platform/credential-store-impl:credentialStore-impl_test_lib", + "//platform/util:util-ui_test_lib", + "//platform/util-ex:util-ex_test_lib", ] ) ### auto-generated section `build intellij.settingsRepository` end @@ -131,6 +139,8 @@ jvm_library( "//platform/platform-api:ide", "//platform/platform-api:ide_test_lib", "//platform/platform-impl:ide-impl", + "//platform/ide-core", + "//platform/progress/shared:ide-progress", "//platform/projectModel-api:projectModel", "//platform/projectModel-api:projectModel_test_lib", "//platform/vcs-impl", @@ -165,12 +175,16 @@ jvm_library( "//libraries/fastutil:fastutil_test_lib", "//platform/util/jdom", "//platform/util/jdom:jdom_test_lib", + "//platform/util-ex", + "//platform/util-ex:util-ex_test_lib", "//platform/workspace/jps", "//platform/workspace/jps:jps_test_lib", ], runtime_deps = [ ":settingsRepository-tests", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", + "//platform/progress/shared:ide-progress_test_lib", ] ) ### auto-generated section `build intellij.settingsRepository.tests` end diff --git a/plugins/settings-repository/intellij.settingsRepository.iml b/plugins/settings-repository/intellij.settingsRepository.iml index 4bc26a596edb..11a9cd3e848b 100644 --- a/plugins/settings-repository/intellij.settingsRepository.iml +++ b/plugins/settings-repository/intellij.settingsRepository.iml @@ -73,8 +73,12 @@ + + + + \ No newline at end of file diff --git a/plugins/settings-repository/intellij.settingsRepository.tests.iml b/plugins/settings-repository/intellij.settingsRepository.tests.iml index 237e0746cf2e..5433840bf2df 100644 --- a/plugins/settings-repository/intellij.settingsRepository.tests.iml +++ b/plugins/settings-repository/intellij.settingsRepository.tests.iml @@ -11,6 +11,8 @@ + + @@ -30,6 +32,7 @@ + \ No newline at end of file diff --git a/plugins/settings-sync/jba/BUILD.bazel b/plugins/settings-sync/jba/BUILD.bazel index c383c51b97d1..d5fec40f18f2 100644 --- a/plugins/settings-sync/jba/BUILD.bazel +++ b/plugins/settings-sync/jba/BUILD.bazel @@ -23,11 +23,13 @@ jvm_library( "//platform/core-ui", "//platform/ide-core", "//platform/platform-impl:ide-impl", + "//platform/progress/shared:ide-progress", "//platform/lang-impl", "//platform/util/jdom", "@lib//:cloud-config-client", "//platform/statistics", "//platform/util/progress", + "//platform/util:util-ui", ] ) @@ -46,6 +48,7 @@ jvm_library( "//platform/core-ui:core-ui_test_lib", "//platform/ide-core:ide-core_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/progress/shared:ide-progress_test_lib", "//platform/lang-impl:lang-impl_test_lib", "//platform/util/jdom:jdom_test_lib", "//platform/statistics:statistics_test_lib", @@ -54,6 +57,7 @@ jvm_library( "//libraries/mockito", "//libraries/mockito:mockito_test_lib", "//platform/util/progress:progress_test_lib", + "//platform/util:util-ui_test_lib", "//libraries/kotlinx/coroutines/test", "//libraries/kotlinx/coroutines/test:test_test_lib", ] diff --git a/plugins/settings-sync/jba/intellij.settingsSync.iml b/plugins/settings-sync/jba/intellij.settingsSync.iml index b18750a9b2c4..3036d1c07a65 100644 --- a/plugins/settings-sync/jba/intellij.settingsSync.iml +++ b/plugins/settings-sync/jba/intellij.settingsSync.iml @@ -17,6 +17,7 @@ + @@ -24,6 +25,7 @@ + \ No newline at end of file diff --git a/plugins/sh/backend/BUILD.bazel b/plugins/sh/backend/BUILD.bazel index b1c0c73c9785..b8407d2c3781 100644 --- a/plugins/sh/backend/BUILD.bazel +++ b/plugins/sh/backend/BUILD.bazel @@ -26,6 +26,7 @@ jvm_library( "//platform/usageView", "//platform/execution-impl", "//platform/platform-util-io:ide-util-io", + "//platform/ide-core", "//platform/eel", "//platform/eel-provider", "//platform/editor-ui-api:editor-ui", @@ -44,6 +45,8 @@ jvm_library( "//platform/forms_rt:java-guiForms-rt", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", "//platform/util/concurrency", + "//platform/util:util-ui", + "//platform/util-ex", ], runtime_deps = ["//platform/backend"] ) @@ -67,6 +70,7 @@ jvm_library( "//platform/usageView:usageView_test_lib", "//platform/execution-impl:execution-impl_test_lib", "//platform/platform-util-io:ide-util-io_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/eel:eel_test_lib", "//platform/eel-provider:eel-provider_test_lib", "//platform/editor-ui-api:editor-ui_test_lib", @@ -85,6 +89,8 @@ jvm_library( "//platform/forms_rt:java-guiForms-rt_test_lib", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", "//platform/util/concurrency:concurrency_test_lib", + "//platform/util:util-ui_test_lib", + "//platform/util-ex:util-ex_test_lib", ] ) ### auto-generated section `build intellij.sh.backend` end diff --git a/plugins/sh/backend/intellij.sh.backend.iml b/plugins/sh/backend/intellij.sh.backend.iml index 2bbe4ea48e0f..581848df4868 100644 --- a/plugins/sh/backend/intellij.sh.backend.iml +++ b/plugins/sh/backend/intellij.sh.backend.iml @@ -21,6 +21,7 @@ + @@ -39,5 +40,7 @@ + + \ No newline at end of file diff --git a/plugins/sh/core/BUILD.bazel b/plugins/sh/core/BUILD.bazel index 3d20c1a6c0e2..230df9cb3c91 100644 --- a/plugins/sh/core/BUILD.bazel +++ b/plugins/sh/core/BUILD.bazel @@ -26,9 +26,11 @@ jvm_library( "//platform/statistics", "//platform/core-ui", "//platform/forms_rt:java-guiForms-rt", + "//platform/util:util-ui", "//libraries/fastutil", "//platform/code-style-impl:codeStyle-impl", "//platform/platform-util-io:ide-util-io", + "//platform/ide-core", "//platform/util/jdom", "//platform/eel", "//platform/eel-provider", @@ -60,9 +62,11 @@ jvm_library( "//platform/statistics:statistics_test_lib", "//platform/core-ui:core-ui_test_lib", "//platform/forms_rt:java-guiForms-rt_test_lib", + "//platform/util:util-ui_test_lib", "//libraries/fastutil:fastutil_test_lib", "//platform/code-style-impl:codeStyle-impl_test_lib", "//platform/platform-util-io:ide-util-io_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/util/jdom:jdom_test_lib", "//platform/eel:eel_test_lib", "//platform/eel-provider:eel-provider_test_lib", @@ -155,8 +159,12 @@ jvm_library( "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", "//platform/code-style-api:codeStyle", "//platform/code-style-api:codeStyle_test_lib", + "//platform/ide-core", ], - runtime_deps = [":tests"] + runtime_deps = [ + ":tests", + "//platform/ide-core:ide-core_test_lib", + ] ) ### auto-generated section `build intellij.sh.tests` end diff --git a/plugins/sh/core/intellij.sh.core.iml b/plugins/sh/core/intellij.sh.core.iml index 6194965452ed..c7ecac62dab5 100644 --- a/plugins/sh/core/intellij.sh.core.iml +++ b/plugins/sh/core/intellij.sh.core.iml @@ -21,9 +21,11 @@ + + diff --git a/plugins/sh/core/intellij.sh.tests.iml b/plugins/sh/core/intellij.sh.tests.iml index 0688326fc328..21419a7eda69 100644 --- a/plugins/sh/core/intellij.sh.tests.iml +++ b/plugins/sh/core/intellij.sh.tests.iml @@ -32,5 +32,6 @@ + \ No newline at end of file diff --git a/plugins/sh/markdown/BUILD.bazel b/plugins/sh/markdown/BUILD.bazel index c9b204330f89..9020fd415509 100644 --- a/plugins/sh/markdown/BUILD.bazel +++ b/plugins/sh/markdown/BUILD.bazel @@ -20,6 +20,7 @@ jvm_library( "//plugins/sh/core", "//platform/execution-impl", "//platform/platform-util-io:ide-util-io", + "//platform/ide-core", "//platform/lang-impl", "//platform/execution", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", @@ -40,6 +41,7 @@ jvm_library( "//plugins/sh/core:core_test_lib", "//platform/execution-impl:execution-impl_test_lib", "//platform/platform-util-io:ide-util-io_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/lang-impl:lang-impl_test_lib", "//platform/backend:backend_test_lib", "//platform/execution:execution_test_lib", diff --git a/plugins/sh/markdown/intellij.sh.markdown.iml b/plugins/sh/markdown/intellij.sh.markdown.iml index 489e8c6be4e9..201e537d9b22 100644 --- a/plugins/sh/markdown/intellij.sh.markdown.iml +++ b/plugins/sh/markdown/intellij.sh.markdown.iml @@ -14,6 +14,7 @@ + diff --git a/plugins/sh/terminal/BUILD.bazel b/plugins/sh/terminal/BUILD.bazel index 1a423be511e4..94714467c06a 100644 --- a/plugins/sh/terminal/BUILD.bazel +++ b/plugins/sh/terminal/BUILD.bazel @@ -18,6 +18,7 @@ jvm_library( "//platform/projectModel-api:projectModel", "//plugins/terminal", "//platform/platform-api:ide", + "//platform/ide-core", "//platform/execution-impl", "//platform/core-ui", "//libraries/jediterm-ui", @@ -39,6 +40,7 @@ jvm_library( "//platform/projectModel-api:projectModel_test_lib", "//plugins/terminal:terminal_test_lib", "//platform/platform-api:ide_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/execution-impl:execution-impl_test_lib", "//platform/core-ui:core-ui_test_lib", "//libraries/jediterm-ui:jediterm-ui_test_lib", diff --git a/plugins/sh/terminal/intellij.sh.terminal.iml b/plugins/sh/terminal/intellij.sh.terminal.iml index 4eac4cc17c2d..bef4210715dc 100644 --- a/plugins/sh/terminal/intellij.sh.terminal.iml +++ b/plugins/sh/terminal/intellij.sh.terminal.iml @@ -13,6 +13,7 @@ + diff --git a/plugins/stats-collector/BUILD.bazel b/plugins/stats-collector/BUILD.bazel index 4e23684bb06d..4171d31ffeb9 100644 --- a/plugins/stats-collector/BUILD.bazel +++ b/plugins/stats-collector/BUILD.bazel @@ -24,6 +24,7 @@ jvm_library( "//plugins/completion-ml-ranking", "//libraries/http-client", "//platform/platform-impl:ide-impl", + "//platform/ide-core", "//libraries/guava", "//libraries/gson", "@lib//:stats_collector-completion-log-events", @@ -49,6 +50,7 @@ jvm_library( "//plugins/completion-ml-ranking:completion-ml-ranking_test_lib", "//libraries/http-client:http-client_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//libraries/guava:guava_test_lib", "//libraries/gson:gson_test_lib", "//platform/projectModel-api:projectModel_test_lib", @@ -81,6 +83,10 @@ jvm_library( deps = [ "//java/testFramework", "//java/testFramework:testFramework_test_lib", + "//java/java-psi-api:psi", + "//java/java-psi-api:psi_test_lib", + "//java/java-frontback-psi-api:frontback-psi", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//libraries/mockito", "//libraries/mockito:mockito_test_lib", "@lib//:assert_j", @@ -88,6 +94,8 @@ jvm_library( "//platform/analysis-api:analysis_test_lib", "//platform/core-api:core", "//platform/core-api:core_test_lib", + "//platform/lang-api:lang", + "//platform/lang-api:lang_test_lib", "//platform/editor-ui-api:editor-ui", "//platform/editor-ui-api:editor-ui_test_lib", "//plugins/stats-collector", @@ -99,8 +107,14 @@ jvm_library( "//platform/testFramework:testFramework_test_lib", "//platform/core-ui", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", + "//platform/ide-core", ], - runtime_deps = [":statsCollector-tests"] + runtime_deps = [ + ":statsCollector-tests", + "//platform/ide-core:ide-core_test_lib", + ] ) ### auto-generated section `build intellij.statsCollector.tests` end diff --git a/plugins/stats-collector/intellij.statsCollector.iml b/plugins/stats-collector/intellij.statsCollector.iml index 566a80e80e18..4650262d993e 100644 --- a/plugins/stats-collector/intellij.statsCollector.iml +++ b/plugins/stats-collector/intellij.statsCollector.iml @@ -18,6 +18,7 @@ + diff --git a/plugins/stats-collector/intellij.statsCollector.tests.iml b/plugins/stats-collector/intellij.statsCollector.tests.iml index 4c637efc23cf..acd4c7650b06 100644 --- a/plugins/stats-collector/intellij.statsCollector.tests.iml +++ b/plugins/stats-collector/intellij.statsCollector.tests.iml @@ -9,10 +9,13 @@ + + + @@ -36,5 +39,7 @@ + + \ No newline at end of file diff --git a/plugins/stream-debugger-core/BUILD.bazel b/plugins/stream-debugger-core/BUILD.bazel index 39fae2ea3f8d..fa00eacf1fcd 100644 --- a/plugins/stream-debugger-core/BUILD.bazel +++ b/plugins/stream-debugger-core/BUILD.bazel @@ -27,6 +27,8 @@ jvm_library( "//platform/util:util-ui", "//platform/core-ui", "//platform/platform-impl:ide-impl", + "//platform/ide-core", + "//platform/progress/shared:ide-progress", "//plugins/stream-debugger-core/intellij.debugger.streams.shared:debugger-streams-shared", ] ) @@ -50,6 +52,8 @@ jvm_library( "//platform/util:util-ui_test_lib", "//platform/core-ui:core-ui_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", + "//platform/progress/shared:ide-progress_test_lib", "//plugins/stream-debugger-core/intellij.debugger.streams.shared:debugger-streams-shared_test_lib", ] ) diff --git a/plugins/stream-debugger-core/intellij.debugger.streams.core.iml b/plugins/stream-debugger-core/intellij.debugger.streams.core.iml index b038ce50ee38..c7c847a8ceb7 100644 --- a/plugins/stream-debugger-core/intellij.debugger.streams.core.iml +++ b/plugins/stream-debugger-core/intellij.debugger.streams.core.iml @@ -21,6 +21,8 @@ + + \ No newline at end of file diff --git a/plugins/stream-debugger/BUILD.bazel b/plugins/stream-debugger/BUILD.bazel index 91b2c147bed6..1b6c24792c7b 100644 --- a/plugins/stream-debugger/BUILD.bazel +++ b/plugins/stream-debugger/BUILD.bazel @@ -30,6 +30,7 @@ jvm_library( "//platform/xdebugger-impl/ui", "//java/java-backend:backend", "//java/openapi:java", + "//java/java-frontback-psi-api:frontback-psi", "//platform/core-ui", "//platform/platform-util-io:ide-util-io", "//platform/analysis-api:analysis", @@ -73,6 +74,7 @@ jvm_library( "//java/java-backend:backend_test_lib", "//java/debugger/backend:backend_test_lib", "//java/openapi:java_test_lib", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//platform/core-ui:core-ui_test_lib", "//platform/platform-util-io:ide-util-io_test_lib", "//plugins/stream-debugger-core/testFramework", @@ -131,6 +133,8 @@ jvm_library( "//platform/core-api:core_test_lib", "//java/java-psi-api:psi", "//java/java-psi-api:psi_test_lib", + "//java/java-syntax:syntax", + "//java/java-syntax:syntax_test_lib", "//java/java-impl:impl", "//java/java-impl:impl_test_lib", "//libraries/stream", @@ -158,6 +162,8 @@ jvm_library( "//plugins/stream-debugger-core/testFramework:testFramework_test_lib", "//platform/util/coroutines", "//platform/util/coroutines:coroutines_test_lib", + "//platform/util:util-ui", + "//platform/util:util-ui_test_lib", "//platform/analysis-api:analysis", "//platform/analysis-api:analysis_test_lib", "//platform/code-style-api:codeStyle", diff --git a/plugins/stream-debugger/intellij.java.debugger.streams.iml b/plugins/stream-debugger/intellij.java.debugger.streams.iml index 9cd0009b0119..882741c2e319 100644 --- a/plugins/stream-debugger/intellij.java.debugger.streams.iml +++ b/plugins/stream-debugger/intellij.java.debugger.streams.iml @@ -31,6 +31,7 @@ + diff --git a/plugins/stream-debugger/intellij.java.debugger.streams.tests.iml b/plugins/stream-debugger/intellij.java.debugger.streams.tests.iml index 96387a4aeeb0..bb9a7635fae5 100644 --- a/plugins/stream-debugger/intellij.java.debugger.streams.tests.iml +++ b/plugins/stream-debugger/intellij.java.debugger.streams.tests.iml @@ -19,6 +19,7 @@ + @@ -34,6 +35,7 @@ + diff --git a/plugins/svn4idea/BUILD.bazel b/plugins/svn4idea/BUILD.bazel index e936fe716308..0d4b1556e63b 100644 --- a/plugins/svn4idea/BUILD.bazel +++ b/plugins/svn4idea/BUILD.bazel @@ -27,6 +27,7 @@ jvm_library( "//platform/vcs-impl", "//platform/platform-impl:ide-impl", "//platform/ide-core-impl", + "//platform/ide-core", "//platform/analysis-impl", "//libraries/http-client", "//platform/diff-impl", @@ -47,6 +48,7 @@ jvm_library( "//platform/external-process-auth-helper", "//platform/vcs-impl/shared", "//platform/core-impl", + "//platform/util:util-ui", ], runtime_deps = [ "@lib//:jaxb-runtime", @@ -74,6 +76,7 @@ jvm_library( "//platform/vcs-impl:vcs-impl_test_lib", "//platform/platform-impl:ide-impl_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/analysis-impl:analysis-impl_test_lib", "//libraries/http-client:http-client_test_lib", "//platform/diff-impl:diff-impl_test_lib", @@ -93,6 +96,7 @@ jvm_library( "//platform/external-process-auth-helper:external-process-auth-helper_test_lib", "//platform/vcs-impl/shared:shared_test_lib", "//platform/core-impl:core-impl_test_lib", + "//platform/util:util-ui_test_lib", ] ) ### auto-generated section `build intellij.vcs.svn` end @@ -148,6 +152,7 @@ jvm_library( "//platform/testFramework", "//platform/testFramework:testFramework_test_lib", "//platform/ide-core-impl", + "//platform/ide-core", "//platform/lang-api:lang", "//platform/lang-api:lang_test_lib", "//platform/core-impl", @@ -174,6 +179,7 @@ jvm_library( ":vcs-svn-tests", "//platform/platform-impl:ide-impl_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/platform-util-io:ide-util-io_test_lib", ] ) diff --git a/plugins/svn4idea/intellij.vcs.svn.iml b/plugins/svn4idea/intellij.vcs.svn.iml index 9d704ec26a58..54b96d9f292f 100644 --- a/plugins/svn4idea/intellij.vcs.svn.iml +++ b/plugins/svn4idea/intellij.vcs.svn.iml @@ -22,6 +22,7 @@ + @@ -44,5 +45,6 @@ + \ No newline at end of file diff --git a/plugins/svn4idea/intellij.vcs.svn.tests.iml b/plugins/svn4idea/intellij.vcs.svn.tests.iml index 43314e0edfc2..fd3612c284c0 100644 --- a/plugins/svn4idea/intellij.vcs.svn.tests.iml +++ b/plugins/svn4idea/intellij.vcs.svn.tests.iml @@ -18,6 +18,7 @@ + diff --git a/plugins/tasks/tasks-api/BUILD.bazel b/plugins/tasks/tasks-api/BUILD.bazel index 7793e0a784a4..c43e19869330 100644 --- a/plugins/tasks/tasks-api/BUILD.bazel +++ b/plugins/tasks/tasks-api/BUILD.bazel @@ -14,9 +14,11 @@ jvm_library( "//platform/projectModel-api:projectModel", "//platform/vcs-api:vcs", "//platform/platform-impl:ide-impl", + "//platform/ide-core", "//platform/forms_rt:java-guiForms-rt", "//platform/tasks-platform-api:tasks", "//platform/core-ui", + "//platform/util:util-ui", "//platform/util-ex", ], exports = ["//platform/tasks-platform-api:tasks"] @@ -40,9 +42,11 @@ jvm_library( "//platform/projectModel-api:projectModel_test_lib", "//platform/vcs-api:vcs_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/forms_rt:java-guiForms-rt_test_lib", "//platform/tasks-platform-api:tasks_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/util:util-ui_test_lib", "//platform/util-ex:util-ex_test_lib", ] ) diff --git a/plugins/tasks/tasks-api/intellij.tasks.iml b/plugins/tasks/tasks-api/intellij.tasks.iml index aee5818601f3..e06bb7a7b7cd 100644 --- a/plugins/tasks/tasks-api/intellij.tasks.iml +++ b/plugins/tasks/tasks-api/intellij.tasks.iml @@ -14,9 +14,11 @@ + + \ No newline at end of file diff --git a/plugins/tasks/tasks-core/BUILD.bazel b/plugins/tasks/tasks-core/BUILD.bazel index b38f1a65e134..96f68bd2dc03 100644 --- a/plugins/tasks/tasks-core/BUILD.bazel +++ b/plugins/tasks/tasks-core/BUILD.bazel @@ -20,6 +20,8 @@ jvm_library( "//plugins/tasks/tasks-api:tasks", "//platform/platform-api:ide", "//platform/platform-impl:ide-impl", + "//platform/ide-core", + "//platform/progress/shared:ide-progress", "//platform/vcs-api:vcs", "//platform/lang-impl", "//platform/vcs-impl", @@ -44,6 +46,7 @@ jvm_library( "//platform/util/jdom", "//platform/markdown-utils", "//platform/util/text-matching", + "//platform/util:util-ui", "//platform/polySymbols", "//platform/forms_rt:java-guiForms-rt", "//libraries/fastutil", @@ -67,6 +70,8 @@ jvm_library( "//plugins/tasks/tasks-api:tasks_test_lib", "//platform/platform-api:ide_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", + "//platform/progress/shared:ide-progress_test_lib", "//platform/vcs-api:vcs_test_lib", "//platform/lang-impl:lang-impl_test_lib", "//platform/vcs-impl:vcs-impl_test_lib", @@ -89,6 +94,7 @@ jvm_library( "//platform/util/jdom:jdom_test_lib", "//platform/markdown-utils:markdown-utils_test_lib", "//platform/util/text-matching:text-matching_test_lib", + "//platform/util:util-ui_test_lib", "//platform/polySymbols:polySymbols_test_lib", "//platform/forms_rt:java-guiForms-rt_test_lib", "//libraries/fastutil:fastutil_test_lib", diff --git a/plugins/tasks/tasks-core/bugzilla/BUILD.bazel b/plugins/tasks/tasks-core/bugzilla/BUILD.bazel index 948f9ef0fe07..7334c18cee38 100644 --- a/plugins/tasks/tasks-core/bugzilla/BUILD.bazel +++ b/plugins/tasks/tasks-core/bugzilla/BUILD.bazel @@ -18,9 +18,11 @@ jvm_library( "//plugins/tasks/tasks-api:tasks", "//platform/tasks-platform-impl:tasks-impl", "//platform/platform-impl:ide-impl", + "//platform/ide-core", "//libraries/xml-rpc", "//plugins/tasks/tasks-core:core", "//platform/core-ui", + "//platform/util:util-ui", "//plugins/tasks/tasks-compatibility:compatibility", ] ) @@ -36,9 +38,11 @@ jvm_library( "//plugins/tasks/tasks-api:tasks_test_lib", "//platform/tasks-platform-impl:tasks-impl_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//libraries/xml-rpc:xml-rpc_test_lib", "//plugins/tasks/tasks-core:core_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/util:util-ui_test_lib", "//plugins/tasks/tasks-compatibility:compatibility_test_lib", ] ) diff --git a/plugins/tasks/tasks-core/bugzilla/intellij.tasks.bugzilla.iml b/plugins/tasks/tasks-core/bugzilla/intellij.tasks.bugzilla.iml index 0e44e15beefd..555b1f350bf3 100644 --- a/plugins/tasks/tasks-core/bugzilla/intellij.tasks.bugzilla.iml +++ b/plugins/tasks/tasks-core/bugzilla/intellij.tasks.bugzilla.iml @@ -12,9 +12,11 @@ + + \ No newline at end of file diff --git a/plugins/tasks/tasks-core/intellij.tasks.core.iml b/plugins/tasks/tasks-core/intellij.tasks.core.iml index 848374446597..6338c7bc2391 100644 --- a/plugins/tasks/tasks-core/intellij.tasks.core.iml +++ b/plugins/tasks/tasks-core/intellij.tasks.core.iml @@ -15,6 +15,8 @@ + + @@ -67,6 +69,7 @@ + diff --git a/plugins/tasks/tasks-core/jira/BUILD.bazel b/plugins/tasks/tasks-core/jira/BUILD.bazel index f9751d4ae66e..9088178f5ef5 100644 --- a/plugins/tasks/tasks-core/jira/BUILD.bazel +++ b/plugins/tasks/tasks-core/jira/BUILD.bazel @@ -21,6 +21,7 @@ jvm_library( "//plugins/tasks/tasks-compatibility:compatibility", "//platform/lang-api:lang", "//platform/platform-impl:ide-impl", + "//platform/ide-core", "//platform/lang-impl", "//platform/tasks-platform-impl:tasks-impl", "//plugins/tasks/tasks-api:tasks", @@ -28,6 +29,7 @@ jvm_library( "//libraries/gson", "//platform/core-ui", "//platform/util/jdom", + "//platform/util:util-ui", "//platform/core-impl", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", ] @@ -47,6 +49,7 @@ jvm_library( "//plugins/tasks/tasks-compatibility:compatibility_test_lib", "//platform/lang-api:lang_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/lang-impl:lang-impl_test_lib", "//platform/tasks-platform-impl:tasks-impl_test_lib", "//plugins/tasks/tasks-api:tasks_test_lib", @@ -54,6 +57,7 @@ jvm_library( "//libraries/gson:gson_test_lib", "//platform/core-ui:core-ui_test_lib", "//platform/util/jdom:jdom_test_lib", + "//platform/util:util-ui_test_lib", "//platform/core-impl:core-impl_test_lib", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", ] diff --git a/plugins/tasks/tasks-core/jira/intellij.tasks.jira.iml b/plugins/tasks/tasks-core/jira/intellij.tasks.jira.iml index 3b61f0e775b3..3e66a8ef48db 100644 --- a/plugins/tasks/tasks-core/jira/intellij.tasks.jira.iml +++ b/plugins/tasks/tasks-core/jira/intellij.tasks.jira.iml @@ -16,6 +16,7 @@ + @@ -23,6 +24,7 @@ + diff --git a/plugins/tasks/tasks-core/trac/BUILD.bazel b/plugins/tasks/tasks-core/trac/BUILD.bazel index 6be3bf75e515..5c14f449a767 100644 --- a/plugins/tasks/tasks-core/trac/BUILD.bazel +++ b/plugins/tasks/tasks-core/trac/BUILD.bazel @@ -21,6 +21,7 @@ jvm_library( "//platform/core-api:core", "//platform/tasks-platform-impl:tasks-impl", "//platform/platform-impl:ide-impl", + "//platform/util:util-ui", "//libraries/xml-rpc", ] ) @@ -39,6 +40,7 @@ jvm_library( "//platform/core-api:core_test_lib", "//platform/tasks-platform-impl:tasks-impl_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/util:util-ui_test_lib", "//libraries/xml-rpc:xml-rpc_test_lib", ] ) diff --git a/plugins/tasks/tasks-core/trac/intellij.tasks.trac.iml b/plugins/tasks/tasks-core/trac/intellij.tasks.trac.iml index 6ca35e1d0563..46fc099e4e37 100644 --- a/plugins/tasks/tasks-core/trac/intellij.tasks.trac.iml +++ b/plugins/tasks/tasks-core/trac/intellij.tasks.trac.iml @@ -15,6 +15,7 @@ + \ No newline at end of file diff --git a/plugins/tasks/tasks-tests/BUILD.bazel b/plugins/tasks/tasks-tests/BUILD.bazel index 970524d3f151..f503861800da 100644 --- a/plugins/tasks/tasks-tests/BUILD.bazel +++ b/plugins/tasks/tasks-tests/BUILD.bazel @@ -43,6 +43,8 @@ jvm_library( "//platform/editor-ui-api:editor-ui_test_lib", "//platform/projectModel-api:projectModel", "//platform/projectModel-api:projectModel_test_lib", + "//platform/lang-api:lang", + "//platform/lang-api:lang_test_lib", "//plugins/tasks/tasks-api:tasks", "//plugins/tasks/tasks-api:tasks_test_lib", "//plugins/tasks/tasks-core:core", @@ -57,6 +59,7 @@ jvm_library( "//platform/vcs-api:vcs_test_lib", "@lib//:junit4", "//platform/ide-core-impl", + "//platform/ide-core", "//platform/dvcs-impl:vcs-dvcs-impl", "//platform/dvcs-impl:vcs-dvcs-impl_test_lib", "//java/testFramework", @@ -94,8 +97,12 @@ jvm_library( "//libraries/stream:stream_test_lib", "//platform/core-ui", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", "//platform/util/jdom", "//platform/util/jdom:jdom_test_lib", + "//platform/util:util-ui", + "//platform/util:util-ui_test_lib", "//platform/bookmarks", "//platform/bookmarks:bookmarks_test_lib", "//plugins/git4idea/shared", @@ -120,6 +127,7 @@ jvm_library( runtime_deps = [ ":tests", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//spellchecker:spellchecker_test_lib", ] ) diff --git a/plugins/tasks/tasks-tests/intellij.tasks.tests.iml b/plugins/tasks/tasks-tests/intellij.tasks.tests.iml index 5a89045d96c0..b8d657086245 100644 --- a/plugins/tasks/tasks-tests/intellij.tasks.tests.iml +++ b/plugins/tasks/tasks-tests/intellij.tasks.tests.iml @@ -12,6 +12,7 @@ + @@ -20,6 +21,7 @@ + @@ -41,7 +43,9 @@ + + diff --git a/plugins/terminal/BUILD.bazel b/plugins/terminal/BUILD.bazel index 7e3d77a2d03b..89ebd1c17dd7 100644 --- a/plugins/terminal/BUILD.bazel +++ b/plugins/terminal/BUILD.bazel @@ -25,6 +25,7 @@ jvm_library( "//platform/projectModel-impl", "//platform/core-impl", "//platform/ide-core-impl", + "//platform/ide-core", "//libraries/guava", "//libraries/pty4j", "@lib//:jna", @@ -65,8 +66,10 @@ jvm_library( "//platform/util/jdom", "//platform/execution", "//platform/observable", + "//platform/progress/shared:ide-progress", "//platform/remote-topics/shared:rpc-topics", "//libraries/fastutil", + "//platform/util:util-ui", ] ) @@ -88,6 +91,7 @@ jvm_library( "//platform/projectModel-impl:projectModel-impl_test_lib", "//platform/core-impl:core-impl_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//libraries/guava:guava_test_lib", "//libraries/pty4j:pty4j_test_lib", "//platform/projectModel-api:projectModel_test_lib", @@ -125,8 +129,10 @@ jvm_library( "//platform/util/jdom:jdom_test_lib", "//platform/execution:execution_test_lib", "//platform/observable:observable_test_lib", + "//platform/progress/shared:ide-progress_test_lib", "//platform/remote-topics/shared:rpc-topics_test_lib", "//libraries/fastutil:fastutil_test_lib", + "//platform/util:util-ui_test_lib", ] ) ### auto-generated section `build intellij.terminal` end diff --git a/plugins/terminal/backend/BUILD.bazel b/plugins/terminal/backend/BUILD.bazel index e73c6e31490f..72ef0faa8860 100644 --- a/plugins/terminal/backend/BUILD.bazel +++ b/plugins/terminal/backend/BUILD.bazel @@ -18,6 +18,7 @@ jvm_library( "//platform/editor-ui-api:editor-ui", "//platform/platform-impl:ide-impl", "//platform/ide-core-impl", + "//platform/ide-core", "//platform/projectModel-api:projectModel", "//plugins/terminal", "//libraries/jediterm-core", @@ -49,6 +50,7 @@ jvm_library( "//platform/editor-ui-api:editor-ui_test_lib", "//platform/platform-impl:ide-impl_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/projectModel-api:projectModel_test_lib", "//plugins/terminal:terminal_test_lib", "//libraries/jediterm-core:jediterm-core_test_lib", diff --git a/plugins/terminal/backend/intellij.terminal.backend.iml b/plugins/terminal/backend/intellij.terminal.backend.iml index 6eb244286e0e..90e8c6ecaa19 100644 --- a/plugins/terminal/backend/intellij.terminal.backend.iml +++ b/plugins/terminal/backend/intellij.terminal.backend.iml @@ -37,6 +37,7 @@ + diff --git a/plugins/terminal/completion/BUILD.bazel b/plugins/terminal/completion/BUILD.bazel index 2dc9737d8851..a09a45a6ed1e 100644 --- a/plugins/terminal/completion/BUILD.bazel +++ b/plugins/terminal/completion/BUILD.bazel @@ -10,6 +10,7 @@ jvm_library( "@lib//:kotlin-stdlib", "@lib//:terminal-completion-terminal-completion-spec", "//platform/util", + "//platform/util/base", ], exports = ["@lib//:terminal-completion-terminal-completion-spec"] ) @@ -23,6 +24,7 @@ jvm_library( runtime_deps = [ ":completion", "//platform/util:util_test_lib", + "//platform/util/base:base_test_lib", "@lib//:junit4", "//platform/testFramework", "//platform/testFramework:testFramework_test_lib", @@ -58,6 +60,8 @@ jvm_library( "@lib//:terminal-completion-tests-terminal-completion-spec", "//platform/util", "//platform/util:util_test_lib", + "//platform/util/base", + "//platform/util/base:base_test_lib", "@lib//:junit4", "//platform/testFramework", "//platform/testFramework:testFramework_test_lib", diff --git a/plugins/terminal/completion/intellij.terminal.completion.iml b/plugins/terminal/completion/intellij.terminal.completion.iml index 8ea83b10a2e5..71b799c19d5a 100644 --- a/plugins/terminal/completion/intellij.terminal.completion.iml +++ b/plugins/terminal/completion/intellij.terminal.completion.iml @@ -27,6 +27,7 @@ + diff --git a/plugins/terminal/completion/intellij.terminal.completion.tests.iml b/plugins/terminal/completion/intellij.terminal.completion.tests.iml index b5a0435b06fd..a94228a77ce5 100644 --- a/plugins/terminal/completion/intellij.terminal.completion.tests.iml +++ b/plugins/terminal/completion/intellij.terminal.completion.tests.iml @@ -27,6 +27,7 @@ + diff --git a/plugins/terminal/frontend/BUILD.bazel b/plugins/terminal/frontend/BUILD.bazel index 7e6d773f43a5..cb934306c9a4 100644 --- a/plugins/terminal/frontend/BUILD.bazel +++ b/plugins/terminal/frontend/BUILD.bazel @@ -32,6 +32,7 @@ jvm_library( "//libraries/guava", "//platform/kernel/shared:kernel", "//platform/ide-core-impl", + "//platform/ide-core", "//platform/statistics", "//platform/indexing-api:indexing", "//platform/lang-impl", @@ -43,6 +44,7 @@ jvm_library( "//platform/eel-provider", "//libraries/caffeine", "//platform/observable", + "//platform/progress/shared:ide-progress", "//libraries/kotlinx/datetime", "//libraries/kotlinx/serialization/core", "//libraries/kotlinx/serialization/json", @@ -51,6 +53,7 @@ jvm_library( "//platform/util/jdom", "//platform/lang-api:lang", "//platform/remote-topics/shared:rpc-topics", + "//platform/util:util-ui", ] ) @@ -79,6 +82,7 @@ jvm_library( "//libraries/guava:guava_test_lib", "//platform/kernel/shared:kernel_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/statistics:statistics_test_lib", "//platform/indexing-api:indexing_test_lib", "//platform/lang-impl:lang-impl_test_lib", @@ -90,6 +94,7 @@ jvm_library( "//platform/eel-provider:eel-provider_test_lib", "//libraries/caffeine:caffeine_test_lib", "//platform/observable:observable_test_lib", + "//platform/progress/shared:ide-progress_test_lib", "//libraries/kotlinx/datetime:datetime_test_lib", "//libraries/kotlinx/serialization/core:core_test_lib", "//libraries/kotlinx/serialization/json:json_test_lib", @@ -98,6 +103,7 @@ jvm_library( "//platform/util/jdom:jdom_test_lib", "//platform/lang-api:lang_test_lib", "//platform/remote-topics/shared:rpc-topics_test_lib", + "//platform/util:util-ui_test_lib", ] ) ### auto-generated section `build intellij.terminal.frontend` end diff --git a/plugins/terminal/frontend/intellij.terminal.frontend.iml b/plugins/terminal/frontend/intellij.terminal.frontend.iml index 918bd5f12851..aeb413c647f7 100644 --- a/plugins/terminal/frontend/intellij.terminal.frontend.iml +++ b/plugins/terminal/frontend/intellij.terminal.frontend.iml @@ -51,6 +51,7 @@ + @@ -62,6 +63,7 @@ + @@ -70,5 +72,6 @@ + \ No newline at end of file diff --git a/plugins/terminal/intellij.terminal.iml b/plugins/terminal/intellij.terminal.iml index 56d6720f8737..acf65e015544 100644 --- a/plugins/terminal/intellij.terminal.iml +++ b/plugins/terminal/intellij.terminal.iml @@ -44,6 +44,7 @@ + @@ -116,7 +117,9 @@ + + \ No newline at end of file diff --git a/plugins/terminal/tests/BUILD.bazel b/plugins/terminal/tests/BUILD.bazel index f3df2a9df1b9..5812ac463b6d 100644 --- a/plugins/terminal/tests/BUILD.bazel +++ b/plugins/terminal/tests/BUILD.bazel @@ -92,6 +92,8 @@ jvm_library( "//platform/projectModel-api:projectModel_test_lib", "//platform/util/coroutines", "//platform/util/coroutines:coroutines_test_lib", + "//platform/util:util-ui", + "//platform/util:util-ui_test_lib", "//platform/platform-impl/internal", "//plugins/sh/plugin", "//plugins/sh/plugin:plugin_test_lib", diff --git a/plugins/terminal/tests/intellij.terminal.tests.iml b/plugins/terminal/tests/intellij.terminal.tests.iml index f29c351d9ac9..2a9f7886eee0 100644 --- a/plugins/terminal/tests/intellij.terminal.tests.iml +++ b/plugins/terminal/tests/intellij.terminal.tests.iml @@ -50,6 +50,7 @@ + diff --git a/plugins/testng/BUILD.bazel b/plugins/testng/BUILD.bazel index 4f70e4661f42..ed58c9f34e5f 100644 --- a/plugins/testng/BUILD.bazel +++ b/plugins/testng/BUILD.bazel @@ -24,10 +24,13 @@ jvm_library( ], deps = [ "//java/openapi:java", + "//java/java-syntax:syntax", "//java/execution/impl", + "//java/java-psi-api:psi", "//platform/analysis-api:analysis", "//platform/util/concurrency", "//platform/core-api:core", + "//platform/lang-api:lang", "//platform/editor-ui-api:editor-ui", "//platform/execution-impl", "//platform/platform-impl:ide-impl", @@ -37,6 +40,7 @@ jvm_library( "//platform/projectModel-api:projectModel", "//java/debugger/openapi:java-debugger", "//platform/ide-core-impl", + "//platform/ide-core", "//platform/testRunner", "//java/java-runtime:rt", "//plugins/testng_rt:testng-rt", @@ -49,15 +53,20 @@ jvm_library( "//java/typeMigration", "//platform/external-system-api:externalSystem", "//platform/core-ui", + "//platform/core-impl", "//platform/forms_rt:java-guiForms-rt", "//platform/platform-util-io:ide-util-io", "//java/java-impl-refactorings:impl-refactorings", + "//java/java-frontback-psi-api:frontback-psi", "//platform/util/jdom", + "//platform/util:util-ui", "//xml/xml-psi-api:psi", "//libraries/jgoodies/forms", "//platform/execution", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", "//jps/model-api:model", + "//jps/model-serialization", + "//platform/statistics", ] ) @@ -69,10 +78,13 @@ jvm_library( runtime_deps = [ ":testng", "//java/openapi:java_test_lib", + "//java/java-syntax:syntax_test_lib", "//java/execution/impl:impl_test_lib", + "//java/java-psi-api:psi_test_lib", "//platform/analysis-api:analysis_test_lib", "//platform/util/concurrency:concurrency_test_lib", "//platform/core-api:core_test_lib", + "//platform/lang-api:lang_test_lib", "//platform/editor-ui-api:editor-ui_test_lib", "//platform/execution-impl:execution-impl_test_lib", "//platform/platform-impl:ide-impl_test_lib", @@ -86,6 +98,7 @@ jvm_library( "//platform/testFramework:testFramework_test_lib", "//java/debugger/openapi:java-debugger_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/testRunner:testRunner_test_lib", "//java/java-runtime:rt_test_lib", "//plugins/testng_rt:testng-rt_test_lib", @@ -102,16 +115,21 @@ jvm_library( "//java/typeMigration:typeMigration_test_lib", "//platform/external-system-api:externalSystem_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl:core-impl_test_lib", "//platform/forms_rt:java-guiForms-rt_test_lib", "@lib//:junit4", "//platform/platform-util-io:ide-util-io_test_lib", "//java/java-impl-refactorings:impl-refactorings_test_lib", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//platform/util/jdom:jdom_test_lib", + "//platform/util:util-ui_test_lib", "//xml/xml-psi-api:psi_test_lib", "//libraries/jgoodies/forms:forms_test_lib", "//platform/execution:execution_test_lib", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", "//jps/model-api:model_test_lib", + "//jps/model-serialization:model-serialization_test_lib", + "//platform/statistics:statistics_test_lib", ] ) ### auto-generated section `build intellij.testng` end @@ -150,6 +168,8 @@ jvm_library( "//java/openapi:java_test_lib", "//java/execution/impl", "//java/execution/impl:impl_test_lib", + "//java/java-syntax:syntax", + "//java/java-syntax:syntax_test_lib", "//platform/analysis-api:analysis", "//platform/analysis-api:analysis_test_lib", "//platform/util/concurrency", @@ -169,6 +189,8 @@ jvm_library( "//platform/indexing-api:indexing_test_lib", "//platform/lang-core", "//platform/lang-core:lang-core_test_lib", + "//platform/lang-api:lang", + "//platform/lang-api:lang_test_lib", "//platform/projectModel-api:projectModel", "//platform/projectModel-api:projectModel_test_lib", "//platform/testFramework", @@ -176,6 +198,7 @@ jvm_library( "//java/debugger/openapi:java-debugger", "//java/debugger/openapi:java-debugger_test_lib", "//platform/ide-core-impl", + "//platform/ide-core", "//platform/testRunner", "//platform/testRunner:testRunner_test_lib", "//java/java-runtime:rt", @@ -188,6 +211,8 @@ jvm_library( "//java/execution/openapi:java-execution_test_lib", "//java/java-impl:impl", "//java/java-impl:impl_test_lib", + "//java/java-psi-api:psi", + "//java/java-psi-api:psi_test_lib", "//java/jsp-openapi:jsp", "//java/jsp-openapi:jsp_test_lib", "//libraries/testng", @@ -210,8 +235,12 @@ jvm_library( "//platform/platform-util-io:ide-util-io", "//java/java-impl-refactorings:impl-refactorings", "//java/java-impl-refactorings:impl-refactorings_test_lib", + "//java/java-frontback-psi-api:frontback-psi", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//platform/util/jdom", "//platform/util/jdom:jdom_test_lib", + "//platform/util:util-ui", + "//platform/util:util-ui_test_lib", "//xml/xml-psi-api:psi", "//xml/xml-psi-api:psi_test_lib", "//libraries/jgoodies/forms", @@ -227,6 +256,7 @@ jvm_library( ":testng-tests", "//platform/platform-impl:ide-impl_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/platform-util-io:ide-util-io_test_lib", ] ) diff --git a/plugins/testng/intellij.testng.iml b/plugins/testng/intellij.testng.iml index 1eca82501faa..d26f9198eecf 100644 --- a/plugins/testng/intellij.testng.iml +++ b/plugins/testng/intellij.testng.iml @@ -10,10 +10,13 @@ + + + @@ -25,6 +28,7 @@ + @@ -39,16 +43,21 @@ + + + + + diff --git a/plugins/testng/intellij.testng.tests.iml b/plugins/testng/intellij.testng.tests.iml index 5d2406088c04..b430347136d4 100644 --- a/plugins/testng/intellij.testng.tests.iml +++ b/plugins/testng/intellij.testng.tests.iml @@ -12,6 +12,7 @@ + @@ -22,16 +23,19 @@ + + + @@ -44,7 +48,9 @@ + + diff --git a/plugins/testng_rt/tests/BUILD.bazel b/plugins/testng_rt/tests/BUILD.bazel index b3234db23152..11863c2e0ab2 100644 --- a/plugins/testng_rt/tests/BUILD.bazel +++ b/plugins/testng_rt/tests/BUILD.bazel @@ -24,6 +24,10 @@ jvm_library( "//platform/core-api:core_test_lib", "//platform/execution", "//platform/execution:execution_test_lib", + "//java/java-syntax:syntax", + "//java/java-syntax:syntax_test_lib", + "//java/java-psi-api:psi", + "//java/java-psi-api:psi_test_lib", "//platform/execution-impl", "//platform/execution-impl:execution-impl_test_lib", "//jps/model-api:model", @@ -51,10 +55,14 @@ jvm_library( "//plugins/testng_rt:testng-rt", "//plugins/testng_rt:testng-rt_test_lib", "//platform/platform-util-io:ide-util-io", + "//platform/ide-core", + "//platform/testRunner", + "//platform/testRunner:testRunner_test_lib", ], runtime_deps = [ ":tests", "//platform/platform-util-io:ide-util-io_test_lib", + "//platform/ide-core:ide-core_test_lib", ] ) ### auto-generated section `build intellij.testng.rt.tests` end diff --git a/plugins/testng_rt/tests/intellij.testng.rt.tests.iml b/plugins/testng_rt/tests/intellij.testng.rt.tests.iml index e6cc33d3abc1..500298759373 100644 --- a/plugins/testng_rt/tests/intellij.testng.rt.tests.iml +++ b/plugins/testng_rt/tests/intellij.testng.rt.tests.iml @@ -10,6 +10,8 @@ + + @@ -24,5 +26,7 @@ + + \ No newline at end of file diff --git a/plugins/textmate/BUILD.bazel b/plugins/textmate/BUILD.bazel index c2e5722652aa..97794e198880 100644 --- a/plugins/textmate/BUILD.bazel +++ b/plugins/textmate/BUILD.bazel @@ -21,6 +21,7 @@ jvm_library( "//platform/editor-ui-api:editor-ui", "//platform/lang-impl", "//platform/ide-core-impl", + "//platform/ide-core", "//platform/projectModel-api:projectModel", "//platform/diff-api:diff", "//plugins/textmate/core", @@ -28,6 +29,7 @@ jvm_library( "//platform/core-ui", "//platform/editor-ui-ex:editor-ex", "//libraries/jackson/jackson", + "//platform/util:util-ui", "//libraries/jackson/databind", "//platform/platform-impl:ide-impl", "//libraries/kotlinx/serialization/core", @@ -65,6 +67,7 @@ jvm_library( "//platform/editor-ui-api:editor-ui_test_lib", "//platform/lang-impl:lang-impl_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/projectModel-api:projectModel_test_lib", "//platform/diff-api:diff_test_lib", "//plugins/textmate/core:core_test_lib", @@ -72,6 +75,7 @@ jvm_library( "//platform/core-ui:core-ui_test_lib", "//platform/editor-ui-ex:editor-ex_test_lib", "//libraries/jackson/jackson:jackson_test_lib", + "//platform/util:util-ui_test_lib", "//libraries/jackson/databind:databind_test_lib", "//platform/platform-impl:ide-impl_test_lib", "//libraries/kotlinx/serialization/core:core_test_lib", diff --git a/plugins/textmate/backend/BUILD.bazel b/plugins/textmate/backend/BUILD.bazel index 677a2c519561..d13d7182d61e 100644 --- a/plugins/textmate/backend/BUILD.bazel +++ b/plugins/textmate/backend/BUILD.bazel @@ -71,6 +71,7 @@ jvm_library( deps = [ "@lib//:jetbrains-annotations-provided", "@lib//:kotlin-stdlib-provided", + "//platform/ide-core", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", ":plugins_textmate_common_provided", ":spellchecker_provided", @@ -107,6 +108,7 @@ jvm_library( "//platform/editor-ui-api:editor-ui_test_lib", "//platform/platform-impl:ide-impl", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/analysis-api:analysis", "//platform/analysis-api:analysis_test_lib", "//platform/code-style-api:codeStyle", diff --git a/plugins/textmate/backend/intellij.textmate.backend.iml b/plugins/textmate/backend/intellij.textmate.backend.iml index 255342218379..a765a4343352 100644 --- a/plugins/textmate/backend/intellij.textmate.backend.iml +++ b/plugins/textmate/backend/intellij.textmate.backend.iml @@ -16,6 +16,7 @@ + diff --git a/plugins/textmate/intellij.textmate.iml b/plugins/textmate/intellij.textmate.iml index a1fae5202782..31ecf1ad3220 100644 --- a/plugins/textmate/intellij.textmate.iml +++ b/plugins/textmate/intellij.textmate.iml @@ -37,6 +37,7 @@ + @@ -44,6 +45,7 @@ + diff --git a/plugins/textmate/tests/BUILD.bazel b/plugins/textmate/tests/BUILD.bazel index 81312d9de81b..599c1b7ffddc 100644 --- a/plugins/textmate/tests/BUILD.bazel +++ b/plugins/textmate/tests/BUILD.bazel @@ -54,6 +54,7 @@ jvm_library( "//plugins/grazie/src:core_test_lib", "//platform/projectModel-api:projectModel", "//platform/projectModel-api:projectModel_test_lib", + "//platform/ide-core", "//plugins/textmate/plugin", "//plugins/textmate/plugin:plugin_test_lib", "//plugins/textmate/backend", @@ -62,7 +63,10 @@ jvm_library( "//plugins/textmate/core/tests:tests_test_lib", "@lib//:kotlin-test-junit5", ], - runtime_deps = [":tests"] + runtime_deps = [ + ":tests", + "//platform/ide-core:ide-core_test_lib", + ] ) ### auto-generated section `build intellij.textmate.tests` end diff --git a/plugins/textmate/tests/intellij.textmate.tests.iml b/plugins/textmate/tests/intellij.textmate.tests.iml index 65a586b22ee7..76edbce40046 100644 --- a/plugins/textmate/tests/intellij.textmate.tests.iml +++ b/plugins/textmate/tests/intellij.textmate.tests.iml @@ -29,6 +29,7 @@ + diff --git a/plugins/toml/core/BUILD.bazel b/plugins/toml/core/BUILD.bazel index 47ecf8ba9591..ab70b16b30f1 100644 --- a/plugins/toml/core/BUILD.bazel +++ b/plugins/toml/core/BUILD.bazel @@ -22,6 +22,8 @@ jvm_library( "//platform/editor-ui-api:editor-ui", "//platform/lang-impl", "//platform/platform-impl:ide-impl", + "//platform/ide-core", + "//platform/util:util-ui", "//platform/code-style-impl:codeStyle-impl", "@lib//:kotlin-stdlib", "//platform/lang-api:lang", @@ -43,6 +45,8 @@ jvm_library( "//platform/editor-ui-api:editor-ui_test_lib", "//platform/lang-impl:lang-impl_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", + "//platform/util:util-ui_test_lib", "//platform/code-style-impl:codeStyle-impl_test_lib", "//platform/lang-api:lang_test_lib", ] diff --git a/plugins/toml/core/intellij.toml.core.iml b/plugins/toml/core/intellij.toml.core.iml index 494c1ebc0fc0..24ddaf56c271 100644 --- a/plugins/toml/core/intellij.toml.core.iml +++ b/plugins/toml/core/intellij.toml.core.iml @@ -17,6 +17,8 @@ + + diff --git a/plugins/toml/frontend/BUILD.bazel b/plugins/toml/frontend/BUILD.bazel index 929d016e0c02..92e325bf611f 100644 --- a/plugins/toml/frontend/BUILD.bazel +++ b/plugins/toml/frontend/BUILD.bazel @@ -19,6 +19,7 @@ jvm_library( "//platform/core-api:core", "//platform/editor-ui-api:editor-ui", "//platform/platform-api:ide", + "//platform/ide-core", "//platform/analysis-api:analysis", "//platform/core-impl", "//platform/lang-api:lang", @@ -37,6 +38,7 @@ jvm_library( "//platform/core-api:core_test_lib", "//platform/editor-ui-api:editor-ui_test_lib", "//platform/platform-api:ide_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/analysis-api:analysis_test_lib", "//platform/core-impl:core-impl_test_lib", "//platform/lang-api:lang_test_lib", diff --git a/plugins/toml/frontend/intellij.toml.frontend.iml b/plugins/toml/frontend/intellij.toml.frontend.iml index c62bb9852bd2..4b56e73f16d9 100644 --- a/plugins/toml/frontend/intellij.toml.frontend.iml +++ b/plugins/toml/frontend/intellij.toml.frontend.iml @@ -13,6 +13,7 @@ + diff --git a/plugins/toml/json/BUILD.bazel b/plugins/toml/json/BUILD.bazel index 6015e9a14ad0..8bdcc15cbc2a 100644 --- a/plugins/toml/json/BUILD.bazel +++ b/plugins/toml/json/BUILD.bazel @@ -25,6 +25,7 @@ jvm_library( "//plugins/toml/core", "@lib//:kotlin-stdlib", "//json/backend", + "//platform/util:util-ui", "//libraries/stream", ], exports = ["//json/backend"], @@ -53,6 +54,7 @@ jvm_library( "//plugins/toml/core:core_test_lib", "//json/backend:backend_test_lib", "//platform/backend:backend_test_lib", + "//platform/util:util-ui_test_lib", "//libraries/stream:stream_test_lib", ] ) diff --git a/plugins/toml/json/intellij.toml.json.iml b/plugins/toml/json/intellij.toml.json.iml index 45dd83b553e4..fe06e528d2c5 100644 --- a/plugins/toml/json/intellij.toml.json.iml +++ b/plugins/toml/json/intellij.toml.json.iml @@ -20,6 +20,7 @@ + \ No newline at end of file diff --git a/plugins/toml/tests/BUILD.bazel b/plugins/toml/tests/BUILD.bazel index d22afde5c456..321b30d96d17 100644 --- a/plugins/toml/tests/BUILD.bazel +++ b/plugins/toml/tests/BUILD.bazel @@ -36,8 +36,12 @@ jvm_library( "//platform/core-api:core_test_lib", "//platform/core-ui", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", "//platform/editor-ui-api:editor-ui", "//platform/editor-ui-api:editor-ui_test_lib", + "//platform/lang-api:lang", + "//platform/lang-api:lang_test_lib", "//platform/projectModel-api:projectModel", "//platform/projectModel-api:projectModel_test_lib", "//plugins/toml", @@ -54,6 +58,8 @@ jvm_library( "//plugins/toml/grazie:grazie_test_lib", "//platform/testFramework", "//platform/testFramework:testFramework_test_lib", + "//platform/util:util-ui", + "//platform/util:util-ui_test_lib", "//java/testFramework", "//java/testFramework:testFramework_test_lib", "//plugins/grazie/src/test:grazie-tests", diff --git a/plugins/toml/tests/intellij.toml.tests.iml b/plugins/toml/tests/intellij.toml.tests.iml index a20a0c4cf6c8..12ffbb629c68 100644 --- a/plugins/toml/tests/intellij.toml.tests.iml +++ b/plugins/toml/tests/intellij.toml.tests.iml @@ -11,7 +11,9 @@ + + @@ -20,6 +22,7 @@ + diff --git a/plugins/ui-designer-core/BUILD.bazel b/plugins/ui-designer-core/BUILD.bazel index ff172d5c7975..c0c29d4201fe 100644 --- a/plugins/ui-designer-core/BUILD.bazel +++ b/plugins/ui-designer-core/BUILD.bazel @@ -22,6 +22,7 @@ jvm_library( "//platform/util", "//platform/icons", "//platform/platform-api:ide", + "//platform/util:util-ui", "//platform/platform-impl:ide-impl", "//platform/lang-impl", "//libraries/fastutil", @@ -29,6 +30,7 @@ jvm_library( "//platform/core-ui", "//platform/util/jdom", "//platform/platform-impl/designer", + "//platform/ide-core", "//platform/core-impl", "//platform/forms_rt:java-guiForms-rt", "//platform/backend", @@ -52,6 +54,7 @@ jvm_library( "//platform/util:util_test_lib", "//platform/icons:icons_test_lib", "//platform/platform-api:ide_test_lib", + "//platform/util:util-ui_test_lib", "//platform/platform-impl:ide-impl_test_lib", "//platform/lang-impl:lang-impl_test_lib", "//libraries/fastutil:fastutil_test_lib", @@ -59,6 +62,7 @@ jvm_library( "//platform/core-ui:core-ui_test_lib", "//platform/util/jdom:jdom_test_lib", "//platform/platform-impl/designer:designer_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/core-impl:core-impl_test_lib", "//platform/forms_rt:java-guiForms-rt_test_lib", "//platform/backend:backend_test_lib", diff --git a/plugins/ui-designer-core/intellij.uiDesigner.iml b/plugins/ui-designer-core/intellij.uiDesigner.iml index c01854809104..ad90f670998c 100644 --- a/plugins/ui-designer-core/intellij.uiDesigner.iml +++ b/plugins/ui-designer-core/intellij.uiDesigner.iml @@ -17,6 +17,7 @@ + @@ -24,6 +25,7 @@ + diff --git a/plugins/ui-designer/BUILD.bazel b/plugins/ui-designer/BUILD.bazel index 0f99e61606ff..039863e512cb 100644 --- a/plugins/ui-designer/BUILD.bazel +++ b/plugins/ui-designer/BUILD.bazel @@ -15,6 +15,8 @@ jvm_library( resources = [":java-guiForms-designer_resources"], deps = [ "//java/openapi:java", + "//java/java-syntax:syntax", + "//java/java-psi-api:psi", "//java/java-indexing-api:indexing", "//platform/analysis-api:analysis", "//platform/code-style-api:codeStyle", @@ -22,6 +24,7 @@ jvm_library( "//platform/core-api:core", "//platform/editor-ui-api:editor-ui", "//platform/ide-core-impl", + "//platform/ide-core", "//platform/indexing-api:indexing", "//jps/model-api:model", "//platform/lang-core", @@ -55,13 +58,17 @@ jvm_library( "//libraries/fastutil", "//platform/util-class-loader:util-classLoader", "//platform/core-ui", + "//platform/core-impl", "//plugins/properties/properties-psi-impl:backend-psi", "//platform/platform-util-io:ide-util-io", "//java/java-impl-refactorings:impl-refactorings", + "//java/java-frontback-psi-api:frontback-psi", "//platform/util/jdom", + "//platform/util:util-ui", "//xml/xml-psi-api:psi", "//platform/execution", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", + "//platform/lang-api:lang", ], exports = [ "//java/compiler/forms-compiler:java-guiForms-compiler", @@ -83,6 +90,8 @@ jvm_library( runtime_deps = [ ":java-guiForms-designer", "//java/openapi:java_test_lib", + "//java/java-syntax:syntax_test_lib", + "//java/java-psi-api:psi_test_lib", "//java/java-indexing-api:indexing_test_lib", "//platform/analysis-api:analysis_test_lib", "//platform/code-style-api:codeStyle_test_lib", @@ -90,6 +99,7 @@ jvm_library( "//platform/core-api:core_test_lib", "//platform/editor-ui-api:editor-ui_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/indexing-api:indexing_test_lib", "//jps/model-api:model_test_lib", "//platform/lang-core:lang-core_test_lib", @@ -133,12 +143,15 @@ jvm_library( "//libraries/fastutil:fastutil_test_lib", "//platform/util-class-loader:util-classLoader_test_lib", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl:core-impl_test_lib", "//plugins/properties/properties-psi-impl:backend-psi_test_lib", "//platform/platform-util-io:ide-util-io_test_lib", "//platform/util/xmlDom", "//platform/util/xmlDom:xmlDom_test_lib", "//java/java-impl-refactorings:impl-refactorings_test_lib", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//platform/util/jdom:jdom_test_lib", + "//platform/util:util-ui_test_lib", "//jps/jps-builders:build-tests", "//jps/jps-builders:build-tests_test_lib", "//xml/xml-psi-api:psi_test_lib", @@ -146,6 +159,7 @@ jvm_library( "//libraries/caffeine:caffeine_test_lib", "//platform/execution:execution_test_lib", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", + "//platform/lang-api:lang_test_lib", ] ) ### auto-generated section `build intellij.java.guiForms.designer` end @@ -197,6 +211,10 @@ jvm_library( "//java/openapi:java_test_lib", "//java/java-indexing-api:indexing", "//java/java-indexing-api:indexing_test_lib", + "//java/java-syntax:syntax", + "//java/java-syntax:syntax_test_lib", + "//java/java-psi-api:psi", + "//java/java-psi-api:psi_test_lib", "//platform/analysis-api:analysis", "//platform/analysis-api:analysis_test_lib", "//platform/code-style-api:codeStyle", @@ -214,6 +232,8 @@ jvm_library( "//jps/model-api:model_test_lib", "//platform/lang-core", "//platform/lang-core:lang-core_test_lib", + "//platform/lang-api:lang", + "//platform/lang-api:lang_test_lib", "//platform/projectModel-api:projectModel", "//platform/projectModel-api:projectModel_test_lib", "//platform/refactoring", @@ -281,6 +301,8 @@ jvm_library( "//platform/util-class-loader:util-classLoader_test_lib", "//platform/core-ui", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", "//plugins/properties/properties-psi-impl:backend-psi", "//plugins/properties/properties-psi-impl:backend-psi_test_lib", "//platform/platform-util-io:ide-util-io", @@ -290,6 +312,8 @@ jvm_library( "//java/java-impl-refactorings:impl-refactorings_test_lib", "//platform/util/jdom", "//platform/util/jdom:jdom_test_lib", + "//platform/util:util-ui", + "//platform/util:util-ui_test_lib", "//jps/jps-builders:build-tests", "//jps/jps-builders:build-tests_test_lib", "//xml/xml-psi-api:psi", @@ -300,6 +324,8 @@ jvm_library( "//platform/execution:execution_test_lib", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", + "//java/java-frontback-psi-api:frontback-psi", + "//java/java-frontback-psi-api:frontback-psi_test_lib", ], exports = [ "//java/compiler/forms-compiler:java-guiForms-compiler", diff --git a/plugins/ui-designer/intellij.java.guiForms.designer.iml b/plugins/ui-designer/intellij.java.guiForms.designer.iml index a7a22789bc19..12504124193c 100644 --- a/plugins/ui-designer/intellij.java.guiForms.designer.iml +++ b/plugins/ui-designer/intellij.java.guiForms.designer.iml @@ -9,6 +9,8 @@ + + @@ -16,6 +18,7 @@ + @@ -55,16 +58,20 @@ + + + + diff --git a/plugins/ui-designer/intellij.java.guiForms.designer.tests.iml b/plugins/ui-designer/intellij.java.guiForms.designer.tests.iml index 58d183cb49ab..9eeb295ccf30 100644 --- a/plugins/ui-designer/intellij.java.guiForms.designer.tests.iml +++ b/plugins/ui-designer/intellij.java.guiForms.designer.tests.iml @@ -15,6 +15,8 @@ + + @@ -24,6 +26,7 @@ + @@ -60,17 +63,20 @@ + + + diff --git a/plugins/ui-designer/jps-plugin/BUILD.bazel b/plugins/ui-designer/jps-plugin/BUILD.bazel index 93cf47e0d931..6cf867702afc 100644 --- a/plugins/ui-designer/jps-plugin/BUILD.bazel +++ b/plugins/ui-designer/jps-plugin/BUILD.bazel @@ -25,6 +25,8 @@ jvm_library( "//platform/forms_rt:java-guiForms-rt", "//libraries/asm", "//platform/util/jdom", + "//platform/util/base/multiplatform", + "//platform/util/base", ] ) @@ -46,6 +48,8 @@ jvm_library( "//platform/forms_rt:java-guiForms-rt_test_lib", "//libraries/asm:asm_test_lib", "//platform/util/jdom:jdom_test_lib", + "//platform/util/base/multiplatform:multiplatform_test_lib", + "//platform/util/base:base_test_lib", ] ) ### auto-generated section `build intellij.java.guiForms.jps` end diff --git a/plugins/ui-designer/jps-plugin/intellij.java.guiForms.jps.iml b/plugins/ui-designer/jps-plugin/intellij.java.guiForms.jps.iml index cdc8e833c883..6ab0d7658811 100644 --- a/plugins/ui-designer/jps-plugin/intellij.java.guiForms.jps.iml +++ b/plugins/ui-designer/jps-plugin/intellij.java.guiForms.jps.iml @@ -34,5 +34,7 @@ + + \ No newline at end of file diff --git a/plugins/xpath/BUILD.bazel b/plugins/xpath/BUILD.bazel index fa6d918bc182..f4a982f48f7b 100644 --- a/plugins/xpath/BUILD.bazel +++ b/plugins/xpath/BUILD.bazel @@ -42,11 +42,14 @@ jvm_library( "//platform/core-ui", "//platform/code-style-impl:codeStyle-impl", "//platform/platform-util-io:ide-util-io", + "//platform/ide-core", "//platform/util/jdom", "//platform/execution", "//platform/forms_rt:java-guiForms-rt", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", "//platform/util/concurrency", + "//platform/util:util-ui", + "//platform/util-ex", ], runtime_deps = ["//xml/dom-impl"] ) @@ -92,6 +95,7 @@ jvm_library( "//platform/core-ui:core-ui_test_lib", "//platform/code-style-impl:codeStyle-impl_test_lib", "//platform/platform-util-io:ide-util-io_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/util/jdom:jdom_test_lib", "//tools/intellij.tools.ide.metrics.benchmark:ide-metrics-benchmark", "//tools/intellij.tools.ide.metrics.benchmark:ide-metrics-benchmark_test_lib", @@ -99,6 +103,8 @@ jvm_library( "//platform/forms_rt:java-guiForms-rt_test_lib", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", "//platform/util/concurrency:concurrency_test_lib", + "//platform/util:util-ui_test_lib", + "//platform/util-ex:util-ex_test_lib", ] ) ### auto-generated section `build intellij.xpath` end diff --git a/plugins/xpath/intellij.xpath.iml b/plugins/xpath/intellij.xpath.iml index 35a0dcdc1ddf..2ef797253c64 100644 --- a/plugins/xpath/intellij.xpath.iml +++ b/plugins/xpath/intellij.xpath.iml @@ -42,11 +42,14 @@ + + + \ No newline at end of file diff --git a/plugins/yaml/BUILD.bazel b/plugins/yaml/BUILD.bazel index 37d6a0559701..6edb0753c069 100644 --- a/plugins/yaml/BUILD.bazel +++ b/plugins/yaml/BUILD.bazel @@ -24,6 +24,7 @@ jvm_library( "//platform/lang-api:lang", "//platform/lang-impl", "//platform/platform-impl:ide-impl", + "//platform/ide-core", "//platform/projectModel-api:projectModel", "//platform/util:util-ui", "//platform/refactoring", @@ -56,6 +57,7 @@ jvm_library( "//platform/lang-api:lang_test_lib", "//platform/lang-impl:lang-impl_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/projectModel-api:projectModel_test_lib", "//platform/util:util-ui_test_lib", "//platform/refactoring:refactoring_test_lib", @@ -115,6 +117,7 @@ jvm_library( "//platform/lang-impl", "//platform/lang-impl:lang-impl_test_lib", "//platform/platform-impl:ide-impl", + "//platform/ide-core", "//platform/projectModel-api:projectModel", "//platform/projectModel-api:projectModel_test_lib", "//platform/util:util-ui", @@ -144,6 +147,7 @@ jvm_library( runtime_deps = [ ":yaml-tests", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", ] ) ### auto-generated section `build intellij.yaml.tests` end diff --git a/plugins/yaml/backend/BUILD.bazel b/plugins/yaml/backend/BUILD.bazel index 0e5c84495e62..1adc72a2616a 100644 --- a/plugins/yaml/backend/BUILD.bazel +++ b/plugins/yaml/backend/BUILD.bazel @@ -32,6 +32,8 @@ jvm_library( "//platform/editor-ui-ex:editor-ex", "//libraries/stream", "//platform/ide-core-impl", + "//platform/ide-core", + "//platform/progress/shared:ide-progress", "//libraries/fastutil", "//platform/refactoring", "//platform/core-ui", @@ -42,6 +44,7 @@ jvm_library( "//platform/searchEverywhere/backend", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", "//jps/model-api:model", + "//platform/util:util-ui", ], runtime_deps = ["//platform/backend"] ) @@ -80,6 +83,8 @@ jvm_library( "//platform/editor-ui-ex:editor-ex_test_lib", "//libraries/stream:stream_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", + "//platform/progress/shared:ide-progress_test_lib", "//libraries/fastutil:fastutil_test_lib", "//platform/refactoring:refactoring_test_lib", "//platform/core-ui:core-ui_test_lib", @@ -99,6 +104,7 @@ jvm_library( "@lib//:jet_check", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", "//jps/model-api:model_test_lib", + "//platform/util:util-ui_test_lib", ] ) ### auto-generated section `build intellij.yaml.backend` end @@ -176,6 +182,7 @@ jvm_library( "//libraries/stream", "//libraries/stream:stream_test_lib", "//platform/ide-core-impl", + "//platform/ide-core", "//libraries/fastutil", "//libraries/fastutil:fastutil_test_lib", "//platform/refactoring", @@ -205,12 +212,15 @@ jvm_library( "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", "//jps/model-api:model", "//jps/model-api:model_test_lib", + "//platform/util:util-ui", + "//platform/util:util-ui_test_lib", ], runtime_deps = [ ":backend-tests", "//platform/backend:backend_test_lib", "//platform/platform-impl:ide-impl_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", ] ) ### auto-generated section `build intellij.yaml.backend.tests` end diff --git a/plugins/yaml/backend/intellij.yaml.backend.iml b/plugins/yaml/backend/intellij.yaml.backend.iml index 7b7b9bd65acd..26708f6630fb 100644 --- a/plugins/yaml/backend/intellij.yaml.backend.iml +++ b/plugins/yaml/backend/intellij.yaml.backend.iml @@ -31,6 +31,8 @@ + + @@ -46,5 +48,6 @@ + \ No newline at end of file diff --git a/plugins/yaml/backend/intellij.yaml.backend.tests.iml b/plugins/yaml/backend/intellij.yaml.backend.tests.iml index f6958006918f..5e4e24837ed8 100644 --- a/plugins/yaml/backend/intellij.yaml.backend.tests.iml +++ b/plugins/yaml/backend/intellij.yaml.backend.tests.iml @@ -33,6 +33,7 @@ + @@ -48,6 +49,7 @@ + diff --git a/plugins/yaml/intellij.yaml.iml b/plugins/yaml/intellij.yaml.iml index f7dbdc29fe88..e26b2a3ff785 100644 --- a/plugins/yaml/intellij.yaml.iml +++ b/plugins/yaml/intellij.yaml.iml @@ -41,6 +41,7 @@ + diff --git a/plugins/yaml/intellij.yaml.tests.iml b/plugins/yaml/intellij.yaml.tests.iml index af1ae85616e2..c398ee9fa591 100644 --- a/plugins/yaml/intellij.yaml.tests.iml +++ b/plugins/yaml/intellij.yaml.tests.iml @@ -39,6 +39,7 @@ + diff --git a/python/BUILD.bazel b/python/BUILD.bazel index b98cfa18e30d..a90e29625e19 100644 --- a/python/BUILD.bazel +++ b/python/BUILD.bazel @@ -331,6 +331,7 @@ jvm_library( "//platform/workspace/storage", "//python/openapi:community", "//platform/ide-core-impl", + "//platform/ide-core", "//platform/platform-impl:ide-impl", "//platform/lang-impl", "//libraries/guava", @@ -400,8 +401,11 @@ jvm_library( "//platform/ui.jcef", "//libraries/io", "//platform/util/progress", + "//platform/util:util-ui", + "//platform/util-ex", "//platform/platform-impl/remote", "//platform/platform-impl/ui", + "//platform/progress/shared:ide-progress", "//libraries/jackson/module-kotlin:libraries-jackson-module-kotlin", "//python/pipenv", "//python/installer", @@ -440,7 +444,6 @@ jvm_library( "//python/openapi:community", "//platform/ide-core-impl", "//RegExpSupport:regexp", - "//platform/testRunner", "//python/python-psi-impl:psi-impl", ], runtime_deps = [ @@ -461,8 +464,6 @@ jvm_library( "//platform/ide-core-impl:ide-core-impl_test_lib", "//RegExpSupport:regexp", "//RegExpSupport:regexp_test_lib", - "//platform/testRunner", - "//platform/testRunner:testRunner_test_lib", "//python/python-psi-impl:psi-impl", "//python/python-psi-impl:psi-impl_test_lib", ], @@ -489,6 +490,7 @@ jvm_library( "//platform/workspace/storage:storage_test_lib", "//python/openapi:community_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/platform-impl:ide-impl_test_lib", "//platform/lang-impl:lang-impl_test_lib", "//libraries/guava:guava_test_lib", @@ -551,8 +553,11 @@ jvm_library( "//platform/ui.jcef:ui.jcef_test_lib", "//libraries/io:io_test_lib", "//platform/util/progress:progress_test_lib", + "//platform/util:util-ui_test_lib", + "//platform/util-ex:util-ex_test_lib", "//platform/platform-impl/remote:remote_test_lib", "//platform/platform-impl/ui:ui_test_lib", + "//platform/progress/shared:ide-progress_test_lib", "//libraries/jackson/module-kotlin:libraries-jackson-module-kotlin_test_lib", "//python/pipenv:pipenv_test_lib", "//python/installer:installer_test_lib", @@ -611,7 +616,6 @@ jvm_library( "//python/openapi:community", "//platform/ide-core-impl", "//RegExpSupport:regexp", - "//platform/testRunner", "//python/python-psi-impl:psi-impl", ], runtime_deps = [ @@ -633,8 +637,6 @@ jvm_library( "//platform/ide-core-impl:ide-core-impl_test_lib", "//RegExpSupport:regexp", "//RegExpSupport:regexp_test_lib", - "//platform/testRunner", - "//platform/testRunner:testRunner_test_lib", "//python/python-psi-impl:psi-impl", "//python/python-psi-impl:psi-impl_test_lib", ], @@ -1106,6 +1108,8 @@ jvm_library( "//libraries/stream:stream_test_lib", "//platform/core-ui", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", "//plugins/stats-collector", "//plugins/stats-collector:stats-collector_test_lib", "//plugins/grazie/src/test:grazie-tests", @@ -1114,6 +1118,10 @@ jvm_library( "//python/python-grazie:grazie_test_lib", "//platform/util/jdom", "//platform/util/jdom:jdom_test_lib", + "//platform/util:util-ui", + "//platform/util:util-ui_test_lib", + "//platform/util-ex", + "//platform/util-ex:util-ex_test_lib", "//platform/ml-api:ml", "//platform/ml-api:ml_test_lib", "//libraries/kotlinx/coroutines/core", @@ -1136,6 +1144,7 @@ jvm_library( "@lib//:junit5Jupiter", "@lib//:junit5Params", "//platform/platform-impl/remote", + "//platform/ide-core", "//platform/testFramework/junit5", "//platform/testFramework/junit5:junit5_test_lib", "//libraries/kotlin/reflect", @@ -1199,6 +1208,8 @@ jvm_library( "//platform/testFramework/junit5/eel:testFramework-junit5-eel-tests_test_lib", "//platform/smRunner:smRunner-tests", "//platform/smRunner:smRunner-tests_test_lib", + "//platform/testRunner", + "//platform/testRunner:testRunner_test_lib", ], runtime_deps = [ ":python-community-tests", @@ -1213,6 +1224,7 @@ jvm_library( "//python/python-features-trainer:featuresTrainer_test_lib", "//jupyter:notebooks-jupyter-core_test_lib", "//platform/platform-impl/remote:remote_test_lib", + "//platform/ide-core:ide-core_test_lib", ] ) ### auto-generated section `build intellij.python.community.tests` end diff --git a/python/common/BUILD.bazel b/python/common/BUILD.bazel index dcfe936aeee1..960f9e6473e3 100644 --- a/python/common/BUILD.bazel +++ b/python/common/BUILD.bazel @@ -28,6 +28,7 @@ jvm_library( "//platform/remote-topics/shared:rpc-topics", "//libraries/kotlinx/serialization/core", "//platform/platform-api:ide", + "//platform/ide-core", ] ) @@ -45,6 +46,7 @@ jvm_library( "//platform/remote-topics/shared:rpc-topics_test_lib", "//libraries/kotlinx/serialization/core:core_test_lib", "//platform/platform-api:ide_test_lib", + "//platform/ide-core:ide-core_test_lib", ] ) ### auto-generated section `build intellij.python.common` end diff --git a/python/common/intellij.python.common.iml b/python/common/intellij.python.common.iml index abb749292a0b..e573fe25a416 100644 --- a/python/common/intellij.python.common.iml +++ b/python/common/intellij.python.common.iml @@ -40,5 +40,6 @@ + \ No newline at end of file diff --git a/python/huggingFace/BUILD.bazel b/python/huggingFace/BUILD.bazel index 0664eb4f047d..123489ba4705 100644 --- a/python/huggingFace/BUILD.bazel +++ b/python/huggingFace/BUILD.bazel @@ -30,6 +30,7 @@ jvm_library( "//python/python-psi-api:psi", "//python:python-community-impl", "//platform/platform-api:ide", + "//platform/ide-core", "//platform/markdown-utils", "//platform/statistics", "//json/backend", @@ -58,6 +59,7 @@ jvm_library( "//python/python-psi-api:psi_test_lib", "//python:python-community-impl_test_lib", "//platform/platform-api:ide_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/markdown-utils:markdown-utils_test_lib", "//platform/statistics:statistics_test_lib", "//json/backend:backend_test_lib", diff --git a/python/huggingFace/intellij.python.community.impl.huggingFace.iml b/python/huggingFace/intellij.python.community.impl.huggingFace.iml index 0e2851989d64..6408158693f7 100644 --- a/python/huggingFace/intellij.python.community.impl.huggingFace.iml +++ b/python/huggingFace/intellij.python.community.impl.huggingFace.iml @@ -25,6 +25,7 @@ + diff --git a/python/ide/impl/BUILD.bazel b/python/ide/impl/BUILD.bazel index 2684a6b984b8..fc184178bf28 100644 --- a/python/ide/impl/BUILD.bazel +++ b/python/ide/impl/BUILD.bazel @@ -21,6 +21,7 @@ jvm_library( "//platform/editor-ui-api:editor-ui", "//platform/platform-impl:ide-impl", "//platform/welcome-screen-impl:welcomeScreen-impl", + "//platform/welcome-screen", "//platform/indexing-api:indexing", "//jps/model-api:model", "//platform/lang-core", @@ -61,6 +62,8 @@ jvm_library( "//platform/non-modal-welcome-screen", "//python/common", "//platform/non-modal-welcome-screen/backend", + "//platform/ide-core", + "//platform/progress/shared:ide-progress", "//python/python-exec-service:community-execService", "//python/python-sdk-configurator/common", "//python/python-sdk-ui:sdk-ui", @@ -71,6 +74,7 @@ jvm_library( "//platform/forms_rt:java-guiForms-rt", "//python/python-external-index:externalIndex", "//platform/util/jdom", + "//platform/util:util-ui", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", "//platform/util/concurrency", ], @@ -92,6 +96,7 @@ jvm_library( "//platform/editor-ui-api:editor-ui_test_lib", "//platform/platform-impl:ide-impl_test_lib", "//platform/welcome-screen-impl:welcomeScreen-impl_test_lib", + "//platform/welcome-screen:welcome-screen_test_lib", "//platform/indexing-api:indexing_test_lib", "//jps/model-api:model_test_lib", "//platform/lang-core:lang-core_test_lib", @@ -134,6 +139,8 @@ jvm_library( "//platform/non-modal-welcome-screen:non-modal-welcome-screen_test_lib", "//python/common:common_test_lib", "//platform/non-modal-welcome-screen/backend:backend_test_lib", + "//platform/ide-core:ide-core_test_lib", + "//platform/progress/shared:ide-progress_test_lib", "//python/python-exec-service:community-execService_test_lib", "//python/python-sdk-configurator/common:common_test_lib", "//python/python-sdk-ui:sdk-ui_test_lib", @@ -144,6 +151,7 @@ jvm_library( "//platform/forms_rt:java-guiForms-rt_test_lib", "//python/python-external-index:externalIndex_test_lib", "//platform/util/jdom:jdom_test_lib", + "//platform/util:util-ui_test_lib", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", "//platform/util/concurrency:concurrency_test_lib", ], @@ -274,6 +282,7 @@ jvm_library( "//python/common", "//python/common:common_test_lib", "//platform/non-modal-welcome-screen/backend", + "//platform/ide-core", "//python/python-exec-service:community-execService", "//python/python-exec-service:community-execService_test_lib", "//python/python-sdk-configurator/common", @@ -305,6 +314,7 @@ jvm_library( "//python/python-features-trainer:featuresTrainer_test_lib", "//platform/non-modal-welcome-screen:non-modal-welcome-screen_test_lib", "//platform/non-modal-welcome-screen/backend:backend_test_lib", + "//platform/ide-core:ide-core_test_lib", ], plugins = ["@lib//:compose-plugin"] ) diff --git a/python/ide/impl/intellij.pycharm.community.ide.impl.iml b/python/ide/impl/intellij.pycharm.community.ide.impl.iml index dfe5a6b8986a..d2ba55363d1c 100644 --- a/python/ide/impl/intellij.pycharm.community.ide.impl.iml +++ b/python/ide/impl/intellij.pycharm.community.ide.impl.iml @@ -36,6 +36,7 @@ + @@ -79,6 +80,8 @@ + + @@ -89,6 +92,7 @@ + diff --git a/python/ide/impl/intellij.pycharm.community.ide.impl.promotion/BUILD.bazel b/python/ide/impl/intellij.pycharm.community.ide.impl.promotion/BUILD.bazel index 89f3fd3f8ec9..9e8a8e6fa0bc 100644 --- a/python/ide/impl/intellij.pycharm.community.ide.impl.promotion/BUILD.bazel +++ b/python/ide/impl/intellij.pycharm.community.ide.impl.promotion/BUILD.bazel @@ -29,6 +29,7 @@ jvm_library( "//platform/core-ui", "//python/ide/customization.shared", "//platform/platform-impl/update-checker", + "//platform/util:util-ui", ] ) @@ -53,6 +54,7 @@ jvm_library( "//platform/core-ui:core-ui_test_lib", "//python/ide/customization.shared:customization.shared_test_lib", "//platform/platform-impl/update-checker:update-checker_test_lib", + "//platform/util:util-ui_test_lib", ] ) ### auto-generated section `build intellij.pycharm.community.ide.impl.promotion` end diff --git a/python/ide/impl/intellij.pycharm.community.ide.impl.promotion/intellij.pycharm.community.ide.impl.promotion.iml b/python/ide/impl/intellij.pycharm.community.ide.impl.promotion/intellij.pycharm.community.ide.impl.promotion.iml index e04278e9b524..927642a8d114 100644 --- a/python/ide/impl/intellij.pycharm.community.ide.impl.promotion/intellij.pycharm.community.ide.impl.promotion.iml +++ b/python/ide/impl/intellij.pycharm.community.ide.impl.promotion/intellij.pycharm.community.ide.impl.promotion.iml @@ -23,5 +23,6 @@ + \ No newline at end of file diff --git a/python/ide/impl/intellij.pycharm.community.ide.impl.tests.iml b/python/ide/impl/intellij.pycharm.community.ide.impl.tests.iml index d0439fceffe3..a3b14197b434 100644 --- a/python/ide/impl/intellij.pycharm.community.ide.impl.tests.iml +++ b/python/ide/impl/intellij.pycharm.community.ide.impl.tests.iml @@ -81,6 +81,7 @@ + diff --git a/python/installer/BUILD.bazel b/python/installer/BUILD.bazel index f82fa878f948..2bc55b085a54 100644 --- a/python/installer/BUILD.bazel +++ b/python/installer/BUILD.bazel @@ -20,6 +20,7 @@ jvm_library( "//platform/core-api:core", "//platform/util", "//platform/platform-api:ide", + "//platform/ide-core", "//platform/statistics", "//libraries/guava", ] @@ -37,6 +38,7 @@ jvm_library( "//platform/core-api:core_test_lib", "//platform/util:util_test_lib", "//platform/platform-api:ide_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/statistics:statistics_test_lib", "//libraries/guava:guava_test_lib", ] diff --git a/python/installer/intellij.python.community.impl.installer.iml b/python/installer/intellij.python.community.impl.installer.iml index 3ef5aae6293d..eaa2f0b1806b 100644 --- a/python/installer/intellij.python.community.impl.installer.iml +++ b/python/installer/intellij.python.community.impl.installer.iml @@ -14,6 +14,7 @@ + diff --git a/python/intellij.python.community.impl.iml b/python/intellij.python.community.impl.iml index a206b462b96c..1930c1a2a0e4 100644 --- a/python/intellij.python.community.impl.iml +++ b/python/intellij.python.community.impl.iml @@ -54,6 +54,7 @@ + @@ -64,7 +65,7 @@ - + @@ -164,8 +165,11 @@ + + + diff --git a/python/intellij.python.community.impl.tests.iml b/python/intellij.python.community.impl.tests.iml index df0a32b17184..e3a693699f95 100644 --- a/python/intellij.python.community.impl.tests.iml +++ b/python/intellij.python.community.impl.tests.iml @@ -60,7 +60,7 @@ - + diff --git a/python/intellij.python.community.tests.iml b/python/intellij.python.community.tests.iml index 28b057491667..cfe7e5386f56 100644 --- a/python/intellij.python.community.tests.iml +++ b/python/intellij.python.community.tests.iml @@ -63,6 +63,7 @@ + @@ -71,6 +72,8 @@ + + @@ -84,6 +87,7 @@ + @@ -116,5 +120,6 @@ + \ No newline at end of file diff --git a/python/intellij.python.ml.features/BUILD.bazel b/python/intellij.python.ml.features/BUILD.bazel index c0412da0d4b2..887e11435d58 100644 --- a/python/intellij.python.ml.features/BUILD.bazel +++ b/python/intellij.python.ml.features/BUILD.bazel @@ -30,6 +30,7 @@ jvm_library( "//platform/util/concurrency", "//platform/core-ui", "//platform/platform-impl/codeinsight-inline:ide-codeinsight-inline", + "//platform/ide-core", "@lib//:python-ml-features-jetbrains-ml-models-python-imports-ranking-model", "@lib//:jetbrains-mlapi-catboost", "@lib//:jetbrains-mlapi-catboost-shadow-need-slf4j", @@ -58,6 +59,7 @@ jvm_library( "//platform/util/concurrency:concurrency_test_lib", "//platform/core-ui:core-ui_test_lib", "//platform/platform-impl/codeinsight-inline:ide-codeinsight-inline_test_lib", + "//platform/ide-core:ide-core_test_lib", ] ) ### auto-generated section `build intellij.python.ml.features` end diff --git a/python/intellij.python.ml.features/intellij.python.ml.features.iml b/python/intellij.python.ml.features/intellij.python.ml.features.iml index 3afa593ccdf4..c216041a936d 100644 --- a/python/intellij.python.ml.features/intellij.python.ml.features.iml +++ b/python/intellij.python.ml.features/intellij.python.ml.features.iml @@ -24,6 +24,7 @@ + diff --git a/python/pluginCore/impl/BUILD.bazel b/python/pluginCore/impl/BUILD.bazel index 2961f7770e42..79b1db8aa1c1 100644 --- a/python/pluginCore/impl/BUILD.bazel +++ b/python/pluginCore/impl/BUILD.bazel @@ -25,12 +25,14 @@ jvm_library( "//platform/execution", "//platform/execution-impl", "//platform/platform-impl:ide-impl", + "//platform/ide-core", "//platform/projectModel-api:projectModel", "//python:python-community-impl", "//python/python-sdk:sdk", "//libraries/guava", "//platform/core-ui", "//platform/util/concurrency", + "//platform/util:util-ui", ] ) @@ -51,12 +53,14 @@ jvm_library( "//platform/execution:execution_test_lib", "//platform/execution-impl:execution-impl_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/projectModel-api:projectModel_test_lib", "//python:python-community-impl_test_lib", "//python/python-sdk:sdk_test_lib", "//libraries/guava:guava_test_lib", "//platform/core-ui:core-ui_test_lib", "//platform/util/concurrency:concurrency_test_lib", + "//platform/util:util-ui_test_lib", ] ) ### auto-generated section `build intellij.python.community.plugin.impl` end diff --git a/python/pluginCore/impl/intellij.python.community.plugin.impl.iml b/python/pluginCore/impl/intellij.python.community.plugin.impl.iml index c46b039a3ef1..01346eda4b04 100644 --- a/python/pluginCore/impl/intellij.python.community.plugin.impl.iml +++ b/python/pluginCore/impl/intellij.python.community.plugin.impl.iml @@ -19,11 +19,13 @@ + + \ No newline at end of file diff --git a/python/pluginJava/BUILD.bazel b/python/pluginJava/BUILD.bazel index 8776c8123a3a..62e3bf95a3ab 100644 --- a/python/pluginJava/BUILD.bazel +++ b/python/pluginJava/BUILD.bazel @@ -29,13 +29,16 @@ jvm_library( "//platform/forms_rt:java-guiForms-rt", "//java/openapi:java", "//java/java-psi-api:psi", + "//java/java-frontback-psi-api:frontback-psi", "//java/java-indexing-api:indexing", "//platform/platform-impl:ide-impl", + "//platform/ide-core", "//java/idea-ui:ui", "//python/pluginCore/impl", "//python/python-psi-impl:psi-impl", "//platform/core-ui", "//platform/util/jdom", + "//platform/util:util-ui", "//python/python-core-impl:community-core-impl", "//platform/execution", "//platform/util/concurrency", @@ -63,13 +66,16 @@ jvm_library( "//platform/forms_rt:java-guiForms-rt_test_lib", "//java/openapi:java_test_lib", "//java/java-psi-api:psi_test_lib", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//java/java-indexing-api:indexing_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//java/idea-ui:ui_test_lib", "//python/pluginCore/impl:impl_test_lib", "//python/python-psi-impl:psi-impl_test_lib", "//platform/core-ui:core-ui_test_lib", "//platform/util/jdom:jdom_test_lib", + "//platform/util:util-ui_test_lib", "//python/python-core-impl:community-core-impl_test_lib", "//platform/execution:execution_test_lib", "//platform/util/concurrency:concurrency_test_lib", diff --git a/python/pluginJava/intellij.python.community.plugin.java.iml b/python/pluginJava/intellij.python.community.plugin.java.iml index 580ca9e2e0d5..24b6a6931b63 100644 --- a/python/pluginJava/intellij.python.community.plugin.java.iml +++ b/python/pluginJava/intellij.python.community.plugin.java.iml @@ -23,13 +23,16 @@ + + + diff --git a/python/pluginMinor/BUILD.bazel b/python/pluginMinor/BUILD.bazel index 8fac032fba3f..7114f7f9419a 100644 --- a/python/pluginMinor/BUILD.bazel +++ b/python/pluginMinor/BUILD.bazel @@ -22,6 +22,7 @@ jvm_library( "//python:python-community-impl", "//python/pluginCore/impl", "//platform/util/jdom", + "//platform/ide-core", "@lib//:kotlin-stdlib", ] ) @@ -41,6 +42,7 @@ jvm_library( "//python:python-community-impl_test_lib", "//python/pluginCore/impl:impl_test_lib", "//platform/util/jdom:jdom_test_lib", + "//platform/ide-core:ide-core_test_lib", ] ) ### auto-generated section `build intellij.python.community.plugin.minor` end diff --git a/python/pluginMinor/intellij.python.community.plugin.minor.iml b/python/pluginMinor/intellij.python.community.plugin.minor.iml index 091933c9b4a5..703d41c09b32 100644 --- a/python/pluginMinor/intellij.python.community.plugin.minor.iml +++ b/python/pluginMinor/intellij.python.community.plugin.minor.iml @@ -16,6 +16,7 @@ + \ No newline at end of file diff --git a/python/python-ast/BUILD.bazel b/python/python-ast/BUILD.bazel index abdd986fc607..59d713ccc689 100644 --- a/python/python-ast/BUILD.bazel +++ b/python/python-ast/BUILD.bazel @@ -16,6 +16,7 @@ jvm_library( deps = [ "@lib//:kotlin-stdlib", "//platform/util", + "//platform/util/base", "//platform/core-api:core", "//python/python-parser:parser", "//platform/core-impl", @@ -32,6 +33,7 @@ jvm_library( runtime_deps = [ ":ast", "//platform/util:util_test_lib", + "//platform/util/base:base_test_lib", "//platform/core-api:core_test_lib", "//python/python-parser:parser_test_lib", "//platform/core-impl:core-impl_test_lib", diff --git a/python/python-ast/intellij.python.ast.iml b/python/python-ast/intellij.python.ast.iml index 01cbaf897cb5..f6d83b50c3e1 100644 --- a/python/python-ast/intellij.python.ast.iml +++ b/python/python-ast/intellij.python.ast.iml @@ -10,6 +10,7 @@ + diff --git a/python/python-external-index/BUILD.bazel b/python/python-external-index/BUILD.bazel index 070ba92af1b4..e856a9cf72dd 100644 --- a/python/python-external-index/BUILD.bazel +++ b/python/python-external-index/BUILD.bazel @@ -26,6 +26,7 @@ jvm_library( "//platform/projectModel-api:projectModel", "//platform/analysis-api:analysis", "//platform/platform-impl:ide-impl", + "//platform/welcome-screen", ] ) @@ -46,6 +47,7 @@ jvm_library( "//platform/projectModel-api:projectModel_test_lib", "//platform/analysis-api:analysis_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/welcome-screen:welcome-screen_test_lib", ] ) ### auto-generated section `build intellij.python.externalIndex` end diff --git a/python/python-external-index/intellij.python.externalIndex.iml b/python/python-external-index/intellij.python.externalIndex.iml index 38c2990b8c17..ecfee62bbc14 100644 --- a/python/python-external-index/intellij.python.externalIndex.iml +++ b/python/python-external-index/intellij.python.externalIndex.iml @@ -21,5 +21,6 @@ + \ No newline at end of file diff --git a/python/python-features-trainer/BUILD.bazel b/python/python-features-trainer/BUILD.bazel index c88426445aee..ad65a77c6274 100644 --- a/python/python-features-trainer/BUILD.bazel +++ b/python/python-features-trainer/BUILD.bazel @@ -27,6 +27,8 @@ jvm_library( "//python:python-community-impl", "//plugins/ide-features-trainer:featuresTrainer", "//platform/platform-impl:ide-impl", + "//platform/ide-core", + "//platform/progress/shared:ide-progress", "//platform/xdebugger-api:debugger", "//platform/usageView", "//platform/lang-impl", @@ -36,6 +38,7 @@ jvm_library( "//libraries/kotlinx/serialization/core", "//libraries/kotlinx/serialization/json", "//python/services/system-python", + "//platform/util:util-ui", "//libraries/stream", ] ) @@ -59,6 +62,8 @@ jvm_library( "//python:python-community-impl_test_lib", "//plugins/ide-features-trainer:featuresTrainer_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", + "//platform/progress/shared:ide-progress_test_lib", "//platform/xdebugger-api:debugger_test_lib", "//platform/usageView:usageView_test_lib", "//platform/lang-impl:lang-impl_test_lib", @@ -76,6 +81,7 @@ jvm_library( "//python/junit5Tests-framework:community-junit5Tests-framework_test_lib", "//platform/testFramework/junit5", "//platform/testFramework/junit5:junit5_test_lib", + "//platform/util:util-ui_test_lib", "//python/python-venv:venv", "//python/python-venv:venv_test_lib", "//python/services/internal-impl:python-community-services-internal-impl", diff --git a/python/python-features-trainer/intellij.python.featuresTrainer.iml b/python/python-features-trainer/intellij.python.featuresTrainer.iml index c4a7823e2eda..fdf52183e850 100644 --- a/python/python-features-trainer/intellij.python.featuresTrainer.iml +++ b/python/python-features-trainer/intellij.python.featuresTrainer.iml @@ -22,6 +22,8 @@ + + @@ -35,6 +37,7 @@ + diff --git a/python/python-parser/BUILD.bazel b/python/python-parser/BUILD.bazel index 1df45356c548..e6c27db55655 100644 --- a/python/python-parser/BUILD.bazel +++ b/python/python-parser/BUILD.bazel @@ -17,6 +17,8 @@ jvm_library( "@lib//:kotlin-stdlib", "//platform/core-api:core", "//platform/util", + "//platform/util/multiplatform", + "//platform/util/base", "//libraries/fastutil", "//platform/core-impl", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", @@ -32,6 +34,8 @@ jvm_library( ":parser", "//platform/core-api:core_test_lib", "//platform/util:util_test_lib", + "//platform/util/multiplatform:multiplatform_test_lib", + "//platform/util/base:base_test_lib", "//libraries/fastutil:fastutil_test_lib", "//platform/core-impl:core-impl_test_lib", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", diff --git a/python/python-parser/intellij.python.parser.iml b/python/python-parser/intellij.python.parser.iml index 7f81e3458af4..8ee726f7b070 100644 --- a/python/python-parser/intellij.python.parser.iml +++ b/python/python-parser/intellij.python.parser.iml @@ -12,6 +12,8 @@ + + diff --git a/python/python-process-output/frontend/BUILD.bazel b/python/python-process-output/frontend/BUILD.bazel index d3bb9657ea5d..ec6d95b3f853 100644 --- a/python/python-process-output/frontend/BUILD.bazel +++ b/python/python-process-output/frontend/BUILD.bazel @@ -26,6 +26,7 @@ jvm_library( "//platform/platform-frontend:frontend", "@lib//:kotlin-stdlib", "//platform/platform-api:ide", + "//platform/ide-core", "//platform/core-api:core", "//libraries/skiko", "//libraries/compose-foundation-desktop", @@ -56,6 +57,7 @@ jvm_library( ":frontend", "//platform/platform-frontend:frontend_test_lib", "//platform/platform-api:ide_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/core-api:core_test_lib", "//libraries/skiko:skiko_test_lib", "//libraries/compose-foundation-desktop:compose-foundation-desktop_test_lib", diff --git a/python/python-process-output/frontend/intellij.python.processOutput.frontend.iml b/python/python-process-output/frontend/intellij.python.processOutput.frontend.iml index d566c1b00609..2cafc1139bab 100644 --- a/python/python-process-output/frontend/intellij.python.processOutput.frontend.iml +++ b/python/python-process-output/frontend/intellij.python.processOutput.frontend.iml @@ -33,6 +33,7 @@ + diff --git a/python/python-psi-impl/BUILD.bazel b/python/python-psi-impl/BUILD.bazel index 212565098de9..a7b35d36dbaa 100644 --- a/python/python-psi-impl/BUILD.bazel +++ b/python/python-psi-impl/BUILD.bazel @@ -44,6 +44,7 @@ jvm_library( "//platform/lvcs-api:lvcs", "//platform/ide-core-impl", "//platform/util/jdom", + "//platform/util-ex", "//libraries/gson", "//platform/workspace/jps", "//platform/backend/workspace", @@ -99,6 +100,7 @@ jvm_library( "//platform/lvcs-api:lvcs_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", "//platform/util/jdom:jdom_test_lib", + "//platform/util-ex:util-ex_test_lib", "//libraries/gson:gson_test_lib", "//platform/workspace/jps:jps_test_lib", "//platform/backend/workspace:workspace_test_lib", diff --git a/python/python-psi-impl/intellij.python.psi.impl.iml b/python/python-psi-impl/intellij.python.psi.impl.iml index b749971aa4d8..15a2d618d6a8 100644 --- a/python/python-psi-impl/intellij.python.psi.impl.iml +++ b/python/python-psi-impl/intellij.python.psi.impl.iml @@ -39,6 +39,7 @@ + diff --git a/python/python-pyproject/BUILD.bazel b/python/python-pyproject/BUILD.bazel index e11d0cbe22df..e456ee6c6882 100644 --- a/python/python-pyproject/BUILD.bazel +++ b/python/python-pyproject/BUILD.bazel @@ -35,6 +35,7 @@ jvm_library( "//python/common", "//platform/lang-impl", "//platform/lang-core", + "//platform/editor-ui-api:editor-ui", "//platform/backend/observation", "//platform/statistics", "//platform/indexing-api:indexing", @@ -69,6 +70,7 @@ jvm_library( "//python/common:common_test_lib", "//platform/lang-impl:lang-impl_test_lib", "//platform/lang-core:lang-core_test_lib", + "//platform/editor-ui-api:editor-ui_test_lib", "//platform/backend/observation:observation_test_lib", "//platform/statistics:statistics_test_lib", "//platform/indexing-api:indexing_test_lib", @@ -120,6 +122,8 @@ jvm_library( "//python/python-sdk:sdk_test_lib", "//platform/util", "//platform/util:util_test_lib", + "//platform/util-ex", + "//platform/util-ex:util-ex_test_lib", "//plugins/toml/core", "//plugins/toml/core:core_test_lib", "@lib//:tuweni-toml", diff --git a/python/python-pyproject/intellij.python.pyproject.iml b/python/python-pyproject/intellij.python.pyproject.iml index 5103a780d6cd..1068b4b5a12a 100644 --- a/python/python-pyproject/intellij.python.pyproject.iml +++ b/python/python-pyproject/intellij.python.pyproject.iml @@ -30,6 +30,7 @@ + diff --git a/python/python-pyproject/intellij.python.pyproject.tests.iml b/python/python-pyproject/intellij.python.pyproject.tests.iml index 1a912810f761..6c966e524421 100644 --- a/python/python-pyproject/intellij.python.pyproject.tests.iml +++ b/python/python-pyproject/intellij.python.pyproject.tests.iml @@ -17,6 +17,7 @@ + diff --git a/python/python-restructuredtext/BUILD.bazel b/python/python-restructuredtext/BUILD.bazel index 57dc0fa2a932..ec43363d98e4 100644 --- a/python/python-restructuredtext/BUILD.bazel +++ b/python/python-restructuredtext/BUILD.bazel @@ -49,7 +49,9 @@ jvm_library( "//libraries/jsoup", "//python/python-sdk:sdk", "//platform/util/jdom", + "//platform/util:util-ui", "//platform/platform-impl:ide-impl", + "//platform/ide-core", "//libraries/jcef", "//plugins/restructuredtext", "//platform/ui.jcef", @@ -92,7 +94,9 @@ jvm_library( "//libraries/jsoup:jsoup_test_lib", "//python/python-sdk:sdk_test_lib", "//platform/util/jdom:jdom_test_lib", + "//platform/util:util-ui_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//libraries/jcef:jcef_test_lib", "//spellchecker", "//spellchecker:spellchecker_test_lib", diff --git a/python/python-restructuredtext/intellij.restructuredtext.python.iml b/python/python-restructuredtext/intellij.restructuredtext.python.iml index 7def5ccbcebb..d513838ee74c 100644 --- a/python/python-restructuredtext/intellij.restructuredtext.python.iml +++ b/python/python-restructuredtext/intellij.restructuredtext.python.iml @@ -22,7 +22,9 @@ + + diff --git a/python/python-sdk-configurator/backend/BUILD.bazel b/python/python-sdk-configurator/backend/BUILD.bazel index 55ea7abce33a..8ea61a35ed08 100644 --- a/python/python-sdk-configurator/backend/BUILD.bazel +++ b/python/python-sdk-configurator/backend/BUILD.bazel @@ -26,6 +26,9 @@ jvm_library( "//platform/core-api:core", "@lib//:jetbrains-annotations", "//platform/platform-api:ide", + "//platform/ide-core", + "//platform/progress/shared:ide-progress", + "//platform/editor-ui-api:editor-ui", "//python/python-sdk:sdk", "//python/openapi:community", "//platform/projectModel-api:projectModel", @@ -55,6 +58,9 @@ jvm_library( "//python/python-pyproject:pyproject_test_lib", "//platform/core-api:core_test_lib", "//platform/platform-api:ide_test_lib", + "//platform/ide-core:ide-core_test_lib", + "//platform/progress/shared:ide-progress_test_lib", + "//platform/editor-ui-api:editor-ui_test_lib", "//python/python-sdk:sdk_test_lib", "//python/openapi:community_test_lib", "//platform/projectModel-api:projectModel_test_lib", diff --git a/python/python-sdk-configurator/backend/intellij.python.sdkConfigurator.backend.iml b/python/python-sdk-configurator/backend/intellij.python.sdkConfigurator.backend.iml index 6c16082b23b7..dfbc9405f2de 100644 --- a/python/python-sdk-configurator/backend/intellij.python.sdkConfigurator.backend.iml +++ b/python/python-sdk-configurator/backend/intellij.python.sdkConfigurator.backend.iml @@ -38,6 +38,9 @@ + + + diff --git a/python/python-sdk-configurator/frontend/BUILD.bazel b/python/python-sdk-configurator/frontend/BUILD.bazel index 1ae9ec1abfe4..693e6fcb439d 100644 --- a/python/python-sdk-configurator/frontend/BUILD.bazel +++ b/python/python-sdk-configurator/frontend/BUILD.bazel @@ -32,6 +32,7 @@ jvm_library( "//platform/project/shared:project", "//fleet/rpc", "//platform/platform-api:ide", + "//platform/ide-core", "//libraries/compose-runtime-desktop", "//platform/jewel/ui", "//platform/jewel/ide-laf-bridge", @@ -40,6 +41,7 @@ jvm_library( "//libraries/compose-foundation-desktop", "//platform/jewel/foundation", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", + "//platform/util:util-ui", "//python/common", ], plugins = ["@lib//:compose-plugin"] @@ -62,6 +64,7 @@ jvm_library( "//platform/project/shared:project_test_lib", "//fleet/rpc:rpc_test_lib", "//platform/platform-api:ide_test_lib", + "//platform/ide-core:ide-core_test_lib", "//libraries/compose-runtime-desktop:compose-runtime-desktop_test_lib", "//platform/jewel/ui:ui_test_lib", "//platform/jewel/ide-laf-bridge:ide-laf-bridge_test_lib", @@ -70,6 +73,7 @@ jvm_library( "//libraries/compose-foundation-desktop:compose-foundation-desktop_test_lib", "//platform/jewel/foundation:foundation_test_lib", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", + "//platform/util:util-ui_test_lib", "//python/common:common_test_lib", ], plugins = ["@lib//:compose-plugin"] diff --git a/python/python-sdk-configurator/frontend/intellij.python.sdkConfigurator.frontend.iml b/python/python-sdk-configurator/frontend/intellij.python.sdkConfigurator.frontend.iml index c07a3adab38c..17e94a88d880 100644 --- a/python/python-sdk-configurator/frontend/intellij.python.sdkConfigurator.frontend.iml +++ b/python/python-sdk-configurator/frontend/intellij.python.sdkConfigurator.frontend.iml @@ -45,6 +45,7 @@ + @@ -53,6 +54,7 @@ + \ No newline at end of file diff --git a/python/python-sdk-ui/BUILD.bazel b/python/python-sdk-ui/BUILD.bazel index 9989f958a294..211ff07f7fd3 100644 --- a/python/python-sdk-ui/BUILD.bazel +++ b/python/python-sdk-ui/BUILD.bazel @@ -16,11 +16,14 @@ jvm_library( deps = [ "@lib//:kotlin-stdlib", "//platform/util", + "//platform/util:util-ui", "//platform/core-api:core", "//platform/core-ui", "//platform/projectModel-api:projectModel", "//platform/platform-api:ide", "//platform/platform-impl:ide-impl", + "//platform/ide-core", + "//platform/progress/shared:ide-progress", "//platform/editor-ui-api:editor-ui", "//python/openapi:community", "//python/python-sdk:sdk", @@ -41,11 +44,14 @@ jvm_library( runtime_deps = [ ":sdk-ui", "//platform/util:util_test_lib", + "//platform/util:util-ui_test_lib", "//platform/core-api:core_test_lib", "//platform/core-ui:core-ui_test_lib", "//platform/projectModel-api:projectModel_test_lib", "//platform/platform-api:ide_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", + "//platform/progress/shared:ide-progress_test_lib", "//platform/editor-ui-api:editor-ui_test_lib", "//python/openapi:community_test_lib", "//python/python-sdk:sdk_test_lib", diff --git a/python/python-sdk-ui/intellij.python.sdk.ui.iml b/python/python-sdk-ui/intellij.python.sdk.ui.iml index 57479e805d6e..8880390e3927 100644 --- a/python/python-sdk-ui/intellij.python.sdk.ui.iml +++ b/python/python-sdk-ui/intellij.python.sdk.ui.iml @@ -11,11 +11,14 @@ + + + diff --git a/python/python-sdk/BUILD.bazel b/python/python-sdk/BUILD.bazel index 497e76d82a44..536891be928e 100644 --- a/python/python-sdk/BUILD.bazel +++ b/python/python-sdk/BUILD.bazel @@ -31,6 +31,7 @@ jvm_library( "//python/python-psi-api:psi", "//platform/projectModel-impl", "//platform/util/jdom", + "//platform/util-ex", "//platform/ide-core", "//platform/execution", "//platform/remote-core", @@ -72,6 +73,7 @@ jvm_library( "//python/python-psi-api:psi_test_lib", "//platform/projectModel-impl:projectModel-impl_test_lib", "//platform/util/jdom:jdom_test_lib", + "//platform/util-ex:util-ex_test_lib", "//platform/ide-core:ide-core_test_lib", "//platform/execution:execution_test_lib", "//platform/remote-core:remote-core_test_lib", diff --git a/python/python-sdk/intellij.python.sdk.iml b/python/python-sdk/intellij.python.sdk.iml index d443e537d4b5..a90288f1d929 100644 --- a/python/python-sdk/intellij.python.sdk.iml +++ b/python/python-sdk/intellij.python.sdk.iml @@ -25,6 +25,7 @@ + diff --git a/python/python-syntax/BUILD.bazel b/python/python-syntax/BUILD.bazel index d85a16920a11..ae5e0d24c3fa 100644 --- a/python/python-syntax/BUILD.bazel +++ b/python/python-syntax/BUILD.bazel @@ -22,12 +22,14 @@ jvm_library( "//platform/editor-ui-api:editor-ui", "//python/python-syntax-core:syntax-core", "//platform/platform-impl:ide-impl", + "//platform/ide-core", "//python/python-ast:ast", "//platform/lang-impl", "//platform/editor-ui-ex:editor-ex", "//platform/core-ui", "//platform/forms_rt:java-guiForms-rt", "//platform/code-style-impl:codeStyle-impl", + "//platform/util:util-ui", "//libraries/fastutil", "//libraries/guava", "//libraries/kotlinx/serialization/core", @@ -53,12 +55,14 @@ jvm_library( "//platform/editor-ui-api:editor-ui_test_lib", "//python/python-syntax-core:syntax-core_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//python/python-ast:ast_test_lib", "//platform/lang-impl:lang-impl_test_lib", "//platform/editor-ui-ex:editor-ex_test_lib", "//platform/core-ui:core-ui_test_lib", "//platform/forms_rt:java-guiForms-rt_test_lib", "//platform/code-style-impl:codeStyle-impl_test_lib", + "//platform/util:util-ui_test_lib", "//libraries/fastutil:fastutil_test_lib", "//libraries/guava:guava_test_lib", "//libraries/kotlinx/serialization/core:core_test_lib", diff --git a/python/python-syntax/intellij.python.syntax.iml b/python/python-syntax/intellij.python.syntax.iml index baf08342820e..5dffe5cda842 100644 --- a/python/python-syntax/intellij.python.syntax.iml +++ b/python/python-syntax/intellij.python.syntax.iml @@ -38,12 +38,14 @@ + + diff --git a/python/python-terminal/BUILD.bazel b/python/python-terminal/BUILD.bazel index b4cb9ff1c7cf..0a9ab51f5e9b 100644 --- a/python/python-terminal/BUILD.bazel +++ b/python/python-terminal/BUILD.bazel @@ -22,6 +22,7 @@ jvm_library( "@lib//:kotlin-stdlib", "//python/python-sdk:sdk", "//platform/lang-api:lang", + "//platform/ide-core", ] ) @@ -58,6 +59,7 @@ jvm_library( "@lib//:junit5Pioneer", "//platform/testFramework/common", "//platform/testFramework/common:common_test_lib", + "//platform/ide-core:ide-core_test_lib", "//python/python-test-env/junit5", "//python/python-test-env/junit5:junit5_test_lib", ] diff --git a/python/python-terminal/intellij.python.terminal.iml b/python/python-terminal/intellij.python.terminal.iml index 8699f2fc7081..1133a6ad27e0 100644 --- a/python/python-terminal/intellij.python.terminal.iml +++ b/python/python-terminal/intellij.python.terminal.iml @@ -27,6 +27,7 @@ + \ No newline at end of file diff --git a/python/services/system-python/BUILD.bazel b/python/services/system-python/BUILD.bazel index baf7d8b7c781..ca847888d167 100644 --- a/python/services/system-python/BUILD.bazel +++ b/python/services/system-python/BUILD.bazel @@ -142,12 +142,16 @@ jvm_library( "//platform/testFramework/junit5/eel:eel_test_lib", "//platform/testFramework/junit5/eel:testFramework-junit5-eel-tests", "//platform/testFramework/junit5/eel:testFramework-junit5-eel-tests_test_lib", + "//platform/ide-core", ], exports = [ "//python/services/shared", "//python/services/shared:shared_test_lib", ], - runtime_deps = [":python-community-services-systemPython-tests"] + runtime_deps = [ + ":python-community-services-systemPython-tests", + "//platform/ide-core:ide-core_test_lib", + ] ) ### auto-generated section `build intellij.python.community.services.systemPython.tests` end diff --git a/python/services/system-python/intellij.python.community.services.systemPython.tests.iml b/python/services/system-python/intellij.python.community.services.systemPython.tests.iml index 58c8f8dc28d4..a6dc8732a220 100644 --- a/python/services/system-python/intellij.python.community.services.systemPython.tests.iml +++ b/python/services/system-python/intellij.python.community.services.systemPython.tests.iml @@ -37,6 +37,7 @@ + \ No newline at end of file diff --git a/python/testFramework/BUILD.bazel b/python/testFramework/BUILD.bazel index 1a3ca6a77db4..585124855dc6 100644 --- a/python/testFramework/BUILD.bazel +++ b/python/testFramework/BUILD.bazel @@ -27,6 +27,8 @@ jvm_library( "//python/python-sdk:sdk", "//platform/execution", "//platform/lang-impl", + "//platform/ide-core", + "//platform/util:util-ui", "//python:python-community-impl", ] ) @@ -51,6 +53,8 @@ jvm_library( "//python/python-sdk:sdk_test_lib", "//platform/execution:execution_test_lib", "//platform/lang-impl:lang-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", + "//platform/util:util-ui_test_lib", "//python:python-community-impl_test_lib", ] ) diff --git a/python/testFramework/intellij.python.community.testFramework.iml b/python/testFramework/intellij.python.community.testFramework.iml index db5415816c99..51150d0439c9 100644 --- a/python/testFramework/intellij.python.community.testFramework.iml +++ b/python/testFramework/intellij.python.community.testFramework.iml @@ -21,6 +21,8 @@ + + \ No newline at end of file diff --git a/spellchecker/BUILD.bazel b/spellchecker/BUILD.bazel index b32c39485ca9..d9530dcbc6ac 100644 --- a/spellchecker/BUILD.bazel +++ b/spellchecker/BUILD.bazel @@ -32,6 +32,7 @@ jvm_library( "//platform/lang-impl", "//platform/platform-api:ide", "//platform/platform-impl:ide-impl", + "//platform/ide-core", "//platform/editor-ui-ex:editor-ex", "//platform/projectModel-api:projectModel", "//platform/refactoring", @@ -48,6 +49,7 @@ jvm_library( "//libraries/fastutil", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", "//platform/util/concurrency", + "//platform/util:util-ui", ], runtime_deps = ["//platform/backend"] ) @@ -68,6 +70,7 @@ jvm_library( "//platform/lang-impl:lang-impl_test_lib", "//platform/platform-api:ide_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/editor-ui-ex:editor-ex_test_lib", "//platform/projectModel-api:projectModel_test_lib", "//platform/backend:backend_test_lib", @@ -84,6 +87,7 @@ jvm_library( "//libraries/fastutil:fastutil_test_lib", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", "//platform/util/concurrency:concurrency_test_lib", + "//platform/util:util-ui_test_lib", ] ) ### auto-generated section `build intellij.spellchecker` end diff --git a/spellchecker/intellij.spellchecker.iml b/spellchecker/intellij.spellchecker.iml index b79e4d85cae4..c308111a5bdb 100644 --- a/spellchecker/intellij.spellchecker.iml +++ b/spellchecker/intellij.spellchecker.iml @@ -19,6 +19,7 @@ + @@ -36,5 +37,6 @@ + \ No newline at end of file diff --git a/tools/intellij.lambda.sampleTestsWithFixtures/BUILD.bazel b/tools/intellij.lambda.sampleTestsWithFixtures/BUILD.bazel index c65c564902e8..97f4a1ba4ac4 100644 --- a/tools/intellij.lambda.sampleTestsWithFixtures/BUILD.bazel +++ b/tools/intellij.lambda.sampleTestsWithFixtures/BUILD.bazel @@ -76,6 +76,7 @@ jvm_library( "//plugins/performanceTesting/core:performanceTesting", "//plugins/performanceTesting/core:performanceTesting_test_lib", "//platform/platform-impl/codeinsight-inline:ide-codeinsight-inline", + "//platform/ide-core", "//platform/xdebugger-api:debugger", "//platform/xdebugger-api:debugger_test_lib", "//platform/xdebugger-impl:debugger-impl", @@ -109,6 +110,7 @@ jvm_library( ":lambda-sampleTestsWithFixtures", "//platform/platform-impl:ide-impl_test_lib", "//platform/platform-impl/codeinsight-inline:ide-codeinsight-inline_test_lib", + "//platform/ide-core:ide-core_test_lib", ] ) ### auto-generated section `build intellij.lambda.sampleTestsWithFixtures` end diff --git a/tools/intellij.lambda.sampleTestsWithFixtures/intellij.lambda.sampleTestsWithFixtures.iml b/tools/intellij.lambda.sampleTestsWithFixtures/intellij.lambda.sampleTestsWithFixtures.iml index 3732d7c41ca6..11f676ffbf09 100644 --- a/tools/intellij.lambda.sampleTestsWithFixtures/intellij.lambda.sampleTestsWithFixtures.iml +++ b/tools/intellij.lambda.sampleTestsWithFixtures/intellij.lambda.sampleTestsWithFixtures.iml @@ -51,6 +51,7 @@ + diff --git a/tools/intellij.lambda.testFramework/BUILD.bazel b/tools/intellij.lambda.testFramework/BUILD.bazel index 6be2534c5a7a..d72865e97b0c 100644 --- a/tools/intellij.lambda.testFramework/BUILD.bazel +++ b/tools/intellij.lambda.testFramework/BUILD.bazel @@ -53,10 +53,14 @@ jvm_library( "//tools/intellij.tools.ide.util.common:ide-util-common", "//tools/intellij.tools.ide.starter.junit5:ide-starter-junit5", "//platform/platform-impl/codeinsight-inline:ide-codeinsight-inline", + "//platform/ide-core", + "//platform/progress/shared:ide-progress", "//tools/intellij.tools.ide.starter.driver:ide-starter-driver", "//libraries/rd/framework", "//libraries/rd/core", "//platform/projectModel-api:projectModel", + "//platform/util:util-ui", + "//platform/util-ex", ] ) @@ -95,10 +99,14 @@ jvm_library( "//tools/intellij.tools.ide.util.common:ide-util-common_test_lib", "//tools/intellij.tools.ide.starter.junit5:ide-starter-junit5_test_lib", "//platform/platform-impl/codeinsight-inline:ide-codeinsight-inline_test_lib", + "//platform/ide-core:ide-core_test_lib", + "//platform/progress/shared:ide-progress_test_lib", "//tools/intellij.tools.ide.starter.driver:ide-starter-driver_test_lib", "//libraries/rd/framework:framework_test_lib", "//libraries/rd/core:core_test_lib", "//platform/projectModel-api:projectModel_test_lib", + "//platform/util:util-ui_test_lib", + "//platform/util-ex:util-ex_test_lib", ] ) ### auto-generated section `build intellij.lambda.testFramework` end diff --git a/tools/intellij.lambda.testFramework/intellij.lambda.testFramework.iml b/tools/intellij.lambda.testFramework/intellij.lambda.testFramework.iml index ccbbfb1f0bef..52b57e30a700 100644 --- a/tools/intellij.lambda.testFramework/intellij.lambda.testFramework.iml +++ b/tools/intellij.lambda.testFramework/intellij.lambda.testFramework.iml @@ -56,9 +56,13 @@ + + + + \ No newline at end of file diff --git a/tools/intellij.tools.ide.starter/BUILD.bazel b/tools/intellij.tools.ide.starter/BUILD.bazel index 2cde68847c33..080705a100e6 100644 --- a/tools/intellij.tools.ide.starter/BUILD.bazel +++ b/tools/intellij.tools.ide.starter/BUILD.bazel @@ -48,6 +48,9 @@ jvm_library( "//libraries/commons/compress", "//libraries/commons/io", "//platform/platform-util-io:ide-util-io", + "//platform/util:util-ui", + "//platform/util-ex", + "//jps/model-serialization", ], exports = [ "//plugins/performanceTesting/commands-model:tools-ide-performanceTesting-commands", @@ -87,6 +90,9 @@ jvm_library( "//libraries/commons/compress:compress_test_lib", "//libraries/commons/io:io_test_lib", "//platform/platform-util-io:ide-util-io_test_lib", + "//platform/util:util-ui_test_lib", + "//platform/util-ex:util-ex_test_lib", + "//jps/model-serialization:model-serialization_test_lib", ] ) ### auto-generated section `build intellij.tools.ide.starter` end diff --git a/tools/intellij.tools.ide.starter/intellij.tools.ide.starter.iml b/tools/intellij.tools.ide.starter/intellij.tools.ide.starter.iml index 5aac34a22fb0..a68dd95dd0b3 100644 --- a/tools/intellij.tools.ide.starter/intellij.tools.ide.starter.iml +++ b/tools/intellij.tools.ide.starter/intellij.tools.ide.starter.iml @@ -68,5 +68,8 @@ + + + \ No newline at end of file diff --git a/uast/testFramework/BUILD.bazel b/uast/testFramework/BUILD.bazel index c2ead3fc60da..31662eefcead 100644 --- a/uast/testFramework/BUILD.bazel +++ b/uast/testFramework/BUILD.bazel @@ -9,6 +9,7 @@ jvm_library( deps = [ "//platform/analysis-api:analysis", "//platform/core-api:core", + "//platform/core-impl", "//platform/indexing-api:indexing", "//jps/model-api:model", "//platform/lang-core", @@ -17,6 +18,7 @@ jvm_library( "//uast/uast-common:uast", "//platform/testFramework", "//java/openapi:java", + "//java/java-psi-api:psi", "@lib//:kotlin-stdlib", "//platform/ide-core-impl", "//platform/vcs-api:vcs", @@ -39,6 +41,7 @@ jvm_library( ":testFramework", "//platform/analysis-api:analysis_test_lib", "//platform/core-api:core_test_lib", + "//platform/core-impl:core-impl_test_lib", "//platform/indexing-api:indexing_test_lib", "//jps/model-api:model_test_lib", "//platform/lang-core:lang-core_test_lib", @@ -47,6 +50,7 @@ jvm_library( "//uast/uast-common:uast_test_lib", "//platform/testFramework:testFramework_test_lib", "//java/openapi:java_test_lib", + "//java/java-psi-api:psi_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", "//platform/vcs-api:vcs_test_lib", "//java/testFramework:testFramework_test_lib", diff --git a/uast/testFramework/intellij.platform.uast.testFramework.iml b/uast/testFramework/intellij.platform.uast.testFramework.iml index deec737faea0..347a2e41535c 100644 --- a/uast/testFramework/intellij.platform.uast.testFramework.iml +++ b/uast/testFramework/intellij.platform.uast.testFramework.iml @@ -9,6 +9,7 @@ + @@ -17,6 +18,7 @@ + diff --git a/uast/uast-common-ide/BUILD.bazel b/uast/uast-common-ide/BUILD.bazel index ac3ef91d9201..c191571fdf0a 100644 --- a/uast/uast-common-ide/BUILD.bazel +++ b/uast/uast-common-ide/BUILD.bazel @@ -20,6 +20,7 @@ jvm_library( "//platform/lang-api:lang", "//platform/platform-impl:ide-impl", "//platform/projectModel-api:projectModel", + "//java/java-psi-api:psi", "//uast/uast-common:uast", "@lib//:kotlin-stdlib", "//libraries/stream", @@ -40,6 +41,7 @@ jvm_library( "//platform/lang-api:lang_test_lib", "//platform/platform-impl:ide-impl_test_lib", "//platform/projectModel-api:projectModel_test_lib", + "//java/java-psi-api:psi_test_lib", "//uast/uast-common:uast_test_lib", "//libraries/stream:stream_test_lib", "//platform/backend:backend_test_lib", diff --git a/uast/uast-common-ide/intellij.platform.uast.ide.iml b/uast/uast-common-ide/intellij.platform.uast.ide.iml index b08ad535029d..fe2f754b3ffe 100644 --- a/uast/uast-common-ide/intellij.platform.uast.ide.iml +++ b/uast/uast-common-ide/intellij.platform.uast.ide.iml @@ -14,6 +14,7 @@ + diff --git a/uast/uast-common/BUILD.bazel b/uast/uast-common/BUILD.bazel index dfe094b7d623..89f564da6a10 100644 --- a/uast/uast-common/BUILD.bazel +++ b/uast/uast-common/BUILD.bazel @@ -17,12 +17,14 @@ jvm_library( deps = [ "//java/java-psi-api:psi", "//java/java-psi-impl:psi-impl", + "//java/java-frontback-psi-api:frontback-psi", "//libraries/stream", "@lib//:kotlin-stdlib", "//platform/core-api:core", + "//platform/core-impl", "//platform/util", - ], - exports = ["//java/java-psi-api:psi"] + "//platform/util/base", + ] ) jvm_library( @@ -31,17 +33,16 @@ jvm_library( visibility = ["//visibility:public"], srcs = glob([], allow_empty = True), kotlinc_opts = "@community//:k11", - exports = [ - "//java/java-psi-api:psi", - "//java/java-psi-api:psi_test_lib", - ], runtime_deps = [ ":uast", "//java/java-psi-api:psi_test_lib", "//java/java-psi-impl:psi-impl_test_lib", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//libraries/stream:stream_test_lib", "//platform/core-api:core_test_lib", + "//platform/core-impl:core-impl_test_lib", "//platform/util:util_test_lib", + "//platform/util/base:base_test_lib", ] ) ### auto-generated section `build intellij.platform.uast` end diff --git a/uast/uast-common/intellij.platform.uast.iml b/uast/uast-common/intellij.platform.uast.iml index b0c1f98dcdac..7538807d8e7f 100644 --- a/uast/uast-common/intellij.platform.uast.iml +++ b/uast/uast-common/intellij.platform.uast.iml @@ -24,11 +24,14 @@ - + + + + \ No newline at end of file diff --git a/uast/uast-java-ide/BUILD.bazel b/uast/uast-java-ide/BUILD.bazel index 7dfd7728c6d8..514cd482a527 100644 --- a/uast/uast-java-ide/BUILD.bazel +++ b/uast/uast-java-ide/BUILD.bazel @@ -15,10 +15,14 @@ jvm_library( resources = [":java-uast-ide_resources"], deps = [ "//java/java-impl:impl", + "//java/java-psi-api:psi", "//platform/analysis-api:analysis", "//platform/core-api:core", + "//platform/core-impl", "//platform/editor-ui-api:editor-ui", "//uast/uast-java:java-uast", + "//java/java-frontback-psi-api:frontback-psi", + "//uast/uast-common-ide:ide", ], exports = ["//uast/uast-java:java-uast"] ) @@ -35,10 +39,14 @@ jvm_library( runtime_deps = [ ":java-uast-ide", "//java/java-impl:impl_test_lib", + "//java/java-psi-api:psi_test_lib", "//platform/analysis-api:analysis_test_lib", "//platform/core-api:core_test_lib", + "//platform/core-impl:core-impl_test_lib", "//platform/editor-ui-api:editor-ui_test_lib", "//uast/uast-java:java-uast_test_lib", + "//java/java-frontback-psi-api:frontback-psi_test_lib", + "//uast/uast-common-ide:ide_test_lib", ] ) ### auto-generated section `build intellij.java.uast.ide` end diff --git a/uast/uast-java-ide/intellij.java.uast.ide.iml b/uast/uast-java-ide/intellij.java.uast.ide.iml index 7eb936ca8000..d314236d5dd4 100644 --- a/uast/uast-java-ide/intellij.java.uast.ide.iml +++ b/uast/uast-java-ide/intellij.java.uast.ide.iml @@ -9,9 +9,13 @@ + + + + \ No newline at end of file diff --git a/uast/uast-java/BUILD.bazel b/uast/uast-java/BUILD.bazel index dd91a6ce68d1..1ba0de229c7d 100644 --- a/uast/uast-java/BUILD.bazel +++ b/uast/uast-java/BUILD.bazel @@ -17,10 +17,14 @@ jvm_library( deps = [ "//java/java-psi-api:psi", "//platform/core-api:core", + "//platform/core-impl", "//uast/uast-common:uast", "@lib//:kotlin-stdlib", "//java/java-psi-impl:psi-impl", + "//java/java-syntax:syntax", + "//java/java-frontback-psi-api:frontback-psi", "//platform/util", + "//platform/util/base", ], exports = ["//uast/uast-common:uast"] ) @@ -39,9 +43,13 @@ jvm_library( ":java-uast", "//java/java-psi-api:psi_test_lib", "//platform/core-api:core_test_lib", + "//platform/core-impl:core-impl_test_lib", "//uast/uast-common:uast_test_lib", "//java/java-psi-impl:psi-impl_test_lib", + "//java/java-syntax:syntax_test_lib", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//platform/util:util_test_lib", + "//platform/util/base:base_test_lib", ] ) ### auto-generated section `build intellij.java.uast` end diff --git a/uast/uast-java/intellij.java.uast.iml b/uast/uast-java/intellij.java.uast.iml index d473fa321337..191214f7d0fd 100644 --- a/uast/uast-java/intellij.java.uast.iml +++ b/uast/uast-java/intellij.java.uast.iml @@ -26,9 +26,13 @@ + + + + \ No newline at end of file diff --git a/uast/uast-tests/BUILD.bazel b/uast/uast-tests/BUILD.bazel index d9dbed048b59..62457c44691b 100644 --- a/uast/uast-tests/BUILD.bazel +++ b/uast/uast-tests/BUILD.bazel @@ -18,6 +18,7 @@ jvm_library( "//platform/core-impl", "//uast/uast-java-ide:java-uast-ide", "//java/java-runtime:rt", + "//java/java-psi-api:psi", "//java/java-psi-impl:psi-impl", "//platform/testFramework", "//java/java-tests:tests", @@ -38,6 +39,8 @@ jvm_library( "//platform/editor-ui-api:editor-ui_test_lib", "//jps/model-api:model", "//jps/model-api:model_test_lib", + "//platform/lang-api:lang", + "//platform/lang-api:lang_test_lib", "//uast/uast-common:uast", "//uast/uast-common:uast_test_lib", "@lib//:kotlin-stdlib", @@ -48,6 +51,8 @@ jvm_library( "//uast/uast-java-ide:java-uast-ide_test_lib", "//java/java-runtime:rt", "//java/java-runtime:rt_test_lib", + "//java/java-psi-api:psi", + "//java/java-psi-api:psi_test_lib", "//java/java-psi-impl:psi-impl", "//java/java-psi-impl:psi-impl_test_lib", "//platform/testFramework", @@ -56,10 +61,14 @@ jvm_library( "//uast/testFramework:testFramework_test_lib", "//java/testFramework", "//java/testFramework:testFramework_test_lib", + "//java/java-frontback-psi-api:frontback-psi", + "//java/java-frontback-psi-api:frontback-psi_test_lib", "//platform/vcs-impl", "//platform/vcs-impl:vcs-impl_test_lib", "//tools/intellij.tools.ide.metrics.benchmark:ide-metrics-benchmark", "//tools/intellij.tools.ide.metrics.benchmark:ide-metrics-benchmark_test_lib", + "//uast/uast-common-ide:ide", + "//uast/uast-common-ide:ide_test_lib", ], exports = [ "//uast/uast-common:uast", diff --git a/uast/uast-tests/intellij.platform.uast.tests.iml b/uast/uast-tests/intellij.platform.uast.tests.iml index e37cfdb41404..4d7f29d7129a 100644 --- a/uast/uast-tests/intellij.platform.uast.tests.iml +++ b/uast/uast-tests/intellij.platform.uast.tests.iml @@ -10,18 +10,22 @@ + + + + \ No newline at end of file diff --git a/wintools/BUILD.bazel b/wintools/BUILD.bazel index 0e41160cfd0b..52b4ffbc774b 100644 --- a/wintools/BUILD.bazel +++ b/wintools/BUILD.bazel @@ -16,6 +16,7 @@ jvm_library( deps = [ "@lib//:kotlin-stdlib", "//platform/util", + "//platform/util/base/multiplatform", "@lib//:jna", ] ) @@ -28,6 +29,7 @@ jvm_library( runtime_deps = [ ":wintools", "//platform/util:util_test_lib", + "//platform/util/base/multiplatform:multiplatform_test_lib", "@lib//:junit5", "//libraries/hamcrest", "//libraries/hamcrest:hamcrest_test_lib", diff --git a/wintools/intellij.community.wintools.iml b/wintools/intellij.community.wintools.iml index d1c2e26a4991..ffdd38c34b0e 100644 --- a/wintools/intellij.community.wintools.iml +++ b/wintools/intellij.community.wintools.iml @@ -10,6 +10,7 @@ + diff --git a/xml/dom-impl/BUILD.bazel b/xml/dom-impl/BUILD.bazel index 9889b2bc57e0..40a4b08f8d4e 100644 --- a/xml/dom-impl/BUILD.bazel +++ b/xml/dom-impl/BUILD.bazel @@ -28,6 +28,7 @@ jvm_library( "//platform/util", "//platform/platform-api:ide", "//platform/platform-impl:ide-impl", + "//platform/ide-core", "//platform/lang-api:lang", "//xml/xml-psi-api:psi", "//xml/xml-structure-view-api:structureView", @@ -42,6 +43,7 @@ jvm_library( "//platform/core-impl", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", "//jps/model-api:model", + "//platform/util:util-ui", ], exports = ["//xml/dom-openapi:dom"], runtime_deps = ["//platform/backend"] @@ -72,6 +74,7 @@ jvm_library( "//platform/util:util_test_lib", "//platform/platform-api:ide_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/lang-api:lang_test_lib", "//xml/xml-psi-api:psi_test_lib", "//xml/xml-structure-view-api:structureView_test_lib", @@ -87,6 +90,7 @@ jvm_library( "//platform/core-impl:core-impl_test_lib", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", "//jps/model-api:model_test_lib", + "//platform/util:util-ui_test_lib", ] ) ### auto-generated section `build intellij.xml.dom.impl` end diff --git a/xml/dom-impl/intellij.xml.dom.impl.iml b/xml/dom-impl/intellij.xml.dom.impl.iml index 3904dd264e73..f4dd1a67e209 100644 --- a/xml/dom-impl/intellij.xml.dom.impl.iml +++ b/xml/dom-impl/intellij.xml.dom.impl.iml @@ -22,6 +22,7 @@ + @@ -37,6 +38,7 @@ + diff --git a/xml/dom-openapi/BUILD.bazel b/xml/dom-openapi/BUILD.bazel index 66aae5584560..c4fc52bf58b6 100644 --- a/xml/dom-openapi/BUILD.bazel +++ b/xml/dom-openapi/BUILD.bazel @@ -21,6 +21,7 @@ jvm_library( "//platform/projectModel-api:projectModel", "//platform/lang-api:lang", "//platform/platform-api:ide", + "//platform/ide-core", "//platform/extensions", "//platform/forms_rt:java-guiForms-rt", "//platform/util", @@ -48,6 +49,7 @@ jvm_library( "//platform/projectModel-api:projectModel_test_lib", "//platform/lang-api:lang_test_lib", "//platform/platform-api:ide_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/extensions:extensions_test_lib", "//platform/forms_rt:java-guiForms-rt_test_lib", "//platform/util:util_test_lib", diff --git a/xml/dom-openapi/intellij.xml.dom.iml b/xml/dom-openapi/intellij.xml.dom.iml index 2edb7f5b22c4..0d0014038c30 100644 --- a/xml/dom-openapi/intellij.xml.dom.iml +++ b/xml/dom-openapi/intellij.xml.dom.iml @@ -15,6 +15,7 @@ + diff --git a/xml/dom-tests/BUILD.bazel b/xml/dom-tests/BUILD.bazel index 703ec52e454c..c93996e9413c 100644 --- a/xml/dom-tests/BUILD.bazel +++ b/xml/dom-tests/BUILD.bazel @@ -11,6 +11,7 @@ jvm_library( "//xml/impl", "//java/testFramework", "//java/java-psi-impl:psi-impl", + "//java/java-psi-api:psi", ] ) @@ -26,8 +27,12 @@ jvm_library( "//platform/core-api:core_test_lib", "//platform/lang-core", "//platform/lang-core:lang-core_test_lib", + "//platform/lang-api:lang", + "//platform/lang-api:lang_test_lib", "//platform/core-ui", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", "//platform/editor-ui-api:editor-ui", "//platform/editor-ui-api:editor-ui_test_lib", "//platform/indexing-api:indexing", @@ -40,6 +45,8 @@ jvm_library( "//java/testFramework:testFramework_test_lib", "//java/java-psi-impl:psi-impl", "//java/java-psi-impl:psi-impl_test_lib", + "//java/java-psi-api:psi", + "//java/java-psi-api:psi_test_lib", "//platform/testFramework", "//platform/testFramework:testFramework_test_lib", "//java/java-impl:impl", @@ -51,6 +58,8 @@ jvm_library( "//tools/intellij.tools.ide.metrics.benchmark:ide-metrics-benchmark_test_lib", "//xml/xml-psi-api:psi", "//xml/xml-psi-api:psi_test_lib", + "//xml/xml-parser:parser", + "//xml/xml-parser:parser_test_lib", "//platform/libraries/cglib", "//platform/libraries/cglib:cglib_test_lib", "//xml/xml-analysis-api:analysis", @@ -59,6 +68,8 @@ jvm_library( "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", "//platform/code-style-api:codeStyle", "//platform/code-style-api:codeStyle_test_lib", + "//platform/util-ex", + "//platform/util-ex:util-ex_test_lib", ], runtime_deps = [":dom-tests"] ) diff --git a/xml/dom-tests/intellij.xml.dom.tests.iml b/xml/dom-tests/intellij.xml.dom.tests.iml index ddfc092d2cad..cdfd4010e541 100644 --- a/xml/dom-tests/intellij.xml.dom.tests.iml +++ b/xml/dom-tests/intellij.xml.dom.tests.iml @@ -10,23 +10,28 @@ + + + + + diff --git a/xml/emmet/BUILD.bazel b/xml/emmet/BUILD.bazel index 2088c52fe33d..4f0907623063 100644 --- a/xml/emmet/BUILD.bazel +++ b/xml/emmet/BUILD.bazel @@ -113,6 +113,7 @@ jvm_library( "@lib//:kotlin-stdlib-provided", "//platform/forms_rt:java-guiForms-rt", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", + "//platform/util:util-ui", ":platform_core_provided", ":platform_analysis-impl_provided", ":xml_psi_provided", @@ -183,6 +184,7 @@ jvm_library( "//platform/refactoring:refactoring_test_lib", "//platform/forms_rt:java-guiForms-rt_test_lib", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", + "//platform/util:util-ui_test_lib", ] ) ### auto-generated section `build intellij.xml.emmet` end diff --git a/xml/emmet/backend/BUILD.bazel b/xml/emmet/backend/BUILD.bazel index 649a883e4319..97c9057543c6 100644 --- a/xml/emmet/backend/BUILD.bazel +++ b/xml/emmet/backend/BUILD.bazel @@ -27,6 +27,11 @@ jvm_provided_library( lib = "//platform/util:util-ui" ) +jvm_provided_library( + name = "platform_editor-ui_provided", + lib = "//platform/editor-ui-api:editor-ui" +) + jvm_provided_library( name = "platform_java-guiForms-rt_provided", lib = "//platform/forms_rt:java-guiForms-rt" @@ -69,6 +74,7 @@ jvm_library( ":platform_ide-core_provided", ":platform_lang-impl_provided", ":platform_util-ui_provided", + ":platform_editor-ui_provided", ":platform_java-guiForms-rt_provided", ":platform_projectModel_provided", ":platform_analysis_provided", @@ -94,6 +100,8 @@ jvm_library( "//platform/lang-impl:lang-impl_test_lib", "//platform/util:util-ui", "//platform/util:util-ui_test_lib", + "//platform/editor-ui-api:editor-ui", + "//platform/editor-ui-api:editor-ui_test_lib", "//platform/forms_rt:java-guiForms-rt", "//platform/forms_rt:java-guiForms-rt_test_lib", "//platform/projectModel-api:projectModel", diff --git a/xml/emmet/backend/intellij.xml.emmet.backend.iml b/xml/emmet/backend/intellij.xml.emmet.backend.iml index f08e3243d5d2..6c4258622e40 100644 --- a/xml/emmet/backend/intellij.xml.emmet.backend.iml +++ b/xml/emmet/backend/intellij.xml.emmet.backend.iml @@ -13,6 +13,7 @@ + diff --git a/xml/emmet/intellij.xml.emmet.iml b/xml/emmet/intellij.xml.emmet.iml index 3fa2fd8e1644..43a2cb65018e 100644 --- a/xml/emmet/intellij.xml.emmet.iml +++ b/xml/emmet/intellij.xml.emmet.iml @@ -31,5 +31,6 @@ + \ No newline at end of file diff --git a/xml/impl/BUILD.bazel b/xml/impl/BUILD.bazel index 297cc8c8794b..c3f2c1a49195 100644 --- a/xml/impl/BUILD.bazel +++ b/xml/impl/BUILD.bazel @@ -40,6 +40,7 @@ jvm_library( "//xml/xml-structure-view-impl:structureView-impl", "//platform/xdebugger-api:debugger", "//platform/ide-core-impl", + "//platform/ide-core", "//platform/diff-api:diff", "//platform/util/diff", "//platform/built-in-server-api:builtInServer", @@ -50,6 +51,7 @@ jvm_library( "//platform/polySymbols", "//platform/code-style-impl:codeStyle-impl", "//platform/platform-util-io-impl:ide-util-io-impl", + "//platform/platform-util-io:ide-util-io", "//platform/util/xmlDom", "//platform/util/jdom", "//libraries/aalto-xml", @@ -60,6 +62,7 @@ jvm_library( "//platform/forms_rt:java-guiForms-rt", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", "//platform/util/concurrency", + "//platform/util:util-ui", ], exports = [ "//xml/xml-psi-impl:psi-impl", @@ -113,6 +116,7 @@ jvm_library( "//xml/xml-structure-view-impl:structureView-impl_test_lib", "//platform/xdebugger-api:debugger_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/diff-api:diff_test_lib", "//platform/util/diff:diff_test_lib", "//platform/built-in-server-api:builtInServer_test_lib", @@ -123,6 +127,7 @@ jvm_library( "//platform/polySymbols:polySymbols_test_lib", "//platform/code-style-impl:codeStyle-impl_test_lib", "//platform/platform-util-io-impl:ide-util-io-impl_test_lib", + "//platform/platform-util-io:ide-util-io_test_lib", "//platform/util/xmlDom:xmlDom_test_lib", "//platform/util/jdom:jdom_test_lib", "//libraries/aalto-xml:aalto-xml_test_lib", @@ -134,6 +139,7 @@ jvm_library( "//platform/forms_rt:java-guiForms-rt_test_lib", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", "//platform/util/concurrency:concurrency_test_lib", + "//platform/util:util-ui_test_lib", ] ) ### auto-generated section `build intellij.xml.impl` end diff --git a/xml/impl/intellij.xml.impl.iml b/xml/impl/intellij.xml.impl.iml index 83099faf2130..0c58d669c959 100644 --- a/xml/impl/intellij.xml.impl.iml +++ b/xml/impl/intellij.xml.impl.iml @@ -34,6 +34,7 @@ + @@ -44,6 +45,7 @@ + @@ -55,6 +57,7 @@ + diff --git a/xml/langInjection/BUILD.bazel b/xml/langInjection/BUILD.bazel index 89c35d996385..de9cdc90e632 100644 --- a/xml/langInjection/BUILD.bazel +++ b/xml/langInjection/BUILD.bazel @@ -25,12 +25,14 @@ jvm_library( "//xml/xml-psi-api:psi", "//platform/forms_rt:java-guiForms-rt", "//platform/platform-api:ide", + "//platform/ide-core", "//libraries/jaxen", "//plugins/IntelliLang:langInjection", "//xml/xml-parser:parser", "//platform/core-ui", "//platform/util/jdom", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", + "//platform/util:util-ui", ] ) @@ -52,12 +54,14 @@ jvm_library( "//xml/xml-psi-api:psi_test_lib", "//platform/forms_rt:java-guiForms-rt_test_lib", "//platform/platform-api:ide_test_lib", + "//platform/ide-core:ide-core_test_lib", "//libraries/jaxen:jaxen_test_lib", "//plugins/IntelliLang:langInjection_test_lib", "//xml/xml-parser:parser_test_lib", "//platform/core-ui:core-ui_test_lib", "//platform/util/jdom:jdom_test_lib", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", + "//platform/util:util-ui_test_lib", ] ) ### auto-generated section `build intellij.xml.langInjection` end diff --git a/xml/langInjection/intellij.xml.langInjection.iml b/xml/langInjection/intellij.xml.langInjection.iml index 309cc5ee39ef..e3a9a7186060 100644 --- a/xml/langInjection/intellij.xml.langInjection.iml +++ b/xml/langInjection/intellij.xml.langInjection.iml @@ -19,12 +19,14 @@ + + diff --git a/xml/relaxng/BUILD.bazel b/xml/relaxng/BUILD.bazel index b76817b1de8f..235c0def92c7 100644 --- a/xml/relaxng/BUILD.bazel +++ b/xml/relaxng/BUILD.bazel @@ -26,6 +26,7 @@ jvm_library( "//xml/impl", "//xml/dom-openapi:dom", "//platform/platform-impl:ide-impl", + "//platform/ide-core", "//platform/lang-impl", "//xml/relaxng/lib:relaxng-rngom-20051226-patched", "@lib//:relaxng-isorelax", @@ -45,6 +46,7 @@ jvm_library( "//platform/util/concurrency", "//jps/model-api:model", "//jps/model-impl", + "//platform/util:util-ui", ], runtime_deps = ["//platform/backend"] ) @@ -69,6 +71,7 @@ jvm_library( "//xml/impl:impl_test_lib", "//xml/dom-openapi:dom_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/lang-impl:lang-impl_test_lib", "//platform/util/nanoxml:nanoxml_test_lib", "//libraries/fastutil:fastutil_test_lib", @@ -84,6 +87,7 @@ jvm_library( "//platform/util/concurrency:concurrency_test_lib", "//jps/model-api:model_test_lib", "//jps/model-impl:model-impl_test_lib", + "//platform/util:util-ui_test_lib", ] ) ### auto-generated section `build intellij.relaxng` end diff --git a/xml/relaxng/intellij.relaxng.iml b/xml/relaxng/intellij.relaxng.iml index 22ee181e133c..9e2ed1dc0f16 100644 --- a/xml/relaxng/intellij.relaxng.iml +++ b/xml/relaxng/intellij.relaxng.iml @@ -21,6 +21,7 @@ + @@ -90,5 +91,6 @@ + \ No newline at end of file diff --git a/xml/tests/BUILD.bazel b/xml/tests/BUILD.bazel index 076df07377e0..87463bd8c7d9 100644 --- a/xml/tests/BUILD.bazel +++ b/xml/tests/BUILD.bazel @@ -41,6 +41,8 @@ jvm_library( "//platform/core-api:core_test_lib", "//platform/lang-core", "//platform/lang-core:lang-core_test_lib", + "//platform/lang-api:lang", + "//platform/lang-api:lang_test_lib", "//platform/editor-ui-api:editor-ui", "//platform/editor-ui-api:editor-ui_test_lib", "//platform/indexing-api:indexing", @@ -65,10 +67,14 @@ jvm_library( "//java/idea-ui:ui_test_lib", "//java/java-impl:impl", "//java/java-impl:impl_test_lib", + "//java/java-psi-api:psi", + "//java/java-psi-api:psi_test_lib", "//platform/editor-ui-ex:editor-ex", "//platform/editor-ui-ex:editor-ex_test_lib", "//xml/xml-psi-api:psi", "//xml/xml-psi-api:psi_test_lib", + "//xml/xml-parser:parser", + "//xml/xml-parser:parser_test_lib", "//xml/testFramework", "//xml/testFramework:testFramework_test_lib", "//platform/testFramework", @@ -82,11 +88,14 @@ jvm_library( "//platform/platform-tests:tests", "//platform/platform-tests:tests_test_lib", "//platform/ide-core-impl", + "//platform/ide-core", "@lib//:xml-resolver", "//RegExpSupport:regexp", "//RegExpSupport:regexp_test_lib", "//platform/util/nanoxml", "//platform/util/nanoxml:nanoxml_test_lib", + "//platform/util:util-ui", + "//platform/util:util-ui_test_lib", "//plugins/IntelliLang:langInjection", "//plugins/IntelliLang:langInjection_test_lib", "//java/langInjection", @@ -95,6 +104,8 @@ jvm_library( "//xml/xml-analysis-impl:analysis-impl_test_lib", "//platform/core-ui", "//platform/core-ui:core-ui_test_lib", + "//platform/core-impl", + "//platform/core-impl:core-impl_test_lib", "@lib//:assert_j", "//libraries/guava", "//libraries/guava:guava_test_lib", @@ -108,6 +119,8 @@ jvm_library( "//libraries/xerces:xerces_test_lib", "//platform/syntax/syntax-scripts:scripts", "//platform/syntax/syntax-scripts:scripts_test_lib", + "//platform/syntax/syntax-util:util", + "//platform/syntax/syntax-util:util_test_lib", "//xml/xml-syntax:syntax", "//xml/xml-syntax:syntax_test_lib", "//java/java-runtime:rt", @@ -127,6 +140,7 @@ jvm_library( runtime_deps = [ ":tests", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//xml/langInjection:langInjection_test_lib", ] ) diff --git a/xml/tests/intellij.xml.tests.iml b/xml/tests/intellij.xml.tests.iml index d81d20837aca..fedd65f23d18 100644 --- a/xml/tests/intellij.xml.tests.iml +++ b/xml/tests/intellij.xml.tests.iml @@ -13,6 +13,7 @@ + @@ -25,8 +26,10 @@ + + @@ -34,14 +37,17 @@ + + + @@ -49,6 +55,7 @@ + diff --git a/xml/xml-analysis-api/BUILD.bazel b/xml/xml-analysis-api/BUILD.bazel index 99d03c6336fa..a90620bce96e 100644 --- a/xml/xml-analysis-api/BUILD.bazel +++ b/xml/xml-analysis-api/BUILD.bazel @@ -19,8 +19,9 @@ jvm_library( "//platform/core-api:core", "//platform/extensions", "//platform/util", + "//platform/util/multiplatform", + "//platform/util/base", ], - exports = ["//platform/extensions"], runtime_deps = ["//platform/backend"] ) @@ -29,10 +30,6 @@ jvm_library( module_name = "intellij.xml.analysis", visibility = ["//visibility:public"], srcs = glob([], allow_empty = True), - exports = [ - "//platform/extensions", - "//platform/extensions:extensions_test_lib", - ], runtime_deps = [ ":analysis", "//xml/xml-psi-api:psi_test_lib", @@ -40,6 +37,8 @@ jvm_library( "//platform/core-api:core_test_lib", "//platform/extensions:extensions_test_lib", "//platform/util:util_test_lib", + "//platform/util/multiplatform:multiplatform_test_lib", + "//platform/util/base:base_test_lib", "//platform/backend:backend_test_lib", ] ) diff --git a/xml/xml-analysis-api/intellij.xml.analysis.iml b/xml/xml-analysis-api/intellij.xml.analysis.iml index 0864bfa6e0bf..e8476bcb3f6e 100644 --- a/xml/xml-analysis-api/intellij.xml.analysis.iml +++ b/xml/xml-analysis-api/intellij.xml.analysis.iml @@ -11,8 +11,10 @@ - + + + \ No newline at end of file diff --git a/xml/xml-parser/BUILD.bazel b/xml/xml-parser/BUILD.bazel index 8f2870d13946..4a42ed8b5f9b 100644 --- a/xml/xml-parser/BUILD.bazel +++ b/xml/xml-parser/BUILD.bazel @@ -18,6 +18,8 @@ jvm_library( "//platform/core-api:core", "//platform/core-impl", "//platform/util", + "//platform/util/multiplatform", + "//platform/util/base", "//platform/editor-ui-api:editor-ui", "//platform/syntax/syntax-api:syntax", "//platform/syntax/syntax-psi:psi", @@ -37,6 +39,8 @@ jvm_library( "//platform/core-api:core_test_lib", "//platform/core-impl:core-impl_test_lib", "//platform/util:util_test_lib", + "//platform/util/multiplatform:multiplatform_test_lib", + "//platform/util/base:base_test_lib", "//platform/editor-ui-api:editor-ui_test_lib", "//platform/syntax/syntax-api:syntax_test_lib", "//platform/syntax/syntax-psi:psi_test_lib", diff --git a/xml/xml-parser/intellij.xml.parser.iml b/xml/xml-parser/intellij.xml.parser.iml index 86832466204e..805eeb3c6fd1 100644 --- a/xml/xml-parser/intellij.xml.parser.iml +++ b/xml/xml-parser/intellij.xml.parser.iml @@ -13,6 +13,8 @@ + + diff --git a/xml/xml-psi-api/BUILD.bazel b/xml/xml-psi-api/BUILD.bazel index b9c0dfdf0974..0642e60ad100 100644 --- a/xml/xml-psi-api/BUILD.bazel +++ b/xml/xml-psi-api/BUILD.bazel @@ -19,6 +19,8 @@ jvm_library( "//platform/projectModel-api:projectModel", "//platform/analysis-api:analysis", "//platform/util", + "//platform/util/multiplatform", + "//platform/util/base", "//platform/editor-ui-api:editor-ui", "@lib//:kotlin-stdlib", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", @@ -37,6 +39,8 @@ jvm_library( "//platform/projectModel-api:projectModel_test_lib", "//platform/analysis-api:analysis_test_lib", "//platform/util:util_test_lib", + "//platform/util/multiplatform:multiplatform_test_lib", + "//platform/util/base:base_test_lib", "//platform/editor-ui-api:editor-ui_test_lib", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib", ] diff --git a/xml/xml-psi-api/intellij.xml.psi.iml b/xml/xml-psi-api/intellij.xml.psi.iml index f8e0ff23752f..7e78985f67ab 100644 --- a/xml/xml-psi-api/intellij.xml.psi.iml +++ b/xml/xml-psi-api/intellij.xml.psi.iml @@ -13,6 +13,8 @@ + + diff --git a/xml/xml-psi-impl/BUILD.bazel b/xml/xml-psi-impl/BUILD.bazel index 2d229887935b..9f25aedf3367 100644 --- a/xml/xml-psi-impl/BUILD.bazel +++ b/xml/xml-psi-impl/BUILD.bazel @@ -34,6 +34,7 @@ jvm_library( "//platform/core-impl", "//xml/xml-parser:parser", "//platform/ide-core-impl", + "//platform/ide-core", "//platform/lang-api:lang", "//platform/lang-impl", "@lib//:xml-resolver", @@ -73,6 +74,7 @@ jvm_library( "//platform/core-impl:core-impl_test_lib", "//xml/xml-parser:parser_test_lib", "//platform/ide-core-impl:ide-core-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/lang-api:lang_test_lib", "//platform/lang-impl:lang-impl_test_lib", "//platform/util:util-ui_test_lib", diff --git a/xml/xml-psi-impl/intellij.xml.psi.impl.iml b/xml/xml-psi-impl/intellij.xml.psi.impl.iml index cd75efb83b3c..b4aa70d9b1ad 100644 --- a/xml/xml-psi-impl/intellij.xml.psi.impl.iml +++ b/xml/xml-psi-impl/intellij.xml.psi.impl.iml @@ -21,6 +21,7 @@ + diff --git a/xml/xml-ui-common/BUILD.bazel b/xml/xml-ui-common/BUILD.bazel index 762a0a1d487a..ed6f979d7ba4 100644 --- a/xml/xml-ui-common/BUILD.bazel +++ b/xml/xml-ui-common/BUILD.bazel @@ -23,6 +23,7 @@ jvm_library( "//platform/core-ui", "//platform/util:util-ui", "//platform/platform-impl:ide-impl", + "//platform/ide-core", "//platform/projectModel-api:projectModel", "//libraries/fastutil", "//platform/code-style-impl:codeStyle-impl", @@ -52,6 +53,7 @@ jvm_library( "//platform/core-ui:core-ui_test_lib", "//platform/util:util-ui_test_lib", "//platform/platform-impl:ide-impl_test_lib", + "//platform/ide-core:ide-core_test_lib", "//platform/projectModel-api:projectModel_test_lib", "//libraries/fastutil:fastutil_test_lib", "//platform/code-style-impl:codeStyle-impl_test_lib", diff --git a/xml/xml-ui-common/intellij.xml.ui.common.iml b/xml/xml-ui-common/intellij.xml.ui.common.iml index a18fe52601e5..ac2e8d2e054e 100644 --- a/xml/xml-ui-common/intellij.xml.ui.common.iml +++ b/xml/xml-ui-common/intellij.xml.ui.common.iml @@ -17,6 +17,7 @@ +