diff --git a/grid/impl/BUILD.bazel b/grid/impl/BUILD.bazel index 716e5d326437..c2ba05b9356f 100644 --- a/grid/impl/BUILD.bazel +++ b/grid/impl/BUILD.bazel @@ -67,6 +67,9 @@ jvm_library( "//libraries/microba", "//platform/platform-impl/ui", "//libraries/kotlinx/html", + "//platform/execution", + "//platform/lang-api:lang", + "//platform/forms_rt:java-guiForms-rt", ] ) ### auto-generated section `build intellij.grid.impl` end \ No newline at end of file diff --git a/grid/impl/intellij.grid.impl.iml b/grid/impl/intellij.grid.impl.iml index fc3474a60ac8..c5dea566ad07 100644 --- a/grid/impl/intellij.grid.impl.iml +++ b/grid/impl/intellij.grid.impl.iml @@ -64,5 +64,8 @@ + + + \ No newline at end of file diff --git a/images/BUILD.bazel b/images/BUILD.bazel index b35dc0ee1645..cfa446a3f13a 100644 --- a/images/BUILD.bazel +++ b/images/BUILD.bazel @@ -24,6 +24,7 @@ jvm_library( "//platform/lang-impl", "//platform/platform-impl:ide-impl", "//libraries/commons/imaging", + "//platform/forms_rt:java-guiForms-rt", "//platform/core-ui", "//platform/platform-util-io:ide-util-io", "//platform/util/jdom", @@ -58,6 +59,7 @@ jvm_library( "//platform/lang-impl", "//platform/platform-impl:ide-impl", "//libraries/commons/imaging", + "//platform/forms_rt:java-guiForms-rt", "//platform/testFramework", "//platform/testFramework:testFramework_test_lib", "//platform/core-ui", diff --git a/images/intellij.platform.images.iml b/images/intellij.platform.images.iml index 7d1c5aeafde1..b8c2d30f7430 100644 --- a/images/intellij.platform.images.iml +++ b/images/intellij.platform.images.iml @@ -40,6 +40,7 @@ + diff --git a/java/compiler/BUILD.bazel b/java/compiler/BUILD.bazel index f40f5f894ea3..e7ba918651ac 100644 --- a/java/compiler/BUILD.bazel +++ b/java/compiler/BUILD.bazel @@ -38,6 +38,7 @@ jvm_library( "//platform/util/jdom", "@lib//:kotlinx-coroutines-core", "//platform/backend/workspace", + "@lib//:jet_check", ], runtime_deps = ["//spellchecker"] ) diff --git a/java/compiler/impl/BUILD.bazel b/java/compiler/impl/BUILD.bazel index eb1a118bc60c..cfd6a005418f 100644 --- a/java/compiler/impl/BUILD.bazel +++ b/java/compiler/impl/BUILD.bazel @@ -76,6 +76,8 @@ jvm_library( "@lib//:netty-codec-protobuf", "//platform/eel-provider", "//xml/xml-psi-api:psi", + "//platform/execution", + "//platform/forms_rt:java-guiForms-rt", ], exports = ["//java/compiler/openapi:java-compiler"] ) diff --git a/java/compiler/impl/intellij.java.compiler.impl.iml b/java/compiler/impl/intellij.java.compiler.impl.iml index efee06a4852f..7bec82e7f814 100644 --- a/java/compiler/impl/intellij.java.compiler.impl.iml +++ b/java/compiler/impl/intellij.java.compiler.impl.iml @@ -77,6 +77,8 @@ + + diff --git a/java/compiler/intellij.java.compiler.tests.iml b/java/compiler/intellij.java.compiler.tests.iml index 9e81e6de289e..88b39cf1b770 100644 --- a/java/compiler/intellij.java.compiler.tests.iml +++ b/java/compiler/intellij.java.compiler.tests.iml @@ -32,6 +32,7 @@ + diff --git a/java/compiler/openapi/BUILD.bazel b/java/compiler/openapi/BUILD.bazel index 771a758945f6..ed7e9d1c70d6 100644 --- a/java/compiler/openapi/BUILD.bazel +++ b/java/compiler/openapi/BUILD.bazel @@ -28,6 +28,7 @@ jvm_library( "//platform/workspace/storage", "//platform/projectModel-api:projectModel", "//platform/workspace/jps", + "//platform/execution", ], exports = ["//platform/workspace/jps"] ) diff --git a/java/compiler/openapi/intellij.java.compiler.iml b/java/compiler/openapi/intellij.java.compiler.iml index a6b19840365b..1333300008da 100644 --- a/java/compiler/openapi/intellij.java.compiler.iml +++ b/java/compiler/openapi/intellij.java.compiler.iml @@ -22,6 +22,7 @@ + diff --git a/java/debugger/backend/BUILD.bazel b/java/debugger/backend/BUILD.bazel index 5fbf04b1e7ff..61ef15f2e64a 100644 --- a/java/debugger/backend/BUILD.bazel +++ b/java/debugger/backend/BUILD.bazel @@ -21,6 +21,7 @@ jvm_library( "//platform/xdebugger-api:debugger", "//platform/xdebugger-impl:debugger-impl", "//platform/platform-impl:ide-impl", + "//platform/execution", "@lib//:kotlinx-coroutines-core", "//libraries/kotlinx/serialization/core", "//libraries/kotlinx/serialization/json", diff --git a/java/debugger/backend/intellij.java.debugger.impl.backend.iml b/java/debugger/backend/intellij.java.debugger.impl.backend.iml index 545ab8550298..3919998b38c8 100644 --- a/java/debugger/backend/intellij.java.debugger.impl.backend.iml +++ b/java/debugger/backend/intellij.java.debugger.impl.backend.iml @@ -40,6 +40,7 @@ + diff --git a/java/debugger/impl/BUILD.bazel b/java/debugger/impl/BUILD.bazel index ee1aa4898d13..3e6a4b5b189a 100644 --- a/java/debugger/impl/BUILD.bazel +++ b/java/debugger/impl/BUILD.bazel @@ -36,6 +36,7 @@ jvm_library( "//platform/lang-api:lang", "//java/compiler/openapi:java-compiler", "//java/compiler/impl", + "//platform/forms_rt:java-guiForms-rt", "//java/java-runtime:rt", "//platform/ide-core-impl", "//java/jsp-openapi:jsp", @@ -74,6 +75,7 @@ jvm_library( "//fleet/rpc", "//platform/kernel/rpc", "//platform/remote-topics/shared:rpc-topics", + "//platform/execution", ] ) @@ -102,6 +104,7 @@ jvm_library( "//platform/lang-api:lang", "//java/compiler/openapi:java-compiler", "//java/compiler/impl", + "//platform/forms_rt:java-guiForms-rt", "//java/java-runtime:rt", "//platform/ide-core-impl", "//java/jsp-openapi:jsp", @@ -144,6 +147,7 @@ jvm_library( "//platform/kernel/rpc", "//platform/testFramework/common", "//platform/remote-topics/shared:rpc-topics", + "//platform/execution", ] ) ### 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 c9dc56076a38..ef8f9b2c8be8 100644 --- a/java/debugger/impl/intellij.java.debugger.impl.iml +++ b/java/debugger/impl/intellij.java.debugger.impl.iml @@ -47,6 +47,7 @@ + @@ -103,6 +104,7 @@ + diff --git a/java/debugger/openapi/BUILD.bazel b/java/debugger/openapi/BUILD.bazel index 18d376490906..c0e4a7e4a786 100644 --- a/java/debugger/openapi/BUILD.bazel +++ b/java/debugger/openapi/BUILD.bazel @@ -29,6 +29,7 @@ jvm_library( "//platform/platform-util-io:ide-util-io", "//xml/xml-psi-api:psi", "@lib//:kotlin-stdlib", + "//platform/execution", ], exports = ["//platform/xdebugger-api:debugger"] ) diff --git a/java/debugger/openapi/intellij.java.debugger.iml b/java/debugger/openapi/intellij.java.debugger.iml index 9e192687ee63..cb617a0eb92c 100644 --- a/java/debugger/openapi/intellij.java.debugger.iml +++ b/java/debugger/openapi/intellij.java.debugger.iml @@ -23,6 +23,7 @@ + diff --git a/java/execution/backend/BUILD.bazel b/java/execution/backend/BUILD.bazel index 5829e0dc93d2..d5bb00d024a6 100644 --- a/java/execution/backend/BUILD.bazel +++ b/java/execution/backend/BUILD.bazel @@ -25,10 +25,12 @@ jvm_library( "//platform/platform-api:ide", "//platform/platform-impl/rpc", "//platform/project/shared:project", + "//platform/lang-api:lang", "//platform/lang-impl", "//platform/projectModel-api:projectModel", "//platform/smRunner", "//platform/core-ui", + "//platform/execution", ], runtime_deps = ["//platform/backend"] ) diff --git a/java/execution/backend/intellij.java.execution.impl.backend.iml b/java/execution/backend/intellij.java.execution.impl.backend.iml index 4a241e70101b..1fca5202e475 100644 --- a/java/execution/backend/intellij.java.execution.impl.backend.iml +++ b/java/execution/backend/intellij.java.execution.impl.backend.iml @@ -45,9 +45,11 @@ + + \ No newline at end of file diff --git a/java/execution/impl/BUILD.bazel b/java/execution/impl/BUILD.bazel index 5502a1b6987f..0aee0a6e6662 100644 --- a/java/execution/impl/BUILD.bazel +++ b/java/execution/impl/BUILD.bazel @@ -60,6 +60,8 @@ jvm_library( "//java/debugger/shared", "//platform/platform-impl/concurrency", "//java/codeserver/core", + "//platform/execution", + "//platform/forms_rt:java-guiForms-rt", ], exports = [ "//java/execution/openapi:java-execution", diff --git a/java/execution/impl/intellij.java.execution.impl.iml b/java/execution/impl/intellij.java.execution.impl.iml index f92e4b8f82d9..7b4d552f9a70 100644 --- a/java/execution/impl/intellij.java.execution.impl.iml +++ b/java/execution/impl/intellij.java.execution.impl.iml @@ -54,6 +54,8 @@ + + diff --git a/java/execution/openapi/BUILD.bazel b/java/execution/openapi/BUILD.bazel index 99c1659c3ac1..6168b5d37272 100644 --- a/java/execution/openapi/BUILD.bazel +++ b/java/execution/openapi/BUILD.bazel @@ -22,6 +22,7 @@ jvm_library( "//platform/util:util-ui", "//platform/core-ui", "//platform/platform-util-io:ide-util-io", + "//platform/execution", ] ) ### auto-generated section `build intellij.java.execution` end \ No newline at end of file diff --git a/java/execution/openapi/intellij.java.execution.iml b/java/execution/openapi/intellij.java.execution.iml index ac6eec70e811..b68f20ac2ec5 100644 --- a/java/execution/openapi/intellij.java.execution.iml +++ b/java/execution/openapi/intellij.java.execution.iml @@ -22,6 +22,7 @@ + diff --git a/java/idea-ui/BUILD.bazel b/java/idea-ui/BUILD.bazel index 43a4f0c5890e..514d057c9e9e 100644 --- a/java/idea-ui/BUILD.bazel +++ b/java/idea-ui/BUILD.bazel @@ -23,6 +23,7 @@ jvm_library( "//platform/platform-impl:ide-impl", "//java/java-impl:impl", "//platform/ide-core-impl", + "//platform/execution", "//java/java-impl-refactorings:impl-refactorings", "//platform/indexing-api:indexing", "//platform/platform-impl/concurrency", @@ -65,6 +66,7 @@ jvm_library( "//libraries/asm", "//libraries/jackson/jackson", "//libraries/jackson/databind", + "//platform/forms_rt:java-guiForms-rt", ] ) ### auto-generated section `build intellij.java.ui` end @@ -121,6 +123,8 @@ jvm_library( "//xml/xml-psi-api:psi", "//libraries/io", "//xml/xml-psi-impl:psi-impl", + "//platform/execution", + "//platform/forms_rt:java-guiForms-rt", ] ) ### 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 e40feee6bdb5..92c17b9782f6 100644 --- a/java/idea-ui/intellij.java.ui.iml +++ b/java/idea-ui/intellij.java.ui.iml @@ -18,6 +18,7 @@ + @@ -60,5 +61,6 @@ + \ 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 36244fd5e01a..e5ded1c6a1b7 100644 --- a/java/idea-ui/intellij.java.ui.tests.iml +++ b/java/idea-ui/intellij.java.ui.tests.iml @@ -41,5 +41,7 @@ + + \ No newline at end of file diff --git a/java/java-features-trainer/BUILD.bazel b/java/java-features-trainer/BUILD.bazel index 30c36c706f45..f644e36a5626 100644 --- a/java/java-features-trainer/BUILD.bazel +++ b/java/java-features-trainer/BUILD.bazel @@ -37,6 +37,7 @@ jvm_library( "//platform/refactoring", "//java/execution/impl", "//java/debugger/shared", + "//platform/execution", ] ) @@ -74,6 +75,7 @@ jvm_library( "//platform/testFramework:testFramework_test_lib", "//java/execution/impl", "//java/debugger/shared", + "//platform/execution", ] ) ### 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 d54d0e147a8b..b8a490cdd16b 100644 --- a/java/java-features-trainer/intellij.java.featuresTrainer.iml +++ b/java/java-features-trainer/intellij.java.featuresTrainer.iml @@ -34,5 +34,6 @@ + \ No newline at end of file diff --git a/java/java-frontback-impl/BUILD.bazel b/java/java-frontback-impl/BUILD.bazel index b5930948488d..fd3c302bd1d1 100644 --- a/java/java-frontback-impl/BUILD.bazel +++ b/java/java-frontback-impl/BUILD.bazel @@ -36,6 +36,8 @@ jvm_library( "//platform/threadDumpParser", "//platform/code-style-impl:codeStyle-impl", "@lib//:kotlinx-serialization-core", + "//platform/execution", + "//platform/lang-api:lang", ], exports = [ "//java/java-frontback-psi-api:frontback-psi", diff --git a/java/java-frontback-impl/intellij.java.frontback.impl.iml b/java/java-frontback-impl/intellij.java.frontback.impl.iml index ef8038e7d0ee..8271583ab44f 100644 --- a/java/java-frontback-impl/intellij.java.frontback.impl.iml +++ b/java/java-frontback-impl/intellij.java.frontback.impl.iml @@ -52,5 +52,7 @@ + + \ No newline at end of file diff --git a/java/java-frontback-impl/src/com/intellij/codeInsight/editorActions/wordSelection/AntLikePropertySelectionHandler.java b/java/java-frontback-impl/src/com/intellij/codeInsight/editorActions/wordSelection/AntLikePropertySelectionHandler.java index ae2962fae142..0d91192d30da 100644 --- a/java/java-frontback-impl/src/com/intellij/codeInsight/editorActions/wordSelection/AntLikePropertySelectionHandler.java +++ b/java/java-frontback-impl/src/com/intellij/codeInsight/editorActions/wordSelection/AntLikePropertySelectionHandler.java @@ -1,4 +1,4 @@ -// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.codeInsight.editorActions.wordSelection; import com.intellij.codeInsight.editorActions.ExtendWordSelectionHandlerBase; @@ -16,7 +16,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -public final class AntLikePropertySelectionHandler extends ExtendWordSelectionHandlerBase { +final class AntLikePropertySelectionHandler extends ExtendWordSelectionHandlerBase { @Override public List select(@NotNull PsiElement e, @NotNull CharSequence editorText, int cursorOffset, @NotNull Editor editor) { TextRange range = e.getTextRange(); diff --git a/java/java-frontback-tests/BUILD.bazel b/java/java-frontback-tests/BUILD.bazel index 88d1550922f8..7c8011e17771 100644 --- a/java/java-frontback-tests/BUILD.bazel +++ b/java/java-frontback-tests/BUILD.bazel @@ -38,6 +38,7 @@ jvm_library( "//platform/syntax/syntax-psi:psi", "//java/java-syntax:syntax", "//platform/syntax/syntax-tree:tree", + "@lib//:jet_check", ], exports = [ "@lib//:easymock", diff --git a/java/java-frontback-tests/intellij.java.frontback.tests.iml b/java/java-frontback-tests/intellij.java.frontback.tests.iml index 259415074fa1..7774177e07aa 100644 --- a/java/java-frontback-tests/intellij.java.frontback.tests.iml +++ b/java/java-frontback-tests/intellij.java.frontback.tests.iml @@ -29,5 +29,6 @@ + \ No newline at end of file diff --git a/java/java-impl-refactorings/BUILD.bazel b/java/java-impl-refactorings/BUILD.bazel index 6d3e89ef32aa..0beb9fd10595 100644 --- a/java/java-impl-refactorings/BUILD.bazel +++ b/java/java-impl-refactorings/BUILD.bazel @@ -45,6 +45,8 @@ jvm_library( "//platform/core-ui", "//xml/xml-psi-api:psi", "//java/codeserver/core", + "//platform/execution", + "//platform/forms_rt:java-guiForms-rt", ] ) ### auto-generated section `build intellij.java.impl.refactorings` end \ No newline at end of file diff --git a/java/java-impl-refactorings/intellij.java.impl.refactorings.iml b/java/java-impl-refactorings/intellij.java.impl.refactorings.iml index 27d665715727..6a74d0b674a1 100644 --- a/java/java-impl-refactorings/intellij.java.impl.refactorings.iml +++ b/java/java-impl-refactorings/intellij.java.impl.refactorings.iml @@ -45,5 +45,7 @@ + + \ No newline at end of file diff --git a/java/java-impl/BUILD.bazel b/java/java-impl/BUILD.bazel index ec7fedc9dada..06893e7a8da1 100644 --- a/java/java-impl/BUILD.bazel +++ b/java/java-impl/BUILD.bazel @@ -35,6 +35,7 @@ jvm_library( "//platform/editor-ui-api:editor-ui", "//platform/foldings", "//platform/indexing-api:indexing", + "//platform/forms_rt:java-guiForms-rt", "//jps/model-api:model", "//jps/model-serialization", "//platform/lang-core", @@ -107,6 +108,7 @@ jvm_library( "//xml/xml-psi-api:psi", "//java/java-syntax:syntax", "//java/java-psi-api:psi", + "//platform/execution", ], exports = [ "//platform/lang-impl", @@ -137,6 +139,7 @@ jvm_library( "//platform/editor-ui-api:editor-ui", "//platform/foldings", "//platform/indexing-api:indexing", + "//platform/forms_rt:java-guiForms-rt", "//jps/model-api:model", "//jps/model-serialization", "//platform/lang-core", @@ -217,6 +220,7 @@ jvm_library( "//xml/xml-psi-api:psi", "//java/java-syntax:syntax", "//java/java-psi-api:psi", + "//platform/execution", "//platform/testFramework/common", ], exports = [ diff --git a/java/java-impl/intellij.java.impl.iml b/java/java-impl/intellij.java.impl.iml index 62f7f66549f7..7d43b6727c68 100644 --- a/java/java-impl/intellij.java.impl.iml +++ b/java/java-impl/intellij.java.impl.iml @@ -35,6 +35,7 @@ + @@ -126,6 +127,7 @@ + diff --git a/java/java-impl/src/com/intellij/ide/java/JavaCodeVisionSettingsDefaults.kt b/java/java-impl/src/com/intellij/ide/java/JavaCodeVisionSettingsDefaults.kt index ff3bbba047ae..8d18ddf5173b 100644 --- a/java/java-impl/src/com/intellij/ide/java/JavaCodeVisionSettingsDefaults.kt +++ b/java/java-impl/src/com/intellij/ide/java/JavaCodeVisionSettingsDefaults.kt @@ -1,8 +1,10 @@ +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.ide.java import com.intellij.codeInsight.codeVision.CodeVisionAnchorKind import com.intellij.codeInsight.codeVision.settings.CodeVisionSettingsDefaults -internal class JavaCodeVisionSettingsDefaults : CodeVisionSettingsDefaults { - override val defaultPosition: CodeVisionAnchorKind = CodeVisionAnchorKind.Right +private class JavaCodeVisionSettingsDefaults : CodeVisionSettingsDefaults { + override val defaultPosition: CodeVisionAnchorKind + get() = CodeVisionAnchorKind.Right } \ No newline at end of file diff --git a/java/java-tests/BUILD.bazel b/java/java-tests/BUILD.bazel index 8a0d2c233326..83f13c2d9331 100644 --- a/java/java-tests/BUILD.bazel +++ b/java/java-tests/BUILD.bazel @@ -163,6 +163,9 @@ jvm_library( "//plugins/grazie/src:core", "//platform/testFramework/junit5/codeInsight", "//java/java-psi-impl:psi-impl", + "//platform/execution", + "@lib//:jet_check", + "//platform/forms_rt:java-guiForms-rt", ], exports = [ "//plugins/java-i18n", diff --git a/java/java-tests/intellij.java.tests.iml b/java/java-tests/intellij.java.tests.iml index 0a7e1641d226..9060ba88fa0c 100644 --- a/java/java-tests/intellij.java.tests.iml +++ b/java/java-tests/intellij.java.tests.iml @@ -133,5 +133,8 @@ + + + \ No newline at end of file diff --git a/java/langInjection/BUILD.bazel b/java/langInjection/BUILD.bazel index f57a9f41bd37..fb4d170e6c94 100644 --- a/java/langInjection/BUILD.bazel +++ b/java/langInjection/BUILD.bazel @@ -35,6 +35,7 @@ jvm_library( "//plugins/IntelliLang:langInjection", "//platform/core-ui", "//platform/util/jdom", + "//platform/forms_rt:java-guiForms-rt", ":plugins_IntelliLang_backend_provided", ], runtime_deps = ["//java/langInjection/jps"] diff --git a/java/langInjection/intellij.java.langInjection.iml b/java/langInjection/intellij.java.langInjection.iml index a9c13cbe0ab0..bd6f1bd69345 100644 --- a/java/langInjection/intellij.java.langInjection.iml +++ b/java/langInjection/intellij.java.langInjection.iml @@ -26,6 +26,7 @@ + diff --git a/java/openapi/BUILD.bazel b/java/openapi/BUILD.bazel index 51ed508a1ee0..02e9f70e4286 100644 --- a/java/openapi/BUILD.bazel +++ b/java/openapi/BUILD.bazel @@ -55,6 +55,7 @@ jvm_library( "//platform/backend/workspace", "//xml/xml-psi-api:psi", "@lib//:kotlin-stdlib", + "//platform/execution", ":platform_java-guiForms-rt_provided", ], exports = [ diff --git a/java/openapi/intellij.java.iml b/java/openapi/intellij.java.iml index 4a400362fad7..f14727038a32 100644 --- a/java/openapi/intellij.java.iml +++ b/java/openapi/intellij.java.iml @@ -37,6 +37,7 @@ + \ No newline at end of file diff --git a/java/testFramework/BUILD.bazel b/java/testFramework/BUILD.bazel index f81ca8b3eb80..e55b723daff9 100644 --- a/java/testFramework/BUILD.bazel +++ b/java/testFramework/BUILD.bazel @@ -59,6 +59,7 @@ jvm_library( "//xml/xml-psi-api:psi", "//java/java-syntax:syntax", "//platform/eel", + "//platform/execution", "//platform/testFramework/junit5", "//platform/testFramework/junit5/codeInsight", "//java/java-frontback-psi-impl:frontback-psi-impl", diff --git a/java/testFramework/intellij.java.testFramework.iml b/java/testFramework/intellij.java.testFramework.iml index 4a828472b3c9..920b9e73c843 100644 --- a/java/testFramework/intellij.java.testFramework.iml +++ b/java/testFramework/intellij.java.testFramework.iml @@ -56,6 +56,7 @@ + diff --git a/java/testFramework/shared/BUILD.bazel b/java/testFramework/shared/BUILD.bazel index 057bfd7078cf..654ca61abf64 100644 --- a/java/testFramework/shared/BUILD.bazel +++ b/java/testFramework/shared/BUILD.bazel @@ -19,6 +19,7 @@ jvm_library( "//java/java-impl:impl", "//platform/testFramework", "//java/idea-ui:ui", + "//platform/execution", "@lib//:org-codehaus-groovy-groovy", "//java/java-syntax:syntax", ], diff --git a/java/testFramework/shared/intellij.java.testFramework.shared.iml b/java/testFramework/shared/intellij.java.testFramework.shared.iml index cc409f8cb6aa..e2fa66f64144 100644 --- a/java/testFramework/shared/intellij.java.testFramework.shared.iml +++ b/java/testFramework/shared/intellij.java.testFramework.shared.iml @@ -19,6 +19,7 @@ + diff --git a/java/unscramble/BUILD.bazel b/java/unscramble/BUILD.bazel index 49a033887a33..caea116d3e80 100644 --- a/java/unscramble/BUILD.bazel +++ b/java/unscramble/BUILD.bazel @@ -27,6 +27,7 @@ jvm_library( "//platform/core-ui", "//java/java-impl:impl", "//platform/threadDumpParser", + "//platform/forms_rt:java-guiForms-rt", ] ) ### auto-generated section `build intellij.java.unscramble` end \ No newline at end of file diff --git a/java/unscramble/intellij.java.unscramble.iml b/java/unscramble/intellij.java.unscramble.iml index 110486fb08af..9b8b3df24a9e 100644 --- a/java/unscramble/intellij.java.unscramble.iml +++ b/java/unscramble/intellij.java.unscramble.iml @@ -21,5 +21,6 @@ + \ No newline at end of file diff --git a/json/backend/BUILD.bazel b/json/backend/BUILD.bazel index bfbd34c147d3..a903a184b8e2 100644 --- a/json/backend/BUILD.bazel +++ b/json/backend/BUILD.bazel @@ -18,6 +18,7 @@ jvm_library( "//platform/code-style-api:codeStyle", "//platform/util/concurrency", "//platform/core-api:core", + "//platform/lang-api:lang", "//platform/core-impl", "//platform/editor-ui-api:editor-ui", "//platform/platform-api:ide", @@ -54,6 +55,7 @@ jvm_library( "//json/syntax", "//platform/syntax/syntax-psi:psi", "//platform/syntax/syntax-util:util", + "//platform/execution", ], exports = ["//json"], runtime_deps = ["//platform/backend"] diff --git a/json/backend/intellij.json.backend.iml b/json/backend/intellij.json.backend.iml index d26d4627ac5a..83cdcbbc0e84 100644 --- a/json/backend/intellij.json.backend.iml +++ b/json/backend/intellij.json.backend.iml @@ -12,6 +12,7 @@ + @@ -50,5 +51,6 @@ + \ No newline at end of file diff --git a/json/backend/tests/BUILD.bazel b/json/backend/tests/BUILD.bazel index 0fe90e6fc13e..2dc260d14d33 100644 --- a/json/backend/tests/BUILD.bazel +++ b/json/backend/tests/BUILD.bazel @@ -23,6 +23,7 @@ jvm_library( "//platform/analysis-api:analysis", "//platform/code-style-api:codeStyle", "//platform/core-api:core", + "//platform/lang-api:lang", "//platform/core-ui", "//platform/editor-ui-api:editor-ui", "//platform/indexing-api:indexing", diff --git a/json/backend/tests/intellij.json.tests.iml b/json/backend/tests/intellij.json.tests.iml index f5e9b056e9b4..5a503fddb662 100644 --- a/json/backend/tests/intellij.json.tests.iml +++ b/json/backend/tests/intellij.json.tests.iml @@ -11,6 +11,7 @@ + diff --git a/json/syntax/BUILD.bazel b/json/syntax/BUILD.bazel index 2b29dc5b131f..4db57df24ee3 100644 --- a/json/syntax/BUILD.bazel +++ b/json/syntax/BUILD.bazel @@ -25,10 +25,6 @@ jvm_library( "@lib//:kotlin-stdlib", "//platform/syntax/syntax-api:syntax", "//platform/syntax/syntax-util:util", - ], - exports = [ - "//platform/syntax/syntax-api:syntax", - "//platform/syntax/syntax-util:util", ] ) ### auto-generated section `build intellij.json.syntax` end \ No newline at end of file diff --git a/json/syntax/intellij.json.syntax.iml b/json/syntax/intellij.json.syntax.iml index c85e9e0a1db2..d6cbe74d3e7f 100644 --- a/json/syntax/intellij.json.syntax.iml +++ b/json/syntax/intellij.json.syntax.iml @@ -26,7 +26,7 @@ - - + + \ No newline at end of file diff --git a/jvm/jvm-analysis-impl/BUILD.bazel b/jvm/jvm-analysis-impl/BUILD.bazel index e2e045e4d441..a3f47e98204e 100644 --- a/jvm/jvm-analysis-impl/BUILD.bazel +++ b/jvm/jvm-analysis-impl/BUILD.bazel @@ -36,6 +36,7 @@ jvm_library( "//platform/ide-core-impl", "//jvm/jvm-analysis-quickFix:analysis-quickFix", "//java/codeserver/core", + "//platform/execution", ], exports = ["//jvm/jvm-analysis-api:analysis"] ) diff --git a/jvm/jvm-analysis-impl/intellij.jvm.analysis.impl.iml b/jvm/jvm-analysis-impl/intellij.jvm.analysis.impl.iml index 358113e48972..00c5aecbac9d 100644 --- a/jvm/jvm-analysis-impl/intellij.jvm.analysis.impl.iml +++ b/jvm/jvm-analysis-impl/intellij.jvm.analysis.impl.iml @@ -30,5 +30,6 @@ + \ No newline at end of file diff --git a/jvm/jvm-analysis-impl/src/com/intellij/analysis/customization/console/ClassLoggingConsoleFilterProvider.kt b/jvm/jvm-analysis-impl/src/com/intellij/analysis/customization/console/ClassLoggingConsoleFilterProvider.kt index 8af251edd1fc..ec25194df440 100644 --- a/jvm/jvm-analysis-impl/src/com/intellij/analysis/customization/console/ClassLoggingConsoleFilterProvider.kt +++ b/jvm/jvm-analysis-impl/src/com/intellij/analysis/customization/console/ClassLoggingConsoleFilterProvider.kt @@ -1,4 +1,4 @@ -// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.analysis.customization.console import com.intellij.execution.filters.ConsoleFilterProvider @@ -10,7 +10,7 @@ import com.intellij.openapi.project.Project import com.intellij.openapi.util.Computable import com.intellij.psi.search.GlobalSearchScope -const val SLF4J_MAVEN = "org.slf4j:slf4j-api" +const val SLF4J_MAVEN: String = "org.slf4j:slf4j-api" private const val LOG4J_MAVEN = "org.apache.logging.log4j:log4j-api" private const val COMMON_LOGGING_MAVEN = "commons-logging:commons-logging" private val LOG_MAVEN = setOf(SLF4J_MAVEN, LOG4J_MAVEN, COMMON_LOGGING_MAVEN) diff --git a/jvm/jvm-analysis-impl/src/com/intellij/analysis/internal/DumpUastTreeActionByEach.kt b/jvm/jvm-analysis-impl/src/com/intellij/analysis/internal/DumpUastTreeActionByEach.kt index 6f548036872b..1d4e3a0e214f 100644 --- a/jvm/jvm-analysis-impl/src/com/intellij/analysis/internal/DumpUastTreeActionByEach.kt +++ b/jvm/jvm-analysis-impl/src/com/intellij/analysis/internal/DumpUastTreeActionByEach.kt @@ -1,4 +1,4 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.analysis.internal import com.intellij.openapi.actionSystem.ActionUpdateThread @@ -7,8 +7,7 @@ import com.intellij.psi.PsiFile import org.jetbrains.uast.toUElement import org.jetbrains.uast.util.IndentedPrintingVisitor -class DumpUastTreeActionByEach : DumpUastTreeAction() { - +private class DumpUastTreeActionByEach : DumpUastTreeAction() { override fun buildDump(file: PsiFile): String = object : IndentedPrintingVisitor({true}){ override fun render(element: PsiElement): CharSequence? = element.toUElement()?.asLogString() }.also { file.accept(it) }.result diff --git a/jvm/jvm-analysis-impl/src/com/intellij/codeInspection/sourceToSink/SourceToSinkLangugeProvider.kt b/jvm/jvm-analysis-impl/src/com/intellij/codeInspection/sourceToSink/SourceToSinkLangugeProvider.kt index f8b1a31332fd..c8411175c6a0 100644 --- a/jvm/jvm-analysis-impl/src/com/intellij/codeInspection/sourceToSink/SourceToSinkLangugeProvider.kt +++ b/jvm/jvm-analysis-impl/src/com/intellij/codeInspection/sourceToSink/SourceToSinkLangugeProvider.kt @@ -32,7 +32,7 @@ interface SourceToSinkProvider { fun computeConstant(element: PsiElement?): Any? } -class JavaSourceToSinkProvider : SourceToSinkProvider { +private class JavaSourceToSinkProvider : SourceToSinkProvider { override fun getPhysicalForLightElement(element: PsiElement?): PsiElement? { //only records now return (element as? LightRecordMember)?.recordComponent diff --git a/jvm/jvm-analysis-internal-testFramework/BUILD.bazel b/jvm/jvm-analysis-internal-testFramework/BUILD.bazel index 086551aa5ef0..0325b7decb37 100644 --- a/jvm/jvm-analysis-internal-testFramework/BUILD.bazel +++ b/jvm/jvm-analysis-internal-testFramework/BUILD.bazel @@ -17,6 +17,7 @@ jvm_library( "//platform/lang-core", "//platform/projectModel-api:projectModel", "//platform/refactoring", + "//platform/execution", "//platform/testFramework", "//java/java-impl-refactorings:impl-refactorings", "//platform/smRunner", 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 87f60076ab54..4ef1ab35f691 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 @@ -17,6 +17,7 @@ + diff --git a/jvm/jvm-analysis-java-tests/BUILD.bazel b/jvm/jvm-analysis-java-tests/BUILD.bazel index b49dacfb16ae..4265f33f89b7 100644 --- a/jvm/jvm-analysis-java-tests/BUILD.bazel +++ b/jvm/jvm-analysis-java-tests/BUILD.bazel @@ -27,6 +27,7 @@ jvm_library( "//jvm/jvm-analysis-testFramework:analysis-testFramework", "//java/java-impl-refactorings:impl-refactorings", "//jvm/jvm-analysis-internal-testFramework:analysis-internal-testFramework", + "@lib//:jet_check", ] ) ### auto-generated section `build intellij.jvm.analysis.java.tests` end 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 57e4d2bdb979..1f71b4106897 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 @@ -20,5 +20,6 @@ + \ No newline at end of file diff --git a/notebooks/visualization/BUILD.bazel b/notebooks/visualization/BUILD.bazel index d3a1892fe010..721cdc92bc5f 100644 --- a/notebooks/visualization/BUILD.bazel +++ b/notebooks/visualization/BUILD.bazel @@ -27,6 +27,7 @@ jvm_library( "//libraries/gson", "//platform/analysis-api:analysis", "//platform/core-api:core", + "//platform/lang-api:lang", "//platform/editor-ui-api:editor-ui", "//platform/platform-impl:ide-impl", "//platform/lang-impl", @@ -58,6 +59,7 @@ jvm_library( "//libraries/gson", "//platform/analysis-api:analysis", "//platform/core-api:core", + "//platform/lang-api:lang", "//platform/editor-ui-api:editor-ui", "//platform/platform-impl:ide-impl", "//platform/lang-impl", diff --git a/notebooks/visualization/intellij.notebooks.visualization.iml b/notebooks/visualization/intellij.notebooks.visualization.iml index 39b1c2cef18e..6c823fe8a2a5 100644 --- a/notebooks/visualization/intellij.notebooks.visualization.iml +++ b/notebooks/visualization/intellij.notebooks.visualization.iml @@ -35,6 +35,7 @@ + diff --git a/notebooks/visualization/src/com/intellij/notebooks/visualization/NotebookIntervalPointerImpl.kt b/notebooks/visualization/src/com/intellij/notebooks/visualization/NotebookIntervalPointerImpl.kt index 20be13d9fd44..a5322596ab27 100644 --- a/notebooks/visualization/src/com/intellij/notebooks/visualization/NotebookIntervalPointerImpl.kt +++ b/notebooks/visualization/src/com/intellij/notebooks/visualization/NotebookIntervalPointerImpl.kt @@ -1,3 +1,4 @@ +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.notebooks.visualization import com.intellij.notebooks.visualization.NotebookIntervalPointerFactory.Companion.compareIntervals @@ -16,7 +17,7 @@ import com.intellij.util.EventDispatcher import com.intellij.util.concurrency.ThreadingAssertions import org.jetbrains.annotations.TestOnly -class NotebookIntervalPointerFactoryImplProvider : NotebookIntervalPointerFactoryProvider { +private class NotebookIntervalPointerFactoryImplProvider : NotebookIntervalPointerFactoryProvider { override fun create(project: Project, document: Document): NotebookIntervalPointerFactory { val provider = NotebookCellLinesProvider.getOrInstall(project, document) val notebookCellLines = provider.create(document) diff --git a/platform/bookmarks/BUILD.bazel b/platform/bookmarks/BUILD.bazel index 823365bc0704..85519b78db2a 100644 --- a/platform/bookmarks/BUILD.bazel +++ b/platform/bookmarks/BUILD.bazel @@ -35,6 +35,7 @@ jvm_library( "//platform/projectModel-api:projectModel", "//platform/util/jdom", "//platform/editor-ui-ex:editor-ex", + "//platform/execution", ], exports = ["//platform/favoritesTreeView"] ) diff --git a/platform/bookmarks/intellij.platform.bookmarks.iml b/platform/bookmarks/intellij.platform.bookmarks.iml index a4919e1fb6a1..c1cb83e2d08f 100644 --- a/platform/bookmarks/intellij.platform.bookmarks.iml +++ b/platform/bookmarks/intellij.platform.bookmarks.iml @@ -54,5 +54,6 @@ + \ No newline at end of file diff --git a/platform/buildView/BUILD.bazel b/platform/buildView/BUILD.bazel index ae3069b3880a..cb0b2c18a6a7 100644 --- a/platform/buildView/BUILD.bazel +++ b/platform/buildView/BUILD.bazel @@ -17,7 +17,9 @@ jvm_library( "@lib//:kotlin-stdlib", "//libraries/kotlinx/serialization/core", "//platform/kernel/shared:kernel", + "//platform/execution", "//platform/platform-impl:ide-impl", + "//platform/lang-api:lang", "//platform/lang-impl", "//platform/editor-ui-api:editor-ui", "//platform/core-api:core", diff --git a/platform/buildView/intellij.platform.buildView.iml b/platform/buildView/intellij.platform.buildView.iml index 21cc210bbeeb..c5f3d4219eec 100644 --- a/platform/buildView/intellij.platform.buildView.iml +++ b/platform/buildView/intellij.platform.buildView.iml @@ -36,7 +36,9 @@ + + diff --git a/platform/built-in-server/BUILD.bazel b/platform/built-in-server/BUILD.bazel index 2aa312061352..55fd516bf35d 100644 --- a/platform/built-in-server/BUILD.bazel +++ b/platform/built-in-server/BUILD.bazel @@ -24,7 +24,6 @@ jvm_library( "//platform/projectModel-impl", "//platform/platform-impl:ide-impl", "//platform/ide-core/plugins", - "//platform/xdebugger-api:debugger", "//libraries/guava", "//libraries/gson", "//libraries/commons/imaging", @@ -44,6 +43,7 @@ jvm_library( "//platform/util/progress", "@lib//:kotlinx-coroutines-core", "@lib//:netty-codec-compression", + "//platform/execution", ], exports = ["//platform/built-in-server-api:builtInServer"] ) diff --git a/platform/built-in-server/intellij.platform.builtInServer.impl.iml b/platform/built-in-server/intellij.platform.builtInServer.impl.iml index 20afa4597854..afa9a4271ada 100644 --- a/platform/built-in-server/intellij.platform.builtInServer.impl.iml +++ b/platform/built-in-server/intellij.platform.builtInServer.impl.iml @@ -21,7 +21,6 @@ - @@ -41,5 +40,6 @@ + \ No newline at end of file diff --git a/platform/collaboration-tools/BUILD.bazel b/platform/collaboration-tools/BUILD.bazel index 46b74346f924..6bc01938db52 100644 --- a/platform/collaboration-tools/BUILD.bazel +++ b/platform/collaboration-tools/BUILD.bazel @@ -18,6 +18,7 @@ jvm_library( "//platform/code-style-api:codeStyle", "//platform/util/concurrency", "//platform/credential-store", + "//platform/lang-api:lang", "//platform/editor-ui-api:editor-ui", "//platform/util-ex", "//platform/core-impl", @@ -65,6 +66,7 @@ jvm_library( "//platform/util/concurrency", "//platform/util/concurrency:concurrency_test_lib", "//platform/credential-store", + "//platform/lang-api:lang", "//platform/editor-ui-api:editor-ui", "//platform/util-ex", "//platform/core-impl", diff --git a/platform/collaboration-tools/intellij.platform.collaborationTools.iml b/platform/collaboration-tools/intellij.platform.collaborationTools.iml index 8623ceebaae2..610ae03a0638 100644 --- a/platform/collaboration-tools/intellij.platform.collaborationTools.iml +++ b/platform/collaboration-tools/intellij.platform.collaborationTools.iml @@ -14,6 +14,7 @@ + diff --git a/platform/configuration-store-impl/BUILD.bazel b/platform/configuration-store-impl/BUILD.bazel index 8ceb5f9479e6..5bd53369ebd8 100644 --- a/platform/configuration-store-impl/BUILD.bazel +++ b/platform/configuration-store-impl/BUILD.bazel @@ -106,6 +106,7 @@ jvm_library( "//libraries/kotlinx/serialization/core", "//java/java-impl:impl", "//java/java-impl:impl_test_lib", + "//platform/lang-api:lang", ] ) ### auto-generated section `build intellij.platform.configurationStore.tests` end diff --git a/platform/configuration-store-impl/intellij.platform.configurationStore.tests.iml b/platform/configuration-store-impl/intellij.platform.configurationStore.tests.iml index 64f50153b6cd..c56905e7b74d 100644 --- a/platform/configuration-store-impl/intellij.platform.configurationStore.tests.iml +++ b/platform/configuration-store-impl/intellij.platform.configurationStore.tests.iml @@ -57,6 +57,7 @@ + \ No newline at end of file diff --git a/platform/diff-impl/BUILD.bazel b/platform/diff-impl/BUILD.bazel index 6fc0765f1f6b..587fa610a50f 100644 --- a/platform/diff-impl/BUILD.bazel +++ b/platform/diff-impl/BUILD.bazel @@ -33,6 +33,7 @@ jvm_library( "//platform/statistics", "//platform/boot", "//platform/core-ui", + "//platform/forms_rt:java-guiForms-rt", "//libraries/fastutil", "//platform/platform-util-io-impl:ide-util-io-impl", "@lib//:kotlinx-coroutines-core", diff --git a/platform/diff-impl/intellij.platform.diff.impl.iml b/platform/diff-impl/intellij.platform.diff.impl.iml index 972fca3d4b95..51537c570fb6 100644 --- a/platform/diff-impl/intellij.platform.diff.impl.iml +++ b/platform/diff-impl/intellij.platform.diff.impl.iml @@ -52,6 +52,7 @@ + diff --git a/platform/dvcs-impl/BUILD.bazel b/platform/dvcs-impl/BUILD.bazel index d14bcac129da..776362e7fbb3 100644 --- a/platform/dvcs-impl/BUILD.bazel +++ b/platform/dvcs-impl/BUILD.bazel @@ -17,6 +17,7 @@ jvm_library( "//platform/analysis-api:analysis", "//platform/util/concurrency", "//platform/core-api:core", + "//platform/lang-api:lang", "//platform/diff-api:diff", "//platform/editor-ui-api:editor-ui", "//platform/lvcs-api:lvcs", @@ -57,6 +58,7 @@ jvm_library( "//platform/util/concurrency", "//platform/util/concurrency:concurrency_test_lib", "//platform/core-api:core", + "//platform/lang-api:lang", "//platform/diff-api:diff", "//platform/editor-ui-api:editor-ui", "//platform/lvcs-api:lvcs", diff --git a/platform/dvcs-impl/intellij.platform.vcs.dvcs.impl.iml b/platform/dvcs-impl/intellij.platform.vcs.dvcs.impl.iml index 9dbada59c2d7..345deec8192e 100644 --- a/platform/dvcs-impl/intellij.platform.vcs.dvcs.impl.iml +++ b/platform/dvcs-impl/intellij.platform.vcs.dvcs.impl.iml @@ -12,6 +12,7 @@ + diff --git a/platform/eel/BUILD.bazel b/platform/eel/BUILD.bazel index 473670cf9c03..788c7688adad 100644 --- a/platform/eel/BUILD.bazel +++ b/platform/eel/BUILD.bazel @@ -51,6 +51,7 @@ jvm_library( "//plugins/kotlin/base/test", "//plugins/kotlin/base/test:test_test_lib", "//plugins/kotlin/base/indices", + "//platform/execution", ], runtime_deps = ["//plugins/kotlin:kotlin-plugin-community-main"] ) diff --git a/platform/eel/intellij.platform.eel.codegen.iml b/platform/eel/intellij.platform.eel.codegen.iml index 0cc0ab4c9675..08a610931e29 100644 --- a/platform/eel/intellij.platform.eel.codegen.iml +++ b/platform/eel/intellij.platform.eel.codegen.iml @@ -26,5 +26,6 @@ + \ No newline at end of file diff --git a/platform/execution-impl/BUILD.bazel b/platform/execution-impl/BUILD.bazel index 97742a8f8e14..3b2084b1708d 100644 --- a/platform/execution-impl/BUILD.bazel +++ b/platform/execution-impl/BUILD.bazel @@ -59,6 +59,7 @@ jvm_library( "//platform/diagnostic", "//platform/ijent", "//platform/ijent/impl", + "//platform/forms_rt:java-guiForms-rt", "@lib//:rd-core", "//platform/rd-platform-community:rd-community", "//platform/util/coroutines", @@ -102,6 +103,7 @@ jvm_library( "//libraries/jediterm-ui", "//platform/eel", "//platform/eel-provider", + "//platform/forms_rt:java-guiForms-rt", ] ) ### auto-generated section `build intellij.platform.execution.tests` end diff --git a/platform/execution-impl/intellij.platform.execution.impl.iml b/platform/execution-impl/intellij.platform.execution.impl.iml index 8ad22f0124ad..c46780f00914 100644 --- a/platform/execution-impl/intellij.platform.execution.impl.iml +++ b/platform/execution-impl/intellij.platform.execution.impl.iml @@ -79,6 +79,7 @@ + diff --git a/platform/execution-impl/intellij.platform.execution.tests.iml b/platform/execution-impl/intellij.platform.execution.tests.iml index 66400b82d65f..2400b9e29362 100644 --- a/platform/execution-impl/intellij.platform.execution.tests.iml +++ b/platform/execution-impl/intellij.platform.execution.tests.iml @@ -21,5 +21,6 @@ + \ No newline at end of file diff --git a/platform/execution.dashboard/BUILD.bazel b/platform/execution.dashboard/BUILD.bazel index fb0db56be9fa..4da258e44a6a 100644 --- a/platform/execution.dashboard/BUILD.bazel +++ b/platform/execution.dashboard/BUILD.bazel @@ -41,6 +41,7 @@ jvm_library( "//platform/lang-core", "//platform/execution", "//platform/remote-topics/shared:rpc-topics", + "//platform/lang-api:lang", ] ) ### auto-generated section `build intellij.platform.execution.dashboard` end \ 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 5b13777dc9ee..6ca8346482c0 100644 --- a/platform/execution.dashboard/intellij.platform.execution.dashboard.iml +++ b/platform/execution.dashboard/intellij.platform.execution.dashboard.iml @@ -60,5 +60,6 @@ + \ No newline at end of file diff --git a/platform/execution.dashboard/src/splitApi/frontend/FrontendRunDashboardManager.kt b/platform/execution.dashboard/src/splitApi/frontend/FrontendRunDashboardManager.kt index a6372d453091..c7df0f022f39 100644 --- a/platform/execution.dashboard/src/splitApi/frontend/FrontendRunDashboardManager.kt +++ b/platform/execution.dashboard/src/splitApi/frontend/FrontendRunDashboardManager.kt @@ -35,7 +35,7 @@ import org.jetbrains.annotations.ApiStatus @ApiStatus.Internal @Service(Service.Level.PROJECT) -class FrontendRunDashboardManager(private val project: Project) : RunDashboardManager { +internal class FrontendRunDashboardManager(private val project: Project) : RunDashboardManager { private val frontendSettings = MutableStateFlow(RunDashboardSettingsDto()) private val frontendDtos = MutableStateFlow>(emptyList()) private val frontendStatuses = MutableStateFlow(emptyMap()) diff --git a/platform/execution.serviceView/BUILD.bazel b/platform/execution.serviceView/BUILD.bazel index df842a9ee705..8e11ecac9dc1 100644 --- a/platform/execution.serviceView/BUILD.bazel +++ b/platform/execution.serviceView/BUILD.bazel @@ -39,6 +39,7 @@ jvm_library( "//libraries/kotlinx/serialization/json", "@lib//:kotlinx-coroutines-core", "//platform/kernel/shared:kernel", + "//platform/execution", ] ) ### auto-generated section `build intellij.platform.execution.serviceView` end \ No newline at end of file diff --git a/platform/execution.serviceView/frontend/BUILD.bazel b/platform/execution.serviceView/frontend/BUILD.bazel index 858be891ce41..af82c394cb25 100644 --- a/platform/execution.serviceView/frontend/BUILD.bazel +++ b/platform/execution.serviceView/frontend/BUILD.bazel @@ -22,6 +22,7 @@ jvm_library( "//platform/kernel/rpc", "//platform/platform-impl/rpc", "//platform/core-api:core", + "//platform/lang-api:lang", ] ) ### auto-generated section `build intellij.platform.execution.serviceView.frontend` end \ No newline at end of file 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 98892fbaa067..969bc6af1e0a 100644 --- a/platform/execution.serviceView/frontend/intellij.platform.execution.serviceView.frontend.iml +++ b/platform/execution.serviceView/frontend/intellij.platform.execution.serviceView.frontend.iml @@ -41,5 +41,6 @@ + \ 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 b4309d583655..b0491dada985 100644 --- a/platform/execution.serviceView/intellij.platform.execution.serviceView.iml +++ b/platform/execution.serviceView/intellij.platform.execution.serviceView.iml @@ -58,5 +58,6 @@ + \ No newline at end of file diff --git a/platform/external-system-api/BUILD.bazel b/platform/external-system-api/BUILD.bazel index 57e42153c052..9fca03636f86 100644 --- a/platform/external-system-api/BUILD.bazel +++ b/platform/external-system-api/BUILD.bazel @@ -37,6 +37,7 @@ jvm_library( "//platform/backend/observation", "//platform/workspace/storage", "//platform/backend/workspace", + "//platform/execution", ], exports = ["//platform/external-system-rt:externalSystem-rt"] ) diff --git a/platform/external-system-api/intellij.platform.externalSystem.iml b/platform/external-system-api/intellij.platform.externalSystem.iml index 3f7db447b549..e64041ab897d 100644 --- a/platform/external-system-api/intellij.platform.externalSystem.iml +++ b/platform/external-system-api/intellij.platform.externalSystem.iml @@ -32,5 +32,6 @@ + \ No newline at end of file diff --git a/platform/external-system-api/testFramework/BUILD.bazel b/platform/external-system-api/testFramework/BUILD.bazel index 6ec1ec20ddf3..3aa13028269b 100644 --- a/platform/external-system-api/testFramework/BUILD.bazel +++ b/platform/external-system-api/testFramework/BUILD.bazel @@ -19,6 +19,7 @@ jvm_library( "//platform/testFramework", "//platform/platform-util-io:ide-util-io", "@lib//:assert_j", + "//platform/execution", "//java/java-impl:impl", "//platform/workspace/storage", "//platform/workspace/jps", 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 8d19e53ecf2b..8f8eb76624c1 100644 --- a/platform/external-system-api/testFramework/intellij.platform.externalSystem.testFramework.iml +++ b/platform/external-system-api/testFramework/intellij.platform.externalSystem.testFramework.iml @@ -19,6 +19,7 @@ + diff --git a/platform/external-system-impl/BUILD.bazel b/platform/external-system-impl/BUILD.bazel index 93bef0642c67..52b912495957 100644 --- a/platform/external-system-impl/BUILD.bazel +++ b/platform/external-system-impl/BUILD.bazel @@ -17,6 +17,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/external-system-api:externalSystem", "//jps/model-api:model", @@ -56,6 +57,8 @@ jvm_library( "//platform/settings", "//libraries/kotlinx/serialization/core", "//platform/eel-provider", + "//platform/execution", + "//platform/forms_rt:java-guiForms-rt", ] ) ### auto-generated section `build intellij.platform.externalSystem.impl` end @@ -120,6 +123,8 @@ jvm_library( "//plugins/gradle", "//tools/intellij.tools.ide.metrics.benchmark:ide-metrics-benchmark", "//tools/intellij.tools.ide.metrics.benchmark:ide-metrics-benchmark_test_lib", + "//platform/execution", + "//platform/forms_rt:java-guiForms-rt", ], exports = ["//platform/lang-impl:lang-tests_test_lib"] ) diff --git a/platform/external-system-impl/intellij.platform.externalSystem.impl.iml b/platform/external-system-impl/intellij.platform.externalSystem.impl.iml index 9c29eecb28c9..a1cc1c3f68d2 100644 --- a/platform/external-system-impl/intellij.platform.externalSystem.impl.iml +++ b/platform/external-system-impl/intellij.platform.externalSystem.impl.iml @@ -34,6 +34,7 @@ + @@ -73,5 +74,7 @@ + + \ No newline at end of file diff --git a/platform/external-system-impl/intellij.platform.externalSystem.tests.iml b/platform/external-system-impl/intellij.platform.externalSystem.tests.iml index 7edf2bddd697..c705ff0070c7 100644 --- a/platform/external-system-impl/intellij.platform.externalSystem.tests.iml +++ b/platform/external-system-impl/intellij.platform.externalSystem.tests.iml @@ -45,5 +45,7 @@ + + \ No newline at end of file diff --git a/platform/indexing-impl/BUILD.bazel b/platform/indexing-impl/BUILD.bazel index c8055bd364f2..1b458e0c79b8 100644 --- a/platform/indexing-impl/BUILD.bazel +++ b/platform/indexing-impl/BUILD.bazel @@ -32,6 +32,7 @@ jvm_library( "//platform/util/xmlDom", "//platform/workspace/storage", "//platform/util/storages", + "//platform/util", ] ) ### auto-generated section `build intellij.platform.indexing.impl` end \ No newline at end of file diff --git a/platform/indexing-impl/intellij.platform.indexing.impl.iml b/platform/indexing-impl/intellij.platform.indexing.impl.iml index 6daa208300e6..24d02c2f6668 100644 --- a/platform/indexing-impl/intellij.platform.indexing.impl.iml +++ b/platform/indexing-impl/intellij.platform.indexing.impl.iml @@ -32,5 +32,6 @@ + \ No newline at end of file diff --git a/platform/lang-api/BUILD.bazel b/platform/lang-api/BUILD.bazel index 3ab9d127bf87..e4092e82f468 100644 --- a/platform/lang-api/BUILD.bazel +++ b/platform/lang-api/BUILD.bazel @@ -34,10 +34,8 @@ jvm_library( "//platform/platform-util-io:ide-util-io", "//platform/execution", "//platform/refactoring", + "//platform/forms_rt:java-guiForms-rt", ], - exports = [ - "//platform/platform-api:ide", - "//platform/execution", - ] + exports = ["//platform/platform-api:ide"] ) ### auto-generated section `build intellij.platform.lang` end \ No newline at end of file diff --git a/platform/lang-api/intellij.platform.lang.iml b/platform/lang-api/intellij.platform.lang.iml index 13b11588425c..26f37fe1bc74 100644 --- a/platform/lang-api/intellij.platform.lang.iml +++ b/platform/lang-api/intellij.platform.lang.iml @@ -29,7 +29,8 @@ - + + \ No newline at end of file diff --git a/platform/lang-api/src/com/intellij/codeInsight/codeVision/settings/CodeVisionSettingsDefaults.kt b/platform/lang-api/src/com/intellij/codeInsight/codeVision/settings/CodeVisionSettingsDefaults.kt index 9ad48e67f0fa..91063429dda8 100644 --- a/platform/lang-api/src/com/intellij/codeInsight/codeVision/settings/CodeVisionSettingsDefaults.kt +++ b/platform/lang-api/src/com/intellij/codeInsight/codeVision/settings/CodeVisionSettingsDefaults.kt @@ -1,4 +1,4 @@ -// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.codeInsight.codeVision.settings import com.intellij.codeInsight.codeVision.CodeVisionAnchorKind @@ -11,7 +11,7 @@ import org.jetbrains.annotations.ApiStatus.Experimental @Experimental interface CodeVisionSettingsDefaults { companion object { - private val EP_NAME = ExtensionPointName.create("com.intellij.codeInsight.codeVision.settings.defaults") + private val EP_NAME = ExtensionPointName("com.intellij.codeInsight.codeVision.settings.defaults") fun getInstance(): CodeVisionSettingsDefaults = EP_NAME.extensionList.firstOrNull() ?: NONE } diff --git a/platform/lang-api/src/com/intellij/codeInsight/editorActions/BackspaceHandlerDelegate.java b/platform/lang-api/src/com/intellij/codeInsight/editorActions/BackspaceHandlerDelegate.java index 61015ce5544b..1b2858176ac6 100644 --- a/platform/lang-api/src/com/intellij/codeInsight/editorActions/BackspaceHandlerDelegate.java +++ b/platform/lang-api/src/com/intellij/codeInsight/editorActions/BackspaceHandlerDelegate.java @@ -1,4 +1,4 @@ -// Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.codeInsight.editorActions; @@ -14,7 +14,7 @@ import org.jetbrains.annotations.NotNull; */ public abstract class BackspaceHandlerDelegate { public static final ExtensionPointName EP_NAME = - ExtensionPointName.create("com.intellij.backspaceHandlerDelegate"); + new ExtensionPointName<>("com.intellij.backspaceHandlerDelegate"); /** * Invoked before the default processing is performed. diff --git a/platform/lang-api/src/com/intellij/ide/actions/searcheverywhere/SearchEverywhereContributor.java b/platform/lang-api/src/com/intellij/ide/actions/searcheverywhere/SearchEverywhereContributor.java index d7f232b17fb7..83a38929592e 100644 --- a/platform/lang-api/src/com/intellij/ide/actions/searcheverywhere/SearchEverywhereContributor.java +++ b/platform/lang-api/src/com/intellij/ide/actions/searcheverywhere/SearchEverywhereContributor.java @@ -1,4 +1,4 @@ -// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.ide.actions.searcheverywhere; import com.intellij.openapi.Disposable; @@ -26,8 +26,7 @@ import java.util.List; * @author Mikhail Sokolov */ public interface SearchEverywhereContributor extends PossiblyDumbAware, Disposable { - - ExtensionPointName> EP_NAME = ExtensionPointName.create("com.intellij.searchEverywhereContributor"); + ExtensionPointName> EP_NAME = new ExtensionPointName<>("com.intellij.searchEverywhereContributor"); /** * Unique ID of provider. Usually {@link Class#getSimpleName()} of the implementing class is used. diff --git a/platform/lang-api/src/com/intellij/psi/codeStyle/LanguageCodeStyleSettingsProvider.java b/platform/lang-api/src/com/intellij/psi/codeStyle/LanguageCodeStyleSettingsProvider.java index 3d9e2be9cbba..024be17c9be4 100644 --- a/platform/lang-api/src/com/intellij/psi/codeStyle/LanguageCodeStyleSettingsProvider.java +++ b/platform/lang-api/src/com/intellij/psi/codeStyle/LanguageCodeStyleSettingsProvider.java @@ -29,7 +29,7 @@ import java.util.function.BiConsumer; */ public abstract class LanguageCodeStyleSettingsProvider extends CodeStyleSettingsProvider implements LanguageCodeStyleProvider { public static final ExtensionPointName EP_NAME = - ExtensionPointName.create("com.intellij.langCodeStyleSettingsProvider"); + new ExtensionPointName<>("com.intellij.langCodeStyleSettingsProvider"); public enum SettingsType { BLANK_LINES_SETTINGS, SPACING_SETTINGS, WRAPPING_AND_BRACES_SETTINGS, INDENT_SETTINGS, COMMENTER_SETTINGS, LANGUAGE_SPECIFIC diff --git a/platform/lang-impl/BUILD.bazel b/platform/lang-impl/BUILD.bazel index 13b672d4c0bf..9604e8f65ba3 100644 --- a/platform/lang-impl/BUILD.bazel +++ b/platform/lang-impl/BUILD.bazel @@ -129,9 +129,10 @@ jvm_library( "//platform/project/shared:project", "//platform/kernel/shared:kernel", "//platform/platform-impl/rpc", + "//platform/execution", + "//platform/forms_rt:java-guiForms-rt", ], exports = [ - "//platform/lang-api:lang", "//platform/analysis-impl", "//platform/util", ] @@ -234,6 +235,8 @@ jvm_library( "//platform/diagnostic/telemetry", "//platform/diagnostic/telemetry:telemetry_test_lib", "//platform/core-impl", + "//platform/execution", + "//platform/forms_rt:java-guiForms-rt", ], exports = [ "//platform/lang-api:lang", diff --git a/platform/lang-impl/backend/BUILD.bazel b/platform/lang-impl/backend/BUILD.bazel index 5a08331a2d53..9972de403540 100644 --- a/platform/lang-impl/backend/BUILD.bazel +++ b/platform/lang-impl/backend/BUILD.bazel @@ -21,6 +21,7 @@ jvm_library( "//platform/util", "//platform/kernel/backend", "//jps/model-api:model", + "//platform/ide-core", ], runtime_deps = ["//platform/backend"] ) diff --git a/platform/lang-impl/backend/intellij.platform.lang.impl.backend.iml b/platform/lang-impl/backend/intellij.platform.lang.impl.backend.iml index c2c4517ba75c..a6a54cf37023 100644 --- a/platform/lang-impl/backend/intellij.platform.lang.impl.backend.iml +++ b/platform/lang-impl/backend/intellij.platform.lang.impl.backend.iml @@ -41,5 +41,6 @@ + \ No newline at end of file diff --git a/platform/lang-impl/intellij.platform.lang.impl.iml b/platform/lang-impl/intellij.platform.lang.impl.iml index d1437dd2cc93..16fb952506e4 100644 --- a/platform/lang-impl/intellij.platform.lang.impl.iml +++ b/platform/lang-impl/intellij.platform.lang.impl.iml @@ -40,7 +40,7 @@ - + @@ -137,5 +137,7 @@ + + \ No newline at end of file diff --git a/platform/lang-impl/intellij.platform.lang.tests.iml b/platform/lang-impl/intellij.platform.lang.tests.iml index 7bd28425ec62..65a5d624af86 100644 --- a/platform/lang-impl/intellij.platform.lang.tests.iml +++ b/platform/lang-impl/intellij.platform.lang.tests.iml @@ -101,5 +101,7 @@ + + \ No newline at end of file diff --git a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/BraceMatcherBasedSelectioner.java b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/BraceMatcherBasedSelectioner.java index 852cff34f185..bbd9b7284cac 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/BraceMatcherBasedSelectioner.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/BraceMatcherBasedSelectioner.java @@ -1,5 +1,4 @@ -// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. - +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.codeInsight.editorActions; import com.intellij.codeInsight.highlighting.BraceMatcher; diff --git a/platform/lang-impl/src/com/intellij/execution/runners/AbstractConsoleRunnerWithHistory.java b/platform/lang-impl/src/com/intellij/execution/runners/AbstractConsoleRunnerWithHistory.java index 97ca127fe78e..23dd2486c059 100644 --- a/platform/lang-impl/src/com/intellij/execution/runners/AbstractConsoleRunnerWithHistory.java +++ b/platform/lang-impl/src/com/intellij/execution/runners/AbstractConsoleRunnerWithHistory.java @@ -31,8 +31,6 @@ import java.util.List; /** * This class provides basic functionality for running consoles. * It launches external process and handles line input with history - * - * @author oleg */ public abstract class AbstractConsoleRunnerWithHistory { private final @Nls(capitalization = Nls.Capitalization.Title) String myConsoleTitle; diff --git a/platform/lang-impl/src/com/intellij/ide/highlighter/custom/impl/CustomFileTypeSelectWordHandler.java b/platform/lang-impl/src/com/intellij/ide/highlighter/custom/impl/CustomFileTypeSelectWordHandler.java index 859ae0eba607..361c6adb0e0f 100644 --- a/platform/lang-impl/src/com/intellij/ide/highlighter/custom/impl/CustomFileTypeSelectWordHandler.java +++ b/platform/lang-impl/src/com/intellij/ide/highlighter/custom/impl/CustomFileTypeSelectWordHandler.java @@ -1,4 +1,4 @@ -// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.ide.highlighter.custom.impl; import com.intellij.codeInsight.editorActions.BraceMatcherBasedSelectioner; @@ -7,15 +7,12 @@ import com.intellij.openapi.editor.highlighter.HighlighterIterator; import com.intellij.openapi.fileTypes.impl.CustomSyntaxTableFileType; import com.intellij.openapi.util.TextRange; import com.intellij.psi.PsiElement; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import java.util.ArrayList; import java.util.List; - -@ApiStatus.Internal -public final class CustomFileTypeSelectWordHandler extends BraceMatcherBasedSelectioner { +final class CustomFileTypeSelectWordHandler extends BraceMatcherBasedSelectioner { @Override public boolean canSelect(@NotNull PsiElement e) { return e.getContainingFile().getFileType() instanceof CustomSyntaxTableFileType; diff --git a/platform/navbar/backend/BUILD.bazel b/platform/navbar/backend/BUILD.bazel index c4d1c0d9cecf..68bd75b12643 100644 --- a/platform/navbar/backend/BUILD.bazel +++ b/platform/navbar/backend/BUILD.bazel @@ -27,6 +27,7 @@ jvm_library( "//platform/editor-ui-api:editor-ui", "//platform/ide-core-impl", "//platform/analysis-api:analysis", + "//platform/lang-api:lang", "//platform/lang-impl", "//platform/navbar/shared:navbar", "//platform/platform-impl:ide-impl", diff --git a/platform/navbar/backend/intellij.platform.navbar.backend.iml b/platform/navbar/backend/intellij.platform.navbar.backend.iml index e8f2f4a47a76..0bf5b8924f83 100644 --- a/platform/navbar/backend/intellij.platform.navbar.backend.iml +++ b/platform/navbar/backend/intellij.platform.navbar.backend.iml @@ -21,6 +21,7 @@ + diff --git a/platform/navbar/frontend/BUILD.bazel b/platform/navbar/frontend/BUILD.bazel index cbeb6c213222..ba45af97e8f1 100644 --- a/platform/navbar/frontend/BUILD.bazel +++ b/platform/navbar/frontend/BUILD.bazel @@ -31,6 +31,7 @@ jvm_library( "//platform/navbar/shared:navbar", "//platform/platform-impl:ide-impl", "//platform/lang-impl", + "//platform/lang-api:lang", ], exports = ["//platform/navbar/shared:navbar"] ) diff --git a/platform/navbar/frontend/intellij.platform.navbar.frontend.iml b/platform/navbar/frontend/intellij.platform.navbar.frontend.iml index 9dd01b2f2f89..e4ba62199076 100644 --- a/platform/navbar/frontend/intellij.platform.navbar.frontend.iml +++ b/platform/navbar/frontend/intellij.platform.navbar.frontend.iml @@ -25,5 +25,6 @@ + \ No newline at end of file diff --git a/platform/navbar/monolith/BUILD.bazel b/platform/navbar/monolith/BUILD.bazel index 83dca47bcd7d..766f214fa720 100644 --- a/platform/navbar/monolith/BUILD.bazel +++ b/platform/navbar/monolith/BUILD.bazel @@ -20,6 +20,7 @@ jvm_library( "//platform/lang-impl", "//platform/navbar/backend", "//platform/navbar/frontend", + "//platform/platform-api:ide", ] ) ### auto-generated section `build intellij.platform.navbar.monolith` end \ No newline at end of file diff --git a/platform/navbar/monolith/intellij.platform.navbar.monolith.iml b/platform/navbar/monolith/intellij.platform.navbar.monolith.iml index 0beefdc0568a..42b7b8ef0ade 100644 --- a/platform/navbar/monolith/intellij.platform.navbar.monolith.iml +++ b/platform/navbar/monolith/intellij.platform.navbar.monolith.iml @@ -14,5 +14,6 @@ + \ No newline at end of file diff --git a/platform/navbar/monolith/src/MonolithNavBarServiceDelegate.kt b/platform/navbar/monolith/src/MonolithNavBarServiceDelegate.kt index 4762342b65a0..a3fafbee921d 100644 --- a/platform/navbar/monolith/src/MonolithNavBarServiceDelegate.kt +++ b/platform/navbar/monolith/src/MonolithNavBarServiceDelegate.kt @@ -1,4 +1,4 @@ -// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.platform.navbar.monolith import com.intellij.openapi.actionSystem.DataContext @@ -15,7 +15,7 @@ import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.channelFlow -internal class MonolithNavbarServiceDelegate(private val project: Project) : NavBarServiceDelegate { +private class MonolithNavbarServiceDelegate(private val project: Project) : NavBarServiceDelegate { override fun activityFlow(): Flow = channelFlow { fireOnIdeActivity(project) diff --git a/platform/platform-api/BUILD.bazel b/platform/platform-api/BUILD.bazel index e6b42cc42603..b5642d4b09c1 100644 --- a/platform/platform-api/BUILD.bazel +++ b/platform/platform-api/BUILD.bazel @@ -60,7 +60,6 @@ jvm_library( ], exports = [ "//platform/util", - "//platform/forms_rt:java-guiForms-rt", "//platform/editor-ui-api:editor-ui", "//platform/util:util-ui", "//platform/ide-core", diff --git a/platform/platform-api/intellij.platform.ide.iml b/platform/platform-api/intellij.platform.ide.iml index f70fc6da3c40..931bc5f70fd1 100644 --- a/platform/platform-api/intellij.platform.ide.iml +++ b/platform/platform-api/intellij.platform.ide.iml @@ -11,7 +11,7 @@ - + diff --git a/platform/platform-impl/BUILD.bazel b/platform/platform-impl/BUILD.bazel index 8a754ba58ff7..4e1ad82b2790 100644 --- a/platform/platform-impl/BUILD.bazel +++ b/platform/platform-impl/BUILD.bazel @@ -155,6 +155,8 @@ jvm_library( "//platform/eel-impl", "//platform/platform-impl/recentProjects", "//platform/runtime/product", + "//platform/execution", + "//platform/forms_rt:java-guiForms-rt", ], exports = [ "//platform/platform-api:ide", @@ -323,6 +325,8 @@ jvm_library( "//platform/eel-impl", "//platform/platform-impl/recentProjects", "//platform/runtime/product", + "//platform/execution", + "//platform/forms_rt:java-guiForms-rt", ], exports = [ "//platform/platform-api:ide", diff --git a/platform/platform-impl/initial-config-import/BUILD.bazel b/platform/platform-impl/initial-config-import/BUILD.bazel index 392ceb21f2e1..af62cdddea9e 100644 --- a/platform/platform-impl/initial-config-import/BUILD.bazel +++ b/platform/platform-impl/initial-config-import/BUILD.bazel @@ -13,6 +13,7 @@ jvm_library( "//platform/core-impl", "//platform/projectModel-api:projectModel", "//platform/service-container", + "//platform/forms_rt:java-guiForms-rt", "//libraries/jackson/jackson", "//platform/statistics", "//platform/core-ui", 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 af5911bf21dd..c724e47b3c4f 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 @@ -13,6 +13,7 @@ + diff --git a/platform/platform-impl/intellij.platform.ide.impl.iml b/platform/platform-impl/intellij.platform.ide.impl.iml index 77598a984b4b..9fcb278a01ac 100644 --- a/platform/platform-impl/intellij.platform.ide.impl.iml +++ b/platform/platform-impl/intellij.platform.ide.impl.iml @@ -174,5 +174,7 @@ + + \ No newline at end of file diff --git a/platform/platform-impl/internal/BUILD.bazel b/platform/platform-impl/internal/BUILD.bazel index e26b92f7cad1..811ec2c8b238 100644 --- a/platform/platform-impl/internal/BUILD.bazel +++ b/platform/platform-impl/internal/BUILD.bazel @@ -41,6 +41,7 @@ jvm_library( "//platform/jbr", "//platform/ide-core-impl", "//platform/util/coroutines", + "//platform/forms_rt:java-guiForms-rt", "//platform/statistics/uploader", "//platform/util/jdom", "//platform/service-container", @@ -58,6 +59,7 @@ jvm_library( "//platform/platform-impl/update-checker", "//libraries/jbr", "//platform/projectModel-impl", + "//platform/execution", ] ) ### auto-generated section `build intellij.platform.ide.internal` end \ No newline at end of file diff --git a/platform/platform-impl/internal/intellij.platform.ide.internal.iml b/platform/platform-impl/internal/intellij.platform.ide.internal.iml index ea0a53383bd7..46942aaf2fdc 100644 --- a/platform/platform-impl/internal/intellij.platform.ide.internal.iml +++ b/platform/platform-impl/internal/intellij.platform.ide.internal.iml @@ -56,6 +56,7 @@ + @@ -73,5 +74,6 @@ + \ No newline at end of file diff --git a/platform/platform-impl/remote/BUILD.bazel b/platform/platform-impl/remote/BUILD.bazel index cefc21cb0a4a..5028bfbdd019 100644 --- a/platform/platform-impl/remote/BUILD.bazel +++ b/platform/platform-impl/remote/BUILD.bazel @@ -13,6 +13,7 @@ jvm_library( "//platform/remote-core", "//platform/util/jdom", "//platform/platform-util-io:ide-util-io", + "//platform/forms_rt:java-guiForms-rt", "//platform/lang-core", "//platform/execution", "//platform/platform-impl:ide-impl", diff --git a/platform/platform-impl/remote/intellij.platform.ide.remote.iml b/platform/platform-impl/remote/intellij.platform.ide.remote.iml index c2efb46a03cf..63f64f65fbd3 100644 --- a/platform/platform-impl/remote/intellij.platform.ide.remote.iml +++ b/platform/platform-impl/remote/intellij.platform.ide.remote.iml @@ -13,6 +13,7 @@ + diff --git a/platform/platform-impl/ui-inspector/BUILD.bazel b/platform/platform-impl/ui-inspector/BUILD.bazel index 74a0690e45c3..c4777a9be20e 100644 --- a/platform/platform-impl/ui-inspector/BUILD.bazel +++ b/platform/platform-impl/ui-inspector/BUILD.bazel @@ -29,6 +29,7 @@ jvm_library( "//platform/projectModel-api:projectModel", "//platform/projectModel-impl", "//platform/editor-ui-ex:editor-ex", + "//platform/execution", ] ) ### auto-generated section `build intellij.platform.ide.ui.inspector` end \ No newline at end of file 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 a6c5e210bed3..78c8e71c88c3 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 @@ -23,5 +23,6 @@ + \ No newline at end of file diff --git a/platform/platform-impl/update-checker/BUILD.bazel b/platform/platform-impl/update-checker/BUILD.bazel index 45f68b756312..bdd4773846bd 100644 --- a/platform/platform-impl/update-checker/BUILD.bazel +++ b/platform/platform-impl/update-checker/BUILD.bazel @@ -34,6 +34,7 @@ jvm_library( "//platform/platform-impl/initial-config-import", "//libraries/kotlinx/serialization/core", "//libraries/kotlinx/serialization/json", + "//platform/forms_rt:java-guiForms-rt", ] ) ### auto-generated section `build intellij.platform.ide.updateChecker` end \ No newline at end of file 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 8b6baf2473e1..5caca7dd3636 100644 --- a/platform/platform-impl/update-checker/intellij.platform.ide.updateChecker.iml +++ b/platform/platform-impl/update-checker/intellij.platform.ide.updateChecker.iml @@ -50,5 +50,6 @@ + \ No newline at end of file diff --git a/platform/platform-tests/BUILD.bazel b/platform/platform-tests/BUILD.bazel index 7c9edca5cf8d..b36369f05155 100644 --- a/platform/platform-tests/BUILD.bazel +++ b/platform/platform-tests/BUILD.bazel @@ -33,8 +33,10 @@ jvm_library( "//platform/indexing-api:indexing", "//jps/model-api:model", "//platform/platform-impl/initial-config-import", + "//platform/forms_rt:java-guiForms-rt", "//jps/model-serialization", "//platform/lang-core", + "//platform/lang-api:lang", "//platform/lang-impl", "@lib//:junit4", "@lib//:jmock", @@ -178,6 +180,8 @@ jvm_library( "//platform/testFramework/junit5/highlighting", "//platform/vcs-impl/shared", "//platform/vcs-impl/shared:shared_test_lib", + "//platform/execution", + "@lib//:jet_check", "@lib//:jediterm-core", ], runtime_deps = [ diff --git a/platform/platform-tests/intellij.platform.tests.iml b/platform/platform-tests/intellij.platform.tests.iml index b9d5b9108cbe..58a7a97dd213 100644 --- a/platform/platform-tests/intellij.platform.tests.iml +++ b/platform/platform-tests/intellij.platform.tests.iml @@ -22,8 +22,10 @@ + + @@ -154,6 +156,8 @@ + + \ No newline at end of file diff --git a/platform/polySymbols/backend/BUILD.bazel b/platform/polySymbols/backend/BUILD.bazel index e96a06055e27..a46ab0a85194 100644 --- a/platform/polySymbols/backend/BUILD.bazel +++ b/platform/polySymbols/backend/BUILD.bazel @@ -25,6 +25,7 @@ jvm_library( "//platform/refactoring", "//platform/editor-ui-api:editor-ui", "//platform/core-ui", + "//platform/lang-api:lang", ] ) ### auto-generated section `build intellij.platform.polySymbols.backend` end \ No newline at end of file diff --git a/platform/polySymbols/backend/intellij.platform.polySymbols.backend.iml b/platform/polySymbols/backend/intellij.platform.polySymbols.backend.iml index e43b03a20424..60daf3ea31d2 100644 --- a/platform/polySymbols/backend/intellij.platform.polySymbols.backend.iml +++ b/platform/polySymbols/backend/intellij.platform.polySymbols.backend.iml @@ -19,5 +19,6 @@ + \ No newline at end of file diff --git a/platform/remote-servers/impl/BUILD.bazel b/platform/remote-servers/impl/BUILD.bazel index dbc938ff0046..9b3bb845c249 100644 --- a/platform/remote-servers/impl/BUILD.bazel +++ b/platform/remote-servers/impl/BUILD.bazel @@ -24,6 +24,7 @@ jvm_library( "//platform/projectModel-api:projectModel", "//platform/remote-servers/api:remoteServers", "//platform/core-impl", + "//platform/forms_rt:java-guiForms-rt", "//platform/lang-api:lang", "//platform/execution-impl", "//platform/platform-impl:ide-impl", @@ -33,6 +34,7 @@ jvm_library( "//platform/platform-util-io-impl:ide-util-io-impl", "//platform/util/jdom", "//platform/util-ex", + "//platform/execution", ] ) ### auto-generated section `build intellij.platform.remoteServers.impl` end \ No newline at end of file diff --git a/platform/remote-servers/impl/intellij.platform.remoteServers.impl.iml b/platform/remote-servers/impl/intellij.platform.remoteServers.impl.iml index 0129d7fe2af1..99f8909a8cf7 100644 --- a/platform/remote-servers/impl/intellij.platform.remoteServers.impl.iml +++ b/platform/remote-servers/impl/intellij.platform.remoteServers.impl.iml @@ -18,6 +18,7 @@ + @@ -27,5 +28,6 @@ + \ 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 ce4abea0e362..48b7941a3d65 100644 --- a/platform/remote-servers/target-integration-tests/BUILD.bazel +++ b/platform/remote-servers/target-integration-tests/BUILD.bazel @@ -38,6 +38,7 @@ jvm_library( "//plugins/junit", "//java/java-tests:tests_test_lib", "//platform/util/jdom", + "//platform/execution", ] ) ### 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 550526d2cc98..ae07af341c18 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 @@ -29,5 +29,6 @@ + \ No newline at end of file diff --git a/platform/script-debugger/debugger-ui/BUILD.bazel b/platform/script-debugger/debugger-ui/BUILD.bazel index 430ea6545b7d..80fd312ca609 100644 --- a/platform/script-debugger/debugger-ui/BUILD.bazel +++ b/platform/script-debugger/debugger-ui/BUILD.bazel @@ -34,6 +34,7 @@ jvm_library( "//platform/platform-util-io:ide-util-io", "//platform/platform-util-netty:ide-util-netty", "//platform/util/jdom", + "//platform/execution", ] ) ### auto-generated section `build intellij.platform.scriptDebugger.ui` end \ No newline at end of file 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 0346e5185e82..4079f506a4b4 100644 --- a/platform/script-debugger/debugger-ui/intellij.platform.scriptDebugger.ui.iml +++ b/platform/script-debugger/debugger-ui/intellij.platform.scriptDebugger.ui.iml @@ -29,5 +29,6 @@ + \ No newline at end of file diff --git a/platform/searchEverywhere/backend/BUILD.bazel b/platform/searchEverywhere/backend/BUILD.bazel index f15d6757762a..cdff91e76e3c 100644 --- a/platform/searchEverywhere/backend/BUILD.bazel +++ b/platform/searchEverywhere/backend/BUILD.bazel @@ -35,6 +35,8 @@ jvm_library( "//platform/indexing-api:indexing", "//platform/scopes", "//platform/projectModel-api:projectModel", + "//platform/platform-api:ide", + "//platform/lang-api:lang", ], runtime_deps = ["//platform/backend"] ) diff --git a/platform/searchEverywhere/backend/intellij.platform.searchEverywhere.backend.iml b/platform/searchEverywhere/backend/intellij.platform.searchEverywhere.backend.iml index c1958a163e78..d8633b6abd93 100644 --- a/platform/searchEverywhere/backend/intellij.platform.searchEverywhere.backend.iml +++ b/platform/searchEverywhere/backend/intellij.platform.searchEverywhere.backend.iml @@ -55,5 +55,7 @@ + + \ No newline at end of file diff --git a/platform/searchEverywhere/backend/src/providers/files/SeFilesProvider.kt b/platform/searchEverywhere/backend/src/providers/files/SeFilesProvider.kt index bc63e712bf33..ece30a7de948 100644 --- a/platform/searchEverywhere/backend/src/providers/files/SeFilesProvider.kt +++ b/platform/searchEverywhere/backend/src/providers/files/SeFilesProvider.kt @@ -11,15 +11,15 @@ import com.intellij.platform.searchEverywhere.backend.providers.target.SeTargets import com.intellij.platform.searchEverywhere.providers.SeAsyncContributorWrapper import com.intellij.platform.searchEverywhere.providers.SeWrappedLegacyContributorItemsProvider import com.intellij.platform.searchEverywhere.providers.target.SeTypeVisibilityStatePresentation -import org.jetbrains.annotations.ApiStatus.Internal import org.jetbrains.annotations.Nls -@Internal -class SeFilesProvider(private val contributorWrapper: SeAsyncContributorWrapper) : SeWrappedLegacyContributorItemsProvider(), - SeSearchScopesProvider, - SeTypeVisibilityStateProvider, - SeItemsPreviewProvider, - SeExtendedInfoProvider { +internal class SeFilesProvider( + private val contributorWrapper: SeAsyncContributorWrapper, +) : SeWrappedLegacyContributorItemsProvider(), + SeSearchScopesProvider, + SeTypeVisibilityStateProvider, + SeItemsPreviewProvider, + SeExtendedInfoProvider { override val id: String get() = SeProviderIdUtils.FILES_ID override val displayName: @Nls String get() = contributorWrapper.contributor.fullGroupName diff --git a/platform/searchEverywhere/backend/src/providers/text/SeTextItemsProviderFactory.kt b/platform/searchEverywhere/backend/src/providers/text/SeTextItemsProviderFactory.kt index f7a94e113684..b70189c57598 100644 --- a/platform/searchEverywhere/backend/src/providers/text/SeTextItemsProviderFactory.kt +++ b/platform/searchEverywhere/backend/src/providers/text/SeTextItemsProviderFactory.kt @@ -9,10 +9,8 @@ import com.intellij.platform.searchEverywhere.SeItemsProvider import com.intellij.platform.searchEverywhere.SeProviderIdUtils import com.intellij.platform.searchEverywhere.providers.SeAsyncContributorWrapper import com.intellij.platform.searchEverywhere.providers.SeWrappedLegacyContributorItemsProviderFactory -import org.jetbrains.annotations.ApiStatus -@ApiStatus.Internal -class SeTextItemsProviderFactory : SeWrappedLegacyContributorItemsProviderFactory { +private class SeTextItemsProviderFactory : SeWrappedLegacyContributorItemsProviderFactory { override val id: String get() = SeProviderIdUtils.TEXT_ID override suspend fun getItemsProvider(project: Project?, legacyContributor: SearchEverywhereContributor): SeItemsProvider? { diff --git a/platform/searchEverywhere/backend/src/providers/topHit/SeBackendTopHitItemsProviderFactory.kt b/platform/searchEverywhere/backend/src/providers/topHit/SeBackendTopHitItemsProviderFactory.kt index 31ad08420527..645930aa36f5 100644 --- a/platform/searchEverywhere/backend/src/providers/topHit/SeBackendTopHitItemsProviderFactory.kt +++ b/platform/searchEverywhere/backend/src/providers/topHit/SeBackendTopHitItemsProviderFactory.kt @@ -3,11 +3,11 @@ package com.intellij.platform.searchEverywhere.backend.providers.topHit import com.intellij.ide.IdeBundle import com.intellij.platform.searchEverywhere.providers.topHit.SeTopHitItemsProviderFactory -import org.jetbrains.annotations.ApiStatus import org.jetbrains.annotations.Nls -@ApiStatus.Internal -class SeBackendTopHitItemsProviderFactory : SeTopHitItemsProviderFactory() { - override val isHost: Boolean get() = true - override val displayName: @Nls String get() = IdeBundle.message("search.everywhere.group.name.top.hit") +private class SeBackendTopHitItemsProviderFactory : SeTopHitItemsProviderFactory() { + override val isHost: Boolean + get() = true + override val displayName: @Nls String + get() = IdeBundle.message("search.everywhere.group.name.top.hit") } \ No newline at end of file diff --git a/platform/searchEverywhere/shared/BUILD.bazel b/platform/searchEverywhere/shared/BUILD.bazel index 4a3237d9359e..ee3662b5582f 100644 --- a/platform/searchEverywhere/shared/BUILD.bazel +++ b/platform/searchEverywhere/shared/BUILD.bazel @@ -32,6 +32,8 @@ jvm_library( "//platform/execution-impl", "//platform/statistics", "//platform/scopes", + "//platform/execution", + "//platform/lang-api:lang", ], exports = [ "//platform/lang-impl", diff --git a/platform/searchEverywhere/shared/intellij.platform.searchEverywhere.iml b/platform/searchEverywhere/shared/intellij.platform.searchEverywhere.iml index 52ea35e505a1..0b0ed01b77d4 100644 --- a/platform/searchEverywhere/shared/intellij.platform.searchEverywhere.iml +++ b/platform/searchEverywhere/shared/intellij.platform.searchEverywhere.iml @@ -51,5 +51,7 @@ + + \ No newline at end of file diff --git a/platform/settings-sync-core/BUILD.bazel b/platform/settings-sync-core/BUILD.bazel index 59ee6a46971f..307311d743fb 100644 --- a/platform/settings-sync-core/BUILD.bazel +++ b/platform/settings-sync-core/BUILD.bazel @@ -117,6 +117,7 @@ jvm_library( "@lib//:assert_j", "//platform/plugins/testFramework", "//platform/platform-tests:tests_test_lib", + "//platform/lang-api:lang", ], exports = ["@lib//:jetbrains-intellij-deps-eclipse-jgit"] ) diff --git a/platform/settings-sync-core/intellij.settingsSync.core.iml b/platform/settings-sync-core/intellij.settingsSync.core.iml index 5bbfd1c21bf1..4b5c5f0fbe7f 100644 --- a/platform/settings-sync-core/intellij.settingsSync.core.iml +++ b/platform/settings-sync-core/intellij.settingsSync.core.iml @@ -77,5 +77,6 @@ + \ No newline at end of file diff --git a/platform/smRunner/BUILD.bazel b/platform/smRunner/BUILD.bazel index 2aa2690985b0..74a36023099d 100644 --- a/platform/smRunner/BUILD.bazel +++ b/platform/smRunner/BUILD.bazel @@ -34,6 +34,7 @@ jvm_library( "//platform/ide-core-impl", "//platform/platform-util-io:ide-util-io", "//platform/util/jdom", + "//platform/execution", ], exports = [ "//platform/testRunner", @@ -77,6 +78,7 @@ jvm_library( "//platform/diff-api:diff", "//tools/intellij.tools.ide.metrics.benchmark:ide-metrics-benchmark", "//tools/intellij.tools.ide.metrics.benchmark:ide-metrics-benchmark_test_lib", + "//platform/execution", ], exports = [ "//platform/testRunner", diff --git a/platform/smRunner/intellij.platform.smRunner.iml b/platform/smRunner/intellij.platform.smRunner.iml index ed89ae0454d9..f3f717034984 100644 --- a/platform/smRunner/intellij.platform.smRunner.iml +++ b/platform/smRunner/intellij.platform.smRunner.iml @@ -35,5 +35,6 @@ + \ No newline at end of file diff --git a/platform/smRunner/vcs/BUILD.bazel b/platform/smRunner/vcs/BUILD.bazel index e171e1ca95d1..80f9bf47d96d 100644 --- a/platform/smRunner/vcs/BUILD.bazel +++ b/platform/smRunner/vcs/BUILD.bazel @@ -30,6 +30,7 @@ jvm_library( "//platform/ide-core-impl", "//platform/util/progress", "//platform/lang-impl", + "//platform/execution", ] ) ### auto-generated section `build intellij.platform.smRunner.vcs` end \ No newline at end of file diff --git a/platform/smRunner/vcs/intellij.platform.smRunner.vcs.iml b/platform/smRunner/vcs/intellij.platform.smRunner.vcs.iml index 7898b9fd3f9f..473ade51cb7b 100644 --- a/platform/smRunner/vcs/intellij.platform.smRunner.vcs.iml +++ b/platform/smRunner/vcs/intellij.platform.smRunner.vcs.iml @@ -24,5 +24,6 @@ + \ No newline at end of file diff --git a/platform/smart-update/BUILD.bazel b/platform/smart-update/BUILD.bazel index 2a88bda06427..3d0931b067c1 100644 --- a/platform/smart-update/BUILD.bazel +++ b/platform/smart-update/BUILD.bazel @@ -16,6 +16,7 @@ jvm_library( deps = [ "@lib//:kotlin-stdlib", "//platform/core-api:core", + "//platform/lang-api:lang", "//platform/editor-ui-api:editor-ui", "//platform/ide-core-impl", "//platform/projectModel-api:projectModel", diff --git a/platform/smart-update/intellij.smart.update.iml b/platform/smart-update/intellij.smart.update.iml index a7f84de91dd7..bb2ea8458bd3 100644 --- a/platform/smart-update/intellij.smart.update.iml +++ b/platform/smart-update/intellij.smart.update.iml @@ -10,6 +10,7 @@ + diff --git a/platform/statistics/devkit/BUILD.bazel b/platform/statistics/devkit/BUILD.bazel index e7f8e12fb5b1..e16d115d43d2 100644 --- a/platform/statistics/devkit/BUILD.bazel +++ b/platform/statistics/devkit/BUILD.bazel @@ -36,6 +36,8 @@ jvm_library( "//libraries/jackson/jackson", "//libraries/jackson/databind", "//platform/util/jdom", + "//platform/execution", + "//platform/forms_rt:java-guiForms-rt", ] ) @@ -70,6 +72,8 @@ jvm_library( "//libraries/jackson/jackson", "//libraries/jackson/databind", "//platform/util/jdom", + "//platform/execution", + "//platform/forms_rt:java-guiForms-rt", ] ) ### auto-generated section `build intellij.platform.statistics.devkit` end diff --git a/platform/statistics/devkit/intellij.platform.statistics.devkit.iml b/platform/statistics/devkit/intellij.platform.statistics.devkit.iml index b998ac02a24c..96031e2d0990 100644 --- a/platform/statistics/devkit/intellij.platform.statistics.devkit.iml +++ b/platform/statistics/devkit/intellij.platform.statistics.devkit.iml @@ -32,5 +32,7 @@ + + \ No newline at end of file diff --git a/platform/tasks-platform-impl/BUILD.bazel b/platform/tasks-platform-impl/BUILD.bazel index fb00b26cd26a..4945ceddd60a 100644 --- a/platform/tasks-platform-impl/BUILD.bazel +++ b/platform/tasks-platform-impl/BUILD.bazel @@ -26,6 +26,8 @@ jvm_library( "//libraries/gson", "//platform/platform-impl:ide-impl", "//platform/lang-impl", + "//platform/forms_rt:java-guiForms-rt", + "//platform/execution", "//platform/execution-impl", "//platform/xdebugger-impl:debugger-impl", "//platform/xdebugger-api:debugger", @@ -36,6 +38,7 @@ jvm_library( "//platform/util/text-matching", "//platform/statistics", "//platform/bookmarks", + "//platform/lang-api:lang", ] ) ### auto-generated section `build intellij.platform.tasks.impl` end \ No newline at end of file diff --git a/platform/tasks-platform-impl/intellij.platform.tasks.impl.iml b/platform/tasks-platform-impl/intellij.platform.tasks.impl.iml index 10149968df2d..b6fc594a17e3 100644 --- a/platform/tasks-platform-impl/intellij.platform.tasks.impl.iml +++ b/platform/tasks-platform-impl/intellij.platform.tasks.impl.iml @@ -20,6 +20,8 @@ + + @@ -30,5 +32,6 @@ + \ No newline at end of file diff --git a/platform/tasks-platform-impl/src/com/intellij/tasks/context/BookmarkContextProvider.java b/platform/tasks-platform-impl/src/com/intellij/tasks/context/BookmarkContextProvider.java index 8b07d4478d77..fd48be04c091 100644 --- a/platform/tasks-platform-impl/src/com/intellij/tasks/context/BookmarkContextProvider.java +++ b/platform/tasks-platform-impl/src/com/intellij/tasks/context/BookmarkContextProvider.java @@ -1,4 +1,4 @@ -// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.tasks.context; import com.intellij.ide.bookmark.BookmarksManager; @@ -9,14 +9,12 @@ import com.intellij.openapi.project.Project; import com.intellij.tasks.TaskBundle; import com.intellij.util.xmlb.XmlSerializer; import org.jdom.Element; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; import static java.util.Objects.requireNonNull; -@ApiStatus.Internal -public class BookmarkContextProvider extends WorkingContextProvider { +final class BookmarkContextProvider extends WorkingContextProvider { @Override public @NotNull String getId() { return "bookmarks"; diff --git a/platform/testFramework/BUILD.bazel b/platform/testFramework/BUILD.bazel index 1f7144e0fc2a..60dcaf7c32c0 100644 --- a/platform/testFramework/BUILD.bazel +++ b/platform/testFramework/BUILD.bazel @@ -94,11 +94,11 @@ jvm_library( "//platform/workspace/storage", "//platform/runtime/product", "//platform/plugins/parser/impl", + "//platform/execution", ":libraries_junit4_provided", ":libraries_junit5-launcher_provided", ], exports = [ - "@lib//:jet_check", "@lib//:junit5-provided", "@lib//:junit5Params-provided", "//libraries/junit4", @@ -199,11 +199,11 @@ jvm_library( "//platform/runtime/product", "//platform/plugins/parser/impl", "//platform/plugins/parser/impl:impl_test_lib", + "//platform/execution", ":libraries_junit4_provided", ":libraries_junit5-launcher_provided", ], exports = [ - "@lib//:jet_check", "@lib//:junit5-provided", "@lib//:junit5Params-provided", "//libraries/junit4", diff --git a/platform/testFramework/intellij.platform.testFramework.iml b/platform/testFramework/intellij.platform.testFramework.iml index d54047c63d14..5c43dee4c8df 100644 --- a/platform/testFramework/intellij.platform.testFramework.iml +++ b/platform/testFramework/intellij.platform.testFramework.iml @@ -11,7 +11,7 @@ - + @@ -117,5 +117,6 @@ + \ No newline at end of file diff --git a/platform/testFramework/junit5/projectStructure/BUILD.bazel b/platform/testFramework/junit5/projectStructure/BUILD.bazel index 9d099c1b1b81..ec75ff3fd59d 100644 --- a/platform/testFramework/junit5/projectStructure/BUILD.bazel +++ b/platform/testFramework/junit5/projectStructure/BUILD.bazel @@ -15,6 +15,7 @@ jvm_library( "//platform/testFramework/common", "//platform/testFramework/junit5", "//platform/lang-impl", + "//platform/ide-core", "//platform/util-ex", "@lib//:kotlin-test", "//platform/ide-core-impl", @@ -38,12 +39,14 @@ jvm_library( "//platform/testFramework/junit5", "//platform/testFramework/junit5:junit5_test_lib", "//platform/lang-impl", + "//platform/ide-core", "//platform/util-ex", "@lib//:junit5", "@lib//:kotlin-test", "//platform/ide-core-impl", "//platform/workspace/jps", "@lib//:kotlin-stdlib", + "//platform/lang-api:lang", ] ) ### auto-generated section `build intellij.platform.testFramework.junit5.projectStructure` end diff --git a/platform/testFramework/junit5/projectStructure/intellij.platform.testFramework.junit5.projectStructure.iml b/platform/testFramework/junit5/projectStructure/intellij.platform.testFramework.junit5.projectStructure.iml index ebb72cf4921d..06dfc749fd06 100644 --- a/platform/testFramework/junit5/projectStructure/intellij.platform.testFramework.junit5.projectStructure.iml +++ b/platform/testFramework/junit5/projectStructure/intellij.platform.testFramework.junit5.projectStructure.iml @@ -16,11 +16,13 @@ + + \ No newline at end of file diff --git a/platform/testFramework/junit5/projectStructure/test/com/intellij/platform/testFramework/junit5/projectStructure/fixture/MultiverseFixtureTest.kt b/platform/testFramework/junit5/projectStructure/test/com/intellij/platform/testFramework/junit5/projectStructure/fixture/MultiverseFixtureTest.kt index 3ad6057e6ab9..b66591507224 100644 --- a/platform/testFramework/junit5/projectStructure/test/com/intellij/platform/testFramework/junit5/projectStructure/fixture/MultiverseFixtureTest.kt +++ b/platform/testFramework/junit5/projectStructure/test/com/intellij/platform/testFramework/junit5/projectStructure/fixture/MultiverseFixtureTest.kt @@ -29,7 +29,7 @@ internal class MultiverseFixtureTest { } @Test - fun `assert project structure`() = timeoutRunBlocking { + fun `assert project structure`(): Unit = timeoutRunBlocking { readAction { val project = projectFixture.get() val moduleManager = ModuleManager.getInstance(project) diff --git a/platform/testRunner/BUILD.bazel b/platform/testRunner/BUILD.bazel index ea53b43762c2..5eaa48cc6585 100644 --- a/platform/testRunner/BUILD.bazel +++ b/platform/testRunner/BUILD.bazel @@ -25,6 +25,7 @@ jvm_library( "//platform/platform-impl:ide-impl", "//platform/xdebugger-api:debugger", "//platform/diff-impl", + "//platform/forms_rt:java-guiForms-rt", "//libraries/fastutil", "//platform/core-ui", "//platform/platform-util-io:ide-util-io", @@ -34,6 +35,7 @@ jvm_library( "//platform/analysis-impl", "//platform/xdebugger-impl:debugger-impl", "//platform/core-impl", + "//platform/execution", ] ) @@ -54,6 +56,7 @@ jvm_library( "//platform/platform-impl:ide-impl", "//platform/xdebugger-api:debugger", "//platform/diff-impl", + "//platform/forms_rt:java-guiForms-rt", "//libraries/fastutil", "@lib//:junit4", "//platform/core-ui", @@ -67,6 +70,7 @@ jvm_library( "//platform/xdebugger-impl:debugger-impl", "//platform/xdebugger-impl:debugger-impl_test_lib", "//platform/core-impl", + "//platform/execution", ] ) ### auto-generated section `build intellij.platform.testRunner` end diff --git a/platform/testRunner/intellij.platform.testRunner.iml b/platform/testRunner/intellij.platform.testRunner.iml index 3c75fc9a6efb..31a606b12d7d 100644 --- a/platform/testRunner/intellij.platform.testRunner.iml +++ b/platform/testRunner/intellij.platform.testRunner.iml @@ -20,6 +20,7 @@ + @@ -31,5 +32,6 @@ + \ No newline at end of file diff --git a/platform/todo/BUILD.bazel b/platform/todo/BUILD.bazel index 381fe2f4284f..2f1a942de424 100644 --- a/platform/todo/BUILD.bazel +++ b/platform/todo/BUILD.bazel @@ -34,6 +34,7 @@ jvm_library( "//platform/editor-ui-ex:editor-ex", "//platform/projectModel-impl", "//platform/core-impl", + "//platform/lang-api:lang", ] ) ### auto-generated section `build intellij.platform.todo` end \ No newline at end of file diff --git a/platform/todo/intellij.platform.todo.iml b/platform/todo/intellij.platform.todo.iml index 8dd1d3a82792..b2890e684113 100644 --- a/platform/todo/intellij.platform.todo.iml +++ b/platform/todo/intellij.platform.todo.iml @@ -28,5 +28,6 @@ + \ No newline at end of file diff --git a/platform/util/storages/BUILD.bazel b/platform/util/storages/BUILD.bazel index 023ef87f5768..06a5b0586d63 100644 --- a/platform/util/storages/BUILD.bazel +++ b/platform/util/storages/BUILD.bazel @@ -17,12 +17,6 @@ jvm_library( "@lib//:kotlinx-coroutines-core", "@lib//:opentelemetry", "//platform/diagnostic/telemetry", - ], - exports = [ - "@lib//:jetbrains-annotations", - "//platform/util-rt", - "//platform/util/base", - "//platform/util", ] ) ### auto-generated section `build intellij.platform.util.io.storages` end \ No newline at end of file diff --git a/platform/util/storages/intellij.platform.util.io.storages.iml b/platform/util/storages/intellij.platform.util.io.storages.iml index 0c8f4f0e8779..3506d4534ac4 100644 --- a/platform/util/storages/intellij.platform.util.io.storages.iml +++ b/platform/util/storages/intellij.platform.util.io.storages.iml @@ -7,11 +7,11 @@ - - + + - - + + diff --git a/platform/vcs-api/BUILD.bazel b/platform/vcs-api/BUILD.bazel index 7abf12bbc2c8..3a16843a5b3b 100644 --- a/platform/vcs-api/BUILD.bazel +++ b/platform/vcs-api/BUILD.bazel @@ -30,6 +30,7 @@ jvm_library( "//platform/core-ui", "//libraries/caffeine", "//platform/vcs-api/shared", + "//platform/execution", ], exports = [ "//platform/vcs-api/vcs-api-core:vcs-core", diff --git a/platform/vcs-api/intellij.platform.vcs.iml b/platform/vcs-api/intellij.platform.vcs.iml index b05f01355264..4e5e9d88d199 100644 --- a/platform/vcs-api/intellij.platform.vcs.iml +++ b/platform/vcs-api/intellij.platform.vcs.iml @@ -25,5 +25,6 @@ + \ No newline at end of file diff --git a/platform/vcs-impl/BUILD.bazel b/platform/vcs-impl/BUILD.bazel index fe520fd497ea..19ab1731c4a9 100644 --- a/platform/vcs-impl/BUILD.bazel +++ b/platform/vcs-impl/BUILD.bazel @@ -69,6 +69,7 @@ jvm_library( "//platform/util/coroutines", "//libraries/kotlinx/serialization/core", "//libraries/kotlinx/serialization/json", + "//platform/forms_rt:java-guiForms-rt", "//libraries/microba", "//platform/kernel/shared:kernel", "//platform/vcs-impl/shared", @@ -79,6 +80,7 @@ jvm_library( "//platform/kernel/backend", "//platform/platform-impl/rpc", "//platform/polySymbols", + "//platform/execution", ] ) @@ -152,6 +154,7 @@ jvm_library( "//platform/util/coroutines", "//libraries/kotlinx/serialization/core", "//libraries/kotlinx/serialization/json", + "//platform/forms_rt:java-guiForms-rt", "//libraries/microba", "//platform/kernel/shared:kernel", "//platform/vcs-impl/shared", @@ -164,6 +167,7 @@ jvm_library( "//platform/platform-impl/rpc", "//platform/diff-impl/tests:tests_test_lib", "//platform/polySymbols", + "//platform/execution", ] ) ### auto-generated section `build intellij.platform.vcs.impl` end diff --git a/platform/vcs-impl/intellij.platform.vcs.impl.iml b/platform/vcs-impl/intellij.platform.vcs.impl.iml index cea604ea4834..a69b18712f1d 100644 --- a/platform/vcs-impl/intellij.platform.vcs.impl.iml +++ b/platform/vcs-impl/intellij.platform.vcs.impl.iml @@ -93,6 +93,7 @@ + @@ -104,5 +105,6 @@ + \ No newline at end of file diff --git a/platform/vcs-impl/lang/BUILD.bazel b/platform/vcs-impl/lang/BUILD.bazel index 983f08223bd3..9861f19d7528 100644 --- a/platform/vcs-impl/lang/BUILD.bazel +++ b/platform/vcs-impl/lang/BUILD.bazel @@ -41,6 +41,7 @@ jvm_library( "//libraries/fastutil", "//platform/todo", "//platform/vcs-impl/shared", + "//platform/lang-api:lang", ] ) ### auto-generated section `build intellij.platform.vcs.impl.lang` end \ No newline at end of file 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 86463c302925..95f5f930c705 100644 --- a/platform/vcs-impl/lang/intellij.platform.vcs.impl.lang.iml +++ b/platform/vcs-impl/lang/intellij.platform.vcs.impl.lang.iml @@ -35,5 +35,6 @@ + \ No newline at end of file diff --git a/platform/vcs-log/impl/BUILD.bazel b/platform/vcs-log/impl/BUILD.bazel index 288e1fb5e52d..a93848fe5bd9 100644 --- a/platform/vcs-log/impl/BUILD.bazel +++ b/platform/vcs-log/impl/BUILD.bazel @@ -17,6 +17,7 @@ jvm_library( "//platform/analysis-api:analysis", "//platform/util/concurrency", "//platform/core-api:core", + "//platform/lang-api:lang", "//platform/core-impl", "//platform/projectModel-impl", "//platform/diff-api:diff", @@ -69,6 +70,7 @@ jvm_library( "//platform/util/concurrency", "//platform/util/concurrency:concurrency_test_lib", "//platform/core-api:core", + "//platform/lang-api:lang", "//platform/core-impl", "//platform/projectModel-impl", "//platform/diff-api:diff", 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 655e7ec1c242..d8c35a0b6e85 100644 --- a/platform/vcs-log/impl/intellij.platform.vcs.log.impl.iml +++ b/platform/vcs-log/impl/intellij.platform.vcs.log.impl.iml @@ -13,6 +13,7 @@ + diff --git a/platform/warmup/BUILD.bazel b/platform/warmup/BUILD.bazel index cba2e26ad318..7650ccff2de1 100644 --- a/platform/warmup/BUILD.bazel +++ b/platform/warmup/BUILD.bazel @@ -33,6 +33,7 @@ jvm_library( "@lib//:kotlin-stdlib", "@lib//:kotlinx-coroutines-core", "//platform/backend/observation", + "//platform/lang-api:lang", ], runtime_deps = ["//platform/backend"] ) diff --git a/platform/warmup/intellij.platform.warmup.iml b/platform/warmup/intellij.platform.warmup.iml index 042d65fa2f91..3aa7565430aa 100644 --- a/platform/warmup/intellij.platform.warmup.iml +++ b/platform/warmup/intellij.platform.warmup.iml @@ -28,5 +28,6 @@ + \ No newline at end of file diff --git a/platform/workspace/jps/tests/BUILD.bazel b/platform/workspace/jps/tests/BUILD.bazel index 1ffe36c42f7d..2a1298e8b804 100644 --- a/platform/workspace/jps/tests/BUILD.bazel +++ b/platform/workspace/jps/tests/BUILD.bazel @@ -54,6 +54,7 @@ jvm_library( "//platform/eel-provider", "//platform/testFramework/junit5/eel", "//platform/testFramework/junit5/eel:eel_test_lib", + "@lib//:jet_check", ] ) ### 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 2ff69d0d1359..8759a07e73aa 100644 --- a/platform/workspace/jps/tests/intellij.platform.workspace.jps.tests.iml +++ b/platform/workspace/jps/tests/intellij.platform.workspace.jps.tests.iml @@ -37,6 +37,7 @@ + \ No newline at end of file diff --git a/platform/workspace/storage/tests/BUILD.bazel b/platform/workspace/storage/tests/BUILD.bazel index 979558138e39..d658011ccfe5 100644 --- a/platform/workspace/storage/tests/BUILD.bazel +++ b/platform/workspace/storage/tests/BUILD.bazel @@ -44,6 +44,7 @@ jvm_library( "//platform/testFramework/junit5", "//platform/testFramework/junit5:junit5_test_lib", "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable", + "@lib//:jet_check", ] ) ### auto-generated section `build intellij.platform.workspace.storage.tests` end diff --git a/platform/workspace/storage/tests/intellij.platform.workspace.storage.tests.iml b/platform/workspace/storage/tests/intellij.platform.workspace.storage.tests.iml index 9f60277414be..3f2f97f809d3 100644 --- a/platform/workspace/storage/tests/intellij.platform.workspace.storage.tests.iml +++ b/platform/workspace/storage/tests/intellij.platform.workspace.storage.tests.iml @@ -36,6 +36,7 @@ + \ No newline at end of file diff --git a/platform/xdebugger-api/BUILD.bazel b/platform/xdebugger-api/BUILD.bazel index 4b359ace0a8e..63eb26ad5219 100644 --- a/platform/xdebugger-api/BUILD.bazel +++ b/platform/xdebugger-api/BUILD.bazel @@ -26,7 +26,7 @@ jvm_library( "//libraries/kotlinx/serialization/json", "@lib//:kotlin-stdlib", "//platform/core-api:core", - ], - exports = ["//platform/lang-api:lang"] + "//platform/execution", + ] ) ### auto-generated section `build intellij.platform.debugger` end \ No newline at end of file diff --git a/platform/xdebugger-api/intellij.platform.debugger.iml b/platform/xdebugger-api/intellij.platform.debugger.iml index 7a42e62d3762..3ff98f0eb101 100644 --- a/platform/xdebugger-api/intellij.platform.debugger.iml +++ b/platform/xdebugger-api/intellij.platform.debugger.iml @@ -14,9 +14,7 @@ - - $KOTLIN_BUNDLED$/lib/kotlinx-serialization-compiler-plugin.jar - + $KOTLIN_BUNDLED$/lib/kotlinx-serialization-compiler-plugin.jar @@ -34,7 +32,7 @@ - + @@ -44,5 +42,6 @@ + \ No newline at end of file diff --git a/platform/xdebugger-impl/BUILD.bazel b/platform/xdebugger-impl/BUILD.bazel index 23493ac8faae..755866eb00a6 100644 --- a/platform/xdebugger-impl/BUILD.bazel +++ b/platform/xdebugger-impl/BUILD.bazel @@ -40,6 +40,7 @@ jvm_library( "//platform/observable", "//jps/model-serialization", "//platform/lang-core", + "//platform/lang-api:lang", "//platform/lang-impl", "//platform/execution-impl", "//platform/diff-api:diff", @@ -67,6 +68,7 @@ jvm_library( "//libraries/jackson/jackson", "//libraries/jackson/databind", "//platform/kernel/shared:kernel", + "//platform/forms_rt:java-guiForms-rt", "//platform/platform-impl/internal", "//libraries/kotlinx/serialization/core", "//libraries/kotlinx/serialization/json", @@ -75,6 +77,7 @@ jvm_library( "//platform/xdebugger-impl/shared", "//platform/xdebugger-impl/rpc", "//platform/remote-topics/shared:rpc-topics", + "//platform/execution", ] ) @@ -96,6 +99,7 @@ jvm_library( "//platform/observable", "//jps/model-serialization", "//platform/lang-core", + "//platform/lang-api:lang", "//platform/lang-impl", "//platform/execution-impl", "//platform/diff-api:diff", @@ -130,6 +134,7 @@ jvm_library( "//libraries/jackson/jackson", "//libraries/jackson/databind", "//platform/kernel/shared:kernel", + "//platform/forms_rt:java-guiForms-rt", "//platform/platform-impl/internal", "//libraries/kotlinx/serialization/core", "//libraries/kotlinx/serialization/json", @@ -138,6 +143,7 @@ jvm_library( "//platform/xdebugger-impl/shared", "//platform/xdebugger-impl/rpc", "//platform/remote-topics/shared:rpc-topics", + "//platform/execution", ] ) ### auto-generated section `build intellij.platform.debugger.impl` end diff --git a/platform/xdebugger-impl/backend/BUILD.bazel b/platform/xdebugger-impl/backend/BUILD.bazel index d220bd2d29a9..2f6360216204 100644 --- a/platform/xdebugger-impl/backend/BUILD.bazel +++ b/platform/xdebugger-impl/backend/BUILD.bazel @@ -17,6 +17,7 @@ jvm_library( "@lib//:kotlinx-coroutines-core", "@lib//:kotlin-stdlib", "//platform/core-api:core", + "//platform/lang-api:lang", "//platform/editor-ui-api:editor-ui", "//platform/ide-core", "//platform/platform-api:ide", @@ -37,6 +38,7 @@ jvm_library( "//platform/lang-impl", "//platform/core-ui", "//platform/statistics", + "//platform/execution", "//platform/util/coroutines", "//platform/execution-impl", "//platform/platform-util-io:ide-util-io", diff --git a/platform/xdebugger-impl/backend/intellij.platform.debugger.impl.backend.iml b/platform/xdebugger-impl/backend/intellij.platform.debugger.impl.backend.iml index 039bebfd7abd..a45f01de8347 100644 --- a/platform/xdebugger-impl/backend/intellij.platform.debugger.impl.backend.iml +++ b/platform/xdebugger-impl/backend/intellij.platform.debugger.impl.backend.iml @@ -37,6 +37,7 @@ + @@ -57,6 +58,7 @@ + diff --git a/platform/xdebugger-impl/frontend/BUILD.bazel b/platform/xdebugger-impl/frontend/BUILD.bazel index 0a6936b8825d..4dcaaf474f6d 100644 --- a/platform/xdebugger-impl/frontend/BUILD.bazel +++ b/platform/xdebugger-impl/frontend/BUILD.bazel @@ -26,8 +26,10 @@ jvm_library( "//platform/xdebugger-impl:debugger-impl", "//platform/platform-impl:ide-impl", "//platform/xdebugger-api:debugger", + "//platform/lang-api:lang", "//platform/lang-impl", "//platform/platform-impl/rpc", + "//platform/execution", "//platform/core-ui", "//platform/util/coroutines", "//platform/core-api:core", @@ -64,8 +66,10 @@ jvm_library( "//platform/xdebugger-impl:debugger-impl_test_lib", "//platform/platform-impl:ide-impl", "//platform/xdebugger-api:debugger", + "//platform/lang-api:lang", "//platform/lang-impl", "//platform/platform-impl/rpc", + "//platform/execution", "//platform/core-ui", "//platform/util/coroutines", "//platform/core-api:core", 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 f8ba8067b1ec..f0fb19adc1f0 100644 --- a/platform/xdebugger-impl/frontend/intellij.platform.debugger.impl.frontend.iml +++ b/platform/xdebugger-impl/frontend/intellij.platform.debugger.impl.frontend.iml @@ -46,8 +46,10 @@ + + diff --git a/platform/xdebugger-impl/intellij.platform.debugger.impl.iml b/platform/xdebugger-impl/intellij.platform.debugger.impl.iml index 39e0e734eea6..9fae2cc912d7 100644 --- a/platform/xdebugger-impl/intellij.platform.debugger.impl.iml +++ b/platform/xdebugger-impl/intellij.platform.debugger.impl.iml @@ -45,6 +45,7 @@ + @@ -76,6 +77,7 @@ + @@ -84,5 +86,6 @@ + \ No newline at end of file diff --git a/platform/xdebugger-impl/rpc/BUILD.bazel b/platform/xdebugger-impl/rpc/BUILD.bazel index a0d5910796da..09cf4ca9a1a7 100644 --- a/platform/xdebugger-impl/rpc/BUILD.bazel +++ b/platform/xdebugger-impl/rpc/BUILD.bazel @@ -26,6 +26,7 @@ jvm_library( "//platform/execution-impl", "//platform/remote-topics/shared:rpc-topics", "//platform/core-api:core", + "//platform/execution", ] ) ### auto-generated section `build intellij.platform.debugger.impl.rpc` end \ No newline at end of file diff --git a/platform/xdebugger-impl/rpc/intellij.platform.debugger.impl.rpc.iml b/platform/xdebugger-impl/rpc/intellij.platform.debugger.impl.rpc.iml index 0009160b3017..e22f4c238403 100644 --- a/platform/xdebugger-impl/rpc/intellij.platform.debugger.impl.rpc.iml +++ b/platform/xdebugger-impl/rpc/intellij.platform.debugger.impl.rpc.iml @@ -45,5 +45,6 @@ + \ No newline at end of file diff --git a/platform/xdebugger-impl/shared/BUILD.bazel b/platform/xdebugger-impl/shared/BUILD.bazel index 933182d52798..4a7eb679316d 100644 --- a/platform/xdebugger-impl/shared/BUILD.bazel +++ b/platform/xdebugger-impl/shared/BUILD.bazel @@ -33,6 +33,8 @@ jvm_library( "//platform/util/coroutines", "//platform/projectModel-api:projectModel", "//platform/execution-impl", + "//platform/lang-api:lang", + "//platform/execution", ] ) ### auto-generated section `build intellij.platform.debugger.impl.shared` end \ No newline at end of file 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 01bdc11c6dd3..2e4f94692112 100644 --- a/platform/xdebugger-impl/shared/intellij.platform.debugger.impl.shared.iml +++ b/platform/xdebugger-impl/shared/intellij.platform.debugger.impl.shared.iml @@ -52,5 +52,7 @@ + + \ No newline at end of file diff --git a/platform/xdebugger-testFramework/BUILD.bazel b/platform/xdebugger-testFramework/BUILD.bazel index f66de7854ca1..959244f7edcc 100644 --- a/platform/xdebugger-testFramework/BUILD.bazel +++ b/platform/xdebugger-testFramework/BUILD.bazel @@ -21,6 +21,7 @@ jvm_library( "//platform/core-ui", "//platform/xdebugger-impl/rpc", "//platform/xdebugger-impl/shared", + "//platform/execution", ] ) ### auto-generated section `build intellij.platform.debugger.testFramework` end \ No newline at end of file diff --git a/platform/xdebugger-testFramework/intellij.platform.debugger.testFramework.iml b/platform/xdebugger-testFramework/intellij.platform.debugger.testFramework.iml index ab68fe316fe3..5a946cb14c9c 100644 --- a/platform/xdebugger-testFramework/intellij.platform.debugger.testFramework.iml +++ b/platform/xdebugger-testFramework/intellij.platform.debugger.testFramework.iml @@ -21,5 +21,6 @@ + \ No newline at end of file diff --git a/plugins/IntelliLang/BUILD.bazel b/plugins/IntelliLang/BUILD.bazel index 73bb392ed484..0b9ca19a281a 100644 --- a/plugins/IntelliLang/BUILD.bazel +++ b/plugins/IntelliLang/BUILD.bazel @@ -32,6 +32,7 @@ jvm_library( "//platform/util/jdom", "//platform/analysis-impl", "//platform/core-impl", + "//platform/forms_rt:java-guiForms-rt", ] ) ### auto-generated section `build intellij.platform.langInjection` end \ No newline at end of file diff --git a/plugins/IntelliLang/intellij.platform.langInjection.iml b/plugins/IntelliLang/intellij.platform.langInjection.iml index 5c8ae83808c4..0e9c79523e1c 100644 --- a/plugins/IntelliLang/intellij.platform.langInjection.iml +++ b/plugins/IntelliLang/intellij.platform.langInjection.iml @@ -26,6 +26,7 @@ + diff --git a/plugins/ant/BUILD.bazel b/plugins/ant/BUILD.bazel index 4e63b558ed6a..af18638146f0 100644 --- a/plugins/ant/BUILD.bazel +++ b/plugins/ant/BUILD.bazel @@ -21,6 +21,7 @@ jvm_library( "//platform/core-api:core", "//platform/editor-ui-api:editor-ui", "//platform/ide-core-impl", + "//platform/forms_rt:java-guiForms-rt", "//java/compiler/impl", "//platform/indexing-api:indexing", "//platform/core-impl", @@ -56,6 +57,7 @@ jvm_library( "//platform/platform-util-io:ide-util-io", "//platform/util/jdom", "//xml/xml-psi-api:psi", + "//platform/execution", ] ) @@ -74,6 +76,7 @@ jvm_library( "//platform/core-api:core", "//platform/editor-ui-api:editor-ui", "//platform/ide-core-impl", + "//platform/forms_rt:java-guiForms-rt", "//java/compiler/impl", "//platform/indexing-api:indexing", "//platform/core-impl", @@ -115,6 +118,7 @@ jvm_library( "//tools/intellij.tools.ide.metrics.benchmark:ide-metrics-benchmark_test_lib", "//xml/xml-psi-api:psi", "//xml/testFramework", + "//platform/execution", ] ) ### auto-generated section `build intellij.ant` end diff --git a/plugins/ant/intellij.ant.iml b/plugins/ant/intellij.ant.iml index 25fd4db44f8e..680f606c2a02 100644 --- a/plugins/ant/intellij.ant.iml +++ b/plugins/ant/intellij.ant.iml @@ -18,6 +18,7 @@ + @@ -56,6 +57,7 @@ + diff --git a/plugins/built-in-help/BUILD.bazel b/plugins/built-in-help/BUILD.bazel index aa63db1a3e14..8c01dc4e4b6f 100644 --- a/plugins/built-in-help/BUILD.bazel +++ b/plugins/built-in-help/BUILD.bazel @@ -23,6 +23,7 @@ jvm_library( "@lib//:lucene-highlighter", "@lib//:lucene-queryparser", "@lib//:lucene-suggest", + "//platform/forms_rt:java-guiForms-rt", "//libraries/jsoup", "@lib//:jaxb-api", "//platform/core-api:core", diff --git a/plugins/built-in-help/intellij.builtInHelp.iml b/plugins/built-in-help/intellij.builtInHelp.iml index b0fe09979c40..b8d6dd6e405b 100644 --- a/plugins/built-in-help/intellij.builtInHelp.iml +++ b/plugins/built-in-help/intellij.builtInHelp.iml @@ -17,6 +17,7 @@ + diff --git a/plugins/commander/BUILD.bazel b/plugins/commander/BUILD.bazel index 6ae947450ed3..ce5513ed0b4e 100644 --- a/plugins/commander/BUILD.bazel +++ b/plugins/commander/BUILD.bazel @@ -16,6 +16,7 @@ jvm_library( deps = [ "//java/java-impl:impl", "//platform/analysis-api:analysis", + "//platform/lang-api:lang", "//platform/diff-api:diff", "//platform/diff-impl", "//platform/editor-ui-api:editor-ui", @@ -39,6 +40,7 @@ jvm_library( "//java/java-impl:impl", "//java/java-impl:impl_test_lib", "//platform/analysis-api:analysis", + "//platform/lang-api:lang", "//platform/diff-api:diff", "//platform/diff-impl", "//platform/editor-ui-api:editor-ui", diff --git a/plugins/commander/intellij.commander.iml b/plugins/commander/intellij.commander.iml index ebdffc86c12b..0d8e45d69541 100644 --- a/plugins/commander/intellij.commander.iml +++ b/plugins/commander/intellij.commander.iml @@ -11,6 +11,7 @@ + diff --git a/plugins/compilation-charts/BUILD.bazel b/plugins/compilation-charts/BUILD.bazel index 66a2a9c1b335..ac00b9bb5dae 100644 --- a/plugins/compilation-charts/BUILD.bazel +++ b/plugins/compilation-charts/BUILD.bazel @@ -39,6 +39,7 @@ jvm_library( "//platform/util/concurrency", "//java/idea-ui:ui", "//platform/platform-impl:ide-impl", + "//platform/execution", ] ) ### auto-generated section `build intellij.compilation.charts` end \ No newline at end of file diff --git a/plugins/compilation-charts/intellij.compilation.charts.iml b/plugins/compilation-charts/intellij.compilation.charts.iml index d357f3e84c30..760c28e17a9f 100644 --- a/plugins/compilation-charts/intellij.compilation.charts.iml +++ b/plugins/compilation-charts/intellij.compilation.charts.iml @@ -33,5 +33,6 @@ + \ No newline at end of file diff --git a/plugins/compose/intellij.compose.ide.plugin.resources/BUILD.bazel b/plugins/compose/intellij.compose.ide.plugin.resources/BUILD.bazel index 3de7cdc96057..441d405e0ba5 100644 --- a/plugins/compose/intellij.compose.ide.plugin.resources/BUILD.bazel +++ b/plugins/compose/intellij.compose.ide.plugin.resources/BUILD.bazel @@ -32,6 +32,7 @@ jvm_library( "//plugins/gradle", "//xml/xml-psi-impl:psi-impl", "//platform/lang-impl", + "//platform/lang-api:lang", "//xml/impl", "//platform/util/coroutines", "//platform/platform-util-io:ide-util-io", @@ -74,6 +75,7 @@ jvm_library( "//plugins/gradle", "//xml/xml-psi-impl:psi-impl", "//platform/lang-impl", + "//platform/lang-api:lang", "//xml/impl", "@lib//:kotlin-test", "@lib//:kotlin-test-junit", 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 c5bce6115c42..f5466ab51cf6 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 @@ -28,6 +28,7 @@ + diff --git a/plugins/configuration-script/BUILD.bazel b/plugins/configuration-script/BUILD.bazel index e4d2c88fd78c..b5ed1d5b1e42 100644 --- a/plugins/configuration-script/BUILD.bazel +++ b/plugins/configuration-script/BUILD.bazel @@ -33,6 +33,7 @@ jvm_library( "//platform/service-container", "//libraries/snakeyaml-engine", "//platform/util/jdom", + "//platform/execution", ] ) @@ -71,6 +72,7 @@ jvm_library( "//platform/service-container:service-container_test_lib", "//libraries/snakeyaml-engine", "//platform/util/jdom", + "//platform/execution", ] ) ### auto-generated section `build intellij.configurationScript` end @@ -102,6 +104,7 @@ jvm_library( "//java/execution/impl", "@lib//:kotlin-stdlib", "//platform/lang-core", + "//platform/execution", "//platform/projectModel-api:projectModel", "//platform/testFramework", "//platform/testFramework:testFramework_test_lib", diff --git a/plugins/configuration-script/intellij.configurationScript.iml b/plugins/configuration-script/intellij.configurationScript.iml index 4bb9a79c118e..da0ef7009937 100644 --- a/plugins/configuration-script/intellij.configurationScript.iml +++ b/plugins/configuration-script/intellij.configurationScript.iml @@ -35,5 +35,6 @@ + \ No newline at end of file diff --git a/plugins/configuration-script/intellij.configurationScript.test.java.iml b/plugins/configuration-script/intellij.configurationScript.test.java.iml index 8bb147b78e34..66f392930978 100644 --- a/plugins/configuration-script/intellij.configurationScript.test.java.iml +++ b/plugins/configuration-script/intellij.configurationScript.test.java.iml @@ -11,6 +11,7 @@ + diff --git a/plugins/copyright/BUILD.bazel b/plugins/copyright/BUILD.bazel index 7786262afb83..0cca9642dc2a 100644 --- a/plugins/copyright/BUILD.bazel +++ b/plugins/copyright/BUILD.bazel @@ -34,6 +34,7 @@ jvm_library( "//xml/xml-psi-api:psi", "//platform/util/jdom", "//platform/core-impl", + "//platform/forms_rt:java-guiForms-rt", ] ) @@ -74,6 +75,7 @@ jvm_library( "//platform/testFramework/junit5.jimfs", "//platform/testFramework/junit5.jimfs:junit5.jimfs_test_lib", "//platform/core-impl", + "//platform/forms_rt:java-guiForms-rt", ] ) ### auto-generated section `build intellij.copyright` end diff --git a/plugins/copyright/intellij.copyright.iml b/plugins/copyright/intellij.copyright.iml index 26e8df69e981..a7bb6e36e9c7 100644 --- a/plugins/copyright/intellij.copyright.iml +++ b/plugins/copyright/intellij.copyright.iml @@ -36,5 +36,6 @@ + \ No newline at end of file diff --git a/plugins/coverage-common/BUILD.bazel b/plugins/coverage-common/BUILD.bazel index 9a6efa3e0087..4f3112481740 100644 --- a/plugins/coverage-common/BUILD.bazel +++ b/plugins/coverage-common/BUILD.bazel @@ -40,6 +40,7 @@ jvm_library( "//platform/util/jdom", "//plugins/coverage-common/intellij.platform.coverage.agent:coverage-agent", "//platform/core-impl", + "//platform/execution", ] ) @@ -79,6 +80,7 @@ jvm_library( "//platform/util/jdom", "//plugins/coverage-common/intellij.platform.coverage.agent:coverage-agent", "//platform/core-impl", + "//platform/execution", ] ) ### auto-generated section `build intellij.platform.coverage` end diff --git a/plugins/coverage-common/intellij.platform.coverage.iml b/plugins/coverage-common/intellij.platform.coverage.iml index 3f5c3271206f..7773a79728ad 100644 --- a/plugins/coverage-common/intellij.platform.coverage.iml +++ b/plugins/coverage-common/intellij.platform.coverage.iml @@ -36,5 +36,6 @@ + \ No newline at end of file diff --git a/plugins/coverage/BUILD.bazel b/plugins/coverage/BUILD.bazel index 55f9fcabbd1d..26f7d014fd96 100644 --- a/plugins/coverage/BUILD.bazel +++ b/plugins/coverage/BUILD.bazel @@ -46,6 +46,7 @@ jvm_library( "//platform/platform-impl:ide-impl", "//plugins/coverage-common/intellij.platform.coverage.agent:coverage-agent", "//libraries/fastutil", + "//platform/execution", ], exports = [ "//plugins/coverage-common:coverage", @@ -102,6 +103,7 @@ jvm_library( "//plugins/coverage-common/intellij.platform.coverage.agent:coverage-agent", "//libraries/fastutil", "//java/java-runtime:rt", + "//platform/execution", ], exports = [ "//plugins/coverage-common:coverage", diff --git a/plugins/coverage/intellij.java.coverage.iml b/plugins/coverage/intellij.java.coverage.iml index 3bb35af40b11..98568c046016 100644 --- a/plugins/coverage/intellij.java.coverage.iml +++ b/plugins/coverage/intellij.java.coverage.iml @@ -118,5 +118,6 @@ + \ No newline at end of file diff --git a/plugins/dev/intellij.dev.psiViewer/BUILD.bazel b/plugins/dev/intellij.dev.psiViewer/BUILD.bazel index f9b68cf3d3ce..39b745fb7ef9 100644 --- a/plugins/dev/intellij.dev.psiViewer/BUILD.bazel +++ b/plugins/dev/intellij.dev.psiViewer/BUILD.bazel @@ -33,6 +33,7 @@ jvm_library( "//platform/platform-impl/concurrency", "//platform/util/coroutines", "//platform/core-impl", + "//platform/forms_rt:java-guiForms-rt", ] ) ### auto-generated section `build intellij.dev.psiViewer` end \ No newline at end of file diff --git a/plugins/dev/intellij.dev.psiViewer/intellij.dev.psiViewer.iml b/plugins/dev/intellij.dev.psiViewer/intellij.dev.psiViewer.iml index daf439320c3f..6797ca463131 100644 --- a/plugins/dev/intellij.dev.psiViewer/intellij.dev.psiViewer.iml +++ b/plugins/dev/intellij.dev.psiViewer/intellij.dev.psiViewer.iml @@ -27,5 +27,6 @@ + \ No newline at end of file diff --git a/plugins/dev/intellij.java.dev/BUILD.bazel b/plugins/dev/intellij.java.dev/BUILD.bazel index 79efb30026cb..acfec09586db 100644 --- a/plugins/dev/intellij.java.dev/BUILD.bazel +++ b/plugins/dev/intellij.java.dev/BUILD.bazel @@ -20,7 +20,9 @@ jvm_library( "//java/debugger/openapi:java-debugger", "//platform/analysis-api:analysis", "//platform/util/concurrency", + "//platform/execution", "//platform/core-api:core", + "//platform/lang-api:lang", "//platform/editor-ui-api:editor-ui", "//platform/core-ui", "//platform/platform-impl/concurrency", diff --git a/plugins/dev/intellij.java.dev/intellij.java.dev.iml b/plugins/dev/intellij.java.dev/intellij.java.dev.iml index 0fee73191cfd..f09f021d2c73 100644 --- a/plugins/dev/intellij.java.dev/intellij.java.dev.iml +++ b/plugins/dev/intellij.java.dev/intellij.java.dev.iml @@ -14,7 +14,9 @@ + + diff --git a/plugins/devkit/devkit-core/BUILD.bazel b/plugins/devkit/devkit-core/BUILD.bazel index e92198b06450..a68fd402e497 100644 --- a/plugins/devkit/devkit-core/BUILD.bazel +++ b/plugins/devkit/devkit-core/BUILD.bazel @@ -99,6 +99,8 @@ jvm_library( "//libraries/xerces", "//platform/usageView-impl", "//platform/util/concurrency", + "//platform/execution", + "//platform/forms_rt:java-guiForms-rt", ] ) ### auto-generated section `build intellij.devkit.core` end \ No newline at end of file diff --git a/plugins/devkit/devkit-core/intellij.devkit.core.iml b/plugins/devkit/devkit-core/intellij.devkit.core.iml index 0c0e2ebe0339..348d7d08b4d9 100644 --- a/plugins/devkit/devkit-core/intellij.devkit.core.iml +++ b/plugins/devkit/devkit-core/intellij.devkit.core.iml @@ -105,5 +105,7 @@ + + \ No newline at end of file diff --git a/plugins/devkit/devkit-kotlin-tests/BUILD.bazel b/plugins/devkit/devkit-kotlin-tests/BUILD.bazel index 96ae2ee2ebae..24952101288e 100644 --- a/plugins/devkit/devkit-kotlin-tests/BUILD.bazel +++ b/plugins/devkit/devkit-kotlin-tests/BUILD.bazel @@ -53,6 +53,7 @@ jvm_library( "//plugins/kotlin/test-framework:test-framework_test_lib", "//plugins/kotlin/base/plugin", "//plugins/kotlin/base/plugin:plugin_test_lib", + "//platform/execution", ], runtime_deps = ["//plugins/devkit"] ) 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 79595cdc5682..c195ad8e5915 100644 --- a/plugins/devkit/devkit-kotlin-tests/intellij.devkit.kotlin.tests.iml +++ b/plugins/devkit/devkit-kotlin-tests/intellij.devkit.kotlin.tests.iml @@ -37,6 +37,7 @@ + \ No newline at end of file diff --git a/plugins/devkit/intellij.devkit.themes/BUILD.bazel b/plugins/devkit/intellij.devkit.themes/BUILD.bazel index f5677dc2c7ba..3a51f6e9cf6e 100644 --- a/plugins/devkit/intellij.devkit.themes/BUILD.bazel +++ b/plugins/devkit/intellij.devkit.themes/BUILD.bazel @@ -33,6 +33,7 @@ jvm_library( "//xml/xml-psi-api:psi", "//xml/dom-openapi:dom", "//platform/core-ui", + "//platform/lang-api:lang", ] ) @@ -66,6 +67,7 @@ jvm_library( "//xml/dom-openapi:dom", "//java/testFramework", "//platform/core-ui", + "//platform/lang-api:lang", ] ) ### 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 12c444ead95e..5a2136b770a8 100644 --- a/plugins/devkit/intellij.devkit.themes/intellij.devkit.themes.iml +++ b/plugins/devkit/intellij.devkit.themes/intellij.devkit.themes.iml @@ -30,5 +30,6 @@ + \ No newline at end of file diff --git a/plugins/devkit/intellij.devkit.uiDesigner/BUILD.bazel b/plugins/devkit/intellij.devkit.uiDesigner/BUILD.bazel index c6892e8ca85e..7df037109488 100644 --- a/plugins/devkit/intellij.devkit.uiDesigner/BUILD.bazel +++ b/plugins/devkit/intellij.devkit.uiDesigner/BUILD.bazel @@ -27,6 +27,8 @@ jvm_library( "//platform/projectModel-api:projectModel", "//platform/util/text-matching", "//platform/platform-impl/designer", + "//platform/lang-api:lang", + "//platform/forms_rt:java-guiForms-rt", ] ) ### auto-generated section `build intellij.devkit.uiDesigner` end \ No newline at end of file diff --git a/plugins/devkit/intellij.devkit.uiDesigner/intellij.devkit.uiDesigner.iml b/plugins/devkit/intellij.devkit.uiDesigner/intellij.devkit.uiDesigner.iml index 5313a421c8a5..06618375d9e7 100644 --- a/plugins/devkit/intellij.devkit.uiDesigner/intellij.devkit.uiDesigner.iml +++ b/plugins/devkit/intellij.devkit.uiDesigner/intellij.devkit.uiDesigner.iml @@ -21,5 +21,7 @@ + + \ No newline at end of file diff --git a/plugins/devkit/intellij.kotlin.devkit/BUILD.bazel b/plugins/devkit/intellij.kotlin.devkit/BUILD.bazel index e7c5b21b9b50..2db39c87e7e1 100644 --- a/plugins/devkit/intellij.kotlin.devkit/BUILD.bazel +++ b/plugins/devkit/intellij.kotlin.devkit/BUILD.bazel @@ -55,6 +55,7 @@ jvm_library( "//plugins/kotlin/base/indices", "//plugins/kotlin/uast/uast-kotlin-base", "//platform/lang-impl", + "//platform/lang-api:lang", "//plugins/kotlin/code-insight/impl-base:kotlin-codeInsight-shared", "//platform/eel", "//java/java-indexing-api:indexing", diff --git a/plugins/devkit/intellij.kotlin.devkit/intellij.kotlin.devkit.iml b/plugins/devkit/intellij.kotlin.devkit/intellij.kotlin.devkit.iml index 89713235fb51..7aeb24efcb8c 100644 --- a/plugins/devkit/intellij.kotlin.devkit/intellij.kotlin.devkit.iml +++ b/plugins/devkit/intellij.kotlin.devkit/intellij.kotlin.devkit.iml @@ -53,6 +53,7 @@ + diff --git a/plugins/eclipse/BUILD.bazel b/plugins/eclipse/BUILD.bazel index a4b607c92187..d824a6d48e30 100644 --- a/plugins/eclipse/BUILD.bazel +++ b/plugins/eclipse/BUILD.bazel @@ -41,6 +41,8 @@ jvm_library( "//libraries/kotlin/reflect", "//platform/backend/workspace", "//xml/xml-psi-impl:psi-impl", + "//platform/execution", + "//platform/forms_rt:java-guiForms-rt", ] ) @@ -89,6 +91,8 @@ jvm_library( "//platform/testFramework/junit5:junit5_test_lib", "//platform/backend/workspace", "//xml/xml-psi-impl:psi-impl", + "//platform/execution", + "//platform/forms_rt:java-guiForms-rt", ] ) ### auto-generated section `build intellij.eclipse` end diff --git a/plugins/eclipse/intellij.eclipse.iml b/plugins/eclipse/intellij.eclipse.iml index 1ae0c0aa7af4..07b61e178a1f 100644 --- a/plugins/eclipse/intellij.eclipse.iml +++ b/plugins/eclipse/intellij.eclipse.iml @@ -45,5 +45,7 @@ + + \ No newline at end of file diff --git a/plugins/eclipse/src/org/jetbrains/idea/eclipse/conversion/EclipseClasspathWriter.java b/plugins/eclipse/src/org/jetbrains/idea/eclipse/conversion/EclipseClasspathWriter.java index ad428c57d3f9..503e03b3028e 100644 --- a/plugins/eclipse/src/org/jetbrains/idea/eclipse/conversion/EclipseClasspathWriter.java +++ b/plugins/eclipse/src/org/jetbrains/idea/eclipse/conversion/EclipseClasspathWriter.java @@ -1,5 +1,4 @@ -// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. - +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package org.jetbrains.idea.eclipse.conversion; import com.intellij.openapi.diagnostic.Logger; @@ -23,7 +22,7 @@ import org.jetbrains.idea.eclipse.config.EclipseModuleManagerImpl; import java.util.HashMap; import java.util.Map; -public class EclipseClasspathWriter { +public final class EclipseClasspathWriter { public static final Logger LOG = Logger.getInstance(EclipseClasspathWriter.class); private final Map myOldEntries = new HashMap<>(); diff --git a/plugins/editorconfig/backend/BUILD.bazel b/plugins/editorconfig/backend/BUILD.bazel index 0945eb53b3da..be46d9811247 100644 --- a/plugins/editorconfig/backend/BUILD.bazel +++ b/plugins/editorconfig/backend/BUILD.bazel @@ -54,6 +54,7 @@ jvm_library( "//libraries/kotlinx/serialization/core", "//plugins/editorconfig/common", "//platform/backend", + "//platform/forms_rt:java-guiForms-rt", ] ) @@ -101,6 +102,7 @@ jvm_library( "//libraries/kotlinx/serialization/core", "//plugins/editorconfig/common", "//platform/backend", + "//platform/forms_rt:java-guiForms-rt", ] ) ### auto-generated section `build intellij.editorconfig.backend` end diff --git a/plugins/editorconfig/backend/intellij.editorconfig.backend.iml b/plugins/editorconfig/backend/intellij.editorconfig.backend.iml index 622d31b5e3f8..72c26d7e8b1c 100644 --- a/plugins/editorconfig/backend/intellij.editorconfig.backend.iml +++ b/plugins/editorconfig/backend/intellij.editorconfig.backend.iml @@ -66,5 +66,6 @@ + \ No newline at end of file diff --git a/plugins/env-files-support/BUILD.bazel b/plugins/env-files-support/BUILD.bazel index 8f36d459df0b..e385aed8d1cb 100644 --- a/plugins/env-files-support/BUILD.bazel +++ b/plugins/env-files-support/BUILD.bazel @@ -26,6 +26,7 @@ jvm_library( "//platform/analysis-impl", "//platform/refactoring", "//platform/lang-impl", + "//platform/lang-api:lang", ] ) ### auto-generated section `build intellij.dotenv` end \ No newline at end of file diff --git a/plugins/env-files-support/intellij.dotenv.iml b/plugins/env-files-support/intellij.dotenv.iml index e430205d0980..e72a795dcda1 100644 --- a/plugins/env-files-support/intellij.dotenv.iml +++ b/plugins/env-files-support/intellij.dotenv.iml @@ -22,5 +22,6 @@ + \ No newline at end of file diff --git a/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/completion/NestedVariableTypedHandlerDelegate.kt b/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/completion/NestedVariableTypedHandlerDelegate.kt index b0473b23bda8..ed2786108682 100644 --- a/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/completion/NestedVariableTypedHandlerDelegate.kt +++ b/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/completion/NestedVariableTypedHandlerDelegate.kt @@ -7,8 +7,7 @@ import com.intellij.openapi.project.Project import com.intellij.psi.PsiFile import ru.adelf.idea.dotenv.psi.DotEnvFile -class NestedVariableTypedHandlerDelegate: TypedHandlerDelegate() { - +private class NestedVariableTypedHandlerDelegate: TypedHandlerDelegate() { override fun checkAutoPopup(charTyped: Char, project: Project, editor: Editor, file: PsiFile): Result { if (file !is DotEnvFile) { return super.checkAutoPopup(charTyped, project, editor, file) diff --git a/plugins/evaluation-plugin/BUILD.bazel b/plugins/evaluation-plugin/BUILD.bazel index db600f05fed8..4be64aafba7a 100644 --- a/plugins/evaluation-plugin/BUILD.bazel +++ b/plugins/evaluation-plugin/BUILD.bazel @@ -25,6 +25,7 @@ jvm_library( "//platform/code-style-api:codeStyle", "//platform/util/concurrency", "//platform/core-api:core", + "//platform/lang-api:lang", "//platform/editor-ui-api:editor-ui", "//platform/indexing-api:indexing", "//jps/model-api:model", diff --git a/plugins/evaluation-plugin/intellij.evaluationPlugin.iml b/plugins/evaluation-plugin/intellij.evaluationPlugin.iml index 1b70e0dddc4b..e59cd5f83494 100644 --- a/plugins/evaluation-plugin/intellij.evaluationPlugin.iml +++ b/plugins/evaluation-plugin/intellij.evaluationPlugin.iml @@ -19,6 +19,7 @@ + diff --git a/plugins/evaluation-plugin/languages/java/BUILD.bazel b/plugins/evaluation-plugin/languages/java/BUILD.bazel index 8c403cc4b241..869b62e25d87 100644 --- a/plugins/evaluation-plugin/languages/java/BUILD.bazel +++ b/plugins/evaluation-plugin/languages/java/BUILD.bazel @@ -31,6 +31,7 @@ jvm_library( "//platform/projectModel-api:projectModel", "//platform/refactoring", "//platform/smRunner", + "//platform/execution", ] ) @@ -63,6 +64,7 @@ jvm_library( "//java/testFramework", "//platform/smRunner", "//platform/smRunner:smRunner_test_lib", + "//platform/execution", ] ) ### auto-generated section `build intellij.evaluationPlugin.languages.java` end 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 685139183445..dd5fbd755e75 100644 --- a/plugins/evaluation-plugin/languages/java/intellij.evaluationPlugin.languages.java.iml +++ b/plugins/evaluation-plugin/languages/java/intellij.evaluationPlugin.languages.java.iml @@ -29,5 +29,6 @@ + \ No newline at end of file diff --git a/plugins/git4idea/BUILD.bazel b/plugins/git4idea/BUILD.bazel index cbc761cda880..275e1e841cda 100644 --- a/plugins/git4idea/BUILD.bazel +++ b/plugins/git4idea/BUILD.bazel @@ -108,6 +108,8 @@ jvm_library( "//platform/eel", "//platform/platform-impl/recentProjects", "//platform/platform-impl/eel:ide-impl-wsl", + "//platform/execution", + "//platform/forms_rt:java-guiForms-rt", ], exports = [ "//platform/dvcs-api:vcs-dvcs", @@ -224,6 +226,8 @@ jvm_library( "//platform/eel", "//platform/platform-impl/recentProjects", "//platform/platform-impl/eel:ide-impl-wsl", + "//platform/execution", + "//platform/forms_rt:java-guiForms-rt", ], exports = [ "//platform/dvcs-api:vcs-dvcs", diff --git a/plugins/git4idea/intellij.vcs.git.iml b/plugins/git4idea/intellij.vcs.git.iml index 2745f6723597..95e388d59288 100644 --- a/plugins/git4idea/intellij.vcs.git.iml +++ b/plugins/git4idea/intellij.vcs.git.iml @@ -125,5 +125,7 @@ + + \ No newline at end of file diff --git a/plugins/git4idea/src/git4idea/conflicts/GitConflictsToolWindowManager.java b/plugins/git4idea/src/git4idea/conflicts/GitConflictsToolWindowManager.java index 4bcdc0e41131..0d134c3e08b0 100644 --- a/plugins/git4idea/src/git4idea/conflicts/GitConflictsToolWindowManager.java +++ b/plugins/git4idea/src/git4idea/conflicts/GitConflictsToolWindowManager.java @@ -1,4 +1,4 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package git4idea.conflicts; import com.intellij.dvcs.repo.VcsRepositoryMappingListener; @@ -35,7 +35,7 @@ public final class GitConflictsToolWindowManager { } } - static class ContentPreloader implements ChangesViewContentProvider.Preloader { + static final class ContentPreloader implements ChangesViewContentProvider.Preloader { @Override public void preloadTabContent(@NotNull Content content) { content.putUserData(ChangesViewContentManager.ORDER_WEIGHT_KEY, @@ -43,7 +43,7 @@ public final class GitConflictsToolWindowManager { } } - static class ContentProvider implements ChangesViewContentProvider { + static final class ContentProvider implements ChangesViewContentProvider { private final Project myProject; ContentProvider(@NotNull Project project) { @@ -60,7 +60,7 @@ public final class GitConflictsToolWindowManager { } } - public static class DisplayNameSupplier implements Supplier { + static final class DisplayNameSupplier implements Supplier { @Override public String get() { return GitBundle.message("tab.title.conflicts"); @@ -68,7 +68,7 @@ public final class GitConflictsToolWindowManager { } - public static class MyStagingAreaListener implements GitStagingAreaHolder.StagingAreaListener { + static final class MyStagingAreaListener implements GitStagingAreaHolder.StagingAreaListener { @Override public void stagingAreaChanged(@NotNull GitRepository repository) { if (!Registry.is("git.merge.conflicts.toolwindow")) return; @@ -80,10 +80,10 @@ public final class GitConflictsToolWindowManager { } } - public static class MyRepositoryListener implements VcsRepositoryMappingListener { + static final class MyRepositoryListener implements VcsRepositoryMappingListener { private final Project myProject; - public MyRepositoryListener(@NotNull Project project) { + MyRepositoryListener(@NotNull Project project) { myProject = project; } diff --git a/plugins/gradle/BUILD.bazel b/plugins/gradle/BUILD.bazel index a8e565ab84c5..8b722f328c19 100644 --- a/plugins/gradle/BUILD.bazel +++ b/plugins/gradle/BUILD.bazel @@ -76,6 +76,8 @@ jvm_library( "//libraries/guava", "//platform/util/trove", "//platform/util/coroutines", + "//platform/execution", + "//platform/forms_rt:java-guiForms-rt", ], exports = [ "//platform/external-system-api:externalSystem", @@ -172,9 +174,11 @@ jvm_library( "//platform/smRunner:smRunner_test_lib", "//libraries/gson", "//libraries/guava", + "//platform/execution", "//platform/eel", "//platform/eel-provider", "//platform/testFramework/eelJava", + "//platform/forms_rt:java-guiForms-rt", ], exports = ["//platform/external-system-api/testFramework"], runtime_deps = ["//platform/execution.dashboard"] diff --git a/plugins/gradle/intellij.gradle.iml b/plugins/gradle/intellij.gradle.iml index 68c3121e4b17..9de9245728f5 100644 --- a/plugins/gradle/intellij.gradle.iml +++ b/plugins/gradle/intellij.gradle.iml @@ -63,5 +63,7 @@ + + \ No newline at end of file diff --git a/plugins/gradle/intellij.gradle.tests.iml b/plugins/gradle/intellij.gradle.tests.iml index 7f3f60076148..3aa2ac6cdd70 100644 --- a/plugins/gradle/intellij.gradle.tests.iml +++ b/plugins/gradle/intellij.gradle.tests.iml @@ -63,8 +63,10 @@ + + \ No newline at end of file diff --git a/plugins/gradle/java/BUILD.bazel b/plugins/gradle/java/BUILD.bazel index ee323ab06f38..d4e743a0e3ee 100644 --- a/plugins/gradle/java/BUILD.bazel +++ b/plugins/gradle/java/BUILD.bazel @@ -76,6 +76,7 @@ jvm_library( "//platform/platform-impl/ui", "//java/debugger/shared", "//platform/eel-provider", + "//platform/execution", ], exports = ["//plugins/gradle:gradle-common"], runtime_deps = ["@lib//ant/lib:ant-antlr"] @@ -163,6 +164,7 @@ jvm_library( "//platform/smRunner", "//platform/smRunner:smRunner_test_lib", "//platform/statistics/testFramework", + "//platform/execution", ] ) ### auto-generated section `build intellij.gradle.java.tests` end diff --git a/plugins/gradle/java/intellij.gradle.java.iml b/plugins/gradle/java/intellij.gradle.java.iml index ad71b11eed30..f7dddfe29aac 100644 --- a/plugins/gradle/java/intellij.gradle.java.iml +++ b/plugins/gradle/java/intellij.gradle.java.iml @@ -72,5 +72,6 @@ + \ 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 b26cc2ccd88d..be6052752aa4 100644 --- a/plugins/gradle/java/intellij.gradle.java.tests.iml +++ b/plugins/gradle/java/intellij.gradle.java.tests.iml @@ -62,5 +62,6 @@ + \ No newline at end of file diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/resolvers/GradleJvmResolver.kt b/plugins/gradle/src/org/jetbrains/plugins/gradle/resolvers/GradleJvmResolver.kt index 4a9f2baa57db..bbfbad4e7d13 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/resolvers/GradleJvmResolver.kt +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/resolvers/GradleJvmResolver.kt @@ -1,4 +1,4 @@ -// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package org.jetbrains.plugins.gradle.resolvers import com.intellij.openapi.extensions.ExtensionPointName @@ -17,7 +17,7 @@ import org.jetbrains.annotations.ApiStatus abstract class GradleJvmResolver { companion object { - val EP_NAME = ExtensionPointName.create("org.jetbrains.plugins.gradle.gradleJvmResolver") + internal val EP_NAME: ExtensionPointName = ExtensionPointName("org.jetbrains.plugins.gradle.gradleJvmResolver") } abstract fun canBeResolved(gradleJvm: String): Boolean diff --git a/plugins/gradle/tooling-extension-impl/BUILD.bazel b/plugins/gradle/tooling-extension-impl/BUILD.bazel index 0a8ce957dba0..bda358d710c8 100644 --- a/plugins/gradle/tooling-extension-impl/BUILD.bazel +++ b/plugins/gradle/tooling-extension-impl/BUILD.bazel @@ -79,6 +79,7 @@ jvm_library( "@lib//:gradle-tooling_extension-tests-org-jeasy-easy-random-core-4-2-0", "//libraries/ion", "//platform/core-api:core", + "//platform/execution", "//platform/lang-core", "//platform/projectModel-api:projectModel", "//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 ec0aee10a843..86377ed1aa28 100644 --- a/plugins/gradle/tooling-extension-impl/intellij.gradle.toolingExtension.tests.iml +++ b/plugins/gradle/tooling-extension-impl/intellij.gradle.toolingExtension.tests.iml @@ -76,6 +76,7 @@ + diff --git a/plugins/grazie/src/BUILD.bazel b/plugins/grazie/src/BUILD.bazel index 139fd58c58a6..caab76b3e5ac 100644 --- a/plugins/grazie/src/BUILD.bazel +++ b/plugins/grazie/src/BUILD.bazel @@ -85,6 +85,7 @@ jvm_library( "//libraries/caffeine", "//libraries/ktor/client", "//libraries/ktor/client-cio:libraries-ktor-client-cio", + "//platform/forms_rt:java-guiForms-rt", ], exports = [ "@lib//:grazie-core-ai-grazie-api-gateway-client-jvm", diff --git a/plugins/grazie/src/intellij.grazie.core.iml b/plugins/grazie/src/intellij.grazie.core.iml index 8c7a2fad18a0..d61b7ed2249a 100644 --- a/plugins/grazie/src/intellij.grazie.core.iml +++ b/plugins/grazie/src/intellij.grazie.core.iml @@ -729,5 +729,6 @@ + \ No newline at end of file diff --git a/plugins/grazie/src/test/BUILD.bazel b/plugins/grazie/src/test/BUILD.bazel index 237bfadaec94..3df775a0f8a5 100644 --- a/plugins/grazie/src/test/BUILD.bazel +++ b/plugins/grazie/src/test/BUILD.bazel @@ -64,6 +64,7 @@ jvm_library( "//platform/testFramework/junit5:junit5_test_lib", "//tools/intellij.tools.ide.metrics.benchmark:ide-metrics-benchmark", "//tools/intellij.tools.ide.metrics.benchmark:ide-metrics-benchmark_test_lib", + "@lib//:jet_check", ], exports = [ "//plugins/grazie", diff --git a/plugins/grazie/src/test/intellij.grazie.tests.iml b/plugins/grazie/src/test/intellij.grazie.tests.iml index daf1e0ecc49b..b89cebeed6b2 100644 --- a/plugins/grazie/src/test/intellij.grazie.tests.iml +++ b/plugins/grazie/src/test/intellij.grazie.tests.iml @@ -365,5 +365,6 @@ + \ No newline at end of file diff --git a/plugins/groovy-live-templates/BUILD.bazel b/plugins/groovy-live-templates/BUILD.bazel index 0339311fd9fb..d5ee1ac18105 100644 --- a/plugins/groovy-live-templates/BUILD.bazel +++ b/plugins/groovy-live-templates/BUILD.bazel @@ -22,6 +22,7 @@ jvm_library( "//platform/editor-ui-api:editor-ui", "//platform/lang-impl", "//platform/util", + "//platform/ide-core", ] ) ### auto-generated section `build intellij.groovy.live.templates` end \ No newline at end of file diff --git a/plugins/groovy-live-templates/intellij.groovy.live.templates.iml b/plugins/groovy-live-templates/intellij.groovy.live.templates.iml index 464fe9918268..dce0153af6bc 100644 --- a/plugins/groovy-live-templates/intellij.groovy.live.templates.iml +++ b/plugins/groovy-live-templates/intellij.groovy.live.templates.iml @@ -16,5 +16,6 @@ + \ No newline at end of file diff --git a/plugins/groovy/BUILD.bazel b/plugins/groovy/BUILD.bazel index 939e769d408a..d2beeb4c9703 100644 --- a/plugins/groovy/BUILD.bazel +++ b/plugins/groovy/BUILD.bazel @@ -85,6 +85,8 @@ jvm_library( "//platform/backend/workspace", "//xml/xml-psi-api:psi", "//java/unscramble", + "//platform/execution", + "//platform/forms_rt:java-guiForms-rt", ":plugins_ant_provided", ":plugins_java-byteCodeViewer_provided", ], @@ -188,6 +190,9 @@ jvm_library( "//tools/intellij.tools.ide.metrics.benchmark:ide-metrics-benchmark_test_lib", "//xml/xml-psi-api:psi", "//java/unscramble", + "//platform/execution", + "@lib//:jet_check", + "//platform/forms_rt:java-guiForms-rt", ":plugins_ant_provided", ":plugins_java-byteCodeViewer_provided", ":plugins_ant_test_lib_provided", diff --git a/plugins/groovy/intellij.groovy.iml b/plugins/groovy/intellij.groovy.iml index dcbb87810494..d4aeda4c3d55 100644 --- a/plugins/groovy/intellij.groovy.iml +++ b/plugins/groovy/intellij.groovy.iml @@ -83,5 +83,8 @@ + + + \ No newline at end of file diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/editor/actions/GStringBackspaceHandlerDelegate.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/editor/actions/GStringBackspaceHandlerDelegate.java index f18c2e6b463d..3857e96cc258 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/editor/actions/GStringBackspaceHandlerDelegate.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/editor/actions/GStringBackspaceHandlerDelegate.java @@ -1,18 +1,4 @@ -/* - * Copyright 2000-2009 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package org.jetbrains.plugins.groovy.editor.actions; @@ -27,8 +13,7 @@ import org.jetbrains.plugins.groovy.lang.psi.GroovyFile; /** * @author Maxim.Medvedev */ -public final class GStringBackspaceHandlerDelegate extends BackspaceHandlerDelegate { - +final class GStringBackspaceHandlerDelegate extends BackspaceHandlerDelegate { @Override public void beforeCharDeleted(char c, PsiFile file, Editor editor) { if (c != '{') return; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/editor/actions/GroovyBackspaceHandler.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/editor/actions/GroovyBackspaceHandler.java index b86856e25232..b426f6ab0b85 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/editor/actions/GroovyBackspaceHandler.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/editor/actions/GroovyBackspaceHandler.java @@ -1,4 +1,4 @@ -// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package org.jetbrains.plugins.groovy.editor.actions; import com.intellij.codeInsight.editorActions.BackspaceHandlerDelegate; @@ -11,7 +11,7 @@ import org.jetbrains.plugins.groovy.lang.psi.GroovyFile; import static org.jetbrains.plugins.groovy.lang.lexer.TokenSets.INVALID_INSIDE_REFERENCE; -public final class GroovyBackspaceHandler extends BackspaceHandlerDelegate { +final class GroovyBackspaceHandler extends BackspaceHandlerDelegate { private boolean myToDeleteGt; @Override diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/editor/actions/GroovyTripleQuoteBackspaceHandlerDelegate.kt b/plugins/groovy/src/org/jetbrains/plugins/groovy/editor/actions/GroovyTripleQuoteBackspaceHandlerDelegate.kt index 31a98c3207b8..7c196e4c03ec 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/editor/actions/GroovyTripleQuoteBackspaceHandlerDelegate.kt +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/editor/actions/GroovyTripleQuoteBackspaceHandlerDelegate.kt @@ -1,4 +1,4 @@ -// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package org.jetbrains.plugins.groovy.editor.actions import com.intellij.codeInsight.CodeInsightSettings @@ -8,8 +8,7 @@ import com.intellij.openapi.editor.highlighter.HighlighterIterator import com.intellij.psi.PsiFile import org.jetbrains.plugins.groovy.lang.psi.GroovyTokenSets -class GroovyTripleQuoteBackspaceHandlerDelegate : BackspaceHandlerDelegate() { - +private class GroovyTripleQuoteBackspaceHandlerDelegate : BackspaceHandlerDelegate() { private var myWithinTripleQuoted: Boolean = false override fun beforeCharDeleted(c: Char, file: PsiFile, editor: Editor) { diff --git a/plugins/hg4idea/BUILD.bazel b/plugins/hg4idea/BUILD.bazel index 58d3fa94ad33..598837f00329 100644 --- a/plugins/hg4idea/BUILD.bazel +++ b/plugins/hg4idea/BUILD.bazel @@ -27,6 +27,7 @@ jvm_library( "//platform/ide-core-impl", "//platform/platform-impl:ide-impl", "//libraries/guava", + "//platform/forms_rt:java-guiForms-rt", "//platform/dvcs-impl:vcs-dvcs-impl", "//platform/vcs-log/api:vcs-log", "//platform/vcs-log/impl", @@ -66,6 +67,7 @@ jvm_library( "//platform/ide-core-impl", "//platform/platform-impl:ide-impl", "//libraries/guava", + "//platform/forms_rt:java-guiForms-rt", "//platform/dvcs-impl:vcs-dvcs-impl", "//platform/dvcs-impl:vcs-dvcs-impl_test_lib", "//platform/vcs-log/api:vcs-log", diff --git a/plugins/hg4idea/intellij.vcs.hg.iml b/plugins/hg4idea/intellij.vcs.hg.iml index a2637137bab8..22c38962caeb 100644 --- a/plugins/hg4idea/intellij.vcs.hg.iml +++ b/plugins/hg4idea/intellij.vcs.hg.iml @@ -23,6 +23,7 @@ + diff --git a/plugins/htmltools/BUILD.bazel b/plugins/htmltools/BUILD.bazel index 260c5a0fab7b..ab57ae25296d 100644 --- a/plugins/htmltools/BUILD.bazel +++ b/plugins/htmltools/BUILD.bazel @@ -16,6 +16,7 @@ jvm_library( deps = [ "//platform/analysis-api:analysis", "//platform/core-api:core", + "//platform/lang-api:lang", "//platform/core-impl", "//platform/editor-ui-api:editor-ui", "//platform/indexing-api:indexing", @@ -65,6 +66,7 @@ jvm_library( "//tools/intellij.tools.ide.metrics.benchmark:ide-metrics-benchmark", "//tools/intellij.tools.ide.metrics.benchmark:ide-metrics-benchmark_test_lib", "//platform/analysis-impl", + "//platform/lang-api:lang", "//platform/lang-impl", "//xml/xml-parser:parser", "//platform/refactoring", diff --git a/plugins/htmltools/intellij.html.tools.iml b/plugins/htmltools/intellij.html.tools.iml index b1412f6fdc5c..5f28fbb12d35 100644 --- a/plugins/htmltools/intellij.html.tools.iml +++ b/plugins/htmltools/intellij.html.tools.iml @@ -10,6 +10,7 @@ + diff --git a/plugins/htmltools/intellij.html.tools.tests.iml b/plugins/htmltools/intellij.html.tools.tests.iml index afbca641324b..2fdfaaea6c20 100644 --- a/plugins/htmltools/intellij.html.tools.tests.iml +++ b/plugins/htmltools/intellij.html.tools.tests.iml @@ -22,6 +22,7 @@ + diff --git a/plugins/ide-features-trainer/BUILD.bazel b/plugins/ide-features-trainer/BUILD.bazel index 879b261612b3..c999acc8789a 100644 --- a/plugins/ide-features-trainer/BUILD.bazel +++ b/plugins/ide-features-trainer/BUILD.bazel @@ -29,6 +29,7 @@ jvm_library( "//platform/code-style-api:codeStyle", "//platform/util/concurrency", "//platform/core-api:core", + "//platform/lang-api:lang", "//platform/editor-ui-api:editor-ui", "//platform/core-impl", "//platform/projectModel-impl", @@ -56,6 +57,7 @@ jvm_library( "//platform/lvcs-impl", "//platform/tips-of-the-day:tips", "//platform/diagnostic", + "//platform/execution", ], exports = [ "@lib//:assert_j", @@ -81,6 +83,7 @@ jvm_library( "//platform/util/concurrency", "//platform/util/concurrency:concurrency_test_lib", "//platform/core-api:core", + "//platform/lang-api:lang", "//platform/editor-ui-api:editor-ui", "//platform/core-impl", "//platform/projectModel-impl", @@ -117,6 +120,7 @@ jvm_library( "//platform/testFramework/junit5:junit5_test_lib", "@lib//:mockito-kotlin", "//libraries/mockito", + "//platform/execution", ], exports = [ "@lib//:assert_j", diff --git a/plugins/ide-features-trainer/intellij.featuresTrainer.iml b/plugins/ide-features-trainer/intellij.featuresTrainer.iml index e5df739299b2..5c706c4a0f76 100644 --- a/plugins/ide-features-trainer/intellij.featuresTrainer.iml +++ b/plugins/ide-features-trainer/intellij.featuresTrainer.iml @@ -41,6 +41,7 @@ + @@ -72,5 +73,6 @@ + \ No newline at end of file diff --git a/plugins/java-i18n/BUILD.bazel b/plugins/java-i18n/BUILD.bazel index 266a1e4a471e..90065d66f8d9 100644 --- a/plugins/java-i18n/BUILD.bazel +++ b/plugins/java-i18n/BUILD.bazel @@ -25,6 +25,7 @@ jvm_library( "//platform/lang-api:lang", "//java/openapi:java", "//platform/projectModel-api:projectModel", + "//platform/forms_rt:java-guiForms-rt", "//platform/refactoring", "//platform/usageView-impl", "//plugins/properties:properties-backend", @@ -73,6 +74,7 @@ jvm_library( "//platform/lang-api:lang", "//java/openapi:java", "//platform/projectModel-api:projectModel", + "//platform/forms_rt:java-guiForms-rt", "//platform/refactoring", "//platform/usageView-impl", "//plugins/properties:properties-backend", diff --git a/plugins/java-i18n/intellij.java.i18n.iml b/plugins/java-i18n/intellij.java.i18n.iml index cf57f32b6b92..0df41e4c727d 100644 --- a/plugins/java-i18n/intellij.java.i18n.iml +++ b/plugins/java-i18n/intellij.java.i18n.iml @@ -21,6 +21,7 @@ + diff --git a/plugins/javaFX/BUILD.bazel b/plugins/javaFX/BUILD.bazel index 2952c5286b41..d0b4c2e56c50 100644 --- a/plugins/javaFX/BUILD.bazel +++ b/plugins/javaFX/BUILD.bazel @@ -43,6 +43,7 @@ jvm_library( "//java/typeMigration", "//platform/util/nanoxml", "//platform/core-ui", + "//platform/forms_rt:java-guiForms-rt", "//platform/code-style-impl:codeStyle-impl", "//platform/platform-util-io:ide-util-io", "//spellchecker", @@ -50,6 +51,7 @@ jvm_library( "//xml/xml-psi-api:psi", "//platform/util/jdom", "//xml/xml-analysis-api:analysis", + "//platform/execution", ] ) @@ -95,6 +97,7 @@ jvm_library( "//platform/util/nanoxml", "//java/java-tests:tests_test_lib", "//platform/core-ui", + "//platform/forms_rt:java-guiForms-rt", "//platform/code-style-impl:codeStyle-impl", "//platform/platform-util-io:ide-util-io", "//spellchecker", @@ -103,6 +106,7 @@ jvm_library( "//xml/xml-psi-api:psi", "//platform/util/jdom", "//xml/xml-analysis-api:analysis", + "//platform/execution", ] ) ### auto-generated section `build intellij.javaFX` end @@ -139,6 +143,7 @@ jvm_library( "//plugins/javaFX", "//platform/analysis-api:analysis", "//libraries/stream", + "//platform/forms_rt:java-guiForms-rt", ] ) ### auto-generated section `build intellij.javaFX.properties` end \ No newline at end of file diff --git a/plugins/javaFX/intellij.javaFX.iml b/plugins/javaFX/intellij.javaFX.iml index d975e1f6e6a0..78392644145e 100644 --- a/plugins/javaFX/intellij.javaFX.iml +++ b/plugins/javaFX/intellij.javaFX.iml @@ -41,6 +41,7 @@ + @@ -48,5 +49,6 @@ + \ No newline at end of file diff --git a/plugins/javaFX/intellij.javaFX.properties.iml b/plugins/javaFX/intellij.javaFX.properties.iml index 8f3cfcc15138..f2b4a7d4970f 100644 --- a/plugins/javaFX/intellij.javaFX.properties.iml +++ b/plugins/javaFX/intellij.javaFX.properties.iml @@ -17,5 +17,6 @@ + \ No newline at end of file diff --git a/plugins/jsonpath/BUILD.bazel b/plugins/jsonpath/BUILD.bazel index 6e306210d44f..2f4a567e6d49 100644 --- a/plugins/jsonpath/BUILD.bazel +++ b/plugins/jsonpath/BUILD.bazel @@ -17,6 +17,7 @@ jvm_library( "@lib//:kotlin-stdlib", "//libraries/jsonpath", "//platform/core-api:core", + "//platform/lang-api:lang", "//platform/analysis-api:analysis", "//platform/editor-ui-api:editor-ui", "//platform/platform-impl:ide-impl", @@ -41,6 +42,7 @@ jvm_library( "@lib//:kotlin-stdlib", "//libraries/jsonpath", "//platform/core-api:core", + "//platform/lang-api:lang", "//platform/analysis-api:analysis", "//platform/editor-ui-api:editor-ui", "//platform/platform-impl:ide-impl", diff --git a/plugins/jsonpath/intellij.jsonpath.iml b/plugins/jsonpath/intellij.jsonpath.iml index ebb8406161a3..b51842b75b6f 100644 --- a/plugins/jsonpath/intellij.jsonpath.iml +++ b/plugins/jsonpath/intellij.jsonpath.iml @@ -13,6 +13,7 @@ + diff --git a/plugins/junit/BUILD.bazel b/plugins/junit/BUILD.bazel index af86369be434..9df46ad64899 100644 --- a/plugins/junit/BUILD.bazel +++ b/plugins/junit/BUILD.bazel @@ -49,6 +49,8 @@ jvm_library( "//platform/util/jdom", "//plugins/properties/properties-psi-impl:backend-psi", "//platform/core-ui", + "//platform/execution", + "//platform/forms_rt:java-guiForms-rt", ], exports = ["//jvm/jvm-analysis-api:analysis"] ) diff --git a/plugins/junit/intellij.junit.iml b/plugins/junit/intellij.junit.iml index a5845953d6cd..12e761653b05 100644 --- a/plugins/junit/intellij.junit.iml +++ b/plugins/junit/intellij.junit.iml @@ -43,5 +43,7 @@ + + \ No newline at end of file diff --git a/plugins/junit/java-tests/BUILD.bazel b/plugins/junit/java-tests/BUILD.bazel index fb6c80f62086..84cd11107c5f 100644 --- a/plugins/junit/java-tests/BUILD.bazel +++ b/plugins/junit/java-tests/BUILD.bazel @@ -42,6 +42,7 @@ jvm_library( "@lib//:assert_j", "//java/compiler/openapi:java-compiler", "//java/java-impl-refactorings:impl-refactorings", + "//platform/execution", ] ) ### 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 b180c4082de3..a380d28d4c92 100644 --- a/plugins/junit/java-tests/intellij.junit.java.tests.iml +++ b/plugins/junit/java-tests/intellij.junit.java.tests.iml @@ -34,5 +34,6 @@ + \ No newline at end of file diff --git a/plugins/junit5_rt_tests/BUILD.bazel b/plugins/junit5_rt_tests/BUILD.bazel index 235de1acd2af..6d66b9b02699 100644 --- a/plugins/junit5_rt_tests/BUILD.bazel +++ b/plugins/junit5_rt_tests/BUILD.bazel @@ -42,6 +42,7 @@ jvm_library( "@lib//:junit5Vintage", "//platform/testFramework/junit5", "//platform/testFramework/junit5:junit5_test_lib", + "//platform/execution", ] ) ### 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 a7d3632a81b2..82ac4cb51d7c 100644 --- a/plugins/junit5_rt_tests/intellij.junit.v5.rt.tests.iml +++ b/plugins/junit5_rt_tests/intellij.junit.v5.rt.tests.iml @@ -32,5 +32,6 @@ + \ No newline at end of file diff --git a/plugins/junit6_rt_tests/BUILD.bazel b/plugins/junit6_rt_tests/BUILD.bazel index 0fef9aedd813..bd5398464f45 100644 --- a/plugins/junit6_rt_tests/BUILD.bazel +++ b/plugins/junit6_rt_tests/BUILD.bazel @@ -37,6 +37,7 @@ jvm_library( "//platform/platform-util-io:ide-util-io", "//platform/testFramework/junit5", "//platform/testFramework/junit5:junit5_test_lib", + "//platform/execution", ] ) ### 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 c67d9e634aac..71761e991895 100644 --- a/plugins/junit6_rt_tests/intellij.junit.v6.rt.tests.iml +++ b/plugins/junit6_rt_tests/intellij.junit.v6.rt.tests.iml @@ -27,5 +27,6 @@ + \ No newline at end of file diff --git a/plugins/junit6_rt_tests/test/com/intellij/junit6/JUnit6SuiteApiIntegrationTest.java b/plugins/junit6_rt_tests/test/com/intellij/junit6/JUnit6SuiteApiIntegrationTest.java index addc1087c7d9..72aef0801bfa 100644 --- a/plugins/junit6_rt_tests/test/com/intellij/junit6/JUnit6SuiteApiIntegrationTest.java +++ b/plugins/junit6_rt_tests/test/com/intellij/junit6/JUnit6SuiteApiIntegrationTest.java @@ -71,8 +71,7 @@ public class JUnit6SuiteApiIntegrationTest extends AbstractTestFrameworkCompilin assertEquals(tests.keySet(), getTestIds(messages, TestFinished.class)); } - @NotNull - private RunConfiguration createRunClassConfiguration(final String className) { + private @NotNull RunConfiguration createRunClassConfiguration(final String className) { PsiClass aClass = JavaPsiFacade.getInstance(myProject).findClass(className, GlobalSearchScope.projectScope(myProject)); assertNotNull(aClass); @@ -81,8 +80,7 @@ public class JUnit6SuiteApiIntegrationTest extends AbstractTestFrameworkCompilin return configuration; } - @NotNull - private RunConfiguration createRunPackageConfiguration(final String packageName) { + private @NotNull RunConfiguration createRunPackageConfiguration(final String packageName) { PsiPackage aPackage = JavaPsiFacade.getInstance(myProject).findPackage(packageName); assertNotNull(aPackage); diff --git a/plugins/kotlin/base/code-insight/BUILD.bazel b/plugins/kotlin/base/code-insight/BUILD.bazel index 3aaf9db6c481..55d25b7ff735 100644 --- a/plugins/kotlin/base/code-insight/BUILD.bazel +++ b/plugins/kotlin/base/code-insight/BUILD.bazel @@ -51,7 +51,9 @@ jvm_library( "//plugins/kotlin/base/resources:kotlin-base-resources", "//platform/analysis-impl", "//platform/core-ui", + "//platform/execution", "//platform/execution-impl", + "//platform/lang-api:lang", "//platform/editor-ui-api:editor-ui", "//platform/indexing-api:indexing", "//platform/lang-impl", @@ -100,7 +102,9 @@ jvm_library( "//plugins/kotlin/base/resources:kotlin-base-resources", "//platform/analysis-impl", "//platform/core-ui", + "//platform/execution", "//platform/execution-impl", + "//platform/lang-api:lang", "//platform/editor-ui-api:editor-ui", "//platform/indexing-api:indexing", "//platform/lang-impl", 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 b4771cc2afa7..881113970cb2 100644 --- a/plugins/kotlin/base/code-insight/intellij.kotlin.base.codeInsight.iml +++ b/plugins/kotlin/base/code-insight/intellij.kotlin.base.codeInsight.iml @@ -48,7 +48,9 @@ + + diff --git a/plugins/kotlin/base/code-insight/minimal/BUILD.bazel b/plugins/kotlin/base/code-insight/minimal/BUILD.bazel index a935f74b9e60..ebc772504b80 100644 --- a/plugins/kotlin/base/code-insight/minimal/BUILD.bazel +++ b/plugins/kotlin/base/code-insight/minimal/BUILD.bazel @@ -28,6 +28,7 @@ jvm_library( "//platform/util/jdom", "//plugins/kotlin/formatter/minimal", "//java/java-psi-api:psi", + "//platform/lang-api:lang", ], runtime_deps = ["//plugins/kotlin/base/frontend-agnostic"] ) diff --git a/plugins/kotlin/base/code-insight/minimal/intellij.kotlin.base.codeInsight.minimal.iml b/plugins/kotlin/base/code-insight/minimal/intellij.kotlin.base.codeInsight.minimal.iml index f4f60b933bed..e023efbfa2ac 100644 --- a/plugins/kotlin/base/code-insight/minimal/intellij.kotlin.base.codeInsight.minimal.iml +++ b/plugins/kotlin/base/code-insight/minimal/intellij.kotlin.base.codeInsight.minimal.iml @@ -23,5 +23,6 @@ + \ No newline at end of file diff --git a/plugins/kotlin/base/code-insight/minimal/src/org/jetbrains/kotlin/idea/kdoc/KDocTypedHandler.kt b/plugins/kotlin/base/code-insight/minimal/src/org/jetbrains/kotlin/idea/kdoc/KDocTypedHandler.kt index 18dad17c3ffe..3748674e5563 100644 --- a/plugins/kotlin/base/code-insight/minimal/src/org/jetbrains/kotlin/idea/kdoc/KDocTypedHandler.kt +++ b/plugins/kotlin/base/code-insight/minimal/src/org/jetbrains/kotlin/idea/kdoc/KDocTypedHandler.kt @@ -1,4 +1,4 @@ -// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package org.jetbrains.kotlin.idea.kdoc @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.kdoc.lexer.KDocTokens * Uses only for square brackets inside [KDocTokens.MARKDOWN_LINK] * KDoc's round brackets are handled by [org.jetbrains.kotlin.idea.KotlinPairMatcher] */ -class KDocTypedHandler : TypedHandlerDelegate() { +private class KDocTypedHandler : TypedHandlerDelegate() { override fun beforeCharTyped(c: Char, project: Project, editor: Editor, file: PsiFile, fileType: FileType): Result { if (overwriteClosingBracket(c, editor, file)) { EditorModificationUtil.moveCaretRelatively(editor, 1) diff --git a/plugins/kotlin/base/compiler-configuration-ui/BUILD.bazel b/plugins/kotlin/base/compiler-configuration-ui/BUILD.bazel index 64a66b21a354..d74959385458 100644 --- a/plugins/kotlin/base/compiler-configuration-ui/BUILD.bazel +++ b/plugins/kotlin/base/compiler-configuration-ui/BUILD.bazel @@ -29,6 +29,7 @@ jvm_library( "//plugins/kotlin/base/plugin", "//plugins/kotlin/base/platforms", "//plugins/kotlin/base/facet", + "//platform/forms_rt:java-guiForms-rt", "//plugins/kotlin/base/jps", "//platform/core-impl", "//platform/core-ui", 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 fdb17b00b35c..f3b5029dd6d8 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 @@ -23,6 +23,7 @@ + diff --git a/plugins/kotlin/base/facet/BUILD.bazel b/plugins/kotlin/base/facet/BUILD.bazel index a3eacdd006b7..890b7f539c54 100644 --- a/plugins/kotlin/base/facet/BUILD.bazel +++ b/plugins/kotlin/base/facet/BUILD.bazel @@ -25,6 +25,7 @@ jvm_library( "//plugins/kotlin/base/frontend-agnostic", "//plugins/kotlin/base/util", "//plugins/kotlin/base/compiler-configuration", + "//platform/execution", "//plugins/kotlin/base/plugin", "//plugins/kotlin/base/platforms", "//plugins/kotlin/base/project-model", diff --git a/plugins/kotlin/base/facet/intellij.kotlin.base.facet.iml b/plugins/kotlin/base/facet/intellij.kotlin.base.facet.iml index f0a1ca3f5fe0..61309806d7b4 100644 --- a/plugins/kotlin/base/facet/intellij.kotlin.base.facet.iml +++ b/plugins/kotlin/base/facet/intellij.kotlin.base.facet.iml @@ -20,6 +20,7 @@ + diff --git a/plugins/kotlin/base/fe10/code-insight/BUILD.bazel b/plugins/kotlin/base/fe10/code-insight/BUILD.bazel index 75579b289ab5..f99044245ee1 100644 --- a/plugins/kotlin/base/fe10/code-insight/BUILD.bazel +++ b/plugins/kotlin/base/fe10/code-insight/BUILD.bazel @@ -57,6 +57,7 @@ jvm_library( "//platform/core-ui", "//java/java-psi-api:psi", "//plugins/kotlin/code-insight/api", + "//platform/lang-api:lang", ] ) ### auto-generated section `build kotlin.base.fe10.code-insight` end \ No newline at end of file diff --git a/plugins/kotlin/base/fe10/code-insight/kotlin.base.fe10.code-insight.iml b/plugins/kotlin/base/fe10/code-insight/kotlin.base.fe10.code-insight.iml index bdb10f659f1e..254b4ae33fbb 100644 --- a/plugins/kotlin/base/fe10/code-insight/kotlin.base.fe10.code-insight.iml +++ b/plugins/kotlin/base/fe10/code-insight/kotlin.base.fe10.code-insight.iml @@ -55,5 +55,6 @@ + \ No newline at end of file diff --git a/plugins/kotlin/base/fe10/code-insight/src/org/jetbrains/kotlin/idea/quickfix/QuickFixContributor.kt b/plugins/kotlin/base/fe10/code-insight/src/org/jetbrains/kotlin/idea/quickfix/QuickFixContributor.kt index ff8087bed4f9..65998089d9a8 100644 --- a/plugins/kotlin/base/fe10/code-insight/src/org/jetbrains/kotlin/idea/quickfix/QuickFixContributor.kt +++ b/plugins/kotlin/base/fe10/code-insight/src/org/jetbrains/kotlin/idea/quickfix/QuickFixContributor.kt @@ -1,12 +1,11 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package org.jetbrains.kotlin.idea.quickfix import com.intellij.openapi.extensions.ExtensionPointName interface QuickFixContributor { companion object { - val EP_NAME: ExtensionPointName = - ExtensionPointName.create("org.jetbrains.kotlin.quickFixContributor") + internal val EP_NAME: ExtensionPointName = ExtensionPointName("org.jetbrains.kotlin.quickFixContributor") } fun registerQuickFixes(quickFixes: QuickFixes) diff --git a/plugins/kotlin/base/platforms/BUILD.bazel b/plugins/kotlin/base/platforms/BUILD.bazel index 6502a5af3fee..31d318dbe21e 100644 --- a/plugins/kotlin/base/platforms/BUILD.bazel +++ b/plugins/kotlin/base/platforms/BUILD.bazel @@ -34,6 +34,7 @@ jvm_library( "//platform/workspace/jps", "//platform/backend/workspace", "//platform/workspace/storage", + "//platform/ide-core", ] ) ### auto-generated section `build intellij.kotlin.base.platforms` end \ No newline at end of file diff --git a/plugins/kotlin/base/platforms/intellij.kotlin.base.platforms.iml b/plugins/kotlin/base/platforms/intellij.kotlin.base.platforms.iml index 1917828a897e..b21b1f779a38 100644 --- a/plugins/kotlin/base/platforms/intellij.kotlin.base.platforms.iml +++ b/plugins/kotlin/base/platforms/intellij.kotlin.base.platforms.iml @@ -28,5 +28,6 @@ + \ No newline at end of file diff --git a/plugins/kotlin/base/plugin/BUILD.bazel b/plugins/kotlin/base/plugin/BUILD.bazel index 7d2681dbbf6b..2b4b8516e3de 100644 --- a/plugins/kotlin/base/plugin/BUILD.bazel +++ b/plugins/kotlin/base/plugin/BUILD.bazel @@ -31,6 +31,7 @@ jvm_library( "//libraries/guava", "//jps/model-api:model", "//platform/projectModel-api:projectModel", + "//platform/execution", "//plugins/kotlin/base/frontend-agnostic", "//plugins/kotlin/base/util", "//plugins/kotlin/base/compiler-configuration", @@ -72,6 +73,7 @@ jvm_library( "@lib//:junit4", "//jps/model-api:model", "//platform/projectModel-api:projectModel", + "//platform/execution", "//plugins/kotlin/base/frontend-agnostic", "//plugins/kotlin/base/util", "//plugins/kotlin/base/util:util_test_lib", diff --git a/plugins/kotlin/base/plugin/intellij.kotlin.base.plugin.iml b/plugins/kotlin/base/plugin/intellij.kotlin.base.plugin.iml index 7bd2de5ae394..6dc595353cc5 100644 --- a/plugins/kotlin/base/plugin/intellij.kotlin.base.plugin.iml +++ b/plugins/kotlin/base/plugin/intellij.kotlin.base.plugin.iml @@ -23,6 +23,7 @@ + diff --git a/plugins/kotlin/base/scripting/scripting.k1/BUILD.bazel b/plugins/kotlin/base/scripting/scripting.k1/BUILD.bazel index 224a8506ebaa..fc93165f26a7 100644 --- a/plugins/kotlin/base/scripting/scripting.k1/BUILD.bazel +++ b/plugins/kotlin/base/scripting/scripting.k1/BUILD.bazel @@ -63,6 +63,8 @@ jvm_library( "//plugins/kotlin/base/scripting/scripting.shared", "//platform/refactoring", "//plugins/kotlin/highlighting/highlighting-shared:kotlin-highlighting-shared", + "//platform/execution", + "//platform/forms_rt:java-guiForms-rt", ] ) @@ -127,6 +129,8 @@ jvm_library( "//plugins/kotlin/base/scripting/scripting.shared", "//platform/refactoring", "//plugins/kotlin/highlighting/highlighting-shared:kotlin-highlighting-shared", + "//platform/execution", + "//platform/forms_rt:java-guiForms-rt", ] ) ### auto-generated section `build kotlin.base.scripting.k1` end 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 38c8d22b5fd4..70d94f125a6d 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 @@ -60,5 +60,7 @@ + + \ No newline at end of file diff --git a/plugins/kotlin/base/scripting/scripting.k2/BUILD.bazel b/plugins/kotlin/base/scripting/scripting.k2/BUILD.bazel index 77331e51cb88..9c8dd30c6412 100644 --- a/plugins/kotlin/base/scripting/scripting.k2/BUILD.bazel +++ b/plugins/kotlin/base/scripting/scripting.k2/BUILD.bazel @@ -64,6 +64,7 @@ jvm_library( "//plugins/kotlin/highlighting/highlighting-shared:kotlin-highlighting-shared", "//platform/lang-core", "//platform/backend/observation", + "//platform/execution", ] ) @@ -134,6 +135,7 @@ jvm_library( "//plugins/kotlin/base/test:test_test_lib", "//platform/backend/observation", "//platform/backend/observation:observation_test_lib", + "//platform/execution", ] ) ### 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 2ac9851d840f..4b48a06f81ae 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 @@ -64,5 +64,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 23982f6504ca..2f6d976d1197 100644 --- a/plugins/kotlin/base/scripting/scripting.shared/BUILD.bazel +++ b/plugins/kotlin/base/scripting/scripting.shared/BUILD.bazel @@ -43,6 +43,7 @@ jvm_library( "//platform/indexing-api:indexing", "//platform/external-system-impl:externalSystem-impl", "//platform/external-system-api:externalSystem", + "//platform/execution", ] ) ### auto-generated section `build intellij.kotlin.base.scripting.shared` end \ No newline at end of file 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 77c624d34730..599d04bde1d1 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 @@ -37,5 +37,6 @@ + \ No newline at end of file diff --git a/plugins/kotlin/code-insight/line-markers-shared/BUILD.bazel b/plugins/kotlin/code-insight/line-markers-shared/BUILD.bazel index eae558aa818a..07b72f00b7a7 100644 --- a/plugins/kotlin/code-insight/line-markers-shared/BUILD.bazel +++ b/plugins/kotlin/code-insight/line-markers-shared/BUILD.bazel @@ -29,6 +29,7 @@ jvm_library( "//plugins/kotlin/base/code-insight", "//platform/platform-impl:ide-impl", "//plugins/kotlin/base/indices", + "//platform/lang-api:lang", "//platform/lang-impl", "//platform/execution-impl", "//java/java-psi-api:psi", 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 629939e0b123..1bf9870142fc 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 @@ -23,6 +23,7 @@ + diff --git a/plugins/kotlin/code-insight/line-markers/BUILD.bazel b/plugins/kotlin/code-insight/line-markers/BUILD.bazel index 9d4a68cbb3b6..7734de8bb6ae 100644 --- a/plugins/kotlin/code-insight/line-markers/BUILD.bazel +++ b/plugins/kotlin/code-insight/line-markers/BUILD.bazel @@ -51,6 +51,7 @@ jvm_library( "//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", ] ) @@ -106,6 +107,7 @@ jvm_library( "//java/java-indexing-api:indexing", "//plugins/kotlin/base/project-structure", "//plugins/kotlin/base/project-structure:project-structure_test_lib", + "//platform/lang-api:lang", ] ) ### 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 0c729d281ac8..e3e6422385b8 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 @@ -63,5 +63,6 @@ + \ 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 bc1b55e91e16..9beeeeaf04a7 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", + "//platform/lang-api:lang", ] ) @@ -80,6 +81,7 @@ jvm_library( "@lib//:kotlinc-kotlin-compiler-tests", "//java/testFramework", "//plugins/groovy-live-templates", + "//platform/lang-api:lang", ] ) ### auto-generated section `build kotlin.code-insight.live-templates.shared` end 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 9e03422ce8c0..9fce8ef5e7b6 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 @@ -47,5 +47,6 @@ + \ No newline at end of file diff --git a/plugins/kotlin/code-insight/override-implement-k1/BUILD.bazel b/plugins/kotlin/code-insight/override-implement-k1/BUILD.bazel index 7067bc129edc..362ba6a7b8df 100644 --- a/plugins/kotlin/code-insight/override-implement-k1/BUILD.bazel +++ b/plugins/kotlin/code-insight/override-implement-k1/BUILD.bazel @@ -27,6 +27,7 @@ jvm_library( "//plugins/kotlin/code-insight/override-implement-shared:kotlin-code-insight-override-implement-shared", "//plugins/kotlin/core", "//plugins/kotlin/frontend-independent", + "//platform/lang-api:lang", ] ) ### auto-generated section `build kotlin.code-insight.override-implement.k1` end \ No newline at end of file diff --git a/plugins/kotlin/code-insight/override-implement-k1/kotlin.code-insight.override-implement.k1.iml b/plugins/kotlin/code-insight/override-implement-k1/kotlin.code-insight.override-implement.k1.iml index eb5bed579d67..dade92fcf335 100644 --- a/plugins/kotlin/code-insight/override-implement-k1/kotlin.code-insight.override-implement.k1.iml +++ b/plugins/kotlin/code-insight/override-implement-k1/kotlin.code-insight.override-implement.k1.iml @@ -27,5 +27,6 @@ + \ No newline at end of file diff --git a/plugins/kotlin/code-insight/override-implement-k2/BUILD.bazel b/plugins/kotlin/code-insight/override-implement-k2/BUILD.bazel index 7803b97cca75..13183c981653 100644 --- a/plugins/kotlin/code-insight/override-implement-k2/BUILD.bazel +++ b/plugins/kotlin/code-insight/override-implement-k2/BUILD.bazel @@ -36,6 +36,7 @@ jvm_library( "//plugins/kotlin/code-insight/override-implement-shared:kotlin-code-insight-override-implement-shared", "//platform/core-impl", "//platform/lang-impl", + "//platform/lang-api:lang", "//java/java-psi-api:psi", "//plugins/kotlin/base/analysis-api/analysis-api-utils:kotlin-base-analysis-utils", "//platform/core-ui", diff --git a/plugins/kotlin/code-insight/override-implement-k2/intellij.kotlin.codeInsight.overrideImplement.iml b/plugins/kotlin/code-insight/override-implement-k2/intellij.kotlin.codeInsight.overrideImplement.iml index 359d33c59adb..3925d6af8d4f 100644 --- a/plugins/kotlin/code-insight/override-implement-k2/intellij.kotlin.codeInsight.overrideImplement.iml +++ b/plugins/kotlin/code-insight/override-implement-k2/intellij.kotlin.codeInsight.overrideImplement.iml @@ -39,6 +39,7 @@ + diff --git a/plugins/kotlin/code-insight/override-implement-shared/BUILD.bazel b/plugins/kotlin/code-insight/override-implement-shared/BUILD.bazel index 7ab8aa130d9e..3c6beb5a3a9b 100644 --- a/plugins/kotlin/code-insight/override-implement-shared/BUILD.bazel +++ b/plugins/kotlin/code-insight/override-implement-shared/BUILD.bazel @@ -18,6 +18,7 @@ jvm_library( "//platform/core-ui", "//java/java-impl:impl", "//plugins/kotlin/base/resources:kotlin-base-resources", + "//platform/lang-api:lang", ] ) ### auto-generated section `build kotlin.code-insight.override-implement.shared` end \ No newline at end of file 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 d9f908a07525..02168df97dd7 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 @@ -18,5 +18,6 @@ + \ No newline at end of file diff --git a/plugins/kotlin/code-insight/postfix-templates-k1/BUILD.bazel b/plugins/kotlin/code-insight/postfix-templates-k1/BUILD.bazel index 1db4e218952b..6ef7ac335447 100644 --- a/plugins/kotlin/code-insight/postfix-templates-k1/BUILD.bazel +++ b/plugins/kotlin/code-insight/postfix-templates-k1/BUILD.bazel @@ -38,6 +38,7 @@ jvm_library( "//plugins/kotlin/core", "//plugins/kotlin/idea", "//plugins/kotlin/refactorings/kotlin.refactorings.common:kotlin-refactorings-common", + "//platform/lang-api:lang", "//platform/lang-impl", "//java/java-psi-api:psi", "//plugins/kotlin/code-insight/impl-base:kotlin-codeInsight-shared", diff --git a/plugins/kotlin/code-insight/postfix-templates-k1/kotlin.code-insight.postfix-templates.k1.iml b/plugins/kotlin/code-insight/postfix-templates-k1/kotlin.code-insight.postfix-templates.k1.iml index a453f352d1a5..6a3950ccf7c9 100644 --- a/plugins/kotlin/code-insight/postfix-templates-k1/kotlin.code-insight.postfix-templates.k1.iml +++ b/plugins/kotlin/code-insight/postfix-templates-k1/kotlin.code-insight.postfix-templates.k1.iml @@ -40,6 +40,7 @@ + diff --git a/plugins/kotlin/code-insight/postfix-templates/BUILD.bazel b/plugins/kotlin/code-insight/postfix-templates/BUILD.bazel index 0db9ffc60825..07f4fb81dda8 100644 --- a/plugins/kotlin/code-insight/postfix-templates/BUILD.bazel +++ b/plugins/kotlin/code-insight/postfix-templates/BUILD.bazel @@ -40,6 +40,7 @@ jvm_library( "//plugins/kotlin/code-insight/impl-base:kotlin-codeInsight-shared", "//plugins/kotlin/code-insight/live-templates-shared:kotlin-code-insight-live-templates-shared", "//plugins/kotlin/code-insight/live-templates-k2:kotlin-codeInsight-liveTemplates", + "//platform/lang-api:lang", "//platform/lang-impl", "//java/java-psi-api:psi", "//plugins/kotlin/refactorings/kotlin.refactorings.common:kotlin-refactorings-common", @@ -81,6 +82,7 @@ jvm_library( "//plugins/kotlin/code-insight/live-templates-k2:kotlin-codeInsight-liveTemplates", "//plugins/kotlin/code-insight/live-templates-k2:kotlin-codeInsight-liveTemplates_test_lib", "//plugins/kotlin/idea/tests:tests_test_lib", + "//platform/lang-api:lang", "//platform/lang-impl", "//platform/testFramework", "//platform/testFramework:testFramework_test_lib", diff --git a/plugins/kotlin/code-insight/postfix-templates/intellij.kotlin.codeInsight.postfixTemplates.iml b/plugins/kotlin/code-insight/postfix-templates/intellij.kotlin.codeInsight.postfixTemplates.iml index 3b0f3beef128..650547f8f747 100644 --- a/plugins/kotlin/code-insight/postfix-templates/intellij.kotlin.codeInsight.postfixTemplates.iml +++ b/plugins/kotlin/code-insight/postfix-templates/intellij.kotlin.codeInsight.postfixTemplates.iml @@ -45,6 +45,7 @@ + diff --git a/plugins/kotlin/code-insight/structural-search-k2/BUILD.bazel b/plugins/kotlin/code-insight/structural-search-k2/BUILD.bazel index a169640cd60e..abe6a0563939 100644 --- a/plugins/kotlin/code-insight/structural-search-k2/BUILD.bazel +++ b/plugins/kotlin/code-insight/structural-search-k2/BUILD.bazel @@ -34,6 +34,7 @@ jvm_library( "//platform/analysis-api:analysis", "//platform/core-api:core", "//platform/core-ui", + "//platform/execution", "//platform/core-impl", "//platform/ide-core", "//platform/platform-api:ide", diff --git a/plugins/kotlin/code-insight/structural-search-k2/intellij.kotlin.codeInsight.structuralSearch.iml b/plugins/kotlin/code-insight/structural-search-k2/intellij.kotlin.codeInsight.structuralSearch.iml index 82ac954b8b36..b0ee4129ca3c 100644 --- a/plugins/kotlin/code-insight/structural-search-k2/intellij.kotlin.codeInsight.structuralSearch.iml +++ b/plugins/kotlin/code-insight/structural-search-k2/intellij.kotlin.codeInsight.structuralSearch.iml @@ -32,6 +32,7 @@ + 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 6b776134f48c..6701f323a01f 100644 --- a/plugins/kotlin/code-insight/structural-search-k2/tests/BUILD.bazel +++ b/plugins/kotlin/code-insight/structural-search-k2/tests/BUILD.bazel @@ -24,6 +24,7 @@ jvm_library( "//platform/structuralsearch:structuralSearch", "//platform/testFramework", "//platform/testFramework:testFramework_test_lib", + "//platform/execution", "//java/testFramework", "//plugins/kotlin/base/test:test_test_lib", "//java/idea-ui:ui", 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 1add2233a44e..8fc74a2eb4b4 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 @@ -17,6 +17,7 @@ + diff --git a/plugins/kotlin/completion/impl-k1/BUILD.bazel b/plugins/kotlin/completion/impl-k1/BUILD.bazel index 0b31c828b72d..cb8ad4fb157f 100644 --- a/plugins/kotlin/completion/impl-k1/BUILD.bazel +++ b/plugins/kotlin/completion/impl-k1/BUILD.bazel @@ -29,6 +29,7 @@ jvm_library( "//libraries/guava", "//java/java-indexing-api:indexing", "//platform/analysis-api:analysis", + "//platform/lang-api:lang", "//platform/code-style-api:codeStyle", "//platform/core-api:core", "//platform/editor-ui-api:editor-ui", 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 67d3863cf6cc..98825686eb13 100644 --- a/plugins/kotlin/completion/impl-k1/kotlin.completion.impl.k1.iml +++ b/plugins/kotlin/completion/impl-k1/kotlin.completion.impl.k1.iml @@ -33,6 +33,7 @@ + diff --git a/plugins/kotlin/completion/impl-k2/BUILD.bazel b/plugins/kotlin/completion/impl-k2/BUILD.bazel index f800998ae767..63eae467cb1e 100644 --- a/plugins/kotlin/completion/impl-k2/BUILD.bazel +++ b/plugins/kotlin/completion/impl-k2/BUILD.bazel @@ -55,6 +55,7 @@ jvm_library( "//plugins/kotlin/completion/api", "//plugins/kotlin/completion/impl-shared:kotlin-completion-impl-shared", "//platform/analysis-impl", + "//platform/lang-api:lang", "//platform/lang-impl", "//platform/core-ui", "//java/java-psi-api:psi", 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 00dc7daf5461..37a953d766a4 100644 --- a/plugins/kotlin/completion/impl-k2/intellij.kotlin.completion.impl.iml +++ b/plugins/kotlin/completion/impl-k2/intellij.kotlin.completion.impl.iml @@ -57,6 +57,7 @@ + diff --git a/plugins/kotlin/completion/impl-shared/BUILD.bazel b/plugins/kotlin/completion/impl-shared/BUILD.bazel index edaddc1629c6..09b536b7bf2a 100644 --- a/plugins/kotlin/completion/impl-shared/BUILD.bazel +++ b/plugins/kotlin/completion/impl-shared/BUILD.bazel @@ -45,6 +45,7 @@ jvm_library( "//libraries/kotlinx/serialization/core", "//libraries/kotlinx/serialization/json", "//plugins/kotlin/base/kotlin.base.serialization", + "//platform/lang-api:lang", ] ) ### auto-generated section `build kotlin.completion.impl.shared` end \ No newline at end of file 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 ef1f0de28ff8..426fc050d163 100644 --- a/plugins/kotlin/completion/impl-shared/kotlin.completion.impl.shared.iml +++ b/plugins/kotlin/completion/impl-shared/kotlin.completion.impl.shared.iml @@ -55,5 +55,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 af71c4432090..9657bc9e7526 100644 --- a/plugins/kotlin/completion/tests-k1/BUILD.bazel +++ b/plugins/kotlin/completion/tests-k1/BUILD.bazel @@ -18,6 +18,7 @@ jvm_library( "//platform/core-ui", "//platform/editor-ui-api:editor-ui", "//platform/lang-core", + "//platform/execution", "//platform/projectModel-api:projectModel", "@lib//:kotlin-stdlib", "@lib//:kotlinc-kotlin-compiler-common", 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 882294b415fe..70d8d47d9cf4 100644 --- a/plugins/kotlin/completion/tests-k1/kotlin.completion.tests.k1.iml +++ b/plugins/kotlin/completion/tests-k1/kotlin.completion.tests.k1.iml @@ -12,6 +12,7 @@ + diff --git a/plugins/kotlin/coverage/BUILD.bazel b/plugins/kotlin/coverage/BUILD.bazel index 2c0eccb28db2..1991df4dfd97 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", + "//platform/execution", ] ) ### auto-generated section `build intellij.kotlin.coverage` end \ No newline at end of file diff --git a/plugins/kotlin/coverage/intellij.kotlin.coverage.iml b/plugins/kotlin/coverage/intellij.kotlin.coverage.iml index 190b707aee07..8f1872f6101e 100644 --- a/plugins/kotlin/coverage/intellij.kotlin.coverage.iml +++ b/plugins/kotlin/coverage/intellij.kotlin.coverage.iml @@ -25,5 +25,6 @@ + \ No newline at end of file diff --git a/plugins/kotlin/fir/tests/BUILD.bazel b/plugins/kotlin/fir/tests/BUILD.bazel index c60c181404dc..81604b4aaff7 100644 --- a/plugins/kotlin/fir/tests/BUILD.bazel +++ b/plugins/kotlin/fir/tests/BUILD.bazel @@ -39,6 +39,7 @@ jvm_library( "//platform/editor-ui-api:editor-ui", "//platform/execution-impl", "//platform/indexing-api:indexing", + "//platform/execution", "//jps/model-api:model", "//platform/lang-core", "//platform/projectModel-api:projectModel", diff --git a/plugins/kotlin/fir/tests/kotlin.fir.tests.iml b/plugins/kotlin/fir/tests/kotlin.fir.tests.iml index e91e34949254..3c3a44cec654 100644 --- a/plugins/kotlin/fir/tests/kotlin.fir.tests.iml +++ b/plugins/kotlin/fir/tests/kotlin.fir.tests.iml @@ -41,6 +41,7 @@ + diff --git a/plugins/kotlin/formatter/minimal/BUILD.bazel b/plugins/kotlin/formatter/minimal/BUILD.bazel index 5e3447bd6b31..ed857303b264 100644 --- a/plugins/kotlin/formatter/minimal/BUILD.bazel +++ b/plugins/kotlin/formatter/minimal/BUILD.bazel @@ -40,6 +40,7 @@ jvm_library( "//platform/core-ui", "//plugins/kotlin/highlighting/highlighting-minimal:kotlin-highlighting-minimal", "//platform/code-style-impl:codeStyle-impl", + "//platform/lang-api:lang", ], runtime_deps = ["//plugins/kotlin/base/frontend-agnostic"] ) diff --git a/plugins/kotlin/formatter/minimal/intellij.kotlin.formatter.minimal.iml b/plugins/kotlin/formatter/minimal/intellij.kotlin.formatter.minimal.iml index 5b680024a841..b3dd6cbc20fe 100644 --- a/plugins/kotlin/formatter/minimal/intellij.kotlin.formatter.minimal.iml +++ b/plugins/kotlin/formatter/minimal/intellij.kotlin.formatter.minimal.iml @@ -27,5 +27,6 @@ + \ No newline at end of file diff --git a/plugins/kotlin/gradle/code-insight-common/BUILD.bazel b/plugins/kotlin/gradle/code-insight-common/BUILD.bazel index 232c635abc63..f09df7330607 100644 --- a/plugins/kotlin/gradle/code-insight-common/BUILD.bazel +++ b/plugins/kotlin/gradle/code-insight-common/BUILD.bazel @@ -52,6 +52,8 @@ jvm_library( "//platform/vcs-api/vcs-api-core:vcs-core", "//platform/core-ui", "//plugins/kotlin/code-insight/inspections-shared:kotlin-code-insight-inspections-shared", + "//platform/execution", + "//platform/lang-api:lang", ] ) ### auto-generated section `build intellij.kotlin.gradle.codeInsight.common` end \ No newline at end of file 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 4c98d2c4b226..31eac456c9d7 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 @@ -46,5 +46,7 @@ + + \ No newline at end of file diff --git a/plugins/kotlin/gradle/code-insight-common/src/org/jetbrains/kotlin/idea/gradleCodeInsightCommon/native/KotlinNativeRunConfigurationProducer.kt b/plugins/kotlin/gradle/code-insight-common/src/org/jetbrains/kotlin/idea/gradleCodeInsightCommon/native/KotlinNativeRunConfigurationProducer.kt index 3da626c16832..bf843f4ff9ba 100644 --- a/plugins/kotlin/gradle/code-insight-common/src/org/jetbrains/kotlin/idea/gradleCodeInsightCommon/native/KotlinNativeRunConfigurationProducer.kt +++ b/plugins/kotlin/gradle/code-insight-common/src/org/jetbrains/kotlin/idea/gradleCodeInsightCommon/native/KotlinNativeRunConfigurationProducer.kt @@ -1,4 +1,4 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package org.jetbrains.kotlin.idea.gradleCodeInsightCommon.native @@ -19,11 +19,12 @@ import org.jetbrains.kotlin.psi.KtFunction import org.jetbrains.plugins.gradle.service.execution.GradleExternalTaskConfigurationType import org.jetbrains.plugins.gradle.service.execution.GradleRunConfiguration -class KotlinNativeRunConfigurationProducer : +private class KotlinNativeRunConfigurationProducer : LazyRunConfigurationProducer(), KotlinNativeRunConfigurationProvider { - override val isForTests = false + override val isForTests: Boolean + get() = false override fun getConfigurationFactory(): ConfigurationFactory = GradleExternalTaskConfigurationType.getInstance().factory diff --git a/plugins/kotlin/gradle/code-insight-groovy/BUILD.bazel b/plugins/kotlin/gradle/code-insight-groovy/BUILD.bazel index 90eca9e38b79..ea88b9143e57 100644 --- a/plugins/kotlin/gradle/code-insight-groovy/BUILD.bazel +++ b/plugins/kotlin/gradle/code-insight-groovy/BUILD.bazel @@ -42,6 +42,7 @@ jvm_library( "//plugins/groovy/groovy-psi:psi", "//plugins/kotlin/project-wizard/core", "//plugins/kotlin/gradle/gradle-java", + "//platform/platform-api:ide", ] ) ### auto-generated section `build intellij.kotlin.gradle.codeInsight.groovy` end \ No newline at end of file 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 8fc9e5e3197f..269393476d07 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 @@ -36,5 +36,6 @@ + \ No newline at end of file diff --git a/plugins/kotlin/gradle/gradle-java/BUILD.bazel b/plugins/kotlin/gradle/gradle-java/BUILD.bazel index a682427a6a17..bae4823f16b1 100644 --- a/plugins/kotlin/gradle/gradle-java/BUILD.bazel +++ b/plugins/kotlin/gradle/gradle-java/BUILD.bazel @@ -90,6 +90,8 @@ jvm_library( "//libraries/commons/lang3", "//plugins/kotlin/jvm-debugger/coroutines", "//platform/diagnostic/telemetry", + "//platform/lang-api:lang", + "//platform/execution", ] ) @@ -177,6 +179,8 @@ jvm_library( "//plugins/kotlin/jvm-debugger/coroutines", "//platform/diagnostic/telemetry", "//platform/diagnostic/telemetry:telemetry_test_lib", + "//platform/lang-api:lang", + "//platform/execution", ] ) ### auto-generated section `build kotlin.gradle.gradle-java` end 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 e9a43b9b9f4d..8e8193a7d272 100644 --- a/plugins/kotlin/gradle/gradle-java/kotlin.gradle.gradle-java.iml +++ b/plugins/kotlin/gradle/gradle-java/kotlin.gradle.gradle-java.iml @@ -92,5 +92,7 @@ + + \ No newline at end of file diff --git a/plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/testing/common/KotlinMultiplatformCommonTestMethodGradleConfigurationProducer.kt b/plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/testing/common/KotlinMultiplatformCommonTestMethodGradleConfigurationProducer.kt index 37141f6b2b1b..2ea5bba5850c 100644 --- a/plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/testing/common/KotlinMultiplatformCommonTestMethodGradleConfigurationProducer.kt +++ b/plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/testing/common/KotlinMultiplatformCommonTestMethodGradleConfigurationProducer.kt @@ -1,4 +1,4 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package org.jetbrains.kotlin.idea.gradleJava.testing.common @@ -6,14 +6,14 @@ import com.intellij.execution.RunnerAndConfigurationSettings import com.intellij.execution.actions.ConfigurationContext import com.intellij.execution.actions.ConfigurationFromContext import com.intellij.openapi.module.Module -import org.jetbrains.kotlin.idea.gradleJava.run.AbstractKotlinMultiplatformTestMethodGradleConfigurationProducer import org.jetbrains.kotlin.idea.gradleJava.extensions.KotlinMultiplatformCommonProducersProvider +import org.jetbrains.kotlin.idea.gradleJava.run.AbstractKotlinMultiplatformTestMethodGradleConfigurationProducer import org.jetbrains.kotlin.idea.gradleJava.run.isProvidedByMultiplatformProducer import org.jetbrains.kotlin.platform.TargetPlatform import org.jetbrains.kotlin.platform.isCommon import org.jetbrains.kotlin.platform.jvm.isJvm -class KotlinMultiplatformCommonTestMethodGradleConfigurationProducer : AbstractKotlinMultiplatformTestMethodGradleConfigurationProducer(), +private class KotlinMultiplatformCommonTestMethodGradleConfigurationProducer : AbstractKotlinMultiplatformTestMethodGradleConfigurationProducer(), KotlinMultiplatformCommonProducersProvider { override fun isApplicable(module: Module, platform: TargetPlatform) = platform.isCommon() || platform.isJvm() override fun findExistingConfiguration(context: ConfigurationContext): RunnerAndConfigurationSettings? = null diff --git a/plugins/kotlin/gradle/gradle-java/tests.shared/BUILD.bazel b/plugins/kotlin/gradle/gradle-java/tests.shared/BUILD.bazel index 378e22bdd114..6fb5c3b30e97 100644 --- a/plugins/kotlin/gradle/gradle-java/tests.shared/BUILD.bazel +++ b/plugins/kotlin/gradle/gradle-java/tests.shared/BUILD.bazel @@ -95,6 +95,7 @@ jvm_library( "//java/openapi:java", "//plugins/kotlin/jvm-debugger/coroutines", "//java/java-runtime:rt", + "//platform/execution", ], exports = ["@lib//:kotlin-gradle-plugin-idea"] ) 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 db6c91e0f103..9a5d1cb0e7ed 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 @@ -78,5 +78,6 @@ + \ No newline at end of file diff --git a/plugins/kotlin/gradle/gradle/BUILD.bazel b/plugins/kotlin/gradle/gradle/BUILD.bazel index 52c056ebf3ef..b6bc710017cc 100644 --- a/plugins/kotlin/gradle/gradle/BUILD.bazel +++ b/plugins/kotlin/gradle/gradle/BUILD.bazel @@ -81,6 +81,7 @@ jvm_library( "//plugins/kotlin/base/project-structure", "//plugins/kotlin/base/facet", "//platform/util/jdom", + "//platform/lang-api:lang", ] ) ### auto-generated section `build intellij.kotlin.gradle.gradle` end \ No newline at end of file diff --git a/plugins/kotlin/gradle/gradle/intellij.kotlin.gradle.gradle.iml b/plugins/kotlin/gradle/gradle/intellij.kotlin.gradle.gradle.iml index 25b544b0e8cf..c75a053841dd 100644 --- a/plugins/kotlin/gradle/gradle/intellij.kotlin.gradle.gradle.iml +++ b/plugins/kotlin/gradle/gradle/intellij.kotlin.gradle.gradle.iml @@ -74,5 +74,6 @@ + \ No newline at end of file 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 789f35b9dd46..4032c199823a 100644 --- a/plugins/kotlin/gradle/scripting/kotlin.gradle.scripting.shared/BUILD.bazel +++ b/plugins/kotlin/gradle/scripting/kotlin.gradle.scripting.shared/BUILD.bazel @@ -50,6 +50,7 @@ jvm_library( "//platform/platform-impl:ide-impl", "//plugins/kotlin/base/scripting/scripting.shared", "//java/java-psi-api:psi", + "//platform/lang-api:lang", ] ) ### auto-generated section `build kotlin.gradle.scripting.shared` end \ No newline at end of file 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 b95cdd50981d..b4c8357c5192 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 @@ -45,5 +45,6 @@ + \ No newline at end of file diff --git a/plugins/kotlin/highlighting/highlighting-k2/BUILD.bazel b/plugins/kotlin/highlighting/highlighting-k2/BUILD.bazel index da3a17344d6f..8f55c4a05dfa 100644 --- a/plugins/kotlin/highlighting/highlighting-k2/BUILD.bazel +++ b/plugins/kotlin/highlighting/highlighting-k2/BUILD.bazel @@ -64,6 +64,7 @@ jvm_library( "//platform/util/coroutines", "//plugins/kotlin/code-insight/impl-base:kotlin-codeInsight-shared", "//plugins/kotlin/base/scripting/scripting.shared", + "//platform/platform-api:ide", ] ) @@ -132,6 +133,7 @@ jvm_library( "//platform/util/coroutines", "//plugins/kotlin/code-insight/impl-base:kotlin-codeInsight-shared", "//plugins/kotlin/base/scripting/scripting.shared", + "//platform/platform-api:ide", ] ) ### auto-generated section `build intellij.kotlin.highlighting` end diff --git a/plugins/kotlin/highlighting/highlighting-k2/intellij.kotlin.highlighting.iml b/plugins/kotlin/highlighting/highlighting-k2/intellij.kotlin.highlighting.iml index 0ea00ce4426d..b15d2d7ee40a 100644 --- a/plugins/kotlin/highlighting/highlighting-k2/intellij.kotlin.highlighting.iml +++ b/plugins/kotlin/highlighting/highlighting-k2/intellij.kotlin.highlighting.iml @@ -75,5 +75,6 @@ + \ No newline at end of file diff --git a/plugins/kotlin/highlighting/highlighting-k2/src/org/jetbrains/kotlin/idea/highlighting/SupportAvailabilityNotificationProvider.kt b/plugins/kotlin/highlighting/highlighting-k2/src/org/jetbrains/kotlin/idea/highlighting/SupportAvailabilityNotificationProvider.kt index 520f0a42142e..ad385417f3e7 100644 --- a/plugins/kotlin/highlighting/highlighting-k2/src/org/jetbrains/kotlin/idea/highlighting/SupportAvailabilityNotificationProvider.kt +++ b/plugins/kotlin/highlighting/highlighting-k2/src/org/jetbrains/kotlin/idea/highlighting/SupportAvailabilityNotificationProvider.kt @@ -1,4 +1,4 @@ -// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package org.jetbrains.kotlin.idea.highlighting import com.intellij.openapi.fileEditor.FileEditor @@ -11,7 +11,7 @@ import org.jetbrains.kotlin.idea.codeinsight.utils.KotlinSupportAvailability import java.util.function.Function import javax.swing.JComponent -class SupportAvailabilityNotificationProvider: EditorNotificationProvider, DumbAware { +private class SupportAvailabilityNotificationProvider: EditorNotificationProvider, DumbAware { override fun collectNotificationData( project: Project, file: VirtualFile diff --git a/plugins/kotlin/highlighting/highlighting-k2/src/org/jetbrains/kotlin/idea/highlighting/visitor/KotlinDiagnosticHighlightVisitor.kt b/plugins/kotlin/highlighting/highlighting-k2/src/org/jetbrains/kotlin/idea/highlighting/visitor/KotlinDiagnosticHighlightVisitor.kt index 4fd9beed839e..a42b601ea2d0 100644 --- a/plugins/kotlin/highlighting/highlighting-k2/src/org/jetbrains/kotlin/idea/highlighting/visitor/KotlinDiagnosticHighlightVisitor.kt +++ b/plugins/kotlin/highlighting/highlighting-k2/src/org/jetbrains/kotlin/idea/highlighting/visitor/KotlinDiagnosticHighlightVisitor.kt @@ -1,4 +1,4 @@ -// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package org.jetbrains.kotlin.idea.highlighting.visitor import com.intellij.codeInsight.daemon.impl.HighlightInfo @@ -14,7 +14,6 @@ import com.intellij.lang.injection.InjectedLanguageManager import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.application.readAction import com.intellij.openapi.diagnostic.Logger -import com.intellij.openapi.project.IntelliJProjectUtil import com.intellij.openapi.util.NlsSafe import com.intellij.openapi.util.TextRange import com.intellij.openapi.util.registry.Registry @@ -52,8 +51,7 @@ import org.jetbrains.kotlin.idea.statistics.compilationError.KotlinCompilationEr import org.jetbrains.kotlin.psi.* import kotlin.coroutines.cancellation.CancellationException - -class KotlinDiagnosticHighlightVisitor : HighlightVisitor, HighlightRangeExtension { +internal class KotlinDiagnosticHighlightVisitor : HighlightVisitor, HighlightRangeExtension { /** * map [PsiElement] -> list of highlighting builders for this element, built in [analyzeFile] * This map is required to extract diagnostics exactly when the current element is being visited, to avoid flickers diff --git a/plugins/kotlin/highlighting/highlighting-minimal/BUILD.bazel b/plugins/kotlin/highlighting/highlighting-minimal/BUILD.bazel index 0c3b8cd54b63..84e199c3cf30 100644 --- a/plugins/kotlin/highlighting/highlighting-minimal/BUILD.bazel +++ b/plugins/kotlin/highlighting/highlighting-minimal/BUILD.bazel @@ -24,6 +24,7 @@ jvm_library( "//platform/util:util-ui", "//platform/lang-impl", "//java/java-frontback-psi-impl:frontback-psi-impl", + "//platform/platform-api:ide", ], runtime_deps = ["//plugins/kotlin/base/frontend-agnostic"] ) 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 e9212e03d17a..b72972ba5339 100644 --- a/plugins/kotlin/highlighting/highlighting-minimal/intellij.kotlin.highlighting.minimal.iml +++ b/plugins/kotlin/highlighting/highlighting-minimal/intellij.kotlin.highlighting.minimal.iml @@ -19,5 +19,6 @@ + \ 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 c0abfdbde39b..d7a825b4ea56 100644 --- a/plugins/kotlin/highlighting/highlighting-shared/BUILD.bazel +++ b/plugins/kotlin/highlighting/highlighting-shared/BUILD.bazel @@ -26,6 +26,7 @@ jvm_library( "//platform/editor-ui-api:editor-ui", "//platform/platform-api:ide", "//java/java-analysis-impl:analysis-impl", + "//platform/lang-api:lang", "//platform/lang-impl", "//platform/core-ui", "//plugins/kotlin/base/resources:kotlin-base-resources", diff --git a/plugins/kotlin/highlighting/highlighting-shared/kotlin.highlighting.shared.iml b/plugins/kotlin/highlighting/highlighting-shared/kotlin.highlighting.shared.iml index 4a18cd88a001..be8501e84ad8 100644 --- a/plugins/kotlin/highlighting/highlighting-shared/kotlin.highlighting.shared.iml +++ b/plugins/kotlin/highlighting/highlighting-shared/kotlin.highlighting.shared.iml @@ -20,6 +20,7 @@ + diff --git a/plugins/kotlin/idea/BUILD.bazel b/plugins/kotlin/idea/BUILD.bazel index c1ddaa03e876..fe8e244c23ce 100644 --- a/plugins/kotlin/idea/BUILD.bazel +++ b/plugins/kotlin/idea/BUILD.bazel @@ -61,6 +61,7 @@ jvm_library( "//platform/lang-core", "//platform/projectModel-api:projectModel", "//platform/refactoring", + "//platform/forms_rt:java-guiForms-rt", "//platform/structure-view-impl:structureView-impl", "//platform/usageView-impl", "//platform/util/jdom", @@ -125,6 +126,7 @@ jvm_library( "//java/compiler/openapi:java-compiler", "@lib//:jaxb-api", "//platform/core-ui", + "//platform/execution", "//platform/lang-impl", "//libraries/fastutil", "//platform/structuralsearch:structuralSearch", diff --git a/plugins/kotlin/idea/kotlin.idea.iml b/plugins/kotlin/idea/kotlin.idea.iml index 240151811871..160c9ced2832 100644 --- a/plugins/kotlin/idea/kotlin.idea.iml +++ b/plugins/kotlin/idea/kotlin.idea.iml @@ -42,6 +42,7 @@ + @@ -106,6 +107,7 @@ + diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt index 7609b28357cc..ab9e0750793e 100644 --- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt +++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt @@ -44,7 +44,7 @@ import org.jetbrains.kotlin.resolve.konan.diagnostics.ErrorsNative.INCOMPATIBLE_ import org.jetbrains.kotlin.resolve.konan.diagnostics.ErrorsNative.MISSING_EXCEPTION_IN_THROWS_ON_SUSPEND import org.jetbrains.kotlin.resolve.konan.diagnostics.ErrorsNative.THROWS_LIST_EMPTY -class QuickFixRegistrar : QuickFixContributor { +private class QuickFixRegistrar : QuickFixContributor { override fun registerQuickFixes(quickFixes: QuickFixes) { fun DiagnosticFactory<*>.registerFactory(vararg factory: QuickFixFactory) { quickFixes.register(this, *factory) diff --git a/plugins/kotlin/idea/tests/BUILD.bazel b/plugins/kotlin/idea/tests/BUILD.bazel index ca606017b684..2d179972f5ba 100644 --- a/plugins/kotlin/idea/tests/BUILD.bazel +++ b/plugins/kotlin/idea/tests/BUILD.bazel @@ -139,6 +139,7 @@ jvm_library( "//platform/service-container:service-container_test_lib", "//jvm/jvm-analysis-impl:analysis-impl", "//java/execution/impl", + "//platform/execution", "//plugins/copyright", "//plugins/copyright:copyright_test_lib", "//platform/code-style-impl:codeStyle-impl", @@ -192,6 +193,7 @@ jvm_library( "//plugins/kotlin/base/scripting/scripting.k1:scripting.k1_test_lib", "//plugins/IntelliLang/backend", "//plugins/kotlin/base/scripting/scripting.shared", + "@lib//:jet_check", ], runtime_deps = [ "//plugins/kotlin/gradle/gradle", diff --git a/plugins/kotlin/idea/tests/kotlin.idea.tests.iml b/plugins/kotlin/idea/tests/kotlin.idea.tests.iml index 7e027ffef36c..cfa6adcc9560 100644 --- a/plugins/kotlin/idea/tests/kotlin.idea.tests.iml +++ b/plugins/kotlin/idea/tests/kotlin.idea.tests.iml @@ -140,6 +140,7 @@ + @@ -189,5 +190,6 @@ + \ No newline at end of file diff --git a/plugins/kotlin/j2k/k1.new/BUILD.bazel b/plugins/kotlin/j2k/k1.new/BUILD.bazel index daaa978e3651..2120a3773f76 100644 --- a/plugins/kotlin/j2k/k1.new/BUILD.bazel +++ b/plugins/kotlin/j2k/k1.new/BUILD.bazel @@ -20,6 +20,7 @@ jvm_library( deps = [ "//java/java-indexing-api:indexing", "//platform/core-api:core", + "//platform/lang-api:lang", "@lib//:kotlin-stdlib", "@lib//:kotlinc-kotlin-compiler-common", "@lib//:kotlinc-kotlin-compiler-fe10", 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 63d8ce1598f5..6c4eb85e202d 100644 --- a/plugins/kotlin/j2k/k1.new/kotlin.j2k.k1.new.iml +++ b/plugins/kotlin/j2k/k1.new/kotlin.j2k.k1.new.iml @@ -25,6 +25,7 @@ + diff --git a/plugins/kotlin/j2k/k1.old/src/org/jetbrains/kotlin/j2k/OldJ2kConverterExtension.kt b/plugins/kotlin/j2k/k1.old/src/org/jetbrains/kotlin/j2k/OldJ2kConverterExtension.kt index 4b7316ce6d02..965e84810994 100644 --- a/plugins/kotlin/j2k/k1.old/src/org/jetbrains/kotlin/j2k/OldJ2kConverterExtension.kt +++ b/plugins/kotlin/j2k/k1.old/src/org/jetbrains/kotlin/j2k/OldJ2kConverterExtension.kt @@ -1,4 +1,4 @@ -// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package org.jetbrains.kotlin.j2k @@ -12,7 +12,7 @@ import org.jetbrains.kotlin.j2k.J2kConverterExtension.Kind.K1_OLD import org.jetbrains.kotlin.j2k.copyPaste.* import org.jetbrains.kotlin.psi.KtFile -class OldJ2kConverterExtension : J2kConverterExtension() { +private class OldJ2kConverterExtension : J2kConverterExtension() { override val kind: Kind = K1_OLD override fun createJavaToKotlinConverter( diff --git a/plugins/kotlin/j2k/shared/BUILD.bazel b/plugins/kotlin/j2k/shared/BUILD.bazel index 77c63cd80637..cdeeca454686 100644 --- a/plugins/kotlin/j2k/shared/BUILD.bazel +++ b/plugins/kotlin/j2k/shared/BUILD.bazel @@ -47,6 +47,7 @@ jvm_library( "//platform/platform-impl:ide-impl", "//plugins/kotlin/base/psi", "//plugins/kotlin/base/util", + "//platform/forms_rt:java-guiForms-rt", "//plugins/kotlin/frontend-independent", "//plugins/kotlin/code-insight/utils", "//platform/core-api:core", @@ -54,6 +55,7 @@ jvm_library( "//plugins/kotlin/project-configuration", "//plugins/kotlin/preferences", "//plugins/kotlin/base/statistics", + "//platform/lang-api:lang", ] ) ### auto-generated section `build kotlin.j2k.shared` end \ No newline at end of file diff --git a/plugins/kotlin/j2k/shared/kotlin.j2k.shared.iml b/plugins/kotlin/j2k/shared/kotlin.j2k.shared.iml index 71351deb8f79..75aa397c7db1 100644 --- a/plugins/kotlin/j2k/shared/kotlin.j2k.shared.iml +++ b/plugins/kotlin/j2k/shared/kotlin.j2k.shared.iml @@ -44,6 +44,7 @@ + @@ -51,5 +52,6 @@ + \ No newline at end of file diff --git a/plugins/kotlin/jvm-debugger/base/util/BUILD.bazel b/plugins/kotlin/jvm-debugger/base/util/BUILD.bazel index 3af261161b37..effdcd372ecb 100644 --- a/plugins/kotlin/jvm-debugger/base/util/BUILD.bazel +++ b/plugins/kotlin/jvm-debugger/base/util/BUILD.bazel @@ -12,6 +12,8 @@ jvm_library( "@lib//:kotlinc-analysis-api", "//libraries/asm", "//platform/core-api:core", + "//platform/util", + "//platform/platform-api:ide", "//platform/projectModel-api:projectModel", "//plugins/kotlin/base/frontend-agnostic", "//plugins/kotlin/base/util", @@ -26,6 +28,7 @@ jvm_library( "//java/compiler/openapi:java-compiler", "//java/java-psi-api:psi", "//java/debugger/impl", + "@lib//:jetbrains-annotations", ] ) ### auto-generated section `build intellij.kotlin.jvm.debugger.base.util` end \ No newline at end of file diff --git a/plugins/kotlin/jvm-debugger/base/util/intellij.kotlin.jvm.debugger.base.util.iml b/plugins/kotlin/jvm-debugger/base/util/intellij.kotlin.jvm.debugger.base.util.iml index f6d5d6eebba2..be98f7992a60 100644 --- a/plugins/kotlin/jvm-debugger/base/util/intellij.kotlin.jvm.debugger.base.util.iml +++ b/plugins/kotlin/jvm-debugger/base/util/intellij.kotlin.jvm.debugger.base.util.iml @@ -12,6 +12,8 @@ + + @@ -26,5 +28,6 @@ + \ No newline at end of file diff --git a/plugins/kotlin/jvm-debugger/core/BUILD.bazel b/plugins/kotlin/jvm-debugger/core/BUILD.bazel index eb8604f44de4..50e50e48aba0 100644 --- a/plugins/kotlin/jvm-debugger/core/BUILD.bazel +++ b/plugins/kotlin/jvm-debugger/core/BUILD.bazel @@ -70,6 +70,8 @@ jvm_library( "//platform/util/jdom", "//java/java-runtime:rt", "@lib//:kotlin-metadata", + "//platform/execution", + "//platform/forms_rt:java-guiForms-rt", ] ) ### auto-generated section `build intellij.kotlin.jvm.debugger.core` end \ No newline at end of file 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 a302407db3c9..c46c82d865d2 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 @@ -69,5 +69,7 @@ + + \ 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 6eac19571d9f..a7274082506a 100644 --- a/plugins/kotlin/jvm-debugger/coroutines/BUILD.bazel +++ b/plugins/kotlin/jvm-debugger/coroutines/BUILD.bazel @@ -35,7 +35,9 @@ jvm_library( "//platform/analysis-api:analysis", "//platform/util/concurrency", "//platform/core-api:core", + "//platform/lang-api:lang", "//platform/editor-ui-api:editor-ui", + "//platform/platform-api:ide", "//platform/lang-core", "//platform/projectModel-api:projectModel", "//platform/refactoring", @@ -66,6 +68,7 @@ jvm_library( "//java/java-impl:impl", "//java/debugger/shared", "//platform/xdebugger-impl/rpc", + "//platform/execution", ] ) ### auto-generated section `build intellij.kotlin.jvm.debugger.coroutines` end \ No newline at end of file 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 12b6c8130136..1c29a768753d 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 @@ -40,7 +40,9 @@ + + @@ -71,5 +73,6 @@ + \ 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 8fc2cf19fb25..3f0fb2800b0e 100644 --- a/plugins/kotlin/jvm-debugger/evaluation/BUILD.bazel +++ b/plugins/kotlin/jvm-debugger/evaluation/BUILD.bazel @@ -19,6 +19,7 @@ jvm_library( "@lib//:kotlinc-kotlin-compiler-common", "@lib//:kotlinc-analysis-api", "@lib//:kotlinc-analysis-api-platform-interface", + "//platform/util", "//platform/core-api:core", "//plugins/kotlin/base/util", "//plugins/kotlin/base/project-structure", @@ -38,6 +39,7 @@ jvm_library( "//platform/xdebugger-impl/rpc", "//platform/editor-ui-api:editor-ui", "//plugins/kotlin/j2k/shared", + "//platform/platform-api:ide", ] ) ### auto-generated section `build kotlin.jvm-debugger.evaluation` end \ No newline at end of file diff --git a/plugins/kotlin/jvm-debugger/evaluation/k1/BUILD.bazel b/plugins/kotlin/jvm-debugger/evaluation/k1/BUILD.bazel index a57cc8de4076..9a6f26e4e213 100644 --- a/plugins/kotlin/jvm-debugger/evaluation/k1/BUILD.bazel +++ b/plugins/kotlin/jvm-debugger/evaluation/k1/BUILD.bazel @@ -49,6 +49,7 @@ jvm_library( "//plugins/kotlin/jvm-debugger/eval4j", "@lib//:kotlinc-scripting-compiler-plugin", "//platform/xdebugger-impl/rpc", + "//platform/lang-api:lang", ] ) ### auto-generated section `build kotlin.jvm-debugger.evaluation.k1` end \ No newline at end of file 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 eef8c7aa54cf..b674c645deba 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 @@ -55,5 +55,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 c553dd96cb6d..17f99905ed7d 100644 --- a/plugins/kotlin/jvm-debugger/evaluation/k2/BUILD.bazel +++ b/plugins/kotlin/jvm-debugger/evaluation/k2/BUILD.bazel @@ -30,6 +30,8 @@ jvm_library( "//platform/xdebugger-impl:debugger-impl", "//plugins/kotlin/code-insight/impl-base:kotlin-codeInsight-shared", "//plugins/kotlin/base/psi", + "//platform/util", + "//platform/util/multiplatform", ] ) ### auto-generated section `build intellij.kotlin.jvm.debugger.evaluation` end \ No newline at end of file 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 f388a2563ba2..d8d12b1ee0c6 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 @@ -24,5 +24,7 @@ + + \ No newline at end of file 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 01a13385e8b6..7bf86abb66bf 100644 --- a/plugins/kotlin/jvm-debugger/evaluation/kotlin.jvm-debugger.evaluation.iml +++ b/plugins/kotlin/jvm-debugger/evaluation/kotlin.jvm-debugger.evaluation.iml @@ -13,6 +13,7 @@ + @@ -32,5 +33,6 @@ + \ No newline at end of file diff --git a/plugins/kotlin/jvm-debugger/evaluation/src/org/jetbrains/kotlin/idea/debugger/evaluate/variables/EvaluatorValueConverter.kt b/plugins/kotlin/jvm-debugger/evaluation/src/org/jetbrains/kotlin/idea/debugger/evaluate/variables/EvaluatorValueConverter.kt index 129d3ebf3d37..341a09c652c4 100644 --- a/plugins/kotlin/jvm-debugger/evaluation/src/org/jetbrains/kotlin/idea/debugger/evaluate/variables/EvaluatorValueConverter.kt +++ b/plugins/kotlin/jvm-debugger/evaluation/src/org/jetbrains/kotlin/idea/debugger/evaluate/variables/EvaluatorValueConverter.kt @@ -1,4 +1,4 @@ -// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package org.jetbrains.kotlin.idea.debugger.evaluate.variables @@ -72,7 +72,7 @@ class EvaluatorValueConverter(val context: ExecutionContext) { return unwrappedActualType == unwrappedRequestedType } - fun coerce(value: Value?, type: AsmType): Result? { + internal fun coerce(value: Value?, type: AsmType): Result? { val unrefResult = coerceRef(value, type) return coerceBoxing(unrefResult.value, type) } diff --git a/plugins/kotlin/jvm-debugger/evaluation/src/org/jetbrains/kotlin/idea/debugger/evaluate/variables/VariableFinder.kt b/plugins/kotlin/jvm-debugger/evaluation/src/org/jetbrains/kotlin/idea/debugger/evaluate/variables/VariableFinder.kt index 1e5cf68edd2a..84bb792bfb26 100644 --- a/plugins/kotlin/jvm-debugger/evaluation/src/org/jetbrains/kotlin/idea/debugger/evaluate/variables/VariableFinder.kt +++ b/plugins/kotlin/jvm-debugger/evaluation/src/org/jetbrains/kotlin/idea/debugger/evaluate/variables/VariableFinder.kt @@ -1,4 +1,4 @@ -// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package org.jetbrains.kotlin.idea.debugger.evaluate.variables @@ -34,7 +34,7 @@ import org.jetbrains.org.objectweb.asm.Type as AsmType private const val OLD_CONTEXT_RECEIVER_PREFIX = "_context_receiver" -class VariableFinder(val context: ExecutionContext) { +internal class VariableFinder(val context: ExecutionContext) { private val frameProxy = context.frameProxy companion object { diff --git a/plugins/kotlin/jvm-debugger/test/BUILD.bazel b/plugins/kotlin/jvm-debugger/test/BUILD.bazel index 8b07d5701ab1..2cd027857dfd 100644 --- a/plugins/kotlin/jvm-debugger/test/BUILD.bazel +++ b/plugins/kotlin/jvm-debugger/test/BUILD.bazel @@ -113,6 +113,7 @@ jvm_library( "//plugins/kotlin/base/scripting/scripting.k1", "//plugins/kotlin/base/scripting/scripting.k1:scripting.k1_test_lib", "//plugins/kotlin/idea/tests:tests_test_lib", + "//platform/execution", ], runtime_deps = [ "//platform/core-api:core", 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 cfecbe1e4f31..06f23484f80a 100644 --- a/plugins/kotlin/jvm-debugger/test/kotlin.jvm-debugger.test.iml +++ b/plugins/kotlin/jvm-debugger/test/kotlin.jvm-debugger.test.iml @@ -74,5 +74,6 @@ + \ No newline at end of file diff --git a/plugins/kotlin/jvm/k1/BUILD.bazel b/plugins/kotlin/jvm/k1/BUILD.bazel index 8144ee459249..d0e675b7c92f 100644 --- a/plugins/kotlin/jvm/k1/BUILD.bazel +++ b/plugins/kotlin/jvm/k1/BUILD.bazel @@ -50,6 +50,8 @@ jvm_library( "//platform/core-ui", "//plugins/kotlin/base/scripting/scripting.k1", "//plugins/kotlin/base/scripting/scripting.shared", + "//platform/execution", + "//platform/lang-api:lang", ] ) ### auto-generated section `build kotlin.jvm.k1` end \ No newline at end of file diff --git a/plugins/kotlin/jvm/k1/kotlin.jvm.k1.iml b/plugins/kotlin/jvm/k1/kotlin.jvm.k1.iml index 7b89fe96c98c..4aeb93c2b558 100644 --- a/plugins/kotlin/jvm/k1/kotlin.jvm.k1.iml +++ b/plugins/kotlin/jvm/k1/kotlin.jvm.k1.iml @@ -44,5 +44,7 @@ + + \ No newline at end of file diff --git a/plugins/kotlin/jvm/k1/src/org/jetbrains/kotlin/idea/jvm/k1/scratch/ScratchFileAutoRunnerK1.kt b/plugins/kotlin/jvm/k1/src/org/jetbrains/kotlin/idea/jvm/k1/scratch/ScratchFileAutoRunnerK1.kt index 7d4917845309..c498292b84f5 100644 --- a/plugins/kotlin/jvm/k1/src/org/jetbrains/kotlin/idea/jvm/k1/scratch/ScratchFileAutoRunnerK1.kt +++ b/plugins/kotlin/jvm/k1/src/org/jetbrains/kotlin/idea/jvm/k1/scratch/ScratchFileAutoRunnerK1.kt @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.idea.jvm.shared.scratch.ScratchFileAutoRunner.Compan import org.jetbrains.kotlin.idea.jvm.shared.scratch.actions.ScratchCompilationSupport import org.jetbrains.kotlin.idea.jvm.shared.scratch.ui.findScratchFileEditorWithPreview -class ScratchFileAutoRunnerK1(private val project: Project) : ScratchFileAutoRunner, Disposable { +private class ScratchFileAutoRunnerK1(private val project: Project) : ScratchFileAutoRunner, Disposable { private val myAlarm = Alarm(Alarm.ThreadToUse.POOLED_THREAD, this) override fun documentChanged(event: DocumentEvent) { diff --git a/plugins/kotlin/jvm/k2/BUILD.bazel b/plugins/kotlin/jvm/k2/BUILD.bazel index a52025d08b2c..4918bce341ed 100644 --- a/plugins/kotlin/jvm/k2/BUILD.bazel +++ b/plugins/kotlin/jvm/k2/BUILD.bazel @@ -31,6 +31,7 @@ jvm_library( "//plugins/kotlin/idea", "//plugins/kotlin/base/plugin", "//plugins/kotlin/base/psi", + "//platform/execution", "//java/execution/impl", "//java/java-frontback-psi-api:frontback-psi", "//platform/vcs-impl", diff --git a/plugins/kotlin/jvm/k2/intellij.kotlin.jvm.iml b/plugins/kotlin/jvm/k2/intellij.kotlin.jvm.iml index 1f4f111e4bca..6772fc574790 100644 --- a/plugins/kotlin/jvm/k2/intellij.kotlin.jvm.iml +++ b/plugins/kotlin/jvm/k2/intellij.kotlin.jvm.iml @@ -25,6 +25,7 @@ + diff --git a/plugins/kotlin/jvm/shared/BUILD.bazel b/plugins/kotlin/jvm/shared/BUILD.bazel index 7c1fdf402a80..05e33c610acf 100644 --- a/plugins/kotlin/jvm/shared/BUILD.bazel +++ b/plugins/kotlin/jvm/shared/BUILD.bazel @@ -86,6 +86,7 @@ jvm_library( "//platform/util", "//platform/editor-ui-api:editor-ui", "//plugins/kotlin/base/scripting/scripting.shared", + "//platform/execution", ] ) ### auto-generated section `build kotlin.jvm.shared` end \ No newline at end of file diff --git a/plugins/kotlin/jvm/shared/kotlin.jvm.shared.iml b/plugins/kotlin/jvm/shared/kotlin.jvm.shared.iml index 8568a37ff309..fb6cfff10bda 100644 --- a/plugins/kotlin/jvm/shared/kotlin.jvm.shared.iml +++ b/plugins/kotlin/jvm/shared/kotlin.jvm.shared.iml @@ -84,5 +84,6 @@ + \ No newline at end of file diff --git a/plugins/kotlin/kotlin.searching/BUILD.bazel b/plugins/kotlin/kotlin.searching/BUILD.bazel index ca376c40fe7f..d3436260af49 100644 --- a/plugins/kotlin/kotlin.searching/BUILD.bazel +++ b/plugins/kotlin/kotlin.searching/BUILD.bazel @@ -33,6 +33,7 @@ jvm_library( "//platform/core-api:core", "//platform/indexing-api:indexing", "//platform/lang-impl", + "//platform/platform-api:ide", "@lib//:kotlinc-analysis-api", "//platform/usageView-impl", "//plugins/kotlin/base/indices", diff --git a/plugins/kotlin/kotlin.searching/intellij.kotlin.searching.iml b/plugins/kotlin/kotlin.searching/intellij.kotlin.searching.iml index d24e3a020c7a..51470e9ba47e 100644 --- a/plugins/kotlin/kotlin.searching/intellij.kotlin.searching.iml +++ b/plugins/kotlin/kotlin.searching/intellij.kotlin.searching.iml @@ -31,6 +31,7 @@ + diff --git a/plugins/kotlin/migration/BUILD.bazel b/plugins/kotlin/migration/BUILD.bazel index c742f0a2f9f0..3b49f59719f6 100644 --- a/plugins/kotlin/migration/BUILD.bazel +++ b/plugins/kotlin/migration/BUILD.bazel @@ -17,6 +17,7 @@ jvm_library( "@lib//:kotlin-stdlib", "@lib//:kotlinc-kotlin-compiler-common", "//platform/analysis-api:analysis", + "//platform/lang-api:lang", "//platform/core-api:core", "//plugins/kotlin/base/frontend-agnostic", "//plugins/kotlin/base/util", diff --git a/plugins/kotlin/migration/intellij.kotlin.migration.iml b/plugins/kotlin/migration/intellij.kotlin.migration.iml index 0b498158b2ac..15faeba4525e 100644 --- a/plugins/kotlin/migration/intellij.kotlin.migration.iml +++ b/plugins/kotlin/migration/intellij.kotlin.migration.iml @@ -11,6 +11,7 @@ + diff --git a/plugins/kotlin/performance-tests/BUILD.bazel b/plugins/kotlin/performance-tests/BUILD.bazel index adde42b8494b..4f9f12671373 100644 --- a/plugins/kotlin/performance-tests/BUILD.bazel +++ b/plugins/kotlin/performance-tests/BUILD.bazel @@ -15,6 +15,7 @@ jvm_library( runtime_deps = [ "@lib//:kotlin-stdlib", "@lib//:kotlinc-kotlin-scripting-compiler-impl", + "//platform/execution", "//platform/usageView", "//plugins/kotlin/base/platforms", "//plugins/kotlin/base/facet", @@ -48,6 +49,7 @@ jvm_library( "//platform/indexing-api:indexing", "//jps/model-api:model", "//platform/lang-core", + "//platform/execution", "//platform/projectModel-api:projectModel", "//platform/refactoring", "//plugins/kotlin/plugin/k1", diff --git a/plugins/kotlin/performance-tests/kotlin.performance-tests.iml b/plugins/kotlin/performance-tests/kotlin.performance-tests.iml index 7cd3eb4825e2..c25ca74194c3 100644 --- a/plugins/kotlin/performance-tests/kotlin.performance-tests.iml +++ b/plugins/kotlin/performance-tests/kotlin.performance-tests.iml @@ -23,6 +23,7 @@ + diff --git a/plugins/kotlin/performance-tests/performance-test-utils/BUILD.bazel b/plugins/kotlin/performance-tests/performance-test-utils/BUILD.bazel index 98eb26c93d86..9d52faff171d 100644 --- a/plugins/kotlin/performance-tests/performance-test-utils/BUILD.bazel +++ b/plugins/kotlin/performance-tests/performance-test-utils/BUILD.bazel @@ -26,6 +26,7 @@ jvm_library( "//platform/testFramework", "//platform/testFramework:testFramework_test_lib", "@lib//:kotlin-test-junit", + "//platform/execution", "@lib//:kotlinc-kotlin-compiler-common", "@lib//:kotlinc-kotlin-compiler-fe10", "@lib//:kotlinc-kotlin-compiler-tests", diff --git a/plugins/kotlin/performance-tests/performance-test-utils/kotlin.performance-tests.performance-test-utils.iml b/plugins/kotlin/performance-tests/performance-test-utils/kotlin.performance-tests.performance-test-utils.iml index bf317e72ef50..42d470010969 100644 --- a/plugins/kotlin/performance-tests/performance-test-utils/kotlin.performance-tests.performance-test-utils.iml +++ b/plugins/kotlin/performance-tests/performance-test-utils/kotlin.performance-tests.performance-test-utils.iml @@ -19,6 +19,7 @@ + diff --git a/plugins/kotlin/project-configuration/BUILD.bazel b/plugins/kotlin/project-configuration/BUILD.bazel index 7715b2d4d355..82714c9d88b5 100644 --- a/plugins/kotlin/project-configuration/BUILD.bazel +++ b/plugins/kotlin/project-configuration/BUILD.bazel @@ -62,6 +62,8 @@ jvm_library( "//platform/workspace/storage", "//platform/vcs-impl/shared", "//platform/backend/workspace", + "//platform/forms_rt:java-guiForms-rt", + "//platform/execution", ] ) ### auto-generated section `build intellij.kotlin.projectConfiguration` end \ No newline at end of file diff --git a/plugins/kotlin/project-configuration/intellij.kotlin.projectConfiguration.iml b/plugins/kotlin/project-configuration/intellij.kotlin.projectConfiguration.iml index 0897120f2693..8aa396e063f6 100644 --- a/plugins/kotlin/project-configuration/intellij.kotlin.projectConfiguration.iml +++ b/plugins/kotlin/project-configuration/intellij.kotlin.projectConfiguration.iml @@ -56,5 +56,7 @@ + + \ No newline at end of file diff --git a/plugins/kotlin/project-wizard/idea/BUILD.bazel b/plugins/kotlin/project-wizard/idea/BUILD.bazel index c1d651c4ecb2..ab865d10f850 100644 --- a/plugins/kotlin/project-wizard/idea/BUILD.bazel +++ b/plugins/kotlin/project-wizard/idea/BUILD.bazel @@ -46,6 +46,7 @@ jvm_library( "//platform/vcs-impl", "//platform/external-system-api:externalSystem", "//platform/external-system-impl:externalSystem-impl", + "//platform/execution", "//java/openapi:java", "//java/java-impl:impl", "//java/idea-ui:ui", 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 69f0e4b33d69..503c7b6bd74b 100644 --- a/plugins/kotlin/project-wizard/idea/intellij.kotlin.projectWizard.idea.iml +++ b/plugins/kotlin/project-wizard/idea/intellij.kotlin.projectWizard.idea.iml @@ -40,6 +40,7 @@ + diff --git a/plugins/kotlin/project-wizard/tests/BUILD.bazel b/plugins/kotlin/project-wizard/tests/BUILD.bazel index 9a27ba613136..a1b986af2e29 100644 --- a/plugins/kotlin/project-wizard/tests/BUILD.bazel +++ b/plugins/kotlin/project-wizard/tests/BUILD.bazel @@ -44,6 +44,7 @@ jvm_library( "//plugins/kotlin/project-wizard/core:core_test_lib", "//plugins/kotlin/project-wizard/idea", "//plugins/kotlin/gradle/gradle", + "//platform/execution", "//plugins/kotlin/gradle/gradle-java", "//plugins/kotlin/gradle/gradle-java:gradle-java_test_lib", "//plugins/kotlin/gradle/gradle-java/k1", 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 43d5af2d0368..f8ac120249bf 100644 --- a/plugins/kotlin/project-wizard/tests/kotlin.project-wizard.tests.iml +++ b/plugins/kotlin/project-wizard/tests/kotlin.project-wizard.tests.iml @@ -37,6 +37,7 @@ + diff --git a/plugins/kotlin/refactorings/kotlin.refactorings.k2/BUILD.bazel b/plugins/kotlin/refactorings/kotlin.refactorings.k2/BUILD.bazel index fd4861394a36..5f36ea3e5132 100644 --- a/plugins/kotlin/refactorings/kotlin.refactorings.k2/BUILD.bazel +++ b/plugins/kotlin/refactorings/kotlin.refactorings.k2/BUILD.bazel @@ -74,6 +74,7 @@ jvm_library( "//plugins/kotlin/j2k/shared", "//platform/ide-core-impl", "//plugins/kotlin/kotlin.ide", + "//platform/forms_rt:java-guiForms-rt", ] ) ### auto-generated section `build intellij.kotlin.refactorings` end \ No newline at end of file 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 17ba5a002e60..345f4a24f3f1 100644 --- a/plugins/kotlin/refactorings/kotlin.refactorings.k2/intellij.kotlin.refactorings.iml +++ b/plugins/kotlin/refactorings/kotlin.refactorings.k2/intellij.kotlin.refactorings.iml @@ -70,5 +70,6 @@ + \ No newline at end of file diff --git a/plugins/kotlin/repl/BUILD.bazel b/plugins/kotlin/repl/BUILD.bazel index c114225edac3..2e436657e976 100644 --- a/plugins/kotlin/repl/BUILD.bazel +++ b/plugins/kotlin/repl/BUILD.bazel @@ -61,6 +61,8 @@ jvm_library( "//plugins/kotlin/jsr223", "//plugins/kotlin/base/scripting/scripting.k1", "//plugins/kotlin/base/scripting/scripting.shared", + "//platform/execution", + "//platform/lang-api:lang", ] ) ### auto-generated section `build kotlin.repl` end \ No newline at end of file diff --git a/plugins/kotlin/repl/kotlin.repl.iml b/plugins/kotlin/repl/kotlin.repl.iml index 7244ce0b0f23..ec04a84bfa08 100644 --- a/plugins/kotlin/repl/kotlin.repl.iml +++ b/plugins/kotlin/repl/kotlin.repl.iml @@ -61,5 +61,7 @@ + + \ No newline at end of file diff --git a/plugins/kotlin/repl/src/org/jetbrains/kotlin/console/ConsoleCompilerHelper.kt b/plugins/kotlin/repl/src/org/jetbrains/kotlin/console/ConsoleCompilerHelper.kt index 4553d1219e8c..ea46acea2eba 100644 --- a/plugins/kotlin/repl/src/org/jetbrains/kotlin/console/ConsoleCompilerHelper.kt +++ b/plugins/kotlin/repl/src/org/jetbrains/kotlin/console/ConsoleCompilerHelper.kt @@ -1,4 +1,4 @@ -// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package org.jetbrains.kotlin.console @@ -11,7 +11,7 @@ import com.intellij.openapi.project.Project import com.intellij.task.ProjectTaskManager import com.intellij.task.impl.ProjectTaskManagerImpl -class ConsoleCompilerHelper( +internal class ConsoleCompilerHelper( private val project: Project, private val module: Module, private val executor: Executor, diff --git a/plugins/kotlin/repl/src/org/jetbrains/kotlin/console/KotlinConsoleRunner.kt b/plugins/kotlin/repl/src/org/jetbrains/kotlin/console/KotlinConsoleRunner.kt index 65dae274b34d..76dfee7e1b54 100644 --- a/plugins/kotlin/repl/src/org/jetbrains/kotlin/console/KotlinConsoleRunner.kt +++ b/plugins/kotlin/repl/src/org/jetbrains/kotlin/console/KotlinConsoleRunner.kt @@ -123,7 +123,7 @@ class KotlinConsoleRunner( private var disposableDescriptor by Delegates.notNull() val executor = CommandExecutor(this) - var compilerHelper: ConsoleCompilerHelper by Delegates.notNull() + internal var compilerHelper: ConsoleCompilerHelper by Delegates.notNull() val consoleScriptDefinition = object : ScriptDefinition.FromConfigurations( defaultJvmScriptingHostConfiguration, diff --git a/plugins/kotlin/run-configurations/junit/BUILD.bazel b/plugins/kotlin/run-configurations/junit/BUILD.bazel index 65787708dfd5..3dd9c3e6af77 100644 --- a/plugins/kotlin/run-configurations/junit/BUILD.bazel +++ b/plugins/kotlin/run-configurations/junit/BUILD.bazel @@ -19,6 +19,7 @@ jvm_library( "//java/java-indexing-api:indexing", "//platform/core-api:core", "//platform/execution-impl", + "//platform/execution", "//platform/indexing-api:indexing", "//plugins/kotlin/base/util", "//plugins/kotlin/base/facet", 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 0ed6054de425..fc0be6cbadad 100644 --- a/plugins/kotlin/run-configurations/junit/intellij.kotlin.runConfigurations.junit.iml +++ b/plugins/kotlin/run-configurations/junit/intellij.kotlin.runConfigurations.junit.iml @@ -13,6 +13,7 @@ + diff --git a/plugins/kotlin/run-configurations/jvm/BUILD.bazel b/plugins/kotlin/run-configurations/jvm/BUILD.bazel index f2f5d0aa4619..4944c45dfc98 100644 --- a/plugins/kotlin/run-configurations/jvm/BUILD.bazel +++ b/plugins/kotlin/run-configurations/jvm/BUILD.bazel @@ -48,6 +48,7 @@ jvm_library( "//plugins/kotlin/base/scripting/scripting.shared", "@lib//:kotlinc-kotlin-scripting-common", "@lib//:kotlinc-kotlin-scripting-compiler-impl", + "//platform/forms_rt:java-guiForms-rt", ] ) ### auto-generated section `build intellij.kotlin.runConfigurations.jvm` end \ No newline at end of file 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 f663293a6b18..9aef14556e1a 100644 --- a/plugins/kotlin/run-configurations/jvm/intellij.kotlin.runConfigurations.jvm.iml +++ b/plugins/kotlin/run-configurations/jvm/intellij.kotlin.runConfigurations.jvm.iml @@ -42,5 +42,6 @@ + \ No newline at end of file diff --git a/plugins/kotlin/run-configurations/testng/BUILD.bazel b/plugins/kotlin/run-configurations/testng/BUILD.bazel index a5598a3a1d17..ba460454c777 100644 --- a/plugins/kotlin/run-configurations/testng/BUILD.bazel +++ b/plugins/kotlin/run-configurations/testng/BUILD.bazel @@ -33,6 +33,7 @@ jvm_library( "//plugins/testng", "//java/java-impl:impl", "//plugins/kotlin/base/plugin", + "//platform/execution", ] ) ### auto-generated section `build intellij.kotlin.runConfigurations.testng` end \ No newline at end of file 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 6c6b8e102905..eecdbabf507d 100644 --- a/plugins/kotlin/run-configurations/testng/intellij.kotlin.runConfigurations.testng.iml +++ b/plugins/kotlin/run-configurations/testng/intellij.kotlin.runConfigurations.testng.iml @@ -27,5 +27,6 @@ + \ No newline at end of file diff --git a/plugins/kotlin/test-framework/BUILD.bazel b/plugins/kotlin/test-framework/BUILD.bazel index 1e925737adf9..fa7ed5730cd3 100644 --- a/plugins/kotlin/test-framework/BUILD.bazel +++ b/plugins/kotlin/test-framework/BUILD.bazel @@ -28,6 +28,7 @@ jvm_library( "//platform/editor-ui-api:editor-ui", "//platform/indexing-api:indexing", "//jps/model-api:model", + "//platform/execution", "//platform/lang-core", "//platform/testFramework", "//platform/testFramework:testFramework_test_lib", diff --git a/plugins/kotlin/test-framework/kotlin.test-framework.iml b/plugins/kotlin/test-framework/kotlin.test-framework.iml index 37a393458af8..d9a177cf6c65 100644 --- a/plugins/kotlin/test-framework/kotlin.test-framework.iml +++ b/plugins/kotlin/test-framework/kotlin.test-framework.iml @@ -22,6 +22,7 @@ + diff --git a/plugins/lombok/BUILD.bazel b/plugins/lombok/BUILD.bazel index 15dc35c87a73..381e6021b46d 100644 --- a/plugins/lombok/BUILD.bazel +++ b/plugins/lombok/BUILD.bazel @@ -33,6 +33,7 @@ jvm_library( "//platform/editor-ui-api:editor-ui", "//platform/indexing-api:indexing", "//jps/model-api:model", + "//platform/forms_rt:java-guiForms-rt", "//platform/lang-api:lang", "//platform/analysis-impl", "//java/openapi:java", @@ -71,6 +72,7 @@ jvm_library( "//platform/editor-ui-api:editor-ui", "//platform/indexing-api:indexing", "//jps/model-api:model", + "//platform/forms_rt:java-guiForms-rt", "//platform/lang-api:lang", "//platform/analysis-impl", "//java/openapi:java", diff --git a/plugins/lombok/intellij.lombok.iml b/plugins/lombok/intellij.lombok.iml index 25aeab4f2683..72d2f303d2f5 100644 --- a/plugins/lombok/intellij.lombok.iml +++ b/plugins/lombok/intellij.lombok.iml @@ -19,6 +19,7 @@ + diff --git a/plugins/markdown/core/BUILD.bazel b/plugins/markdown/core/BUILD.bazel index cebfe8bd07a9..5afbe362053c 100644 --- a/plugins/markdown/core/BUILD.bazel +++ b/plugins/markdown/core/BUILD.bazel @@ -65,6 +65,8 @@ jvm_library( "//libraries/kotlinx/serialization/json", "//platform/kernel/shared:kernel", "//platform/platform-impl/rpc", + "//platform/execution", + "//platform/lang-api:lang", ], exports = ["//platform/ui.jcef"] ) diff --git a/plugins/markdown/core/intellij.markdown.iml b/plugins/markdown/core/intellij.markdown.iml index aa26d7cfb48e..669c3b3ac169 100644 --- a/plugins/markdown/core/intellij.markdown.iml +++ b/plugins/markdown/core/intellij.markdown.iml @@ -85,5 +85,7 @@ + + \ No newline at end of file diff --git a/plugins/markdown/images/BUILD.bazel b/plugins/markdown/images/BUILD.bazel index 8dc078c9e148..aa3406c20514 100644 --- a/plugins/markdown/images/BUILD.bazel +++ b/plugins/markdown/images/BUILD.bazel @@ -17,6 +17,7 @@ jvm_library( "//plugins/markdown/core:markdown", "//platform/analysis-api:analysis", "//platform/core-api:core", + "//platform/lang-api:lang", "//platform/editor-ui-api:editor-ui", "//platform/core-impl", "//platform/projectModel-api:projectModel", diff --git a/plugins/markdown/images/intellij.markdown.images.iml b/plugins/markdown/images/intellij.markdown.images.iml index 404d403329cd..e6431f2afd73 100644 --- a/plugins/markdown/images/intellij.markdown.images.iml +++ b/plugins/markdown/images/intellij.markdown.images.iml @@ -11,6 +11,7 @@ + diff --git a/plugins/markdown/model/BUILD.bazel b/plugins/markdown/model/BUILD.bazel index 800eee8d1ba5..68ab88fef4cf 100644 --- a/plugins/markdown/model/BUILD.bazel +++ b/plugins/markdown/model/BUILD.bazel @@ -19,6 +19,7 @@ jvm_library( "//xml/xml-psi-api:psi", "//xml/xml-psi-impl:psi-impl", "//platform/core-api:core", + "//platform/lang-api:lang", "//platform/core-impl", "//platform/lang-impl", "//platform/indexing-api:indexing", diff --git a/plugins/markdown/model/intellij.markdown.model.iml b/plugins/markdown/model/intellij.markdown.model.iml index f5fc0c17d7fe..80a411057dec 100644 --- a/plugins/markdown/model/intellij.markdown.model.iml +++ b/plugins/markdown/model/intellij.markdown.model.iml @@ -13,6 +13,7 @@ + diff --git a/plugins/markdown/test/BUILD.bazel b/plugins/markdown/test/BUILD.bazel index 8d0c9e319993..68957c2b5988 100644 --- a/plugins/markdown/test/BUILD.bazel +++ b/plugins/markdown/test/BUILD.bazel @@ -67,6 +67,7 @@ jvm_library( "//platform/testFramework/junit5", "//platform/testFramework/junit5:junit5_test_lib", "//xml/testFramework", + "//platform/lang-api:lang", ] ) ### 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 e373d0ebddc0..ad0aa5cd2269 100644 --- a/plugins/markdown/test/intellij.markdown.tests.iml +++ b/plugins/markdown/test/intellij.markdown.tests.iml @@ -50,5 +50,6 @@ + \ No newline at end of file diff --git a/plugins/maven/BUILD.bazel b/plugins/maven/BUILD.bazel index 2d34b5cdd99b..3e7a078b3a44 100644 --- a/plugins/maven/BUILD.bazel +++ b/plugins/maven/BUILD.bazel @@ -112,6 +112,7 @@ jvm_library( "//xml/xml-analysis-api:analysis", "//platform/xdebugger-impl:debugger-impl", "//libraries/http-client", + "//platform/execution", ":platform_java-guiForms-rt_provided", ":plugins_maven_artifactResolver-m31_provided", ], diff --git a/plugins/maven/intellij.maven.iml b/plugins/maven/intellij.maven.iml index 6813ce2dfa7b..0c3823b832c5 100644 --- a/plugins/maven/intellij.maven.iml +++ b/plugins/maven/intellij.maven.iml @@ -132,6 +132,7 @@ + diff --git a/plugins/maven/src/test/BUILD.bazel b/plugins/maven/src/test/BUILD.bazel index 65ee81b95564..739dbbcaeb21 100644 --- a/plugins/maven/src/test/BUILD.bazel +++ b/plugins/maven/src/test/BUILD.bazel @@ -83,6 +83,7 @@ jvm_library( "//platform/eel-provider", "//xml/xml-psi-impl:psi-impl", "//xml/xml-ui-common:ui-common", + "//platform/execution", ] ) ### 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 2c22a16c74e3..6acbfc18bd13 100644 --- a/plugins/maven/src/test/intellij.maven.tests.iml +++ b/plugins/maven/src/test/intellij.maven.tests.iml @@ -64,5 +64,6 @@ + \ No newline at end of file diff --git a/plugins/maven/testFramework/BUILD.bazel b/plugins/maven/testFramework/BUILD.bazel index f6c58612a414..f485eb4caebd 100644 --- a/plugins/maven/testFramework/BUILD.bazel +++ b/plugins/maven/testFramework/BUILD.bazel @@ -38,6 +38,7 @@ jvm_library( "//platform/util/progress", "//xml/xml-analysis-api:analysis", "//xml/xml-analysis-impl:analysis-impl", + "//platform/execution", ] ) ### auto-generated section `build intellij.maven.testFramework` end \ No newline at end of file diff --git a/plugins/maven/testFramework/intellij.maven.testFramework.iml b/plugins/maven/testFramework/intellij.maven.testFramework.iml index 919368baec6b..56f2dc37ed67 100644 --- a/plugins/maven/testFramework/intellij.maven.testFramework.iml +++ b/plugins/maven/testFramework/intellij.maven.testFramework.iml @@ -55,5 +55,6 @@ + \ No newline at end of file diff --git a/plugins/mcp-server/BUILD.bazel b/plugins/mcp-server/BUILD.bazel index 7e7f4b46b148..2027db96e8c2 100644 --- a/plugins/mcp-server/BUILD.bazel +++ b/plugins/mcp-server/BUILD.bazel @@ -34,6 +34,7 @@ jvm_library( "//platform/xdebugger-impl:debugger-impl", "//platform/editor-ui-api:editor-ui", "//platform/analysis-api:analysis", + "//platform/lang-api:lang", "//platform/xdebugger-api:debugger", "//platform/refactoring", "//platform/lang-impl", @@ -69,6 +70,7 @@ jvm_library( "//libraries/ktor/network-tls:libraries-ktor-network-tls", "@lib//:mcpserver-ktor-server-cio-internal", "//libraries/ktor/io", + "//platform/execution", ] ) @@ -101,6 +103,7 @@ jvm_library( "//platform/xdebugger-impl:debugger-impl_test_lib", "//platform/editor-ui-api:editor-ui", "//platform/analysis-api:analysis", + "//platform/lang-api:lang", "//platform/xdebugger-api:debugger", "//platform/refactoring", "//platform/lang-impl", @@ -151,6 +154,7 @@ jvm_library( "//libraries/ktor/network-tls:libraries-ktor-network-tls", "@lib//:mcpserver-ktor-server-cio-internal", "//libraries/ktor/io", + "//platform/execution", ] ) ### auto-generated section `build intellij.mcpserver` end diff --git a/plugins/mcp-server/intellij.mcpserver.iml b/plugins/mcp-server/intellij.mcpserver.iml index 3def7fb84440..c863b4b24ea4 100644 --- a/plugins/mcp-server/intellij.mcpserver.iml +++ b/plugins/mcp-server/intellij.mcpserver.iml @@ -53,6 +53,7 @@ + @@ -139,5 +140,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 d7740b75cc13..30b5d498f4ac 100644 --- a/plugins/ml-local-models/java/BUILD.bazel +++ b/plugins/ml-local-models/java/BUILD.bazel @@ -23,6 +23,7 @@ jvm_library( "//platform/editor-ui-api:editor-ui", "//platform/workspace/storage", "//platform/workspace/jps", + "//platform/lang-api:lang", ] ) ### auto-generated section `build intellij.ml.models.local.java` end \ No newline at end of file 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 6bb3417b1365..c7c4c4d1172c 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 @@ -18,5 +18,6 @@ + \ No newline at end of file diff --git a/plugins/ml-local-models/java/src/com/intellij/java/ml/local/JavaFrequencyElementFeatureProvider.kt b/plugins/ml-local-models/java/src/com/intellij/java/ml/local/JavaFrequencyElementFeatureProvider.kt index 0c06444ada94..d259ceb665c3 100644 --- a/plugins/ml-local-models/java/src/com/intellij/java/ml/local/JavaFrequencyElementFeatureProvider.kt +++ b/plugins/ml-local-models/java/src/com/intellij/java/ml/local/JavaFrequencyElementFeatureProvider.kt @@ -12,7 +12,7 @@ import com.intellij.ml.local.models.frequency.classes.ClassesFrequencyLocalModel import com.intellij.psi.PsiClass import com.intellij.psi.PsiMethod -class JavaFrequencyElementFeatureProvider : ElementFeatureProvider { +private class JavaFrequencyElementFeatureProvider : ElementFeatureProvider { override fun getName(): String = "local" override fun calculateFeatures(element: LookupElement, diff --git a/plugins/performanceTesting/core/BUILD.bazel b/plugins/performanceTesting/core/BUILD.bazel index de13d44fe1d4..e57fbffb4331 100644 --- a/plugins/performanceTesting/core/BUILD.bazel +++ b/plugins/performanceTesting/core/BUILD.bazel @@ -31,6 +31,7 @@ jvm_library( "//platform/indexing-api:indexing", "//platform/indexing-impl", "//jps/model-api:model", + "//platform/lang-api:lang", "//platform/lang-core", "//platform/lang-impl", "//platform/projectModel-api:projectModel", @@ -69,6 +70,8 @@ jvm_library( "//platform/eel-provider", "//libraries/jbr", "@lib//:github-oshi-core", + "//platform/execution", + "//platform/forms_rt:java-guiForms-rt", ":libraries_cli-parser_provided", ] ) @@ -92,6 +95,7 @@ jvm_library( "//platform/indexing-api:indexing", "//platform/indexing-impl", "//jps/model-api:model", + "//platform/lang-api:lang", "//platform/lang-core", "//platform/lang-impl", "//platform/projectModel-api:projectModel", @@ -137,6 +141,8 @@ jvm_library( "//platform/eel-provider", "//libraries/jbr", "@lib//:github-oshi-core", + "//platform/execution", + "//platform/forms_rt:java-guiForms-rt", ":libraries_cli-parser_provided", ] ) diff --git a/plugins/performanceTesting/core/intellij.performanceTesting.iml b/plugins/performanceTesting/core/intellij.performanceTesting.iml index 424849deeaec..076398335760 100644 --- a/plugins/performanceTesting/core/intellij.performanceTesting.iml +++ b/plugins/performanceTesting/core/intellij.performanceTesting.iml @@ -21,6 +21,7 @@ + @@ -61,5 +62,7 @@ + + \ No newline at end of file diff --git a/plugins/performanceTesting/scripts-ui/BUILD.bazel b/plugins/performanceTesting/scripts-ui/BUILD.bazel index ea091c9b1b05..a6d6560067ea 100644 --- a/plugins/performanceTesting/scripts-ui/BUILD.bazel +++ b/plugins/performanceTesting/scripts-ui/BUILD.bazel @@ -23,6 +23,7 @@ jvm_library( "//platform/platform-api:ide", "//platform/platform-impl:ide-impl", "//platform/core-ui", + "//platform/forms_rt:java-guiForms-rt", ] ) @@ -44,6 +45,7 @@ jvm_library( "//platform/core-ui", "//platform/testFramework", "//platform/testFramework:testFramework_test_lib", + "//platform/forms_rt:java-guiForms-rt", ] ) ### 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 57b981fcaf42..cf323c4f2d34 100644 --- a/plugins/performanceTesting/scripts-ui/intellij.performanceTesting.ui.iml +++ b/plugins/performanceTesting/scripts-ui/intellij.performanceTesting.ui.iml @@ -20,5 +20,6 @@ + \ No newline at end of file diff --git a/plugins/properties/BUILD.bazel b/plugins/properties/BUILD.bazel index 8e77763ffd46..f4cf54dfe13d 100644 --- a/plugins/properties/BUILD.bazel +++ b/plugins/properties/BUILD.bazel @@ -40,6 +40,7 @@ jvm_library( "//platform/structuralsearch:structuralSearch", "//plugins/properties/properties-common:properties", "//platform/diff-impl", + "//platform/forms_rt:java-guiForms-rt", ], runtime_deps = ["//platform/backend"] ) diff --git a/plugins/properties/intellij.properties.backend.iml b/plugins/properties/intellij.properties.backend.iml index 74ceb9209ee0..7e4e3e28a3fb 100644 --- a/plugins/properties/intellij.properties.backend.iml +++ b/plugins/properties/intellij.properties.backend.iml @@ -35,5 +35,6 @@ + \ No newline at end of file diff --git a/plugins/properties/properties-common/BUILD.bazel b/plugins/properties/properties-common/BUILD.bazel index 31bfa30bb709..186afd2f9c98 100644 --- a/plugins/properties/properties-common/BUILD.bazel +++ b/plugins/properties/properties-common/BUILD.bazel @@ -29,6 +29,7 @@ jvm_library( "//platform/lang-impl", "//platform/platform-impl:ide-impl", "//platform/refactoring", + "//platform/lang-api:lang", ] ) ### auto-generated section `build intellij.properties` end \ No newline at end of file diff --git a/plugins/properties/properties-common/intellij.properties.iml b/plugins/properties/properties-common/intellij.properties.iml index 197ca56151cc..09b62cdfe151 100644 --- a/plugins/properties/properties-common/intellij.properties.iml +++ b/plugins/properties/properties-common/intellij.properties.iml @@ -24,5 +24,6 @@ + \ No newline at end of file diff --git a/plugins/properties/properties-common/src/com/intellij/lang/properties/codeStyle/PropertiesCodeStyleSettingsPanel.java b/plugins/properties/properties-common/src/com/intellij/lang/properties/codeStyle/PropertiesCodeStyleSettingsPanel.java index 6497bf76632d..4ffe51758f44 100644 --- a/plugins/properties/properties-common/src/com/intellij/lang/properties/codeStyle/PropertiesCodeStyleSettingsPanel.java +++ b/plugins/properties/properties-common/src/com/intellij/lang/properties/codeStyle/PropertiesCodeStyleSettingsPanel.java @@ -1,4 +1,4 @@ -// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.lang.properties.codeStyle; import com.intellij.application.options.codeStyle.OptionTableWithPreviewPanel; @@ -7,13 +7,10 @@ import com.intellij.lang.properties.PropertiesBundle; import com.intellij.lang.properties.PropertiesLanguage; import com.intellij.psi.codeStyle.CodeStyleSettings; import com.intellij.psi.codeStyle.LanguageCodeStyleSettingsProvider; -import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.NotNull; -/** - * @author Dmitry Batkovich - */ -public class PropertiesCodeStyleSettingsPanel extends OptionTableWithPreviewPanel { - public PropertiesCodeStyleSettingsPanel(CodeStyleSettings settings) { +final class PropertiesCodeStyleSettingsPanel extends OptionTableWithPreviewPanel { + PropertiesCodeStyleSettingsPanel(CodeStyleSettings settings) { super(settings); init(); } @@ -29,7 +26,7 @@ public class PropertiesCodeStyleSettingsPanel extends OptionTableWithPreviewPane } @Override - public @Nullable Language getDefaultLanguage() { + public @NotNull Language getDefaultLanguage() { return PropertiesLanguage.INSTANCE; } } diff --git a/plugins/properties/properties-psi-impl/BUILD.bazel b/plugins/properties/properties-psi-impl/BUILD.bazel index e2d014ef3aec..d5176eb09d66 100644 --- a/plugins/properties/properties-psi-impl/BUILD.bazel +++ b/plugins/properties/properties-psi-impl/BUILD.bazel @@ -36,6 +36,7 @@ jvm_library( "//platform/util/jdom", "//plugins/properties/properties-common:properties", "//xml/xml-psi-impl:psi-impl", + "//platform/lang-api:lang", ], exports = [ "//plugins/properties/properties-psi-api:psi", 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 efd3d770feb5..6d81e95f5e8c 100644 --- a/plugins/properties/properties-psi-impl/intellij.properties.backend.psi.iml +++ b/plugins/properties/properties-psi-impl/intellij.properties.backend.psi.iml @@ -31,5 +31,6 @@ + \ No newline at end of file diff --git a/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/provider/PropertiesProviderImpl.java b/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/provider/PropertiesProviderImpl.java index 4388abbb23d0..485667e0c4a9 100644 --- a/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/provider/PropertiesProviderImpl.java +++ b/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/provider/PropertiesProviderImpl.java @@ -12,7 +12,7 @@ import org.jetbrains.annotations.Nullable; import java.util.Collection; -public class PropertiesProviderImpl implements PropertiesProvider { +final class PropertiesProviderImpl implements PropertiesProvider { @Override public @Nullable String getPropertyValue(@NotNull String propertyKey, @NotNull GlobalSearchScope scope) { Project project = scope.getProject(); diff --git a/plugins/properties/properties-resource-bundle-editor/BUILD.bazel b/plugins/properties/properties-resource-bundle-editor/BUILD.bazel index 377cc97fd9e0..cd45c5f7b686 100644 --- a/plugins/properties/properties-resource-bundle-editor/BUILD.bazel +++ b/plugins/properties/properties-resource-bundle-editor/BUILD.bazel @@ -17,6 +17,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/projectModel-api:projectModel", "//platform/core-impl", @@ -34,6 +35,7 @@ jvm_library( "//platform/core-ui", "//libraries/fastutil", "//platform/util/jdom", + "//platform/forms_rt:java-guiForms-rt", ], runtime_deps = ["//platform/backend"] ) @@ -48,6 +50,7 @@ jvm_library( "//platform/util/concurrency", "//platform/util/concurrency:concurrency_test_lib", "//platform/core-api:core", + "//platform/lang-api:lang", "//platform/editor-ui-api:editor-ui", "//platform/projectModel-api:projectModel", "//platform/core-impl", @@ -67,6 +70,7 @@ jvm_library( "//platform/core-ui", "//libraries/fastutil", "//platform/util/jdom", + "//platform/forms_rt:java-guiForms-rt", ] ) ### auto-generated section `build intellij.properties.resource.bundle.editor` end diff --git a/plugins/properties/properties-resource-bundle-editor/intellij.properties.resource.bundle.editor.iml b/plugins/properties/properties-resource-bundle-editor/intellij.properties.resource.bundle.editor.iml index ba8a20965315..2640aac10f5f 100644 --- a/plugins/properties/properties-resource-bundle-editor/intellij.properties.resource.bundle.editor.iml +++ b/plugins/properties/properties-resource-bundle-editor/intellij.properties.resource.bundle.editor.iml @@ -12,6 +12,7 @@ + @@ -31,5 +32,6 @@ + \ No newline at end of file diff --git a/plugins/properties/tests/BUILD.bazel b/plugins/properties/tests/BUILD.bazel index 33cb818f6b6d..3432ea4570a8 100644 --- a/plugins/properties/tests/BUILD.bazel +++ b/plugins/properties/tests/BUILD.bazel @@ -50,6 +50,7 @@ jvm_library( "//platform/diff-impl", "//xml/xml-psi-api:psi", "//libraries/fastutil", + "@lib//:jet_check", ], exports = ["//plugins/properties:properties-backend"] ) diff --git a/plugins/properties/tests/intellij.properties.tests.iml b/plugins/properties/tests/intellij.properties.tests.iml index 8f09dcb118ae..b98685708a4d 100644 --- a/plugins/properties/tests/intellij.properties.tests.iml +++ b/plugins/properties/tests/intellij.properties.tests.iml @@ -40,5 +40,6 @@ + \ No newline at end of file diff --git a/plugins/rareJavaRefactorings/BUILD.bazel b/plugins/rareJavaRefactorings/BUILD.bazel index 6cabd6d47f25..fd6a5cff8a33 100644 --- a/plugins/rareJavaRefactorings/BUILD.bazel +++ b/plugins/rareJavaRefactorings/BUILD.bazel @@ -30,6 +30,7 @@ jvm_library( "//java/java-impl-refactorings:impl-refactorings", "//libraries/stream", "//libraries/fastutil", + "//platform/forms_rt:java-guiForms-rt", ] ) @@ -59,6 +60,7 @@ jvm_library( "//java/java-impl-refactorings:impl-refactorings", "//libraries/stream", "//libraries/fastutil", + "//platform/forms_rt:java-guiForms-rt", ] ) ### auto-generated section `build intellij.java.rareRefactorings` end diff --git a/plugins/rareJavaRefactorings/intellij.java.rareRefactorings.iml b/plugins/rareJavaRefactorings/intellij.java.rareRefactorings.iml index e691d9e34434..36ba371afde6 100644 --- a/plugins/rareJavaRefactorings/intellij.java.rareRefactorings.iml +++ b/plugins/rareJavaRefactorings/intellij.java.rareRefactorings.iml @@ -27,5 +27,6 @@ + \ No newline at end of file diff --git a/plugins/search-everywhere-ml/ranking/core/BUILD.bazel b/plugins/search-everywhere-ml/ranking/core/BUILD.bazel index f8a9d50fc722..ff0d4bf53c0a 100644 --- a/plugins/search-everywhere-ml/ranking/core/BUILD.bazel +++ b/plugins/search-everywhere-ml/ranking/core/BUILD.bazel @@ -21,6 +21,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/platform-impl:ide-impl", "//libraries/caffeine", @@ -47,6 +48,7 @@ jvm_library( "@lib//:search_everywhere_ml-ranking-core-find-ec-model-experimental", "//plugins/search-everywhere-ml/ranking/ext", "//plugins/search-everywhere-ml", + "//platform/execution", ], exports = ["//platform/statistics"] ) @@ -65,6 +67,7 @@ jvm_library( "//platform/util/concurrency", "//platform/util/concurrency:concurrency_test_lib", "//platform/core-api:core", + "//platform/lang-api:lang", "//platform/editor-ui-api:editor-ui", "//platform/platform-impl:ide-impl", "//libraries/caffeine", @@ -99,6 +102,7 @@ jvm_library( "//plugins/search-everywhere-ml:search-everywhere-ml_test_lib", "//platform/bookmarks", "//platform/statistics/testFramework", + "//platform/execution", ], exports = [ "//platform/statistics", 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 acfbc4cafde2..d2b16c3433df 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 @@ -16,6 +16,7 @@ + @@ -182,5 +183,6 @@ + \ No newline at end of file diff --git a/plugins/search-everywhere-ml/ranking/java/BUILD.bazel b/plugins/search-everywhere-ml/ranking/java/BUILD.bazel index 926d4f36df39..896b3d1bffaf 100644 --- a/plugins/search-everywhere-ml/ranking/java/BUILD.bazel +++ b/plugins/search-everywhere-ml/ranking/java/BUILD.bazel @@ -16,6 +16,7 @@ jvm_library( deps = [ "@lib//:kotlin-stdlib", "//platform/core-api:core", + "//platform/lang-api:lang", "//plugins/search-everywhere-ml/ranking/core", "//platform/lang-impl", "//java/java-psi-api:psi", 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 b6a20cf2cbfa..f25d8f912893 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 @@ -10,6 +10,7 @@ + diff --git a/plugins/search-everywhere-ml/ranking/vcs/BUILD.bazel b/plugins/search-everywhere-ml/ranking/vcs/BUILD.bazel index 3519d6f0fd50..bb2c48392b7f 100644 --- a/plugins/search-everywhere-ml/ranking/vcs/BUILD.bazel +++ b/plugins/search-everywhere-ml/ranking/vcs/BUILD.bazel @@ -16,6 +16,7 @@ jvm_library( deps = [ "@lib//:kotlin-stdlib", "//platform/core-api:core", + "//platform/lang-api:lang", "//platform/editor-ui-api:editor-ui", "//platform/lang-impl", "//platform/vcs-api:vcs", 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 7c9130f5e836..952dd063ab77 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 @@ -10,6 +10,7 @@ + diff --git a/plugins/search-everywhere-ml/ranking/yaml/BUILD.bazel b/plugins/search-everywhere-ml/ranking/yaml/BUILD.bazel index 118138b70386..41f800d45f6e 100644 --- a/plugins/search-everywhere-ml/ranking/yaml/BUILD.bazel +++ b/plugins/search-everywhere-ml/ranking/yaml/BUILD.bazel @@ -18,6 +18,7 @@ jvm_library( "//platform/projectModel-api:projectModel", "//plugins/yaml/backend", "//platform/analysis-api:analysis", + "//platform/lang-api:lang", "//platform/core-api:core", "//platform/platform-impl:ide-impl", "//platform/lang-impl", 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 cf02dcd2222c..b0acdc091baa 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 @@ -12,6 +12,7 @@ + diff --git a/plugins/search-everywhere-ml/typos/BUILD.bazel b/plugins/search-everywhere-ml/typos/BUILD.bazel index 7768d9dbd2f3..2472db13ff0c 100644 --- a/plugins/search-everywhere-ml/typos/BUILD.bazel +++ b/plugins/search-everywhere-ml/typos/BUILD.bazel @@ -18,6 +18,7 @@ jvm_library( "@lib//:kotlinx-coroutines-core", "//platform/analysis-api:analysis", "//platform/core-api:core", + "//platform/lang-api:lang", "//platform/editor-ui-api:editor-ui", "//platform/lang-impl", "//platform/core-impl", @@ -43,6 +44,7 @@ jvm_library( "@lib//:kotlinx-coroutines-core", "//platform/analysis-api:analysis", "//platform/core-api:core", + "//platform/lang-api:lang", "//platform/core-ui", "//platform/editor-ui-api:editor-ui", "//platform/lang-impl", diff --git a/plugins/search-everywhere-ml/typos/intellij.searchEverywhereMl.typos.iml b/plugins/search-everywhere-ml/typos/intellij.searchEverywhereMl.typos.iml index 0055018b5d16..84e7cd7cb538 100644 --- a/plugins/search-everywhere-ml/typos/intellij.searchEverywhereMl.typos.iml +++ b/plugins/search-everywhere-ml/typos/intellij.searchEverywhereMl.typos.iml @@ -13,6 +13,7 @@ + diff --git a/plugins/sh/backend/BUILD.bazel b/plugins/sh/backend/BUILD.bazel index ca17e742a13a..383fe3138641 100644 --- a/plugins/sh/backend/BUILD.bazel +++ b/plugins/sh/backend/BUILD.bazel @@ -40,6 +40,8 @@ jvm_library( "//platform/code-style-impl:codeStyle-impl", "//platform/projectModel-api:projectModel", "//platform/refactoring", + "//platform/execution", + "//platform/forms_rt:java-guiForms-rt", ], runtime_deps = ["//platform/backend"] ) diff --git a/plugins/sh/backend/intellij.sh.backend.iml b/plugins/sh/backend/intellij.sh.backend.iml index f9ab7136f166..8d6c8b04b09d 100644 --- a/plugins/sh/backend/intellij.sh.backend.iml +++ b/plugins/sh/backend/intellij.sh.backend.iml @@ -35,5 +35,7 @@ + + \ No newline at end of file diff --git a/plugins/sh/core/BUILD.bazel b/plugins/sh/core/BUILD.bazel index c2c86cb914d3..62a1929a8ae8 100644 --- a/plugins/sh/core/BUILD.bazel +++ b/plugins/sh/core/BUILD.bazel @@ -25,6 +25,7 @@ jvm_library( "//platform/refactoring", "//platform/statistics", "//platform/core-ui", + "//platform/forms_rt:java-guiForms-rt", "//libraries/fastutil", "//platform/code-style-impl:codeStyle-impl", "//platform/platform-util-io:ide-util-io", @@ -35,6 +36,7 @@ jvm_library( "//platform/analysis-api:analysis", "//platform/projectModel-api:projectModel", "//platform/core-impl", + "//platform/execution", ] ) ### auto-generated section `build intellij.sh.core` end @@ -68,6 +70,7 @@ jvm_library( "//platform/testFramework", "//platform/testFramework:testFramework_test_lib", "//platform/analysis-impl", + "//platform/lang-api:lang", "//platform/lang-impl", "//platform/eel", "//platform/eel-provider", diff --git a/plugins/sh/core/intellij.sh.core.iml b/plugins/sh/core/intellij.sh.core.iml index 2302a54156ff..387c51def788 100644 --- a/plugins/sh/core/intellij.sh.core.iml +++ b/plugins/sh/core/intellij.sh.core.iml @@ -20,6 +20,7 @@ + @@ -30,5 +31,6 @@ + \ No newline at end of file diff --git a/plugins/sh/core/intellij.sh.tests.iml b/plugins/sh/core/intellij.sh.tests.iml index 075f94323f86..8abc5b5bb110 100644 --- a/plugins/sh/core/intellij.sh.tests.iml +++ b/plugins/sh/core/intellij.sh.tests.iml @@ -21,6 +21,7 @@ + diff --git a/plugins/sh/markdown/BUILD.bazel b/plugins/sh/markdown/BUILD.bazel index 94575fb602c9..a6368321e50f 100644 --- a/plugins/sh/markdown/BUILD.bazel +++ b/plugins/sh/markdown/BUILD.bazel @@ -16,10 +16,12 @@ jvm_library( deps = [ "//plugins/markdown/core:markdown", "//platform/core-api:core", + "//platform/lang-api:lang", "//plugins/sh/core", "//platform/execution-impl", "//platform/platform-util-io:ide-util-io", "//platform/lang-impl", + "//platform/execution", ], runtime_deps = ["//platform/backend"] ) diff --git a/plugins/sh/markdown/intellij.sh.markdown.iml b/plugins/sh/markdown/intellij.sh.markdown.iml index 7d7fa42bedb1..663902698c33 100644 --- a/plugins/sh/markdown/intellij.sh.markdown.iml +++ b/plugins/sh/markdown/intellij.sh.markdown.iml @@ -10,10 +10,12 @@ + + \ No newline at end of file diff --git a/plugins/stream-debugger-core/intellij.debugger.streams.backend/BUILD.bazel b/plugins/stream-debugger-core/intellij.debugger.streams.backend/BUILD.bazel index 04e6d72e397a..9963a8ecd77a 100644 --- a/plugins/stream-debugger-core/intellij.debugger.streams.backend/BUILD.bazel +++ b/plugins/stream-debugger-core/intellij.debugger.streams.backend/BUILD.bazel @@ -24,6 +24,7 @@ jvm_library( "//platform/xdebugger-api:debugger", "//plugins/stream-debugger-core:debugger-streams-core", "//platform/core-api:core", + "//platform/util", "//platform/xdebugger-impl/rpc", ] ) diff --git a/plugins/stream-debugger-core/intellij.debugger.streams.backend/intellij.debugger.streams.backend.iml b/plugins/stream-debugger-core/intellij.debugger.streams.backend/intellij.debugger.streams.backend.iml index 0461d15b08e3..3be63aa030a1 100644 --- a/plugins/stream-debugger-core/intellij.debugger.streams.backend/intellij.debugger.streams.backend.iml +++ b/plugins/stream-debugger-core/intellij.debugger.streams.backend/intellij.debugger.streams.backend.iml @@ -43,6 +43,7 @@ + \ No newline at end of file diff --git a/plugins/stream-debugger-core/testFramework/BUILD.bazel b/plugins/stream-debugger-core/testFramework/BUILD.bazel index cc304f7f9599..ecb5a0c71334 100644 --- a/plugins/stream-debugger-core/testFramework/BUILD.bazel +++ b/plugins/stream-debugger-core/testFramework/BUILD.bazel @@ -20,6 +20,7 @@ jvm_library( "//plugins/stream-debugger-core:debugger-streams-core", "//platform/core-api:core", "//platform/xdebugger-api:debugger", + "//platform/util", ] ) ### auto-generated section `build intellij.debugger.streams.core.testFramework` end \ No newline at end of file diff --git a/plugins/stream-debugger-core/testFramework/intellij.debugger.streams.core.testFramework.iml b/plugins/stream-debugger-core/testFramework/intellij.debugger.streams.core.testFramework.iml index 8ce6a6f82460..52f4fa238927 100644 --- a/plugins/stream-debugger-core/testFramework/intellij.debugger.streams.core.testFramework.iml +++ b/plugins/stream-debugger-core/testFramework/intellij.debugger.streams.core.testFramework.iml @@ -14,5 +14,6 @@ + \ No newline at end of file diff --git a/plugins/stream-debugger/BUILD.bazel b/plugins/stream-debugger/BUILD.bazel index 9fe2e9fd4851..f0b267cb0a1c 100644 --- a/plugins/stream-debugger/BUILD.bazel +++ b/plugins/stream-debugger/BUILD.bazel @@ -44,6 +44,7 @@ jvm_library( "//platform/platform-impl:ide-impl", "//jps/model-api:model", "//platform/lang-core", + "//platform/execution", "//platform/testFramework", "//platform/testFramework:testFramework_test_lib", "//plugins/stream-debugger-core:debugger-streams-core", diff --git a/plugins/stream-debugger/intellij.java.debugger.streams.iml b/plugins/stream-debugger/intellij.java.debugger.streams.iml index d350173d8248..3f71abccd562 100644 --- a/plugins/stream-debugger/intellij.java.debugger.streams.iml +++ b/plugins/stream-debugger/intellij.java.debugger.streams.iml @@ -15,6 +15,7 @@ + diff --git a/plugins/svn4idea/BUILD.bazel b/plugins/svn4idea/BUILD.bazel index 9f04b8a7398b..bf2db9d4e6b4 100644 --- a/plugins/svn4idea/BUILD.bazel +++ b/plugins/svn4idea/BUILD.bazel @@ -32,6 +32,7 @@ jvm_library( "//platform/diff-impl", "//platform/util/concurrency", "//platform/util-ex", + "//platform/forms_rt:java-guiForms-rt", "//libraries/guava", "//libraries/ini4j", "//libraries/oro-matcher", @@ -89,6 +90,7 @@ jvm_library( "//libraries/stream", "//platform/core-ui", "//platform/platform-util-io:ide-util-io", + "//platform/forms_rt:java-guiForms-rt", ] ) ### auto-generated section `build intellij.vcs.svn.tests` end diff --git a/plugins/svn4idea/intellij.vcs.svn.iml b/plugins/svn4idea/intellij.vcs.svn.iml index 96b15a400dfe..9d704ec26a58 100644 --- a/plugins/svn4idea/intellij.vcs.svn.iml +++ b/plugins/svn4idea/intellij.vcs.svn.iml @@ -27,6 +27,7 @@ + diff --git a/plugins/svn4idea/intellij.vcs.svn.tests.iml b/plugins/svn4idea/intellij.vcs.svn.tests.iml index 7dd51a73be37..4cce984eb449 100644 --- a/plugins/svn4idea/intellij.vcs.svn.tests.iml +++ b/plugins/svn4idea/intellij.vcs.svn.tests.iml @@ -27,5 +27,6 @@ + \ No newline at end of file diff --git a/plugins/tasks/tasks-api/BUILD.bazel b/plugins/tasks/tasks-api/BUILD.bazel index 21cecce222a1..5afe008c1b4d 100644 --- a/plugins/tasks/tasks-api/BUILD.bazel +++ b/plugins/tasks/tasks-api/BUILD.bazel @@ -14,6 +14,7 @@ jvm_library( "//platform/projectModel-api:projectModel", "//platform/vcs-api:vcs", "//platform/platform-impl:ide-impl", + "//platform/forms_rt:java-guiForms-rt", "//platform/tasks-platform-api:tasks", "//platform/core-ui", "//platform/util-ex", diff --git a/plugins/tasks/tasks-api/intellij.tasks.iml b/plugins/tasks/tasks-api/intellij.tasks.iml index 8d6503a45aff..aee5818601f3 100644 --- a/plugins/tasks/tasks-api/intellij.tasks.iml +++ b/plugins/tasks/tasks-api/intellij.tasks.iml @@ -14,6 +14,7 @@ + diff --git a/plugins/tasks/tasks-core/BUILD.bazel b/plugins/tasks/tasks-core/BUILD.bazel index 595abcbe67d3..6cec0716bd1b 100644 --- a/plugins/tasks/tasks-core/BUILD.bazel +++ b/plugins/tasks/tasks-core/BUILD.bazel @@ -27,6 +27,7 @@ jvm_library( "//libraries/gson", "//xml/impl", "//platform/core-api:core", + "//platform/lang-api:lang", "//RegExpSupport:regexp", "//platform/xdebugger-api:debugger", "//platform/xdebugger-impl:debugger-impl", @@ -44,6 +45,7 @@ jvm_library( "//platform/markdown-utils", "//platform/util/text-matching", "//platform/polySymbols", + "//platform/forms_rt:java-guiForms-rt", ], exports = ["//plugins/tasks/tasks-core/lib:axis-1-4"] ) diff --git a/plugins/tasks/tasks-core/intellij.tasks.core.iml b/plugins/tasks/tasks-core/intellij.tasks.core.iml index 8fe0051f2eea..49a465ee22b7 100644 --- a/plugins/tasks/tasks-core/intellij.tasks.core.iml +++ b/plugins/tasks/tasks-core/intellij.tasks.core.iml @@ -33,6 +33,7 @@ + @@ -67,5 +68,6 @@ + \ No newline at end of file diff --git a/plugins/terminal/BUILD.bazel b/plugins/terminal/BUILD.bazel index a9db1a2749b7..7e77bedb28df 100644 --- a/plugins/terminal/BUILD.bazel +++ b/plugins/terminal/BUILD.bazel @@ -65,6 +65,7 @@ jvm_library( "//platform/eel", "//platform/eel-provider", "//platform/util/jdom", + "//platform/execution", ] ) ### auto-generated section `build intellij.terminal` end \ No newline at end of file diff --git a/plugins/terminal/backend/BUILD.bazel b/plugins/terminal/backend/BUILD.bazel index 2c7e9a0a475b..f830f2956758 100644 --- a/plugins/terminal/backend/BUILD.bazel +++ b/plugins/terminal/backend/BUILD.bazel @@ -33,6 +33,7 @@ jvm_library( "//platform/lang-api:lang", "//platform/eel", "//platform/eel-provider", + "//platform/execution", ] ) ### auto-generated section `build intellij.terminal.backend` end \ No newline at end of file diff --git a/plugins/terminal/backend/intellij.terminal.backend.iml b/plugins/terminal/backend/intellij.terminal.backend.iml index 342e60c548fe..ea615063bd95 100644 --- a/plugins/terminal/backend/intellij.terminal.backend.iml +++ b/plugins/terminal/backend/intellij.terminal.backend.iml @@ -52,5 +52,6 @@ + \ No newline at end of file diff --git a/plugins/terminal/frontend/BUILD.bazel b/plugins/terminal/frontend/BUILD.bazel index d18a8b575a3b..74b11f56de4f 100644 --- a/plugins/terminal/frontend/BUILD.bazel +++ b/plugins/terminal/frontend/BUILD.bazel @@ -49,6 +49,7 @@ jvm_library( "//platform/project/shared:project", "//libraries/pty4j", "//platform/util/jdom", + "//platform/lang-api:lang", ] ) ### auto-generated section `build intellij.terminal.frontend` end \ No newline at end of file diff --git a/plugins/terminal/frontend/intellij.terminal.frontend.iml b/plugins/terminal/frontend/intellij.terminal.frontend.iml index 8cca0a65e64a..f93d91839d5e 100644 --- a/plugins/terminal/frontend/intellij.terminal.frontend.iml +++ b/plugins/terminal/frontend/intellij.terminal.frontend.iml @@ -68,5 +68,6 @@ + \ No newline at end of file diff --git a/plugins/terminal/frontend/src/com/intellij/terminal/frontend/view/impl/TerminalToolWindowSplitContentProvider.kt b/plugins/terminal/frontend/src/com/intellij/terminal/frontend/view/impl/TerminalToolWindowSplitContentProvider.kt index 74ae01eb0416..293cfac0c69d 100644 --- a/plugins/terminal/frontend/src/com/intellij/terminal/frontend/view/impl/TerminalToolWindowSplitContentProvider.kt +++ b/plugins/terminal/frontend/src/com/intellij/terminal/frontend/view/impl/TerminalToolWindowSplitContentProvider.kt @@ -12,7 +12,7 @@ import org.jetbrains.plugins.terminal.TerminalToolWindowManager import org.jetbrains.plugins.terminal.fus.TerminalOpeningWay import org.jetbrains.plugins.terminal.fus.TerminalStartupFusInfo -internal class TerminalToolWindowSplitContentProvider : ToolWindowSplitContentProvider { +private class TerminalToolWindowSplitContentProvider : ToolWindowSplitContentProvider { override fun createContentCopy(project: Project, content: Content): Content { val fusInfo = TerminalStartupFusInfo(TerminalOpeningWay.SPLIT_TOOLWINDOW) diff --git a/plugins/terminal/intellij.terminal.iml b/plugins/terminal/intellij.terminal.iml index 3e6de95be4b6..1af0be27039c 100644 --- a/plugins/terminal/intellij.terminal.iml +++ b/plugins/terminal/intellij.terminal.iml @@ -116,5 +116,6 @@ + \ No newline at end of file diff --git a/plugins/terminal/tests/BUILD.bazel b/plugins/terminal/tests/BUILD.bazel index 7bbda78f808a..a83950f0dfbe 100644 --- a/plugins/terminal/tests/BUILD.bazel +++ b/plugins/terminal/tests/BUILD.bazel @@ -58,6 +58,7 @@ jvm_library( "//platform/testFramework/junit5", "//platform/testFramework/junit5:junit5_test_lib", "//platform/platform-impl/eel:ide-impl-wsl", + "//platform/execution", ] ) ### auto-generated section `build intellij.terminal.tests` end diff --git a/plugins/terminal/tests/intellij.terminal.tests.iml b/plugins/terminal/tests/intellij.terminal.tests.iml index bcd34064c25a..3dc29a737d8e 100644 --- a/plugins/terminal/tests/intellij.terminal.tests.iml +++ b/plugins/terminal/tests/intellij.terminal.tests.iml @@ -41,5 +41,6 @@ + \ No newline at end of file diff --git a/plugins/testng/BUILD.bazel b/plugins/testng/BUILD.bazel index 6b554ea380ac..b6dfe50311d0 100644 --- a/plugins/testng/BUILD.bazel +++ b/plugins/testng/BUILD.bazel @@ -55,11 +55,13 @@ jvm_library( "//java/typeMigration", "//platform/external-system-api:externalSystem", "//platform/core-ui", + "//platform/forms_rt:java-guiForms-rt", "//platform/platform-util-io:ide-util-io", "//java/java-impl-refactorings:impl-refactorings", "//platform/util/jdom", "//xml/xml-psi-api:psi", "@lib//:jgoodies-forms", + "//platform/execution", ] ) @@ -107,12 +109,14 @@ jvm_library( "//java/typeMigration:typeMigration_test_lib", "//platform/external-system-api:externalSystem", "//platform/core-ui", + "//platform/forms_rt:java-guiForms-rt", "@lib//:junit4", "//platform/platform-util-io:ide-util-io", "//java/java-impl-refactorings:impl-refactorings", "//platform/util/jdom", "//xml/xml-psi-api:psi", "@lib//:jgoodies-forms", + "//platform/execution", ] ) ### auto-generated section `build intellij.testng` end diff --git a/plugins/testng/intellij.testng.iml b/plugins/testng/intellij.testng.iml index 5a34a5323836..c41b2a4e0d9e 100644 --- a/plugins/testng/intellij.testng.iml +++ b/plugins/testng/intellij.testng.iml @@ -41,12 +41,14 @@ + + diff --git a/plugins/testng_rt/tests/BUILD.bazel b/plugins/testng_rt/tests/BUILD.bazel index a3157198e115..1db3dda28bc9 100644 --- a/plugins/testng_rt/tests/BUILD.bazel +++ b/plugins/testng_rt/tests/BUILD.bazel @@ -15,6 +15,7 @@ jvm_library( deps = [ "//java/java-tests:tests_test_lib", "//platform/core-api:core", + "//platform/execution", "//platform/execution-impl", "//jps/model-api:model", "//platform/projectModel-api:projectModel", diff --git a/plugins/testng_rt/tests/intellij.testng.rt.tests.iml b/plugins/testng_rt/tests/intellij.testng.rt.tests.iml index 720944806ed4..e6cc33d3abc1 100644 --- a/plugins/testng_rt/tests/intellij.testng.rt.tests.iml +++ b/plugins/testng_rt/tests/intellij.testng.rt.tests.iml @@ -9,6 +9,7 @@ + diff --git a/plugins/textmate/BUILD.bazel b/plugins/textmate/BUILD.bazel index 581794b52aa8..72c9e44339bf 100644 --- a/plugins/textmate/BUILD.bazel +++ b/plugins/textmate/BUILD.bazel @@ -36,6 +36,7 @@ jvm_library( "//fleet/fastutil", "//libraries/fastutil", "//platform/util/xmlDom", + "//platform/lang-api:lang", ], exports = [ "//plugins/textmate/core", diff --git a/plugins/textmate/intellij.textmate.iml b/plugins/textmate/intellij.textmate.iml index 1f2dafd85cf5..d2ce02e3427b 100644 --- a/plugins/textmate/intellij.textmate.iml +++ b/plugins/textmate/intellij.textmate.iml @@ -52,5 +52,6 @@ + \ No newline at end of file diff --git a/plugins/textmate/src/org/jetbrains/plugins/textmate/editor/TextMateBackspaceHandler.java b/plugins/textmate/src/org/jetbrains/plugins/textmate/editor/TextMateBackspaceHandler.java index 56723571b7df..bb048bbec399 100644 --- a/plugins/textmate/src/org/jetbrains/plugins/textmate/editor/TextMateBackspaceHandler.java +++ b/plugins/textmate/src/org/jetbrains/plugins/textmate/editor/TextMateBackspaceHandler.java @@ -20,7 +20,7 @@ import java.util.Set; import static org.jetbrains.plugins.textmate.editor.TextMateEditorUtils.getSmartTypingPairs; -public class TextMateBackspaceHandler extends BackspaceHandlerDelegate { +final class TextMateBackspaceHandler extends BackspaceHandlerDelegate { @Override public void beforeCharDeleted(char c, @NotNull PsiFile file, @NotNull Editor editor) { } diff --git a/plugins/textmate/tests/BUILD.bazel b/plugins/textmate/tests/BUILD.bazel index dd63d52baac8..1f03486edb83 100644 --- a/plugins/textmate/tests/BUILD.bazel +++ b/plugins/textmate/tests/BUILD.bazel @@ -31,6 +31,7 @@ jvm_library( "@lib//:kotlinx-coroutines-core", "//plugins/textmate", "//platform/core-api:core", + "//platform/lang-api:lang", "//platform/lang-impl", "//platform/analysis-api:analysis", "//platform/editor-ui-api:editor-ui", diff --git a/plugins/textmate/tests/intellij.textmate.tests.iml b/plugins/textmate/tests/intellij.textmate.tests.iml index 3967c77a64d1..35fbfdc0b2d5 100644 --- a/plugins/textmate/tests/intellij.textmate.tests.iml +++ b/plugins/textmate/tests/intellij.textmate.tests.iml @@ -22,6 +22,7 @@ + diff --git a/plugins/toml/core/BUILD.bazel b/plugins/toml/core/BUILD.bazel index f7d0db449add..881be08351af 100644 --- a/plugins/toml/core/BUILD.bazel +++ b/plugins/toml/core/BUILD.bazel @@ -24,6 +24,7 @@ jvm_library( "//platform/platform-impl:ide-impl", "//platform/code-style-impl:codeStyle-impl", "@lib//:kotlin-stdlib", + "//platform/lang-api:lang", ] ) ### auto-generated section `build intellij.toml.core` end \ No newline at end of file diff --git a/plugins/toml/core/intellij.toml.core.iml b/plugins/toml/core/intellij.toml.core.iml index 7752e370736a..494c1ebc0fc0 100644 --- a/plugins/toml/core/intellij.toml.core.iml +++ b/plugins/toml/core/intellij.toml.core.iml @@ -19,5 +19,6 @@ + \ No newline at end of file diff --git a/plugins/toml/core/src/main/kotlin/org/toml/ide/formatter/settings/TomlLanguageCodeStyleSettingsProvider.kt b/plugins/toml/core/src/main/kotlin/org/toml/ide/formatter/settings/TomlLanguageCodeStyleSettingsProvider.kt index 059f8181c146..09bbc37d29ba 100644 --- a/plugins/toml/core/src/main/kotlin/org/toml/ide/formatter/settings/TomlLanguageCodeStyleSettingsProvider.kt +++ b/plugins/toml/core/src/main/kotlin/org/toml/ide/formatter/settings/TomlLanguageCodeStyleSettingsProvider.kt @@ -16,7 +16,7 @@ import com.intellij.psi.codeStyle.CustomCodeStyleSettings import com.intellij.psi.codeStyle.LanguageCodeStyleSettingsProvider import org.toml.lang.TomlLanguage -class TomlLanguageCodeStyleSettingsProvider : LanguageCodeStyleSettingsProvider() { +private class TomlLanguageCodeStyleSettingsProvider : LanguageCodeStyleSettingsProvider() { override fun getLanguage(): Language = TomlLanguage override fun createCustomSettings(settings: CodeStyleSettings): CustomCodeStyleSettings = diff --git a/plugins/toml/frontend/BUILD.bazel b/plugins/toml/frontend/BUILD.bazel index 7acf1e16b0b6..a6f923da4028 100644 --- a/plugins/toml/frontend/BUILD.bazel +++ b/plugins/toml/frontend/BUILD.bazel @@ -21,6 +21,7 @@ jvm_library( "//platform/platform-api:ide", "//platform/analysis-api:analysis", "//platform/core-impl", + "//platform/lang-api:lang", "//platform/lang-impl", ] ) diff --git a/plugins/toml/frontend/intellij.toml.frontend.iml b/plugins/toml/frontend/intellij.toml.frontend.iml index ad7da85ef612..c62bb9852bd2 100644 --- a/plugins/toml/frontend/intellij.toml.frontend.iml +++ b/plugins/toml/frontend/intellij.toml.frontend.iml @@ -15,6 +15,7 @@ + \ No newline at end of file diff --git a/plugins/toml/frontend/src/org/toml/ide/wordSelection/TomlStringLiteralSelectionHandler.kt b/plugins/toml/frontend/src/org/toml/ide/wordSelection/TomlStringLiteralSelectionHandler.kt index 7637b0a84480..f221e88bcebf 100644 --- a/plugins/toml/frontend/src/org/toml/ide/wordSelection/TomlStringLiteralSelectionHandler.kt +++ b/plugins/toml/frontend/src/org/toml/ide/wordSelection/TomlStringLiteralSelectionHandler.kt @@ -15,7 +15,7 @@ import org.toml.lang.psi.TOML_STRING_LITERALS import org.toml.lang.psi.ext.TomlLiteralKind import org.toml.lang.psi.ext.elementType -class TomlStringLiteralSelectionHandler : ExtendWordSelectionHandlerBase() { +private class TomlStringLiteralSelectionHandler : ExtendWordSelectionHandlerBase() { override fun canSelect(e: PsiElement): Boolean = e.elementType in TOML_STRING_LITERALS diff --git a/plugins/ui-designer-core/BUILD.bazel b/plugins/ui-designer-core/BUILD.bazel index 5921fc9b033c..b2ab32031205 100644 --- a/plugins/ui-designer-core/BUILD.bazel +++ b/plugins/ui-designer-core/BUILD.bazel @@ -30,6 +30,7 @@ jvm_library( "//platform/util/jdom", "//platform/platform-impl/designer", "//platform/core-impl", + "//platform/forms_rt:java-guiForms-rt", ] ) ### auto-generated section `build intellij.uiDesigner` end \ No newline at end of file diff --git a/plugins/ui-designer-core/intellij.uiDesigner.iml b/plugins/ui-designer-core/intellij.uiDesigner.iml index 7662a257509d..67d27e484315 100644 --- a/plugins/ui-designer-core/intellij.uiDesigner.iml +++ b/plugins/ui-designer-core/intellij.uiDesigner.iml @@ -25,5 +25,6 @@ + \ No newline at end of file diff --git a/plugins/ui-designer/BUILD.bazel b/plugins/ui-designer/BUILD.bazel index 341f92634ec7..e900966df7cb 100644 --- a/plugins/ui-designer/BUILD.bazel +++ b/plugins/ui-designer/BUILD.bazel @@ -72,6 +72,7 @@ jvm_library( "//java/java-impl-refactorings:impl-refactorings", "//platform/util/jdom", "//xml/xml-psi-api:psi", + "//platform/execution", ], exports = [ "//java/compiler/forms-compiler:java-guiForms-compiler", @@ -150,6 +151,7 @@ jvm_library( "//jps/jps-builders:build-tests_test_lib", "//xml/xml-psi-api:psi", "//libraries/caffeine", + "//platform/execution", ], 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 bd4836f76199..670f22140d40 100644 --- a/plugins/ui-designer/intellij.java.guiForms.designer.iml +++ b/plugins/ui-designer/intellij.java.guiForms.designer.iml @@ -66,6 +66,7 @@ + diff --git a/plugins/xpath/BUILD.bazel b/plugins/xpath/BUILD.bazel index 8709d8d649a5..8aebc84b114b 100644 --- a/plugins/xpath/BUILD.bazel +++ b/plugins/xpath/BUILD.bazel @@ -50,6 +50,8 @@ jvm_library( "//platform/code-style-impl:codeStyle-impl", "//platform/platform-util-io:ide-util-io", "//platform/util/jdom", + "//platform/execution", + "//platform/forms_rt:java-guiForms-rt", ], runtime_deps = ["//xml/dom-impl"] ) @@ -98,6 +100,8 @@ jvm_library( "//platform/util/jdom", "//tools/intellij.tools.ide.metrics.benchmark:ide-metrics-benchmark", "//tools/intellij.tools.ide.metrics.benchmark:ide-metrics-benchmark_test_lib", + "//platform/execution", + "//platform/forms_rt:java-guiForms-rt", ] ) ### auto-generated section `build intellij.xpath` end diff --git a/plugins/xpath/intellij.xpath.iml b/plugins/xpath/intellij.xpath.iml index 2424cd478737..0da7c934ffdf 100644 --- a/plugins/xpath/intellij.xpath.iml +++ b/plugins/xpath/intellij.xpath.iml @@ -47,5 +47,7 @@ + + \ No newline at end of file diff --git a/plugins/xslt-debugger/BUILD.bazel b/plugins/xslt-debugger/BUILD.bazel index a3de1d2d90d9..14395f2aebbe 100644 --- a/plugins/xslt-debugger/BUILD.bazel +++ b/plugins/xslt-debugger/BUILD.bazel @@ -37,6 +37,7 @@ jvm_library( "//libraries/fastutil", "//platform/core-ui", "//platform/platform-util-io:ide-util-io", + "//platform/execution", ] ) ### auto-generated section `build intellij.xslt.debugger` end \ No newline at end of file diff --git a/plugins/xslt-debugger/intellij.xslt.debugger.iml b/plugins/xslt-debugger/intellij.xslt.debugger.iml index 0f1e1c5977d5..858868c76b82 100644 --- a/plugins/xslt-debugger/intellij.xslt.debugger.iml +++ b/plugins/xslt-debugger/intellij.xslt.debugger.iml @@ -34,5 +34,6 @@ + \ No newline at end of file diff --git a/plugins/yaml/backend/BUILD.bazel b/plugins/yaml/backend/BUILD.bazel index 3f744dea91b2..29c3f27b56d9 100644 --- a/plugins/yaml/backend/BUILD.bazel +++ b/plugins/yaml/backend/BUILD.bazel @@ -98,6 +98,7 @@ jvm_library( "//platform/searchEverywhere/shared:searchEverywhere", "//platform/searchEverywhere/backend", "//plugins/IntelliLang/backend", + "@lib//:jet_check", ] ) ### auto-generated section `build intellij.yaml.backend` end diff --git a/plugins/yaml/backend/intellij.yaml.backend.iml b/plugins/yaml/backend/intellij.yaml.backend.iml index a6c2fc0a64be..9804359d4778 100644 --- a/plugins/yaml/backend/intellij.yaml.backend.iml +++ b/plugins/yaml/backend/intellij.yaml.backend.iml @@ -45,5 +45,6 @@ + \ No newline at end of file diff --git a/plugins/yaml/src/smart/YAMLEmptySequenceItemBackspaceHandler.kt b/plugins/yaml/src/smart/YAMLEmptySequenceItemBackspaceHandler.kt index 805298980e0a..763aa00eafde 100644 --- a/plugins/yaml/src/smart/YAMLEmptySequenceItemBackspaceHandler.kt +++ b/plugins/yaml/src/smart/YAMLEmptySequenceItemBackspaceHandler.kt @@ -8,7 +8,7 @@ import com.intellij.psi.PsiFile import org.jetbrains.yaml.YAMLLanguage import org.jetbrains.yaml.YAMLTokenTypes -class YAMLEmptySequenceItemBackspaceHandler : BackspaceHandlerDelegate() { +private class YAMLEmptySequenceItemBackspaceHandler : BackspaceHandlerDelegate() { private var shouldDelete = false override fun beforeCharDeleted(c: Char, file: PsiFile, editor: Editor) { diff --git a/python/BUILD.bazel b/python/BUILD.bazel index f089950ba471..00106f2b1d02 100644 --- a/python/BUILD.bazel +++ b/python/BUILD.bazel @@ -249,6 +249,7 @@ jvm_library( "//platform/indexing-api:indexing", "//jps/model-api:model", "//platform/lang-core", + "//platform/lang-api:lang", "//platform/macro", "//platform/projectModel-api:projectModel", "//platform/refactoring", @@ -358,6 +359,8 @@ jvm_library( "//python/python-process-output:processOutput", "//platform/xdebugger-impl/shared", "//platform/xdebugger-impl/rpc", + "//platform/execution", + "//platform/forms_rt:java-guiForms-rt", ], exports = [ "//python/openapi:community", @@ -573,6 +576,9 @@ jvm_library( "//python/python-syntax:syntax", "//python/python-exec-service:community-execService", "//python/python-exec-service:community-execService_test_lib", + "//platform/execution", + "@lib//:jet_check", + "//platform/forms_rt:java-guiForms-rt", ], runtime_deps = [ "//python/pluginCore/impl", @@ -682,6 +688,7 @@ jvm_library( "//platform/core-ui", "//platform/ide-core-impl", "//platform/core-impl", + "//platform/ide-core", ] ) ### auto-generated section `build intellij.python.pydev` end \ No newline at end of file diff --git a/python/ide/impl/BUILD.bazel b/python/ide/impl/BUILD.bazel index 6b4895910cdb..cba8d240ce24 100644 --- a/python/ide/impl/BUILD.bazel +++ b/python/ide/impl/BUILD.bazel @@ -72,6 +72,8 @@ jvm_library( "//python/python-poetry/common", "//python/python-uv/common", "//python/python-exec-service/execService.python", + "//platform/execution", + "//platform/forms_rt:java-guiForms-rt", ], runtime_deps = ["//python/python-features-trainer:featuresTrainer"], plugins = ["@lib//:compose-plugin"] @@ -151,6 +153,8 @@ jvm_library( "//python/python-uv/common", "//python/python-exec-service/execService.python", "//python/python-exec-service/execService.python:execService.python_test_lib", + "//platform/execution", + "//platform/forms_rt:java-guiForms-rt", ], 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 4bdc6b20e8f4..f046458e31d2 100644 --- a/python/ide/impl/intellij.pycharm.community.ide.impl.iml +++ b/python/ide/impl/intellij.pycharm.community.ide.impl.iml @@ -86,5 +86,7 @@ + + \ No newline at end of file diff --git a/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/PyCharmCodeVisionSettingsDefaults.kt b/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/PyCharmCodeVisionSettingsDefaults.kt index 202349ecd76a..a8d681ec16c0 100644 --- a/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/PyCharmCodeVisionSettingsDefaults.kt +++ b/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/PyCharmCodeVisionSettingsDefaults.kt @@ -1,9 +1,9 @@ -// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.pycharm.community.ide.impl import com.intellij.codeInsight.codeVision.CodeVisionAnchorKind import com.intellij.codeInsight.codeVision.settings.CodeVisionSettingsDefaults -class PyCharmCodeVisionSettingsDefaults : CodeVisionSettingsDefaults { +private class PyCharmCodeVisionSettingsDefaults : CodeVisionSettingsDefaults { override val defaultPosition: CodeVisionAnchorKind get() = CodeVisionAnchorKind.Right } \ No newline at end of file diff --git a/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/PyIdeCommonOptionsFormFactory.java b/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/PyIdeCommonOptionsFormFactory.java index 706d17aef7b9..9a7876749463 100644 --- a/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/PyIdeCommonOptionsFormFactory.java +++ b/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/PyIdeCommonOptionsFormFactory.java @@ -1,11 +1,10 @@ -// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.pycharm.community.ide.impl; import com.jetbrains.python.run.PyCommonOptionsFormData; import com.jetbrains.python.run.PyCommonOptionsFormFactory; - -public final class PyIdeCommonOptionsFormFactory extends PyCommonOptionsFormFactory { +final class PyIdeCommonOptionsFormFactory extends PyCommonOptionsFormFactory { @Override public PyIdeCommonOptionsForm createForm(PyCommonOptionsFormData data) { return new PyIdeCommonOptionsForm(data); diff --git a/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/conda/PyEnvironmentYmlSdkConfiguration.kt b/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/conda/PyEnvironmentYmlSdkConfiguration.kt index a8be546839d0..ba8ae1b27cac 100644 --- a/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/conda/PyEnvironmentYmlSdkConfiguration.kt +++ b/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/conda/PyEnvironmentYmlSdkConfiguration.kt @@ -60,8 +60,7 @@ import kotlin.io.path.name * This class only supports local, not remote target. * TODO: Support remote target (ie \\wsl) */ -@ApiStatus.Internal -class PyEnvironmentYmlSdkConfiguration : PyProjectSdkConfigurationExtension { +internal class PyEnvironmentYmlSdkConfiguration : PyProjectSdkConfigurationExtension { override val toolId: ToolId = CONDA_TOOL_ID diff --git a/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/configuration/PyHatchSdkConfiguration.kt b/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/configuration/PyHatchSdkConfiguration.kt index 425e9938e27a..655fa02991c1 100644 --- a/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/configuration/PyHatchSdkConfiguration.kt +++ b/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/configuration/PyHatchSdkConfiguration.kt @@ -1,4 +1,4 @@ -// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.pycharm.community.ide.impl.configuration import com.intellij.openapi.diagnostic.Logger @@ -13,14 +13,12 @@ import com.intellij.python.hatch.cli.HatchEnvironment import com.intellij.python.hatch.getHatchService import com.intellij.python.hatch.impl.HATCH_TOOL_ID import com.jetbrains.python.errorProcessing.PyResult -import com.jetbrains.python.orLogException import com.jetbrains.python.hatch.sdk.createSdk +import com.jetbrains.python.orLogException import com.jetbrains.python.sdk.configuration.* import com.jetbrains.python.util.runWithModalBlockingOrInBackground -import org.jetbrains.annotations.ApiStatus -@ApiStatus.Internal -class PyHatchSdkConfiguration : PyProjectTomlConfigurationExtension { +internal class PyHatchSdkConfiguration : PyProjectTomlConfigurationExtension { companion object { private val LOGGER = Logger.getInstance(PyHatchSdkConfiguration::class.java) } diff --git a/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/configuration/PyPipfileSdkConfiguration.kt b/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/configuration/PyPipfileSdkConfiguration.kt index 3bdc3eb57d5e..33759701a74c 100644 --- a/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/configuration/PyPipfileSdkConfiguration.kt +++ b/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/configuration/PyPipfileSdkConfiguration.kt @@ -25,7 +25,6 @@ import com.intellij.ui.components.JBLabel import com.intellij.util.ui.JBUI import com.jetbrains.python.PyBundle import com.jetbrains.python.errorProcessing.PyResult -import com.jetbrains.python.orLogException import com.jetbrains.python.sdk.PythonSdkType import com.jetbrains.python.sdk.basePath import com.jetbrains.python.sdk.configuration.* @@ -39,7 +38,6 @@ import com.jetbrains.python.sdk.setAssociationToModule import com.jetbrains.python.venvReader.VirtualEnvReader import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext -import org.jetbrains.annotations.ApiStatus import java.awt.BorderLayout import java.nio.file.Path import javax.swing.JComponent @@ -49,8 +47,7 @@ import kotlin.io.path.pathString private val LOGGER = Logger.getInstance(PyPipfileSdkConfiguration::class.java) -@ApiStatus.Internal -class PyPipfileSdkConfiguration : PyProjectSdkConfigurationExtension { +internal class PyPipfileSdkConfiguration : PyProjectSdkConfigurationExtension { override val toolId: ToolId = PIPENV_TOOL_ID diff --git a/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/configuration/PyPoetrySdkConfiguration.kt b/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/configuration/PyPoetrySdkConfiguration.kt index ef103312772c..14299f74d589 100644 --- a/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/configuration/PyPoetrySdkConfiguration.kt +++ b/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/configuration/PyPoetrySdkConfiguration.kt @@ -29,12 +29,10 @@ import com.jetbrains.python.sdk.poetry.* import com.jetbrains.python.sdk.setAssociationToModule import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext -import org.jetbrains.annotations.ApiStatus import java.nio.file.Path import kotlin.io.path.pathString -@ApiStatus.Internal -class PyPoetrySdkConfiguration : PyProjectTomlConfigurationExtension { +internal class PyPoetrySdkConfiguration : PyProjectTomlConfigurationExtension { companion object { private val LOGGER = Logger.getInstance(PyPoetrySdkConfiguration::class.java) diff --git a/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/configuration/PyRequirementsTxtOrSetupPySdkConfiguration.kt b/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/configuration/PyRequirementsTxtOrSetupPySdkConfiguration.kt index c8a32d54b924..eccbf1663b30 100644 --- a/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/configuration/PyRequirementsTxtOrSetupPySdkConfiguration.kt +++ b/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/configuration/PyRequirementsTxtOrSetupPySdkConfiguration.kt @@ -36,7 +36,6 @@ import com.jetbrains.python.sdk.impl.PySdkBundle import com.jetbrains.python.sdk.legacy.PythonSdkUtil import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext -import org.jetbrains.annotations.ApiStatus import java.awt.BorderLayout import java.nio.file.Paths import javax.swing.JComponent @@ -47,8 +46,7 @@ private val LOGGER = fileLogger() internal val PY_REQ_TOOL_ID = ToolId("requirements.txt") -@ApiStatus.Internal -class PyRequirementsTxtOrSetupPySdkConfiguration : PyProjectSdkConfigurationExtension { +private class PyRequirementsTxtOrSetupPySdkConfiguration : PyProjectSdkConfigurationExtension { override val toolId: ToolId = PY_REQ_TOOL_ID // This is nonsense, but will be dropped soon diff --git a/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/configuration/PyUvSdkConfiguration.kt b/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/configuration/PyUvSdkConfiguration.kt index 47a597eab803..5b9d3658c8f6 100644 --- a/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/configuration/PyUvSdkConfiguration.kt +++ b/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/configuration/PyUvSdkConfiguration.kt @@ -1,4 +1,4 @@ -// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.pycharm.community.ide.impl.configuration import com.intellij.openapi.application.EDT @@ -16,8 +16,8 @@ import com.intellij.python.pyproject.PyProjectToml import com.intellij.python.pyproject.model.api.SuggestedSdk import com.intellij.python.pyproject.model.api.suggestSdk import com.jetbrains.python.errorProcessing.PyResult -import com.jetbrains.python.orLogException import com.jetbrains.python.onSuccess +import com.jetbrains.python.orLogException import com.jetbrains.python.sdk.* import com.jetbrains.python.sdk.configuration.* import com.jetbrains.python.sdk.legacy.PythonSdkUtil @@ -27,14 +27,12 @@ import com.jetbrains.python.sdk.uv.setupNewUvSdkAndEnv import com.jetbrains.python.venvReader.tryResolvePath import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext -import org.jetbrains.annotations.ApiStatus import java.io.IOException import java.nio.file.Path private val logger = fileLogger() -@ApiStatus.Internal -class PyUvSdkConfiguration : PyProjectTomlConfigurationExtension { +private class PyUvSdkConfiguration : PyProjectTomlConfigurationExtension { private val existingSdks by lazy { PythonSdkUtil.getAllSdks() } private val context = UserDataHolderBase() diff --git a/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/configuration/PyVenvSdkConfiguration.kt b/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/configuration/PyVenvSdkConfiguration.kt index cbc328d62880..db4ff06e6f84 100644 --- a/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/configuration/PyVenvSdkConfiguration.kt +++ b/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/configuration/PyVenvSdkConfiguration.kt @@ -19,10 +19,8 @@ import com.jetbrains.python.sdk.flavors.VirtualEnvSdkFlavor import com.jetbrains.python.sdk.legacy.PythonSdkUtil import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext -import org.jetbrains.annotations.ApiStatus -@ApiStatus.Internal -class PyVenvSdkConfiguration : PyProjectSdkConfigurationExtension { +private class PyVenvSdkConfiguration : PyProjectSdkConfigurationExtension { private val existingSdks by lazy { PythonSdkUtil.getAllSdks() } private val context = UserDataHolderBase() diff --git a/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/miscProject/impl/PyNewMiscScriptAction.kt b/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/miscProject/impl/PyNewMiscScriptAction.kt index b20f3b09a782..c09b6ab88b19 100644 --- a/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/miscProject/impl/PyNewMiscScriptAction.kt +++ b/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/miscProject/impl/PyNewMiscScriptAction.kt @@ -1,4 +1,4 @@ // Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.pycharm.community.ide.impl.miscProject.impl -internal class PyNewMiscScriptAction : PyMiscFileAction(MiscScriptFileType) +private class PyNewMiscScriptAction : PyMiscFileAction(MiscScriptFileType) diff --git a/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/newProjectWizard/PyCharmNewProjectAction.kt b/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/newProjectWizard/PyCharmNewProjectAction.kt index 439b64a41833..5e518832b851 100644 --- a/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/newProjectWizard/PyCharmNewProjectAction.kt +++ b/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/newProjectWizard/PyCharmNewProjectAction.kt @@ -1,4 +1,4 @@ -// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.pycharm.community.ide.impl.newProjectWizard; import com.intellij.openapi.actionSystem.AnActionEvent @@ -15,7 +15,7 @@ import kotlinx.coroutines.withContext /** * New project wizard entry point */ -class PyCharmNewProjectAction : DumbAwareAction() { +private class PyCharmNewProjectAction : DumbAwareAction() { override fun actionPerformed(e: AnActionEvent) { currentThreadCoroutineScope().launch { runCatching { diff --git a/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/newProjectWizard/welcome/PyWelcome.kt b/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/newProjectWizard/welcome/PyWelcome.kt index 1ee7f6d0dbb4..3b84cb7e51d9 100644 --- a/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/newProjectWizard/welcome/PyWelcome.kt +++ b/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/newProjectWizard/welcome/PyWelcome.kt @@ -1,4 +1,4 @@ -// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.pycharm.community.ide.impl.newProjectWizard.welcome import com.intellij.execution.RunManager @@ -53,7 +53,7 @@ import org.jetbrains.annotations.CalledInAny import org.jetbrains.concurrency.CancellablePromise import java.util.concurrent.Callable -internal class PyWelcomeConfigurator : DirectoryProjectConfigurator { +private class PyWelcomeConfigurator : DirectoryProjectConfigurator { override val isEdtRequired: Boolean get() = false diff --git a/python/intellij.python.community.impl.iml b/python/intellij.python.community.impl.iml index a185840c7605..e5a35d8540a0 100644 --- a/python/intellij.python.community.impl.iml +++ b/python/intellij.python.community.impl.iml @@ -44,6 +44,7 @@ + @@ -194,5 +195,7 @@ + + \ No newline at end of file diff --git a/python/intellij.python.community.tests.iml b/python/intellij.python.community.tests.iml index 69b526e2ceed..91d34e1233ec 100644 --- a/python/intellij.python.community.tests.iml +++ b/python/intellij.python.community.tests.iml @@ -97,5 +97,8 @@ + + + \ No newline at end of file diff --git a/python/intellij.python.pydev.iml b/python/intellij.python.pydev.iml index 962969d52929..73ab1bff690c 100644 --- a/python/intellij.python.pydev.iml +++ b/python/intellij.python.pydev.iml @@ -25,5 +25,6 @@ + \ No newline at end of file diff --git a/python/pluginCore/impl/BUILD.bazel b/python/pluginCore/impl/BUILD.bazel index 9a187f1f3341..28095de23238 100644 --- a/python/pluginCore/impl/BUILD.bazel +++ b/python/pluginCore/impl/BUILD.bazel @@ -21,6 +21,7 @@ jvm_library( "//platform/lang-api:lang", "//platform/lang-core", "//platform/lang-impl", + "//platform/execution", "//platform/execution-impl", "//platform/platform-impl:ide-impl", "//platform/projectModel-api:projectModel", diff --git a/python/pluginCore/impl/intellij.python.community.plugin.impl.iml b/python/pluginCore/impl/intellij.python.community.plugin.impl.iml index 19d975fd2da8..1e2a45b325c7 100644 --- a/python/pluginCore/impl/intellij.python.community.plugin.impl.iml +++ b/python/pluginCore/impl/intellij.python.community.plugin.impl.iml @@ -15,6 +15,7 @@ + diff --git a/python/pluginJava/BUILD.bazel b/python/pluginJava/BUILD.bazel index 4d1701c41177..5a2f8650e502 100644 --- a/python/pluginJava/BUILD.bazel +++ b/python/pluginJava/BUILD.bazel @@ -25,6 +25,7 @@ jvm_library( "//python/python-sdk:sdk", "//python/python-psi-api:psi", "//python:python-community-impl", + "//platform/forms_rt:java-guiForms-rt", "//java/openapi:java", "//java/java-psi-api:psi", "//java/java-indexing-api:indexing", @@ -35,6 +36,7 @@ jvm_library( "//platform/core-ui", "//platform/util/jdom", "//python/python-core-impl:community-core-impl", + "//platform/execution", ] ) ### auto-generated section `build intellij.python.community.plugin.java` end \ No newline at end of file diff --git a/python/pluginJava/intellij.python.community.plugin.java.iml b/python/pluginJava/intellij.python.community.plugin.java.iml index ef108d0cb1d8..33bda24578f3 100644 --- a/python/pluginJava/intellij.python.community.plugin.java.iml +++ b/python/pluginJava/intellij.python.community.plugin.java.iml @@ -19,6 +19,7 @@ + @@ -29,5 +30,6 @@ + \ No newline at end of file diff --git a/python/pluginJava/src/com/intellij/python/community/plugin/java/PythonNewProjectWizard.kt b/python/pluginJava/src/com/intellij/python/community/plugin/java/PythonNewProjectWizard.kt index bdae60a17e09..361a4567b684 100644 --- a/python/pluginJava/src/com/intellij/python/community/plugin/java/PythonNewProjectWizard.kt +++ b/python/pluginJava/src/com/intellij/python/community/plugin/java/PythonNewProjectWizard.kt @@ -1,4 +1,4 @@ -// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.python.community.plugin.java import com.intellij.icons.AllIcons @@ -6,19 +6,22 @@ import com.intellij.ide.projectWizard.NewProjectWizardConstants import com.intellij.ide.wizard.NewProjectWizardStep import com.intellij.ide.wizard.language.LanguageGeneratorNewProjectWizard import com.jetbrains.python.newProject.NewPythonProjectStep +import javax.swing.Icon /** * A wizard for creating new pure-Python projects in IntelliJ. * * It suggests creating a new Python virtual environment for your new project to follow Python best practices. */ -internal class PythonNewProjectWizard : LanguageGeneratorNewProjectWizard { +private class PythonNewProjectWizard : LanguageGeneratorNewProjectWizard { + override val name: String + get() = NewProjectWizardConstants.Language.PYTHON - override val name = NewProjectWizardConstants.Language.PYTHON + override val icon: Icon + get() = AllIcons.Language.Python - override val icon = AllIcons.Language.Python - - override val ordinal = 600 + override val ordinal: Int + get() = 600 override fun createStep(parent: NewProjectWizardStep): NewProjectWizardStep = NewPythonProjectStep(parent, createPythonModuleStructure = true) } diff --git a/python/pluginJava/src/com/intellij/python/community/plugin/java/PythonSdkEditorAdditionalOptionsProvider.java b/python/pluginJava/src/com/intellij/python/community/plugin/java/PythonSdkEditorAdditionalOptionsProvider.java index 5fbeb9d51a51..b373a36993ef 100644 --- a/python/pluginJava/src/com/intellij/python/community/plugin/java/PythonSdkEditorAdditionalOptionsProvider.java +++ b/python/pluginJava/src/com/intellij/python/community/plugin/java/PythonSdkEditorAdditionalOptionsProvider.java @@ -1,4 +1,4 @@ -// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.python.community.plugin.java; import com.intellij.openapi.SdkEditorAdditionalOptionsProvider; @@ -9,18 +9,18 @@ import com.intellij.openapi.projectRoots.Sdk; import com.intellij.openapi.util.NlsContexts; import com.intellij.ui.AncestorListenerAdapter; import com.intellij.webcore.packaging.PackagesNotificationPanel; -import com.jetbrains.python.sdk.impl.PySdkBundle; import com.jetbrains.python.packaging.PyPackageManagers; import com.jetbrains.python.packaging.PyPackagesNotificationPanel; import com.jetbrains.python.packaging.ui.PyInstalledPackagesPanel; import com.jetbrains.python.sdk.PythonSdkType; +import com.jetbrains.python.sdk.impl.PySdkBundle; import org.jetbrains.annotations.NotNull; import javax.swing.*; import javax.swing.event.AncestorEvent; import java.awt.*; -public final class PythonSdkEditorAdditionalOptionsProvider extends SdkEditorAdditionalOptionsProvider { +final class PythonSdkEditorAdditionalOptionsProvider extends SdkEditorAdditionalOptionsProvider { private PythonSdkEditorAdditionalOptionsProvider() { super(PythonSdkType.getInstance()); } diff --git a/python/pluginJava/src/com/intellij/python/community/plugin/java/inspections/PythonPluginCommandLineInspectionProjectConfigurator.java b/python/pluginJava/src/com/intellij/python/community/plugin/java/inspections/PythonPluginCommandLineInspectionProjectConfigurator.java index 41a250860a2b..5d6e64a2afab 100644 --- a/python/pluginJava/src/com/intellij/python/community/plugin/java/inspections/PythonPluginCommandLineInspectionProjectConfigurator.java +++ b/python/pluginJava/src/com/intellij/python/community/plugin/java/inspections/PythonPluginCommandLineInspectionProjectConfigurator.java @@ -1,4 +1,4 @@ -// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.python.community.plugin.java.inspections; import com.intellij.facet.FacetManager; @@ -13,10 +13,10 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.projectRoots.ProjectJdkTable; import com.intellij.openapi.projectRoots.Sdk; import com.intellij.psi.search.FileTypeIndex; -import com.jetbrains.python.PyBundle; -import com.jetbrains.python.PythonFileType; import com.intellij.python.community.plugin.java.facet.JavaPythonFacet; import com.intellij.python.community.plugin.java.facet.JavaPythonFacetType; +import com.jetbrains.python.PyBundle; +import com.jetbrains.python.PythonFileType; import com.jetbrains.python.sdk.PyDetectedSdk; import com.jetbrains.python.sdk.PySdkExtKt; import com.jetbrains.python.sdk.legacy.PythonSdkUtil; @@ -29,7 +29,7 @@ import java.nio.file.Files; import java.util.Arrays; import java.util.List; -public final class PythonPluginCommandLineInspectionProjectConfigurator implements CommandLineInspectionProjectConfigurator { +final class PythonPluginCommandLineInspectionProjectConfigurator implements CommandLineInspectionProjectConfigurator { @Override public @NotNull String getName() { return "python"; diff --git a/python/pluginJava/src/com/intellij/python/community/plugin/java/psi/impl/PyJavaImportCandidateProvider.java b/python/pluginJava/src/com/intellij/python/community/plugin/java/psi/impl/PyJavaImportCandidateProvider.java index d14bb33d4b13..f9cced7033dc 100644 --- a/python/pluginJava/src/com/intellij/python/community/plugin/java/psi/impl/PyJavaImportCandidateProvider.java +++ b/python/pluginJava/src/com/intellij/python/community/plugin/java/psi/impl/PyJavaImportCandidateProvider.java @@ -1,4 +1,4 @@ -// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.python.community.plugin.java.psi.impl; import com.intellij.openapi.module.Module; @@ -14,8 +14,7 @@ import com.intellij.psi.util.QualifiedName; import com.jetbrains.python.codeInsight.imports.AutoImportQuickFix; import com.jetbrains.python.codeInsight.imports.PyImportCandidateProvider; - -public final class PyJavaImportCandidateProvider implements PyImportCandidateProvider { +final class PyJavaImportCandidateProvider implements PyImportCandidateProvider { @Override public void addImportCandidates(PsiReference reference, String name, AutoImportQuickFix quickFix) { final PsiElement element = reference.getElement(); diff --git a/python/pluginJava/src/com/intellij/python/community/plugin/java/psi/impl/PyJavaImportResolver.java b/python/pluginJava/src/com/intellij/python/community/plugin/java/psi/impl/PyJavaImportResolver.java index a38e5c395c2d..d1b5b6c22aa0 100644 --- a/python/pluginJava/src/com/intellij/python/community/plugin/java/psi/impl/PyJavaImportResolver.java +++ b/python/pluginJava/src/com/intellij/python/community/plugin/java/psi/impl/PyJavaImportResolver.java @@ -1,4 +1,4 @@ -// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.python.community.plugin.java.psi.impl; import com.intellij.openapi.module.Module; @@ -16,8 +16,7 @@ import com.jetbrains.python.psi.resolve.PyQualifiedNameResolveContext; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; - -public final class PyJavaImportResolver implements PyImportResolver { +final class PyJavaImportResolver implements PyImportResolver { @Override public @Nullable PsiElement resolveImportReference(@NotNull QualifiedName name, @NotNull PyQualifiedNameResolveContext context, boolean withRoots) { String fqn = name.toString(); diff --git a/python/pluginJava/src/com/intellij/python/community/plugin/java/psi/impl/PyJavaSuperMethodsSearchExecutor.java b/python/pluginJava/src/com/intellij/python/community/plugin/java/psi/impl/PyJavaSuperMethodsSearchExecutor.java index 95f46eaef793..44693069daa4 100644 --- a/python/pluginJava/src/com/intellij/python/community/plugin/java/psi/impl/PyJavaSuperMethodsSearchExecutor.java +++ b/python/pluginJava/src/com/intellij/python/community/plugin/java/psi/impl/PyJavaSuperMethodsSearchExecutor.java @@ -1,4 +1,4 @@ -// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.python.community.plugin.java.psi.impl; import com.intellij.psi.PsiClass; @@ -14,8 +14,7 @@ import com.jetbrains.python.psi.types.PyClassLikeType; import com.jetbrains.python.psi.types.TypeEvalContext; import org.jetbrains.annotations.NotNull; - -public final class PyJavaSuperMethodsSearchExecutor implements QueryExecutor { +final class PyJavaSuperMethodsSearchExecutor implements QueryExecutor { @Override public boolean execute(final @NotNull PySuperMethodsSearch.SearchParameters queryParameters, final @NotNull Processor consumer) { PyFunction func = queryParameters.getDerivedMethod(); diff --git a/python/pluginJava/src/com/intellij/python/community/plugin/java/psi/impl/PyJavaTypeProvider.java b/python/pluginJava/src/com/intellij/python/community/plugin/java/psi/impl/PyJavaTypeProvider.java index e1d4cfcc8fed..beadf5af151b 100644 --- a/python/pluginJava/src/com/intellij/python/community/plugin/java/psi/impl/PyJavaTypeProvider.java +++ b/python/pluginJava/src/com/intellij/python/community/plugin/java/psi/impl/PyJavaTypeProvider.java @@ -1,4 +1,4 @@ -// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.python.community.plugin.java.psi.impl; import com.intellij.openapi.module.Module; @@ -20,8 +20,7 @@ import org.jetbrains.annotations.Nullable; import java.util.ArrayList; import java.util.List; - -public final class PyJavaTypeProvider extends PyTypeProviderBase { +final class PyJavaTypeProvider extends PyTypeProviderBase { @Override public @Nullable Ref getReferenceType(@NotNull PsiElement referenceTarget, @NotNull TypeEvalContext context, @Nullable PsiElement anchor) { if (referenceTarget instanceof PsiClass) { diff --git a/python/python-core-impl/BUILD.bazel b/python/python-core-impl/BUILD.bazel index 407a4d3ced56..802070e48210 100644 --- a/python/python-core-impl/BUILD.bazel +++ b/python/python-core-impl/BUILD.bazel @@ -21,6 +21,7 @@ jvm_library( "//platform/projectModel-api:projectModel", "//python/python-psi-api:psi", "//platform/analysis-impl", + "//platform/lang-api:lang", "//platform/lang-impl", "//RegExpSupport:regexp", "//libraries/guava", diff --git a/python/python-core-impl/intellij.python.community.core.impl.iml b/python/python-core-impl/intellij.python.community.core.impl.iml index 51c52aa89cc6..8b40b9610e39 100644 --- a/python/python-core-impl/intellij.python.community.core.impl.iml +++ b/python/python-core-impl/intellij.python.community.core.impl.iml @@ -15,6 +15,7 @@ + diff --git a/python/python-core-impl/src/com/jetbrains/python/codeInsight/PyElementListCellRenderer.java b/python/python-core-impl/src/com/jetbrains/python/codeInsight/PyElementListCellRenderer.java index e083f9912969..dd72def589eb 100644 --- a/python/python-core-impl/src/com/jetbrains/python/codeInsight/PyElementListCellRenderer.java +++ b/python/python-core-impl/src/com/jetbrains/python/codeInsight/PyElementListCellRenderer.java @@ -1,4 +1,4 @@ -// Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.jetbrains.python.codeInsight; import com.intellij.ide.util.PsiElementListCellRenderer; @@ -7,7 +7,6 @@ import com.intellij.navigation.NavigationItem; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiNamedElement; - public class PyElementListCellRenderer extends PsiElementListCellRenderer { @Override public String getElementText(final PsiElement element) { diff --git a/python/python-features-trainer/BUILD.bazel b/python/python-features-trainer/BUILD.bazel index 85e2f5ebe664..07ce25202c7a 100644 --- a/python/python-features-trainer/BUILD.bazel +++ b/python/python-features-trainer/BUILD.bazel @@ -28,6 +28,7 @@ jvm_library( "//jps/model-api:model", "//platform/lang-core", "//platform/projectModel-api:projectModel", + "//platform/execution", "//platform/refactoring", "//python:python-community-impl", "//plugins/ide-features-trainer:featuresTrainer", @@ -60,6 +61,7 @@ jvm_library( "//jps/model-api:model", "//platform/lang-core", "//platform/projectModel-api:projectModel", + "//platform/execution", "//platform/refactoring", "//python:python-community-impl", "//plugins/ide-features-trainer:featuresTrainer", diff --git a/python/python-features-trainer/intellij.python.featuresTrainer.iml b/python/python-features-trainer/intellij.python.featuresTrainer.iml index b784bfc233c3..b33aaba17eb2 100644 --- a/python/python-features-trainer/intellij.python.featuresTrainer.iml +++ b/python/python-features-trainer/intellij.python.featuresTrainer.iml @@ -19,6 +19,7 @@ + diff --git a/python/python-restructuredtext/BUILD.bazel b/python/python-restructuredtext/BUILD.bazel index 16eed40784ca..043e6fe7c000 100644 --- a/python/python-restructuredtext/BUILD.bazel +++ b/python/python-restructuredtext/BUILD.bazel @@ -54,6 +54,9 @@ jvm_library( "//plugins/restructuredtext", "//platform/ui.jcef", "//platform/core-impl", + "//platform/execution", + "//platform/lang-api:lang", + "//platform/forms_rt:java-guiForms-rt", ":platform_lang-impl_provided", ":platform_execution-impl_provided", ":python-community-impl_provided", diff --git a/python/python-restructuredtext/intellij.restructuredtext.python.iml b/python/python-restructuredtext/intellij.restructuredtext.python.iml index 8ed352d4c707..061eb4c88c3f 100644 --- a/python/python-restructuredtext/intellij.restructuredtext.python.iml +++ b/python/python-restructuredtext/intellij.restructuredtext.python.iml @@ -28,5 +28,8 @@ + + + \ No newline at end of file diff --git a/python/python-syntax/BUILD.bazel b/python/python-syntax/BUILD.bazel index 5b0edb2ea855..bf27772163a3 100644 --- a/python/python-syntax/BUILD.bazel +++ b/python/python-syntax/BUILD.bazel @@ -26,11 +26,13 @@ jvm_library( "//platform/lang-impl", "//platform/editor-ui-ex:editor-ex", "//platform/core-ui", + "//platform/forms_rt:java-guiForms-rt", "//platform/code-style-impl:codeStyle-impl", "//libraries/fastutil", "//libraries/guava", "//libraries/kotlinx/serialization/core", "//platform/core-impl", + "//platform/lang-api:lang", ] ) ### auto-generated section `build intellij.python.syntax` end \ No newline at end of file diff --git a/python/python-syntax/intellij.python.syntax.iml b/python/python-syntax/intellij.python.syntax.iml index ceb948f9e3ee..32a263c85634 100644 --- a/python/python-syntax/intellij.python.syntax.iml +++ b/python/python-syntax/intellij.python.syntax.iml @@ -42,10 +42,12 @@ + + \ No newline at end of file diff --git a/python/python-terminal/BUILD.bazel b/python/python-terminal/BUILD.bazel index 8518dd24ce05..09556a279ee6 100644 --- a/python/python-terminal/BUILD.bazel +++ b/python/python-terminal/BUILD.bazel @@ -23,6 +23,7 @@ jvm_library( "//python:python-community-impl", "//plugins/terminal", "//platform/core-api:core", + "//platform/execution", "//platform/projectModel-api:projectModel", "@lib//:kotlin-stdlib", "//python/python-sdk:sdk", @@ -41,6 +42,7 @@ jvm_library( "//plugins/terminal", "//libraries/mockito", "//platform/core-api:core", + "//platform/execution", "//platform/projectModel-api:projectModel", "@lib//:kotlin-stdlib", "//python/python-sdk:sdk", diff --git a/python/python-terminal/intellij.python.terminal.iml b/python/python-terminal/intellij.python.terminal.iml index b354fddd8bdb..36f87922f88f 100644 --- a/python/python-terminal/intellij.python.terminal.iml +++ b/python/python-terminal/intellij.python.terminal.iml @@ -14,6 +14,7 @@ + diff --git a/uast/testFramework/BUILD.bazel b/uast/testFramework/BUILD.bazel index 07120eae1370..6b7669990cbb 100644 --- a/uast/testFramework/BUILD.bazel +++ b/uast/testFramework/BUILD.bazel @@ -12,6 +12,7 @@ jvm_library( "//platform/indexing-api:indexing", "//jps/model-api:model", "//platform/lang-core", + "//platform/execution", "//platform/projectModel-api:projectModel", "//uast/uast-common:uast", "//platform/testFramework", diff --git a/uast/testFramework/intellij.platform.uast.testFramework.iml b/uast/testFramework/intellij.platform.uast.testFramework.iml index 7a25beb3c3e1..deec737faea0 100644 --- a/uast/testFramework/intellij.platform.uast.testFramework.iml +++ b/uast/testFramework/intellij.platform.uast.testFramework.iml @@ -12,6 +12,7 @@ + diff --git a/xml/dom-openapi/BUILD.bazel b/xml/dom-openapi/BUILD.bazel index f95e998f4417..8e6bf1381037 100644 --- a/xml/dom-openapi/BUILD.bazel +++ b/xml/dom-openapi/BUILD.bazel @@ -22,6 +22,7 @@ jvm_library( "//platform/lang-api:lang", "//platform/platform-api:ide", "//platform/extensions", + "//platform/forms_rt:java-guiForms-rt", "//platform/util", "//platform/util:util-ui", "//xml/xml-psi-api:psi", diff --git a/xml/dom-openapi/intellij.xml.dom.iml b/xml/dom-openapi/intellij.xml.dom.iml index ecc2f7557524..aff0b0184ebd 100644 --- a/xml/dom-openapi/intellij.xml.dom.iml +++ b/xml/dom-openapi/intellij.xml.dom.iml @@ -16,6 +16,7 @@ + diff --git a/xml/impl/BUILD.bazel b/xml/impl/BUILD.bazel index 68eb1c3fe4cd..5de71e347f83 100644 --- a/xml/impl/BUILD.bazel +++ b/xml/impl/BUILD.bazel @@ -17,6 +17,7 @@ jvm_library( "//platform/analysis-api:analysis", "//platform/code-style-api:codeStyle", "//platform/core-api:core", + "//platform/lang-api:lang", "//platform/editor-ui-api:editor-ui", "//platform/foldings", "//platform/core-impl", @@ -56,6 +57,7 @@ jvm_library( "//libraries/xerces", "//xml/xml-syntax:syntax", "//xml/xml-analysis-api:analysis", + "//platform/forms_rt:java-guiForms-rt", ], exports = [ "//xml/xml-psi-impl:psi-impl", diff --git a/xml/impl/intellij.xml.impl.iml b/xml/impl/intellij.xml.impl.iml index 47e18b92b954..addbfe1419b7 100644 --- a/xml/impl/intellij.xml.impl.iml +++ b/xml/impl/intellij.xml.impl.iml @@ -10,6 +10,7 @@ + @@ -51,6 +52,7 @@ + diff --git a/xml/langInjection/BUILD.bazel b/xml/langInjection/BUILD.bazel index 0b3aa4fdf786..a0a71cf5307c 100644 --- a/xml/langInjection/BUILD.bazel +++ b/xml/langInjection/BUILD.bazel @@ -28,6 +28,7 @@ jvm_library( "//xml/impl", "//RegExpSupport:regexp", "//xml/xml-psi-api:psi", + "//platform/forms_rt:java-guiForms-rt", "//platform/platform-api:ide", "//libraries/jaxen", "//plugins/IntelliLang:langInjection", diff --git a/xml/langInjection/intellij.xml.langInjection.iml b/xml/langInjection/intellij.xml.langInjection.iml index 4cdd91500ae4..fde1261f4f37 100644 --- a/xml/langInjection/intellij.xml.langInjection.iml +++ b/xml/langInjection/intellij.xml.langInjection.iml @@ -18,6 +18,7 @@ + diff --git a/xml/relaxng/BUILD.bazel b/xml/relaxng/BUILD.bazel index 56f9bd5c88db..0bbee8e23d44 100644 --- a/xml/relaxng/BUILD.bazel +++ b/xml/relaxng/BUILD.bazel @@ -21,6 +21,7 @@ jvm_library( "//platform/indexing-api:indexing", "//platform/lang-api:lang", "//platform/lang-core", + "//platform/forms_rt:java-guiForms-rt", "//platform/projectModel-api:projectModel", "//xml/impl", "//xml/dom-openapi:dom", @@ -39,6 +40,7 @@ jvm_library( "//platform/util/jdom", "//platform/core-impl", "//xml/xml-analysis-api:analysis", + "//platform/execution", ], runtime_deps = ["//platform/backend"] ) @@ -56,6 +58,7 @@ jvm_library( "//platform/indexing-api:indexing", "//platform/lang-api:lang", "//platform/lang-core", + "//platform/forms_rt:java-guiForms-rt", "//platform/projectModel-api:projectModel", "//xml/impl", "//xml/dom-openapi:dom", @@ -76,6 +79,7 @@ jvm_library( "//platform/util/jdom", "//platform/core-impl", "//xml/xml-analysis-api:analysis", + "//platform/execution", ] ) ### auto-generated section `build intellij.relaxng` end diff --git a/xml/relaxng/intellij.relaxng.iml b/xml/relaxng/intellij.relaxng.iml index 395adbcb025b..16a33b448bdf 100644 --- a/xml/relaxng/intellij.relaxng.iml +++ b/xml/relaxng/intellij.relaxng.iml @@ -17,6 +17,7 @@ + @@ -86,5 +87,6 @@ + \ No newline at end of file diff --git a/xml/tests/BUILD.bazel b/xml/tests/BUILD.bazel index fd7896c2c880..b3609f1b64e2 100644 --- a/xml/tests/BUILD.bazel +++ b/xml/tests/BUILD.bazel @@ -66,6 +66,7 @@ jvm_library( "//platform/syntax/syntax-scripts:scripts", "//xml/xml-syntax:syntax", "//java/java-runtime:rt", + "@lib//:jet_check", "//xml/xml-analysis-api:analysis", ], runtime_deps = ["//xml/langInjection"] diff --git a/xml/tests/intellij.xml.tests.iml b/xml/tests/intellij.xml.tests.iml index fab61ef27c86..bacf0df72dc5 100644 --- a/xml/tests/intellij.xml.tests.iml +++ b/xml/tests/intellij.xml.tests.iml @@ -49,6 +49,7 @@ + diff --git a/xml/xml-analysis-impl/BUILD.bazel b/xml/xml-analysis-impl/BUILD.bazel index 113d66dea221..7aad662ac554 100644 --- a/xml/xml-analysis-impl/BUILD.bazel +++ b/xml/xml-analysis-impl/BUILD.bazel @@ -34,6 +34,7 @@ jvm_library( "//platform/polySymbols/backend", "//libraries/xerces", "//platform/polySymbols", + "//platform/lang-api:lang", ], runtime_deps = ["//platform/backend"] ) diff --git a/xml/xml-analysis-impl/intellij.xml.analysis.impl.iml b/xml/xml-analysis-impl/intellij.xml.analysis.impl.iml index 7afd9548160c..3780620a59b6 100644 --- a/xml/xml-analysis-impl/intellij.xml.analysis.impl.iml +++ b/xml/xml-analysis-impl/intellij.xml.analysis.impl.iml @@ -29,5 +29,6 @@ + \ No newline at end of file diff --git a/xml/xml-ui-common/BUILD.bazel b/xml/xml-ui-common/BUILD.bazel index dc5970a6738c..f7a91b58d333 100644 --- a/xml/xml-ui-common/BUILD.bazel +++ b/xml/xml-ui-common/BUILD.bazel @@ -30,6 +30,8 @@ jvm_library( "//platform/analysis-api:analysis", "//xml/xml-psi-impl:psi-impl", "//platform/core-impl", + "//platform/lang-api:lang", + "//platform/forms_rt:java-guiForms-rt", ] ) ### auto-generated section `build intellij.xml.ui.common` end \ No newline at end of file diff --git a/xml/xml-ui-common/intellij.xml.ui.common.iml b/xml/xml-ui-common/intellij.xml.ui.common.iml index bff78db8b8b7..549379a1fae4 100644 --- a/xml/xml-ui-common/intellij.xml.ui.common.iml +++ b/xml/xml-ui-common/intellij.xml.ui.common.iml @@ -24,5 +24,7 @@ + + \ No newline at end of file diff --git a/xml/xml-ui-common/src/com/intellij/application/options/XmlLanguageCodeStyleSettingsProvider.java b/xml/xml-ui-common/src/com/intellij/application/options/XmlLanguageCodeStyleSettingsProvider.java index 4c8b51633ca2..8d8e683b1306 100644 --- a/xml/xml-ui-common/src/com/intellij/application/options/XmlLanguageCodeStyleSettingsProvider.java +++ b/xml/xml-ui-common/src/com/intellij/application/options/XmlLanguageCodeStyleSettingsProvider.java @@ -1,4 +1,4 @@ -// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.application.options; import com.intellij.application.options.codeStyle.properties.CodeStyleFieldAccessor; @@ -15,7 +15,7 @@ import org.jetbrains.annotations.Nullable; import java.lang.reflect.Field; -public class XmlLanguageCodeStyleSettingsProvider extends LanguageCodeStyleSettingsProvider { +public final class XmlLanguageCodeStyleSettingsProvider extends LanguageCodeStyleSettingsProvider { @Override public @NotNull CodeStyleConfigurable createConfigurable(final @NotNull CodeStyleSettings baseSettings, final @NotNull CodeStyleSettings modelSettings) { diff --git a/xml/xmlbeans/BUILD.bazel b/xml/xmlbeans/BUILD.bazel index 64af75fd03b7..2ba8ce603aca 100644 --- a/xml/xmlbeans/BUILD.bazel +++ b/xml/xmlbeans/BUILD.bazel @@ -16,6 +16,7 @@ jvm_library( deps = [ "//platform/analysis-api:analysis", "//platform/core-api:core", + "//platform/lang-api:lang", "//xml/impl", "@lib//:xml-xmlbeans-_xml_beans", "@lib//:xml-xmlbeans-apache-logging-log4j-to-slf4j", @@ -29,6 +30,7 @@ jvm_library( "//platform/util:util-ui", "//xml/xml-psi-api:psi", "//platform/lang-impl", + "//platform/forms_rt:java-guiForms-rt", ] ) @@ -40,6 +42,7 @@ jvm_library( deps = [ "//platform/analysis-api:analysis", "//platform/core-api:core", + "//platform/lang-api:lang", "//xml/impl", "@lib//:xml-xmlbeans-_xml_beans", "@lib//:xml-xmlbeans-apache-logging-log4j-to-slf4j", @@ -57,6 +60,7 @@ jvm_library( "//platform/testFramework:testFramework_test_lib", "//xml/xml-psi-api:psi", "//platform/lang-impl", + "//platform/forms_rt:java-guiForms-rt", ] ) ### auto-generated section `build intellij.xml.xmlbeans` end diff --git a/xml/xmlbeans/intellij.xml.xmlbeans.iml b/xml/xmlbeans/intellij.xml.xmlbeans.iml index 05fade8359ee..54a1139c950c 100644 --- a/xml/xmlbeans/intellij.xml.xmlbeans.iml +++ b/xml/xmlbeans/intellij.xml.xmlbeans.iml @@ -11,6 +11,7 @@ + @@ -69,5 +70,6 @@ + \ No newline at end of file