diff --git a/.idea/modules.xml b/.idea/modules.xml index b38e389889bd..857fb6b258c9 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -516,6 +516,7 @@ + diff --git a/BUILD.bazel b/BUILD.bazel index c469f9ab9be1..0b44e2cedc99 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -293,6 +293,7 @@ jvm_library( runtime_deps = [ ":main", "//java/java-tests:tests_test_lib", + "//java/idea-ui:ui-tests_test_lib", "//plugins/junit/java-tests:java-tests_test_lib", "//jvm/jvm-analysis-java-tests:analysis-java-tests_test_lib", "//plugins/svn4idea:vcs-svn-tests_test_lib", diff --git a/build/bazel-generated-file-list.txt b/build/bazel-generated-file-list.txt index 2acd482f3e02..ea7e15ef24e4 100644 --- a/build/bazel-generated-file-list.txt +++ b/build/bazel-generated-file-list.txt @@ -303,6 +303,7 @@ java/ide-resources java/idea-ui java/java-analysis-api java/java-analysis-impl +java/java-backend java/java-copyright java/java-features-trainer java/java-frontback-impl diff --git a/intellij.idea.community.main.iml b/intellij.idea.community.main.iml index 8c5e2b4019ca..de7598f76638 100644 --- a/intellij.idea.community.main.iml +++ b/intellij.idea.community.main.iml @@ -67,6 +67,7 @@ + diff --git a/java/codeserver/core/BUILD.bazel b/java/codeserver/core/BUILD.bazel index 46315ed37dbd..35b7fbe322fd 100644 --- a/java/codeserver/core/BUILD.bazel +++ b/java/codeserver/core/BUILD.bazel @@ -28,6 +28,7 @@ jvm_library( "//java/java-psi-impl:psi-impl", "//platform/workspace/storage", "//java/java-indexing-api:indexing", - ] + ], + runtime_deps = ["//platform/backend"] ) ### auto-generated section `build intellij.java.codeserver.core` end \ No newline at end of file diff --git a/java/codeserver/core/intellij.java.codeserver.core.iml b/java/codeserver/core/intellij.java.codeserver.core.iml index e8f1f968ca69..f3fad2001c29 100644 --- a/java/codeserver/core/intellij.java.codeserver.core.iml +++ b/java/codeserver/core/intellij.java.codeserver.core.iml @@ -22,5 +22,6 @@ + \ No newline at end of file diff --git a/java/codeserver/core/resources/META-INF/JavaCodeServerCore.xml b/java/codeserver/core/resources/META-INF/JavaCodeServerCore.xml index 9f17ccea8f48..f063dfb685c9 100644 --- a/java/codeserver/core/resources/META-INF/JavaCodeServerCore.xml +++ b/java/codeserver/core/resources/META-INF/JavaCodeServerCore.xml @@ -1,4 +1,4 @@ - + + + + + + + + + + + + + + + + + diff --git a/java/codeserver/highlighting/BUILD.bazel b/java/codeserver/highlighting/BUILD.bazel index dd5b91f18540..792a6684f1f4 100644 --- a/java/codeserver/highlighting/BUILD.bazel +++ b/java/codeserver/highlighting/BUILD.bazel @@ -27,6 +27,7 @@ jvm_library( "//java/java-indexing-api:indexing", "//java/codeserver/core", "//java/java-frontback-impl:frontback-impl", - ] + ], + runtime_deps = ["//platform/backend"] ) ### auto-generated section `build intellij.java.codeserver.highlighting` end \ No newline at end of file diff --git a/java/codeserver/highlighting/intellij.java.codeserver.highlighting.iml b/java/codeserver/highlighting/intellij.java.codeserver.highlighting.iml index 3ab46e0ca0a5..e8658e26b8e3 100644 --- a/java/codeserver/highlighting/intellij.java.codeserver.highlighting.iml +++ b/java/codeserver/highlighting/intellij.java.codeserver.highlighting.iml @@ -21,5 +21,6 @@ + \ No newline at end of file diff --git a/java/codeserver/highlighting/resources/META-INF/JavaCodeServerHighlighting.xml b/java/codeserver/highlighting/resources/META-INF/JavaCodeServerHighlighting.xml index 1efce3fbf598..f8245ea672f9 100644 --- a/java/codeserver/highlighting/resources/META-INF/JavaCodeServerHighlighting.xml +++ b/java/codeserver/highlighting/resources/META-INF/JavaCodeServerHighlighting.xml @@ -1,4 +1,4 @@ - + diff --git a/java/codeserver/highlighting/resources/intellij.java.codeserver.highlighting.xml b/java/codeserver/highlighting/resources/intellij.java.codeserver.highlighting.xml new file mode 100644 index 000000000000..11f4c2ce9d09 --- /dev/null +++ b/java/codeserver/highlighting/resources/intellij.java.codeserver.highlighting.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/java/compiler/impl/BUILD.bazel b/java/compiler/impl/BUILD.bazel index 1e5ec2172f21..f62d30369c65 100644 --- a/java/compiler/impl/BUILD.bazel +++ b/java/compiler/impl/BUILD.bazel @@ -1,11 +1,18 @@ ### auto-generated section `build intellij.java.compiler.impl` start -load("@rules_jvm//:jvm.bzl", "jvm_library") +load("@rules_jvm//:jvm.bzl", "jvm_library", "resourcegroup") + +resourcegroup( + name = "impl_resources", + srcs = glob(["resources/**/*"]), + strip_prefix = "resources" +) jvm_library( name = "impl", module_name = "intellij.java.compiler.impl", visibility = ["//visibility:public"], srcs = glob(["src/**/*.kt", "src/**/*.java", "src/**/*.form"], allow_empty = True), + resources = [":impl_resources"], deps = [ "//java/compiler/openapi:java-compiler", "//java/java-indexing-api:indexing", diff --git a/java/compiler/impl/intellij.java.compiler.impl.iml b/java/compiler/impl/intellij.java.compiler.impl.iml index 9354b79ecd22..9fdf269a2130 100644 --- a/java/compiler/impl/intellij.java.compiler.impl.iml +++ b/java/compiler/impl/intellij.java.compiler.impl.iml @@ -3,6 +3,7 @@ + diff --git a/java/compiler/impl/resources/intellij.java.compiler.impl.xml b/java/compiler/impl/resources/intellij.java.compiler.impl.xml new file mode 100644 index 000000000000..cc9a3c565878 --- /dev/null +++ b/java/compiler/impl/resources/intellij.java.compiler.impl.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/compiler/openapi/resources/intellij.java.compiler.xml b/java/compiler/openapi/resources/intellij.java.compiler.xml new file mode 100644 index 000000000000..39022e15a532 --- /dev/null +++ b/java/compiler/openapi/resources/intellij.java.compiler.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/java/debugger/backend/resources/intellij.java.debugger.impl.backend.xml b/java/debugger/backend/resources/intellij.java.debugger.impl.backend.xml index cbc15fcbbae3..99f105444f09 100644 --- a/java/debugger/backend/resources/intellij.java.debugger.impl.backend.xml +++ b/java/debugger/backend/resources/intellij.java.debugger.impl.backend.xml @@ -1,6 +1,24 @@ - + + + + + + + + + + + + + + + + + + + diff --git a/java/debugger/frontend/resources/intellij.java.debugger.impl.frontend.xml b/java/debugger/frontend/resources/intellij.java.debugger.impl.frontend.xml index afd43323530c..e9a9d3b93229 100644 --- a/java/debugger/frontend/resources/intellij.java.debugger.impl.frontend.xml +++ b/java/debugger/frontend/resources/intellij.java.debugger.impl.frontend.xml @@ -1,7 +1,8 @@ - + + diff --git a/java/debugger/impl/resources/META-INF/java-debugger.xml b/java/debugger/impl/resources/META-INF/java-debugger.xml index 0312a24e351d..6324345845fd 100644 --- a/java/debugger/impl/resources/META-INF/java-debugger.xml +++ b/java/debugger/impl/resources/META-INF/java-debugger.xml @@ -1,4 +1,4 @@ - + messages.ActionsBundle diff --git a/java/debugger/impl/resources/intellij.java.debugger.impl.xml b/java/debugger/impl/resources/intellij.java.debugger.impl.xml new file mode 100644 index 000000000000..9bd5205a5297 --- /dev/null +++ b/java/debugger/impl/resources/intellij.java.debugger.impl.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/debugger/memory-agent/BUILD.bazel b/java/debugger/memory-agent/BUILD.bazel index c2dcf4baad3b..83ef961e9e9b 100644 --- a/java/debugger/memory-agent/BUILD.bazel +++ b/java/debugger/memory-agent/BUILD.bazel @@ -1,11 +1,18 @@ ### auto-generated section `build intellij.java.debugger.memory.agent` start -load("@rules_jvm//:jvm.bzl", "jvm_library") +load("@rules_jvm//:jvm.bzl", "jvm_library", "resourcegroup") + +resourcegroup( + name = "java-debugger-memory-agent_resources", + srcs = glob(["resources/**/*"]), + strip_prefix = "resources" +) jvm_library( name = "java-debugger-memory-agent", module_name = "intellij.java.debugger.memory.agent", visibility = ["//visibility:public"], srcs = glob(["src/**/*.kt", "src/**/*.java", "src/**/*.form"], allow_empty = True), + resources = [":java-debugger-memory-agent_resources"], deps = [ "//platform/util", "@lib//:java-debugger-memory-agent-debugger-memory-agent", diff --git a/java/debugger/memory-agent/intellij.java.debugger.memory.agent.iml b/java/debugger/memory-agent/intellij.java.debugger.memory.agent.iml index c5668954cb61..d2edfd83ef9b 100644 --- a/java/debugger/memory-agent/intellij.java.debugger.memory.agent.iml +++ b/java/debugger/memory-agent/intellij.java.debugger.memory.agent.iml @@ -3,6 +3,7 @@ + diff --git a/java/debugger/memory-agent/resources/intellij.java.debugger.memory.agent.xml b/java/debugger/memory-agent/resources/intellij.java.debugger.memory.agent.xml new file mode 100644 index 000000000000..93e275b7db1d --- /dev/null +++ b/java/debugger/memory-agent/resources/intellij.java.debugger.memory.agent.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/java/debugger/openapi/BUILD.bazel b/java/debugger/openapi/BUILD.bazel index c0e4a7e4a786..ab3c84c71107 100644 --- a/java/debugger/openapi/BUILD.bazel +++ b/java/debugger/openapi/BUILD.bazel @@ -31,6 +31,7 @@ jvm_library( "@lib//:kotlin-stdlib", "//platform/execution", ], - exports = ["//platform/xdebugger-api:debugger"] + exports = ["//platform/xdebugger-api:debugger"], + runtime_deps = ["//platform/backend"] ) ### auto-generated section `build intellij.java.debugger` end \ No newline at end of file diff --git a/java/debugger/openapi/intellij.java.debugger.iml b/java/debugger/openapi/intellij.java.debugger.iml index cb617a0eb92c..add94755f114 100644 --- a/java/debugger/openapi/intellij.java.debugger.iml +++ b/java/debugger/openapi/intellij.java.debugger.iml @@ -24,6 +24,7 @@ + diff --git a/java/debugger/openapi/resources/intellij.java.debugger.xml b/java/debugger/openapi/resources/intellij.java.debugger.xml new file mode 100644 index 000000000000..95dc0b69f739 --- /dev/null +++ b/java/debugger/openapi/resources/intellij.java.debugger.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/java/execution/backend/resources/intellij.java.execution.impl.backend.xml b/java/execution/backend/resources/intellij.java.execution.impl.backend.xml index eff77e5ac135..64d6da6fbffe 100644 --- a/java/execution/backend/resources/intellij.java.execution.impl.backend.xml +++ b/java/execution/backend/resources/intellij.java.execution.impl.backend.xml @@ -2,6 +2,7 @@ + diff --git a/java/execution/frontend/resources/intellij.java.execution.impl.frontend.xml b/java/execution/frontend/resources/intellij.java.execution.impl.frontend.xml index e2e1ac23344d..78904f0ee68f 100644 --- a/java/execution/frontend/resources/intellij.java.execution.impl.frontend.xml +++ b/java/execution/frontend/resources/intellij.java.execution.impl.frontend.xml @@ -2,8 +2,8 @@ - - + + diff --git a/java/execution/impl/resources/intellij.java.execution.impl.xml b/java/execution/impl/resources/intellij.java.execution.impl.xml new file mode 100644 index 000000000000..be376aadaa02 --- /dev/null +++ b/java/execution/impl/resources/intellij.java.execution.impl.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/execution/openapi/BUILD.bazel b/java/execution/openapi/BUILD.bazel index 6168b5d37272..76795c405e6c 100644 --- a/java/execution/openapi/BUILD.bazel +++ b/java/execution/openapi/BUILD.bazel @@ -1,11 +1,18 @@ ### auto-generated section `build intellij.java.execution` start -load("@rules_jvm//:jvm.bzl", "jvm_library") +load("@rules_jvm//:jvm.bzl", "jvm_library", "resourcegroup") + +resourcegroup( + name = "java-execution_resources", + srcs = glob(["resources/**/*"]), + strip_prefix = "resources" +) jvm_library( name = "java-execution", module_name = "intellij.java.execution", visibility = ["//visibility:public"], srcs = glob(["src/**/*.kt", "src/**/*.java", "src/**/*.form"], allow_empty = True), + resources = [":java-execution_resources"], deps = [ "//java/openapi:java", "//java/java-indexing-api:indexing", @@ -23,6 +30,7 @@ jvm_library( "//platform/core-ui", "//platform/platform-util-io:ide-util-io", "//platform/execution", - ] + ], + runtime_deps = ["//platform/backend"] ) ### 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 b68f20ac2ec5..71c96bedc71a 100644 --- a/java/execution/openapi/intellij.java.execution.iml +++ b/java/execution/openapi/intellij.java.execution.iml @@ -3,10 +3,12 @@ + + diff --git a/java/execution/openapi/resources/intellij.java.execution.xml b/java/execution/openapi/resources/intellij.java.execution.xml new file mode 100644 index 000000000000..411ec4ec629e --- /dev/null +++ b/java/execution/openapi/resources/intellij.java.execution.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/java/idea-ui/resources/intellij.java.ui.xml b/java/idea-ui/resources/intellij.java.ui.xml index d629a7b71f79..77ea862dfaf9 100644 --- a/java/idea-ui/resources/intellij.java.ui.xml +++ b/java/idea-ui/resources/intellij.java.ui.xml @@ -1,8 +1,35 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - \ No newline at end of file + diff --git a/java/java-analysis-api/resources/intellij.java.analysis.xml b/java/java-analysis-api/resources/intellij.java.analysis.xml new file mode 100644 index 000000000000..697acf7c08b0 --- /dev/null +++ b/java/java-analysis-api/resources/intellij.java.analysis.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/java/java-analysis-impl/resources/intellij.java.analysis.impl.xml b/java/java-analysis-impl/resources/intellij.java.analysis.impl.xml new file mode 100644 index 000000000000..df38770e824e --- /dev/null +++ b/java/java-analysis-impl/resources/intellij.java.analysis.impl.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/java-backend/BUILD.bazel b/java/java-backend/BUILD.bazel new file mode 100644 index 000000000000..c1c5bde76d6e --- /dev/null +++ b/java/java-backend/BUILD.bazel @@ -0,0 +1,98 @@ +### auto-generated section `build intellij.java.backend` start +load("@rules_jvm//:jvm.bzl", "jvm_library", "resourcegroup") + +resourcegroup( + name = "backend_resources", + srcs = glob(["resources/**/*"]), + strip_prefix = "resources" +) + +jvm_library( + name = "backend", + module_name = "intellij.java.backend", + visibility = ["//visibility:public"], + srcs = glob(["src/**/*.kt", "src/**/*.java", "src/**/*.form"], allow_empty = True), + resources = [":backend_resources"], + deps = ["//resources:java-resources"], + exports = [ + "//java/java-syntax:syntax", + "//java/java-frontback-psi-api:frontback-psi", + "//java/java-frontback-psi-impl:frontback-psi-impl", + "//java/java-psi-api:psi", + "//java/java-psi-impl:psi-impl", + "//java/java-frontback-impl:frontback-impl", + "//java/java-indexing-api:indexing", + "//uast/uast-common:uast", + "//uast/uast-common-ide:ide", + "//uast/uast-java:java-uast", + "//java/compiler/openapi:java-compiler", + "//java/java-analysis-api:analysis", + "//java/openapi:java", + "//resources:java-resources", + "//java/execution/openapi:java-execution", + "//jvm/jvm-analysis-api:analysis", + "//java/jsp-openapi:jsp", + "//resources-en:java-resources-en", + "//java/debugger/openapi:java-debugger", + "//java/codeserver/core", + "//java/codeserver/highlighting", + "//java/jsp-spi", + "//java/java-indexing-impl:indexing-impl", + "//java/java-analysis-impl:analysis-impl", + "//java/java-structure-view:structureView", + "//java/java-impl:impl", + "//java/java-impl-refactorings:impl-refactorings", + "//java/compiler/impl", + "//java/java-impl-inspections:impl-inspections", + "//jvm/jvm-analysis-refactoring:analysis-refactoring", + "//jvm/jvm-analysis-quickFix:analysis-quickFix", + "//plugins/ui-designer-core:uiDesigner", + "//java/idea-ui:ui", + "//java/execution/impl", + "//java/debugger/impl", + "//java/debugger/backend", + "//java/debugger/memory-agent:java-debugger-memory-agent", + "//uast/uast-java-ide:java-uast-ide", + ], + runtime_deps = [ + "//java/java-syntax:syntax", + "//java/java-frontback-psi-api:frontback-psi", + "//java/java-frontback-psi-impl:frontback-psi-impl", + "//java/java-psi-api:psi", + "//java/java-psi-impl:psi-impl", + "//java/java-frontback-impl:frontback-impl", + "//java/java-indexing-api:indexing", + "//uast/uast-common:uast", + "//uast/uast-common-ide:ide", + "//uast/uast-java:java-uast", + "//java/compiler/openapi:java-compiler", + "//java/java-analysis-api:analysis", + "//java/openapi:java", + "//java/execution/openapi:java-execution", + "//jvm/jvm-analysis-api:analysis", + "//java/jsp-openapi:jsp", + "//resources-en:java-resources-en", + "//java/debugger/openapi:java-debugger", + "//java/codeserver/core", + "//java/codeserver/highlighting", + "//java/jsp-spi", + "//java/java-indexing-impl:indexing-impl", + "//java/java-analysis-impl:analysis-impl", + "//java/java-structure-view:structureView", + "//java/java-impl:impl", + "//java/java-impl-refactorings:impl-refactorings", + "//java/compiler/impl", + "//java/java-impl-inspections:impl-inspections", + "//jvm/jvm-analysis-refactoring:analysis-refactoring", + "//jvm/jvm-analysis-quickFix:analysis-quickFix", + "//plugins/ui-designer-core:uiDesigner", + "//java/idea-ui:ui", + "//java/execution/impl", + "//java/debugger/impl", + "//java/debugger/backend", + "//java/debugger/memory-agent:java-debugger-memory-agent", + "//uast/uast-java-ide:java-uast-ide", + "//platform/backend", + ] +) +### auto-generated section `build intellij.java.backend` end \ No newline at end of file diff --git a/java/java-backend/intellij.java.backend.iml b/java/java-backend/intellij.java.backend.iml new file mode 100644 index 000000000000..be089e86cf98 --- /dev/null +++ b/java/java-backend/intellij.java.backend.iml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/java/java-analysis-impl/resources/META-INF/GlobalInspections.xml b/java/java-backend/resources/META-INF/GlobalInspections.xml similarity index 100% rename from java/java-analysis-impl/resources/META-INF/GlobalInspections.xml rename to java/java-backend/resources/META-INF/GlobalInspections.xml diff --git a/java/java-impl/resources/META-INF/InspectionGadgets.xml b/java/java-backend/resources/META-INF/InspectionGadgets.xml similarity index 100% rename from java/java-impl/resources/META-INF/InspectionGadgets.xml rename to java/java-backend/resources/META-INF/InspectionGadgets.xml diff --git a/java/java-impl/resources/META-INF/Inspections.xml b/java/java-backend/resources/META-INF/Inspections.xml similarity index 100% rename from java/java-impl/resources/META-INF/Inspections.xml rename to java/java-backend/resources/META-INF/Inspections.xml diff --git a/java/java-impl/resources/META-INF/IntentionPowerPack.xml b/java/java-backend/resources/META-INF/IntentionPowerPack.xml similarity index 100% rename from java/java-impl/resources/META-INF/IntentionPowerPack.xml rename to java/java-backend/resources/META-INF/IntentionPowerPack.xml diff --git a/java/java-impl/resources/META-INF/Intentions.xml b/java/java-backend/resources/META-INF/Intentions.xml similarity index 100% rename from java/java-impl/resources/META-INF/Intentions.xml rename to java/java-backend/resources/META-INF/Intentions.xml diff --git a/java/java-backend/resources/META-INF/JavaActions.xml b/java/java-backend/resources/META-INF/JavaActions.xml new file mode 100644 index 000000000000..2e3ae4d4ea48 --- /dev/null +++ b/java/java-backend/resources/META-INF/JavaActions.xml @@ -0,0 +1,413 @@ + + messages.ActionsBundle + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/java-analysis-impl/resources/META-INF/JavaAnalysisPlugin.xml b/java/java-backend/resources/META-INF/JavaAnalysisPlugin.xml similarity index 100% rename from java/java-analysis-impl/resources/META-INF/JavaAnalysisPlugin.xml rename to java/java-backend/resources/META-INF/JavaAnalysisPlugin.xml diff --git a/java/java-impl/resources/META-INF/JavaPlugin.xml b/java/java-backend/resources/META-INF/JavaPlugin.xml similarity index 99% rename from java/java-impl/resources/META-INF/JavaPlugin.xml rename to java/java-backend/resources/META-INF/JavaPlugin.xml index 2d6eeba2996c..68f60b1d1412 100644 --- a/java/java-impl/resources/META-INF/JavaPlugin.xml +++ b/java/java-backend/resources/META-INF/JavaPlugin.xml @@ -1,23 +1,30 @@ - - + - + - - - + + + + + + - - - - - + + + + + + + + + + @@ -288,6 +295,16 @@ + + + + + + + + + @@ -987,9 +1004,9 @@ - - - + + + diff --git a/java/java-impl/resources/META-INF/RegistryKeys.xml b/java/java-backend/resources/META-INF/RegistryKeys.xml similarity index 100% rename from java/java-impl/resources/META-INF/RegistryKeys.xml rename to java/java-backend/resources/META-INF/RegistryKeys.xml diff --git a/java/java-backend/resources/intellij.java.backend.xml b/java/java-backend/resources/intellij.java.backend.xml new file mode 100644 index 000000000000..5837b4e5fdeb --- /dev/null +++ b/java/java-backend/resources/intellij.java.backend.xml @@ -0,0 +1,79 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/java-backend/src/.keep b/java/java-backend/src/.keep new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/java/java-features-trainer/resources/intellij.java.featuresTrainer.xml b/java/java-features-trainer/resources/intellij.java.featuresTrainer.xml index ab8b6036ee2c..005a716d7392 100644 --- a/java/java-features-trainer/resources/intellij.java.featuresTrainer.xml +++ b/java/java-features-trainer/resources/intellij.java.featuresTrainer.xml @@ -1,6 +1,16 @@ + + + + + + + + + + diff --git a/java/java-impl-inspections/BUILD.bazel b/java/java-impl-inspections/BUILD.bazel index daa12389df09..015e1453232c 100644 --- a/java/java-impl-inspections/BUILD.bazel +++ b/java/java-impl-inspections/BUILD.bazel @@ -1,11 +1,18 @@ ### auto-generated section `build intellij.java.impl.inspections` start -load("@rules_jvm//:jvm.bzl", "jvm_library") +load("@rules_jvm//:jvm.bzl", "jvm_library", "resourcegroup") + +resourcegroup( + name = "impl-inspections_resources", + srcs = glob(["resources/**/*"]), + strip_prefix = "resources" +) jvm_library( name = "impl-inspections", module_name = "intellij.java.impl.inspections", visibility = ["//visibility:public"], srcs = glob(["src/**/*.kt", "src/**/*.java", "src/**/*.form"], allow_empty = True), + resources = [":impl-inspections_resources"], deps = [ "//java/openapi:java", "//java/java-analysis-impl:analysis-impl", diff --git a/java/java-impl-inspections/intellij.java.impl.inspections.iml b/java/java-impl-inspections/intellij.java.impl.inspections.iml index 0bfc55cda8c0..6d1fd851aaa2 100644 --- a/java/java-impl-inspections/intellij.java.impl.inspections.iml +++ b/java/java-impl-inspections/intellij.java.impl.inspections.iml @@ -3,6 +3,7 @@ + diff --git a/java/java-impl-inspections/resources/intellij.java.impl.inspections.xml b/java/java-impl-inspections/resources/intellij.java.impl.inspections.xml new file mode 100644 index 000000000000..c96f2b061730 --- /dev/null +++ b/java/java-impl-inspections/resources/intellij.java.impl.inspections.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/java-impl-refactorings/BUILD.bazel b/java/java-impl-refactorings/BUILD.bazel index 0beb9fd10595..4b88aa6d4d50 100644 --- a/java/java-impl-refactorings/BUILD.bazel +++ b/java/java-impl-refactorings/BUILD.bazel @@ -1,11 +1,18 @@ ### auto-generated section `build intellij.java.impl.refactorings` start -load("@rules_jvm//:jvm.bzl", "jvm_library") +load("@rules_jvm//:jvm.bzl", "jvm_library", "resourcegroup") + +resourcegroup( + name = "impl-refactorings_resources", + srcs = glob(["resources/**/*"]), + strip_prefix = "resources" +) jvm_library( name = "impl-refactorings", module_name = "intellij.java.impl.refactorings", visibility = ["//visibility:public"], srcs = glob(["src/**/*.kt", "src/**/*.java", "src/**/*.form"], allow_empty = True), + resources = [":impl-refactorings_resources"], deps = [ "//java/java-indexing-api:indexing", "//platform/analysis-api:analysis", diff --git a/java/java-impl-refactorings/intellij.java.impl.refactorings.iml b/java/java-impl-refactorings/intellij.java.impl.refactorings.iml index 6a74d0b674a1..1d84275def8d 100644 --- a/java/java-impl-refactorings/intellij.java.impl.refactorings.iml +++ b/java/java-impl-refactorings/intellij.java.impl.refactorings.iml @@ -3,6 +3,7 @@ + diff --git a/java/java-impl-refactorings/resources/intellij.java.impl.refactorings.xml b/java/java-impl-refactorings/resources/intellij.java.impl.refactorings.xml new file mode 100644 index 000000000000..71732e0f10d3 --- /dev/null +++ b/java/java-impl-refactorings/resources/intellij.java.impl.refactorings.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/java-impl/resources/META-INF/UsageData.xml b/java/java-impl/resources/META-INF/UsageData.xml index 0714dfa4ec47..a735cf9cf692 100644 --- a/java/java-impl/resources/META-INF/UsageData.xml +++ b/java/java-impl/resources/META-INF/UsageData.xml @@ -25,6 +25,8 @@ topic="com.intellij.codeInsight.daemon.DaemonCodeAnalyzer$DaemonListener"/> + + messages.ActionsBundle + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/java-impl/src/com/intellij/openapi/projectRoots/impl/JavaSdkImpl.java b/java/java-impl/src/com/intellij/openapi/projectRoots/impl/JavaSdkImpl.java index ab768a6e874a..bf974fb36c4f 100644 --- a/java/java-impl/src/com/intellij/openapi/projectRoots/impl/JavaSdkImpl.java +++ b/java/java-impl/src/com/intellij/openapi/projectRoots/impl/JavaSdkImpl.java @@ -426,6 +426,17 @@ public final class JavaSdkImpl extends JavaSdk { String url = "jar://" + annotationsJarPathString + "!/"; root = refresh ? vfm.refreshAndFindFileByUrl(url) : vfm.findFileByUrl(url); pathsChecked.add(annotationsJarPathString); + // if java is modularized, + // javaPluginClassesRootPath is "lib/modules", let's try to check "/lib" + if (root == null && + javaPluginClassesRootPath.getParent() != null) { + Path parentJavaPluginClassesRootPath = javaPluginClassesRootPath.getParent(); + Path parentAnnotationsJarPath = parentJavaPluginClassesRootPath.resolveSibling(pathInResources); + String parentAnnotationsJarPathString = FileUtil.toSystemIndependentName(parentAnnotationsJarPath.toString()); + String urlParent = "jar://" + parentAnnotationsJarPathString + "!/"; + root = refresh ? vfm.refreshAndFindFileByUrl(urlParent) : vfm.findFileByUrl(urlParent); + pathsChecked.add(parentAnnotationsJarPathString); + } } else { // when run against IDEA plugin JDK, something like this comes up: "$IDEA_HOME$/out/classes/production/intellij.java.impl" diff --git a/java/java-indexing-api/BUILD.bazel b/java/java-indexing-api/BUILD.bazel index 568cd129e75d..71f0c1c75ee4 100644 --- a/java/java-indexing-api/BUILD.bazel +++ b/java/java-indexing-api/BUILD.bazel @@ -20,6 +20,7 @@ jvm_library( "//platform/indexing-api:indexing", "//platform/util", "//platform/util/concurrency", - ] + ], + runtime_deps = ["//platform/backend"] ) ### auto-generated section `build intellij.java.indexing` end \ No newline at end of file diff --git a/java/java-indexing-api/intellij.java.indexing.iml b/java/java-indexing-api/intellij.java.indexing.iml index 7d3486c73898..c2f5490d0141 100644 --- a/java/java-indexing-api/intellij.java.indexing.iml +++ b/java/java-indexing-api/intellij.java.indexing.iml @@ -14,5 +14,6 @@ + \ No newline at end of file diff --git a/java/java-indexing-api/resources/intellij.java.indexing.xml b/java/java-indexing-api/resources/intellij.java.indexing.xml new file mode 100644 index 000000000000..f45fbae3b1fc --- /dev/null +++ b/java/java-indexing-api/resources/intellij.java.indexing.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/java/java-indexing-impl/resources/META-INF/JavaIndexingPlugin.xml b/java/java-indexing-impl/resources/META-INF/JavaIndexingPlugin.xml index 384f172d661e..6adad6f22b3f 100644 --- a/java/java-indexing-impl/resources/META-INF/JavaIndexingPlugin.xml +++ b/java/java-indexing-impl/resources/META-INF/JavaIndexingPlugin.xml @@ -59,11 +59,8 @@ - - @@ -86,9 +83,6 @@ - - - \ No newline at end of file diff --git a/java/java-indexing-impl/resources/intellij.java.indexing.impl.xml b/java/java-indexing-impl/resources/intellij.java.indexing.impl.xml new file mode 100644 index 000000000000..0cd90b6261be --- /dev/null +++ b/java/java-indexing-impl/resources/intellij.java.indexing.impl.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/java/java-psi-impl/resources/intellij.java.psi.impl.xml b/java/java-psi-impl/resources/intellij.java.psi.impl.xml index d3d940ed847f..c2077e546205 100644 --- a/java/java-psi-impl/resources/intellij.java.psi.impl.xml +++ b/java/java-psi-impl/resources/intellij.java.psi.impl.xml @@ -1,4 +1,3 @@ - + + + + + + + + @@ -55,16 +62,6 @@ - - - - @@ -162,12 +159,6 @@ - - - @@ -177,16 +168,6 @@ description="Whether to show sub-interfaces when invoking the 'Go to Implementation' action (Ctrl+Alt+B) on an interface."/> - - - - - - - - - - diff --git a/java/java-structure-view/resources/intellij.java.structureView.xml b/java/java-structure-view/resources/intellij.java.structureView.xml new file mode 100644 index 000000000000..ac7a1ff77fa8 --- /dev/null +++ b/java/java-structure-view/resources/intellij.java.structureView.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/java/java-terminal/resources/intellij.java.terminal.xml b/java/java-terminal/resources/intellij.java.terminal.xml index 06f1f82726b2..96e04606aa5a 100644 --- a/java/java-terminal/resources/intellij.java.terminal.xml +++ b/java/java-terminal/resources/intellij.java.terminal.xml @@ -1,6 +1,10 @@ - + + + + + diff --git a/java/java-tests/BUILD.bazel b/java/java-tests/BUILD.bazel index 1fd2661f0997..31e2572ed489 100644 --- a/java/java-tests/BUILD.bazel +++ b/java/java-tests/BUILD.bazel @@ -14,6 +14,7 @@ jvm_library( exports = [ "//plugins/java-i18n", "//plugins/coverage", + "//java/java-backend:backend", ], runtime_deps = [ "//platform/testFramework", @@ -41,6 +42,7 @@ jvm_library( "//xml/xml-analysis-impl:analysis-impl", "//xml/xml-psi-impl:psi-impl", "//plugins/coverage", + "//java/java-backend:backend", "//libraries/stream", "//libraries/fastutil", "//platform/platform-impl:ide-impl", @@ -148,6 +150,7 @@ jvm_library( "//platform/lvcs-impl:lvcs-impl_test_lib", "//plugins/coverage", "//plugins/coverage:coverage_test_lib", + "//java/java-backend:backend", "//platform/workspace/jps", "//libraries/jackson/jackson", "//libraries/jackson/databind", @@ -207,12 +210,14 @@ jvm_library( "//platform/forms_rt:java-guiForms-rt", "//java/testFramework/backend", "//plugins/groovy-live-templates", + "//java/java-copyright:copyright", ], exports = [ "//plugins/java-i18n", "//plugins/java-i18n:java-i18n_test_lib", "//plugins/coverage", "//plugins/coverage:coverage_test_lib", + "//java/java-backend:backend", ], runtime_deps = [":tests"] ) diff --git a/java/java-tests/intellij.java.tests.iml b/java/java-tests/intellij.java.tests.iml index c3f6835cd5c7..b1060c00446a 100644 --- a/java/java-tests/intellij.java.tests.iml +++ b/java/java-tests/intellij.java.tests.iml @@ -83,6 +83,7 @@ + @@ -137,5 +138,6 @@ + \ No newline at end of file diff --git a/java/jsp-openapi/BUILD.bazel b/java/jsp-openapi/BUILD.bazel index f36d5752b181..a24ba7aad95f 100644 --- a/java/jsp-openapi/BUILD.bazel +++ b/java/jsp-openapi/BUILD.bazel @@ -1,11 +1,18 @@ ### auto-generated section `build intellij.jsp` start -load("@rules_jvm//:jvm.bzl", "jvm_library") +load("@rules_jvm//:jvm.bzl", "jvm_library", "resourcegroup") + +resourcegroup( + name = "jsp_resources", + srcs = glob(["resources/**/*"]), + strip_prefix = "resources" +) jvm_library( name = "jsp", module_name = "intellij.jsp", visibility = ["//visibility:public"], srcs = glob(["src/**/*.kt", "src/**/*.java", "src/**/*.form"], allow_empty = True), + resources = [":jsp_resources"], deps = [ "//java/java-psi-api:psi", "//platform/core-api:core", @@ -13,6 +20,7 @@ jvm_library( "//xml/xml-psi-api:psi", "//java/jsp-base-openapi:jsp-base", ], - exports = ["//java/jsp-base-openapi:jsp-base"] + exports = ["//java/jsp-base-openapi:jsp-base"], + runtime_deps = ["//platform/backend"] ) ### auto-generated section `build intellij.jsp` end \ No newline at end of file diff --git a/java/jsp-openapi/intellij.jsp.iml b/java/jsp-openapi/intellij.jsp.iml index 7bbbd7c34754..4877e361dfc0 100644 --- a/java/jsp-openapi/intellij.jsp.iml +++ b/java/jsp-openapi/intellij.jsp.iml @@ -3,6 +3,7 @@ + @@ -11,6 +12,7 @@ + \ No newline at end of file diff --git a/java/jsp-openapi/resources/intellij.jsp.xml b/java/jsp-openapi/resources/intellij.jsp.xml new file mode 100644 index 000000000000..4cbead2fd641 --- /dev/null +++ b/java/jsp-openapi/resources/intellij.jsp.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/java/jsp-spi/BUILD.bazel b/java/jsp-spi/BUILD.bazel index f047e25254d7..0062c3b2aad3 100644 --- a/java/jsp-spi/BUILD.bazel +++ b/java/jsp-spi/BUILD.bazel @@ -1,11 +1,18 @@ ### auto-generated section `build intellij.jsp.spi` start -load("@rules_jvm//:jvm.bzl", "jvm_library") +load("@rules_jvm//:jvm.bzl", "jvm_library", "resourcegroup") + +resourcegroup( + name = "jsp-spi_resources", + srcs = glob(["resources/**/*"]), + strip_prefix = "resources" +) jvm_library( name = "jsp-spi", module_name = "intellij.jsp.spi", visibility = ["//visibility:public"], srcs = glob(["src/**/*.kt", "src/**/*.java", "src/**/*.form"], allow_empty = True), + resources = [":jsp-spi_resources"], deps = [ "//java/jsp-openapi:jsp", "//java/openapi:java", @@ -19,6 +26,7 @@ jvm_library( exports = [ "//java/jsp-openapi:jsp", "//java/openapi:java", - ] + ], + runtime_deps = ["//platform/backend"] ) ### auto-generated section `build intellij.jsp.spi` end \ No newline at end of file diff --git a/java/jsp-spi/intellij.jsp.spi.iml b/java/jsp-spi/intellij.jsp.spi.iml index f759c4536822..0a46cd559690 100644 --- a/java/jsp-spi/intellij.jsp.spi.iml +++ b/java/jsp-spi/intellij.jsp.spi.iml @@ -3,6 +3,7 @@ + @@ -15,6 +16,7 @@ + diff --git a/java/jsp-spi/resources/intellij.jsp.spi.xml b/java/jsp-spi/resources/intellij.jsp.spi.xml new file mode 100644 index 000000000000..9034ca9f66d7 --- /dev/null +++ b/java/jsp-spi/resources/intellij.jsp.spi.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/java/langInjection/BUILD.bazel b/java/langInjection/BUILD.bazel index fb4d170e6c94..e5d453661747 100644 --- a/java/langInjection/BUILD.bazel +++ b/java/langInjection/BUILD.bazel @@ -38,6 +38,9 @@ jvm_library( "//platform/forms_rt:java-guiForms-rt", ":plugins_IntelliLang_backend_provided", ], - runtime_deps = ["//java/langInjection/jps"] + runtime_deps = [ + "//java/langInjection/jps", + "//platform/backend", + ] ) ### auto-generated section `build intellij.java.langInjection` end \ No newline at end of file diff --git a/java/langInjection/intellij.java.langInjection.iml b/java/langInjection/intellij.java.langInjection.iml index bd6f1bd69345..2c821020a624 100644 --- a/java/langInjection/intellij.java.langInjection.iml +++ b/java/langInjection/intellij.java.langInjection.iml @@ -27,6 +27,7 @@ + diff --git a/java/langInjection/jps/resources/intellij.java.langInjection.jps.xml b/java/langInjection/jps/resources/intellij.java.langInjection.jps.xml index e547a22cd81d..44c990c90903 100644 --- a/java/langInjection/jps/resources/intellij.java.langInjection.jps.xml +++ b/java/langInjection/jps/resources/intellij.java.langInjection.jps.xml @@ -1,7 +1,8 @@ - + + diff --git a/java/langInjection/resources/intellij.java.langInjection.xml b/java/langInjection/resources/intellij.java.langInjection.xml index e3e05b8d2860..758c643ee120 100644 --- a/java/langInjection/resources/intellij.java.langInjection.xml +++ b/java/langInjection/resources/intellij.java.langInjection.xml @@ -4,6 +4,13 @@ + + + + + + + + diff --git a/java/manifest/resources/intellij.java.manifest.xml b/java/manifest/resources/intellij.java.manifest.xml new file mode 100644 index 000000000000..e4a9458eae8a --- /dev/null +++ b/java/manifest/resources/intellij.java.manifest.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/openapi/BUILD.bazel b/java/openapi/BUILD.bazel index 02e9f70e4286..7137aaf64164 100644 --- a/java/openapi/BUILD.bazel +++ b/java/openapi/BUILD.bazel @@ -63,6 +63,7 @@ jvm_library( "//platform/lang-api:lang", "//java/java-psi-api:psi", "//java/java-analysis-api:analysis", - ] + ], + runtime_deps = ["//platform/backend"] ) ### auto-generated section `build intellij.java` end \ No newline at end of file diff --git a/java/openapi/intellij.java.iml b/java/openapi/intellij.java.iml index f14727038a32..6c90dda3270d 100644 --- a/java/openapi/intellij.java.iml +++ b/java/openapi/intellij.java.iml @@ -38,6 +38,7 @@ + \ No newline at end of file diff --git a/java/plugin/resources/META-INF/plugin.xml b/java/plugin/resources/META-INF/plugin.xml index 6db46cfc1d33..2593790f18fd 100644 --- a/java/plugin/resources/META-INF/plugin.xml +++ b/java/plugin/resources/META-INF/plugin.xml @@ -1,4 +1,4 @@ - + com.intellij.java Java - + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + - - - + - - com.intellij.modules.remoteServers - - - - - - \ No newline at end of file diff --git a/java/remote-servers/api/BUILD.bazel b/java/remote-servers/api/BUILD.bazel index dde8e3f96115..d56a82cf9e01 100644 --- a/java/remote-servers/api/BUILD.bazel +++ b/java/remote-servers/api/BUILD.bazel @@ -1,11 +1,18 @@ ### auto-generated section `build intellij.java.remoteServers` start -load("@rules_jvm//:jvm.bzl", "jvm_library") +load("@rules_jvm//:jvm.bzl", "jvm_library", "resourcegroup") + +resourcegroup( + name = "java-remoteServers_resources", + srcs = glob(["resources/**/*"]), + strip_prefix = "resources" +) jvm_library( name = "java-remoteServers", module_name = "intellij.java.remoteServers", visibility = ["//visibility:public"], srcs = glob(["src/**/*.kt", "src/**/*.java", "src/**/*.form"], allow_empty = True), + resources = [":java-remoteServers_resources"], deps = [ "//platform/projectModel-api:projectModel", "//platform/remote-servers/api:remoteServers", diff --git a/java/remote-servers/api/intellij.java.remoteServers.iml b/java/remote-servers/api/intellij.java.remoteServers.iml index 512dd1fc05f0..4d5530546e5a 100644 --- a/java/remote-servers/api/intellij.java.remoteServers.iml +++ b/java/remote-servers/api/intellij.java.remoteServers.iml @@ -3,6 +3,7 @@ + diff --git a/java/remote-servers/api/resources/intellij.java.remoteServers.xml b/java/remote-servers/api/resources/intellij.java.remoteServers.xml new file mode 100644 index 000000000000..2f240778d6df --- /dev/null +++ b/java/remote-servers/api/resources/intellij.java.remoteServers.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/java/remote-servers/impl/resources/META-INF/Java-RemoteServer.xml b/java/remote-servers/impl/resources/META-INF/Java-RemoteServer.xml new file mode 100644 index 000000000000..f632d33a5139 --- /dev/null +++ b/java/remote-servers/impl/resources/META-INF/Java-RemoteServer.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/java/remote-servers/impl/resources/intellij.java.remoteServers.impl.xml b/java/remote-servers/impl/resources/intellij.java.remoteServers.impl.xml index 4b1b0343eca2..89f7e787d6ea 100644 --- a/java/remote-servers/impl/resources/intellij.java.remoteServers.impl.xml +++ b/java/remote-servers/impl/resources/intellij.java.remoteServers.impl.xml @@ -1,17 +1,25 @@ - + + + + + + + + + + + + + + + + - - - + + - - + + + - - - - \ No newline at end of file diff --git a/java/structuralsearch-java/resources/intellij.java.structuralSearch.xml b/java/structuralsearch-java/resources/intellij.java.structuralSearch.xml index e2aed3dc1566..b890e0823283 100644 --- a/java/structuralsearch-java/resources/intellij.java.structuralSearch.xml +++ b/java/structuralsearch-java/resources/intellij.java.structuralSearch.xml @@ -1,6 +1,12 @@ + + + + + + diff --git a/java/testFramework/BUILD.bazel b/java/testFramework/BUILD.bazel index ee8db9d9335c..5720b948ec15 100644 --- a/java/testFramework/BUILD.bazel +++ b/java/testFramework/BUILD.bazel @@ -35,6 +35,7 @@ jvm_library( "//java/compiler/impl", "//java/debugger/openapi:java-debugger", "//java/java-impl:impl", + "//java/java-backend:backend", "//platform/ide-core-impl", "//java/execution/impl", "//platform/editor-ui-ex:editor-ex", @@ -72,6 +73,7 @@ jvm_library( "//platform/util", "//platform/lang-api:lang", "//java/java-impl:impl", + "//java/java-backend:backend", ], runtime_deps = [ "//java/plugin", diff --git a/java/testFramework/intellij.java.testFramework.iml b/java/testFramework/intellij.java.testFramework.iml index 700213d0b223..e014397c8c61 100644 --- a/java/testFramework/intellij.java.testFramework.iml +++ b/java/testFramework/intellij.java.testFramework.iml @@ -29,6 +29,7 @@ + diff --git a/java/typeMigration/resources/META-INF/TypeMigration.xml b/java/typeMigration/resources/META-INF/TypeMigration.xml index dbd07b864550..11b70835eb69 100644 --- a/java/typeMigration/resources/META-INF/TypeMigration.xml +++ b/java/typeMigration/resources/META-INF/TypeMigration.xml @@ -1,4 +1,4 @@ - + diff --git a/java/typeMigration/resources/intellij.java.typeMigration.xml b/java/typeMigration/resources/intellij.java.typeMigration.xml new file mode 100644 index 000000000000..d5736909542d --- /dev/null +++ b/java/typeMigration/resources/intellij.java.typeMigration.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/java/unscramble/resources/intellij.java.unscramble.xml b/java/unscramble/resources/intellij.java.unscramble.xml index facaf997ac9d..820bc82fda4c 100644 --- a/java/unscramble/resources/intellij.java.unscramble.xml +++ b/java/unscramble/resources/intellij.java.unscramble.xml @@ -1,6 +1,10 @@ + + + + diff --git a/java/vcs/resources/intellij.java.vcs.xml b/java/vcs/resources/intellij.java.vcs.xml index 14c83d471bb7..ba0c16865115 100644 --- a/java/vcs/resources/intellij.java.vcs.xml +++ b/java/vcs/resources/intellij.java.vcs.xml @@ -1,6 +1,9 @@ + + + diff --git a/jvm/jvm-analysis-api/BUILD.bazel b/jvm/jvm-analysis-api/BUILD.bazel index a4ea34e9c8dd..51594b3ffaa2 100644 --- a/jvm/jvm-analysis-api/BUILD.bazel +++ b/jvm/jvm-analysis-api/BUILD.bazel @@ -1,11 +1,18 @@ ### auto-generated section `build intellij.jvm.analysis` start -load("@rules_jvm//:jvm.bzl", "jvm_library") +load("@rules_jvm//:jvm.bzl", "jvm_library", "resourcegroup") + +resourcegroup( + name = "analysis_resources", + srcs = glob(["resources/**/*"]), + strip_prefix = "resources" +) jvm_library( name = "analysis", module_name = "intellij.jvm.analysis", visibility = ["//visibility:public"], srcs = glob(["src/**/*.kt", "src/**/*.java", "src/**/*.form"], allow_empty = True), + resources = [":analysis_resources"], deps = [ "//platform/core-api:core", "//uast/uast-common:uast", @@ -20,6 +27,7 @@ jvm_library( "//uast/uast-common:uast", "//java/java-psi-api:psi", "//uast/uast-common-ide:ide", - ] + ], + runtime_deps = ["//platform/backend"] ) ### auto-generated section `build intellij.jvm.analysis` end \ No newline at end of file diff --git a/jvm/jvm-analysis-api/intellij.jvm.analysis.iml b/jvm/jvm-analysis-api/intellij.jvm.analysis.iml index 141deff41ca8..58c40db1b68e 100644 --- a/jvm/jvm-analysis-api/intellij.jvm.analysis.iml +++ b/jvm/jvm-analysis-api/intellij.jvm.analysis.iml @@ -3,6 +3,7 @@ + @@ -15,5 +16,6 @@ + \ No newline at end of file diff --git a/jvm/jvm-analysis-api/resources/intellij.jvm.analysis.xml b/jvm/jvm-analysis-api/resources/intellij.jvm.analysis.xml new file mode 100644 index 000000000000..8c12f4f6c0cf --- /dev/null +++ b/jvm/jvm-analysis-api/resources/intellij.jvm.analysis.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/jvm/jvm-analysis-impl/resources/intellij.jvm.analysis.impl.xml b/jvm/jvm-analysis-impl/resources/intellij.jvm.analysis.impl.xml index acf4ab6029c1..0f7999cfab69 100644 --- a/jvm/jvm-analysis-impl/resources/intellij.jvm.analysis.impl.xml +++ b/jvm/jvm-analysis-impl/resources/intellij.jvm.analysis.impl.xml @@ -1,4 +1,20 @@ + + + + + + + + + + + + + + + + @@ -176,8 +192,6 @@ level="WARNING" implementationClass="com.intellij.codeInspection.emptyMethod.EmptyMethodInspection" key="inspection.empty.method.display.name" bundle="messages.JvmAnalysisBundle"/> - diff --git a/jvm/jvm-analysis-quickFix/BUILD.bazel b/jvm/jvm-analysis-quickFix/BUILD.bazel index 73c4db85ea83..7e798ac7adcd 100644 --- a/jvm/jvm-analysis-quickFix/BUILD.bazel +++ b/jvm/jvm-analysis-quickFix/BUILD.bazel @@ -1,11 +1,18 @@ ### auto-generated section `build intellij.jvm.analysis.quickFix` start -load("@rules_jvm//:jvm.bzl", "jvm_library") +load("@rules_jvm//:jvm.bzl", "jvm_library", "resourcegroup") + +resourcegroup( + name = "analysis-quickFix_resources", + srcs = glob(["resources/**/*"]), + strip_prefix = "resources" +) jvm_library( name = "analysis-quickFix", module_name = "intellij.jvm.analysis.quickFix", visibility = ["//visibility:public"], srcs = glob(["src/**/*.kt", "src/**/*.java", "src/**/*.form"], allow_empty = True), + resources = [":analysis-quickFix_resources"], deps = [ "@lib//:kotlin-stdlib", "//jvm/jvm-analysis-refactoring:analysis-refactoring", diff --git a/jvm/jvm-analysis-quickFix/intellij.jvm.analysis.quickFix.iml b/jvm/jvm-analysis-quickFix/intellij.jvm.analysis.quickFix.iml index f7a60879da43..70c8fbbc14c8 100644 --- a/jvm/jvm-analysis-quickFix/intellij.jvm.analysis.quickFix.iml +++ b/jvm/jvm-analysis-quickFix/intellij.jvm.analysis.quickFix.iml @@ -3,6 +3,7 @@ + diff --git a/jvm/jvm-analysis-quickFix/resources/intellij.jvm.analysis.quickFix.xml b/jvm/jvm-analysis-quickFix/resources/intellij.jvm.analysis.quickFix.xml new file mode 100644 index 000000000000..8ab70b06b421 --- /dev/null +++ b/jvm/jvm-analysis-quickFix/resources/intellij.jvm.analysis.quickFix.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/jvm/jvm-analysis-refactoring/BUILD.bazel b/jvm/jvm-analysis-refactoring/BUILD.bazel index 907fd19c9889..ef00b86865d9 100644 --- a/jvm/jvm-analysis-refactoring/BUILD.bazel +++ b/jvm/jvm-analysis-refactoring/BUILD.bazel @@ -1,11 +1,18 @@ ### auto-generated section `build intellij.jvm.analysis.refactoring` start -load("@rules_jvm//:jvm.bzl", "jvm_library") +load("@rules_jvm//:jvm.bzl", "jvm_library", "resourcegroup") + +resourcegroup( + name = "analysis-refactoring_resources", + srcs = glob(["resources/**/*"]), + strip_prefix = "resources" +) jvm_library( name = "analysis-refactoring", module_name = "intellij.jvm.analysis.refactoring", visibility = ["//visibility:public"], srcs = glob(["src/**/*.kt", "src/**/*.java", "src/**/*.form"], allow_empty = True), + resources = [":analysis-refactoring_resources"], deps = [ "@lib//:kotlin-stdlib", "//platform/analysis-api:analysis", diff --git a/jvm/jvm-analysis-refactoring/intellij.jvm.analysis.refactoring.iml b/jvm/jvm-analysis-refactoring/intellij.jvm.analysis.refactoring.iml index 6981c08542e9..dbc21ddbc1cc 100644 --- a/jvm/jvm-analysis-refactoring/intellij.jvm.analysis.refactoring.iml +++ b/jvm/jvm-analysis-refactoring/intellij.jvm.analysis.refactoring.iml @@ -3,6 +3,7 @@ + diff --git a/jvm/jvm-analysis-refactoring/resources/intellij.jvm.analysis.refactoring.xml b/jvm/jvm-analysis-refactoring/resources/intellij.jvm.analysis.refactoring.xml new file mode 100644 index 000000000000..7957ae53cf60 --- /dev/null +++ b/jvm/jvm-analysis-refactoring/resources/intellij.jvm.analysis.refactoring.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/platform/bookmarks/backend/resources/intellij.platform.bookmarks.backend.xml b/platform/bookmarks/backend/resources/intellij.platform.bookmarks.backend.xml index 333c9f59fcb1..92aa5507661a 100644 --- a/platform/bookmarks/backend/resources/intellij.platform.bookmarks.backend.xml +++ b/platform/bookmarks/backend/resources/intellij.platform.bookmarks.backend.xml @@ -1,4 +1,4 @@ - + diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/JavaPluginLayout.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/JavaPluginLayout.kt index 7d5505037aef..e09384b9df2e 100644 --- a/platform/build-scripts/src/org/jetbrains/intellij/build/JavaPluginLayout.kt +++ b/platform/build-scripts/src/org/jetbrains/intellij/build/JavaPluginLayout.kt @@ -31,50 +31,6 @@ object JavaPluginLayout { spec.withModule(moduleName, "javac2.jar") } - // api modules - spec.withModules(listOf( - "intellij.java.compiler", - "intellij.java.debugger", - "intellij.java.execution", - "intellij.java.execution.impl.shared", - "intellij.java.remoteServers", - "intellij.java.analysis", - "intellij.jvm.analysis", - "intellij.java.indexing", - "intellij.java", - "intellij.jsp", - "intellij.platform.uast", - "intellij.platform.uast.ide", - "intellij.java.uast.ide", - )) - - spec.withModules(listOf( - "intellij.java.codeserver.core", - "intellij.java.codeserver.highlighting", - "intellij.java.compiler.impl", - "intellij.java.debugger.impl", - "intellij.java.terminal", - "intellij.java.debugger.memory.agent", - "intellij.java.execution.impl", - "intellij.java.execution.impl.backend", - "intellij.java.execution.impl.frontend", - "intellij.java.structureView", - "intellij.java.manifest", - "intellij.java.remoteServers.impl", - //"intellij.uiDesigner", - "intellij.java.analysis.impl", - "intellij.jvm.analysis.impl", - "intellij.jvm.analysis.quickFix", - "intellij.jvm.analysis.refactoring", - "intellij.java.indexing.impl", - "intellij.java.impl", - "intellij.java.impl.inspections", - "intellij.java.impl.refactorings", - "intellij.jsp.spi", - "intellij.java.uast", - "intellij.java.typeMigration", - )) - spec.withModuleLibrary("debugger-agent", "intellij.java.debugger.agent.holder", "rt") spec.withProjectLibrary("Eclipse", "ecj") diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/DefaultLiveTemplateEP.kt b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/DefaultLiveTemplateEP.kt index 75b084d8cc99..e09553613df1 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/DefaultLiveTemplateEP.kt +++ b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/DefaultLiveTemplateEP.kt @@ -26,4 +26,11 @@ internal class DefaultLiveTemplateEP { @Attribute @JvmField var hidden: Boolean = false + + /** + * `true` if it is necessary to use the parent loader + */ + @Attribute + @JvmField + var useParentLoader: Boolean = false } diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateSettings.java b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateSettings.java index b3e68317ce77..099eae6553a0 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateSettings.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateSettings.java @@ -502,7 +502,7 @@ public final class TemplateSettings implements PersistentStateComponent