diff --git a/.idea/modules.xml b/.idea/modules.xml index c305abcb5729..06e647fe17d7 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -876,7 +876,6 @@ - diff --git a/build/bazel-generated-file-list.txt b/build/bazel-generated-file-list.txt index a94f6304882d..249657d5fd58 100644 --- a/build/bazel-generated-file-list.txt +++ b/build/bazel-generated-file-list.txt @@ -706,7 +706,6 @@ platform/xdebugger-testFramework plugins/ByteCodeViewer plugins/IntelliLang plugins/IntelliLang/backend -plugins/IntelliLang/plugin plugins/IntelliLang/tests plugins/ant plugins/ant/jps-plugin diff --git a/java/langInjection/jps/resources/intellij.java.langInjection.jps.xml b/java/langInjection/jps/resources/intellij.java.langInjection.jps.xml index 0ba9bd46062a..e547a22cd81d 100644 --- a/java/langInjection/jps/resources/intellij.java.langInjection.jps.xml +++ b/java/langInjection/jps/resources/intellij.java.langInjection.jps.xml @@ -1,6 +1,6 @@ - + diff --git a/java/plugin/BUILD.bazel b/java/plugin/BUILD.bazel index 215b106a5af8..0dc43595f381 100644 --- a/java/plugin/BUILD.bazel +++ b/java/plugin/BUILD.bazel @@ -36,7 +36,6 @@ jvm_library( "//java/typeMigration", "//resources:java-resources", "//resources-en:java-resources-en", - "//plugins/IntelliLang/plugin", "//java/performancePlugin", "//java/vcs", "//java/java-syntax:syntax", diff --git a/java/plugin/intellij.java.plugin.iml b/java/plugin/intellij.java.plugin.iml index ff9e905181f9..a643ccdbf7b7 100644 --- a/java/plugin/intellij.java.plugin.iml +++ b/java/plugin/intellij.java.plugin.iml @@ -32,7 +32,6 @@ - diff --git a/json/backend/tests/BUILD.bazel b/json/backend/tests/BUILD.bazel index c8f0e0fde01c..aad6a9d53c43 100644 --- a/json/backend/tests/BUILD.bazel +++ b/json/backend/tests/BUILD.bazel @@ -38,7 +38,6 @@ jvm_library( "//platform/testFramework/extensions:testExtensions", "@lib//:kotlin-stdlib", "//plugins/IntelliLang:langInjection", - "//plugins/IntelliLang/plugin", "@lib//:jsonpath", "@lib//:kotlinx-coroutines-core", "@lib//:assert_j", diff --git a/json/backend/tests/intellij.json.tests.iml b/json/backend/tests/intellij.json.tests.iml index 401857193acd..f2659a553ea5 100644 --- a/json/backend/tests/intellij.json.tests.iml +++ b/json/backend/tests/intellij.json.tests.iml @@ -25,7 +25,6 @@ - diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/BaseIdeaProperties.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/BaseIdeaProperties.kt index b795435d9002..3da9c5b5aea9 100644 --- a/platform/build-scripts/src/org/jetbrains/intellij/build/BaseIdeaProperties.kt +++ b/platform/build-scripts/src/org/jetbrains/intellij/build/BaseIdeaProperties.kt @@ -47,7 +47,6 @@ val IDEA_BUNDLED_PLUGINS: PersistentList = DEFAULT_BUNDLED_PLUGINS + seq "intellij.java.coverage", "intellij.java.decompiler", "intellij.eclipse", - "intellij.platform.langInjection.plugin", "intellij.java.debugger.streams", "intellij.sh.plugin", "intellij.markdown", diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/CommunityRepositoryModules.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/CommunityRepositoryModules.kt index 0a4c15e5ba31..953b541f111a 100644 --- a/platform/build-scripts/src/org/jetbrains/intellij/build/CommunityRepositoryModules.kt +++ b/platform/build-scripts/src/org/jetbrains/intellij/build/CommunityRepositoryModules.kt @@ -69,7 +69,6 @@ object CommunityRepositoryModules { pluginAuto(listOf("intellij.xpath")) { spec -> spec.withModule("intellij.xpath.rt", "rt/xslt-rt.jar") }, - pluginAuto("intellij.platform.langInjection.plugin") {}, pluginAutoWithCustomDirName("intellij.tasks.core") { spec -> spec.directoryName = "tasks" spec.withModule("intellij.tasks") diff --git a/platform/platform-resources/src/META-INF/common-ide-modules.xml b/platform/platform-resources/src/META-INF/common-ide-modules.xml index ffa9eded9fed..c8c2f69cfbf2 100644 --- a/platform/platform-resources/src/META-INF/common-ide-modules.xml +++ b/platform/platform-resources/src/META-INF/common-ide-modules.xml @@ -54,6 +54,9 @@ + + + diff --git a/plugins/IntelliLang/plugin/BUILD.bazel b/plugins/IntelliLang/plugin/BUILD.bazel deleted file mode 100644 index 536aea179a06..000000000000 --- a/plugins/IntelliLang/plugin/BUILD.bazel +++ /dev/null @@ -1,20 +0,0 @@ -### auto-generated section `build intellij.platform.langInjection.plugin` start -load("@rules_jvm//:jvm.bzl", "jvm_library", "jvm_resources") - -jvm_resources( - name = "plugin_resources", - files = glob(["resources/**/*"]), - strip_prefix = "resources" -) - -jvm_library( - name = "plugin", - visibility = ["//visibility:public"], - srcs = glob([], allow_empty = True), - runtime_deps = [ - ":plugin_resources", - "//plugins/IntelliLang:langInjection", - "//plugins/IntelliLang/backend", - ] -) -### auto-generated section `build intellij.platform.langInjection.plugin` end \ No newline at end of file diff --git a/plugins/IntelliLang/plugin/intellij.platform.langInjection.plugin.iml b/plugins/IntelliLang/plugin/intellij.platform.langInjection.plugin.iml deleted file mode 100644 index dce8e9c62aa2..000000000000 --- a/plugins/IntelliLang/plugin/intellij.platform.langInjection.plugin.iml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/plugins/IntelliLang/plugin/plugin-content.yaml b/plugins/IntelliLang/plugin/plugin-content.yaml deleted file mode 100644 index 062129dc850d..000000000000 --- a/plugins/IntelliLang/plugin/plugin-content.yaml +++ /dev/null @@ -1,9 +0,0 @@ -- name: lib/modules/intellij.platform.langInjection.backend.jar - contentModules: - - name: intellij.platform.langInjection.backend -- name: lib/modules/intellij.platform.langInjection.jar - contentModules: - - name: intellij.platform.langInjection -- name: lib/platform-langInjection-plugin.jar - modules: - - name: intellij.platform.langInjection.plugin \ No newline at end of file diff --git a/plugins/IntelliLang/plugin/resources/META-INF/plugin.xml b/plugins/IntelliLang/plugin/resources/META-INF/plugin.xml deleted file mode 100644 index eb8f53bdd060..000000000000 --- a/plugins/IntelliLang/plugin/resources/META-INF/plugin.xml +++ /dev/null @@ -1,24 +0,0 @@ - - IntelliLang - org.intellij.intelliLang - IDE Settings - JetBrains - - -
  • Language injection
    • -
  • Pattern validation
    • -
  • Regular expression support
    • -
  • Language Injections page in the Settings/Preferences dialog.
    • -
  • Ability to edit injected code in the special scratch-pad editor. - - ]]> - - - - - - - \ No newline at end of file diff --git a/plugins/IntelliLang/resources/intellij.platform.langInjection.xml b/plugins/IntelliLang/resources/intellij.platform.langInjection.xml index 898721e0f5e4..6c1226034056 100644 --- a/plugins/IntelliLang/resources/intellij.platform.langInjection.xml +++ b/plugins/IntelliLang/resources/intellij.platform.langInjection.xml @@ -1,4 +1,6 @@ + + diff --git a/plugins/IntelliLang/tests/BUILD.bazel b/plugins/IntelliLang/tests/BUILD.bazel index b6b08ecbd1a7..ac3c0d9ee489 100644 --- a/plugins/IntelliLang/tests/BUILD.bazel +++ b/plugins/IntelliLang/tests/BUILD.bazel @@ -41,7 +41,6 @@ jvm_library( "//java/langInjection/jps", "@lib//:asm", "//platform/util/jdom", - "//plugins/IntelliLang/plugin", "//plugins/IntelliLang/backend", "//plugins/markdown/plugin:plugin-main", ], diff --git a/plugins/IntelliLang/tests/intellij.platform.langInjection.tests.iml b/plugins/IntelliLang/tests/intellij.platform.langInjection.tests.iml index c59ac26044a9..3cea0f688617 100644 --- a/plugins/IntelliLang/tests/intellij.platform.langInjection.tests.iml +++ b/plugins/IntelliLang/tests/intellij.platform.langInjection.tests.iml @@ -27,7 +27,6 @@ - diff --git a/plugins/devkit/intellij.devkit.intelliLang/resources/intellij.devkit.intelliLang.xml b/plugins/devkit/intellij.devkit.intelliLang/resources/intellij.devkit.intelliLang.xml index 021265352560..013f9235f862 100644 --- a/plugins/devkit/intellij.devkit.intelliLang/resources/intellij.devkit.intelliLang.xml +++ b/plugins/devkit/intellij.devkit.intelliLang/resources/intellij.devkit.intelliLang.xml @@ -1,6 +1,5 @@ - diff --git a/plugins/jsonpath/BUILD.bazel b/plugins/jsonpath/BUILD.bazel index b3e7421b3fc1..1fa52bccf836 100644 --- a/plugins/jsonpath/BUILD.bazel +++ b/plugins/jsonpath/BUILD.bazel @@ -56,7 +56,6 @@ jvm_library( "//platform/testFramework", "//platform/testFramework:testFramework_test_lib", "//plugins/IntelliLang:langInjection", - "//plugins/IntelliLang/plugin", "//platform/testFramework/extensions:testExtensions", ], runtime_deps = [":jsonpath_resources"] diff --git a/plugins/jsonpath/intellij.jsonpath.iml b/plugins/jsonpath/intellij.jsonpath.iml index 1c6cea9fd4d6..c75fb9ab320a 100644 --- a/plugins/jsonpath/intellij.jsonpath.iml +++ b/plugins/jsonpath/intellij.jsonpath.iml @@ -27,7 +27,6 @@ - \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/BUILD.bazel b/plugins/kotlin/idea/tests/BUILD.bazel index 6ebd5b725ea2..bea05e1c6330 100644 --- a/plugins/kotlin/idea/tests/BUILD.bazel +++ b/plugins/kotlin/idea/tests/BUILD.bazel @@ -183,7 +183,6 @@ jvm_library( "//plugins/kotlin/jvm/k1", "//plugins/kotlin/base/scripting/scripting.k1", "//plugins/kotlin/base/scripting/scripting.k1:scripting.k1_test_lib", - "//plugins/IntelliLang/plugin", "//plugins/IntelliLang/backend", "//plugins/kotlin/base/scripting/scripting.shared", ], diff --git a/plugins/kotlin/idea/tests/kotlin.idea.tests.iml b/plugins/kotlin/idea/tests/kotlin.idea.tests.iml index ae9a6ffd13f0..f2e211add80f 100644 --- a/plugins/kotlin/idea/tests/kotlin.idea.tests.iml +++ b/plugins/kotlin/idea/tests/kotlin.idea.tests.iml @@ -186,7 +186,6 @@ - diff --git a/plugins/kotlin/injection/base/resources/kotlin.base.injection.xml b/plugins/kotlin/injection/base/resources/kotlin.base.injection.xml index 3b2da52e9f64..7748f6e2a512 100644 --- a/plugins/kotlin/injection/base/resources/kotlin.base.injection.xml +++ b/plugins/kotlin/injection/base/resources/kotlin.base.injection.xml @@ -1,6 +1,5 @@ - diff --git a/plugins/kotlin/injection/base/tests/BUILD.bazel b/plugins/kotlin/injection/base/tests/BUILD.bazel index 1b0912ae7552..6116c8f416c6 100644 --- a/plugins/kotlin/injection/base/tests/BUILD.bazel +++ b/plugins/kotlin/injection/base/tests/BUILD.bazel @@ -35,7 +35,6 @@ jvm_library( "//RegExpSupport:regexp", "//RegExpSupport:regexp_test_lib", "//plugins/IntelliLang:langInjection", - "//plugins/IntelliLang/plugin", "@lib//:kotlinc-kotlin-compiler-common", "//plugins/IntelliLang/backend", ] diff --git a/plugins/kotlin/injection/base/tests/kotlin.base.injection.tests.iml b/plugins/kotlin/injection/base/tests/kotlin.base.injection.tests.iml index d0969239c7fd..c1256c71a291 100644 --- a/plugins/kotlin/injection/base/tests/kotlin.base.injection.tests.iml +++ b/plugins/kotlin/injection/base/tests/kotlin.base.injection.tests.iml @@ -36,7 +36,6 @@ - diff --git a/plugins/kotlin/injection/k1/resources/kotlin.injection.k1.xml b/plugins/kotlin/injection/k1/resources/kotlin.injection.k1.xml index c23851486d6f..1995896ba4fe 100644 --- a/plugins/kotlin/injection/k1/resources/kotlin.injection.k1.xml +++ b/plugins/kotlin/injection/k1/resources/kotlin.injection.k1.xml @@ -1,6 +1,5 @@ - diff --git a/plugins/kotlin/injection/k2/resources/kotlin.injection.k2.xml b/plugins/kotlin/injection/k2/resources/kotlin.injection.k2.xml index d85c3c73f594..5ae204c26f51 100644 --- a/plugins/kotlin/injection/k2/resources/kotlin.injection.k2.xml +++ b/plugins/kotlin/injection/k2/resources/kotlin.injection.k2.xml @@ -1,6 +1,5 @@ - diff --git a/plugins/markdown/fenceInjection/src/main/resources/intellij.markdown.fenceInjection.xml b/plugins/markdown/fenceInjection/src/main/resources/intellij.markdown.fenceInjection.xml index 6f4742ecb202..49d2708de2dc 100644 --- a/plugins/markdown/fenceInjection/src/main/resources/intellij.markdown.fenceInjection.xml +++ b/plugins/markdown/fenceInjection/src/main/resources/intellij.markdown.fenceInjection.xml @@ -1,6 +1,5 @@ - diff --git a/plugins/markdown/frontmatter/src/main/resources/intellij.markdown.frontmatter.xml b/plugins/markdown/frontmatter/src/main/resources/intellij.markdown.frontmatter.xml index c68d7a6f7b7e..c14cfd239717 100644 --- a/plugins/markdown/frontmatter/src/main/resources/intellij.markdown.frontmatter.xml +++ b/plugins/markdown/frontmatter/src/main/resources/intellij.markdown.frontmatter.xml @@ -1,6 +1,5 @@ - diff --git a/plugins/markdown/frontmatter/toml/src/main/resources/intellij.markdown.frontmatter.toml.xml b/plugins/markdown/frontmatter/toml/src/main/resources/intellij.markdown.frontmatter.toml.xml index f43f7e8bbbec..042be8b3a365 100644 --- a/plugins/markdown/frontmatter/toml/src/main/resources/intellij.markdown.frontmatter.toml.xml +++ b/plugins/markdown/frontmatter/toml/src/main/resources/intellij.markdown.frontmatter.toml.xml @@ -1,6 +1,5 @@ - diff --git a/plugins/markdown/frontmatter/yaml/src/main/resources/intellij.markdown.frontmatter.yaml.xml b/plugins/markdown/frontmatter/yaml/src/main/resources/intellij.markdown.frontmatter.yaml.xml index 3992b2f95b1b..42b6004cdcac 100644 --- a/plugins/markdown/frontmatter/yaml/src/main/resources/intellij.markdown.frontmatter.yaml.xml +++ b/plugins/markdown/frontmatter/yaml/src/main/resources/intellij.markdown.frontmatter.yaml.xml @@ -1,6 +1,5 @@ - diff --git a/plugins/yaml/backend/BUILD.bazel b/plugins/yaml/backend/BUILD.bazel index b3c0e86442ba..06cdd3a89f63 100644 --- a/plugins/yaml/backend/BUILD.bazel +++ b/plugins/yaml/backend/BUILD.bazel @@ -85,7 +85,6 @@ jvm_library( "//platform/core-ui", "//platform/code-style-impl:codeStyle-impl", "//plugins/IntelliLang:langInjection", - "//plugins/IntelliLang/plugin", "//platform/statistics", "//platform/statistics:statistics_test_lib", "//RegExpSupport:regexp", diff --git a/plugins/yaml/backend/intellij.yaml.backend.iml b/plugins/yaml/backend/intellij.yaml.backend.iml index bd7a73ebfe5f..aa121b363404 100644 --- a/plugins/yaml/backend/intellij.yaml.backend.iml +++ b/plugins/yaml/backend/intellij.yaml.backend.iml @@ -36,7 +36,6 @@ - diff --git a/python/IntelliLang-python/resources/intellij.python.langInjection.xml b/python/IntelliLang-python/resources/intellij.python.langInjection.xml index 3332cfc6e71d..30443870ee8e 100644 --- a/python/IntelliLang-python/resources/intellij.python.langInjection.xml +++ b/python/IntelliLang-python/resources/intellij.python.langInjection.xml @@ -1,6 +1,5 @@ - diff --git a/python/build/plugin-list.txt b/python/build/plugin-list.txt index ba791f2428b7..89232983a18c 100644 --- a/python/build/plugin-list.txt +++ b/python/build/plugin-list.txt @@ -10,7 +10,6 @@ intellij.editorconfig.plugin intellij.featuresTrainer intellij.grazie intellij.markdown -intellij.platform.langInjection.plugin intellij.properties intellij.restructuredtext intellij.searchEverywhereMl diff --git a/xml/langInjection/xpath/resources/intellij.xml.langInjection.xpath.xml b/xml/langInjection/xpath/resources/intellij.xml.langInjection.xpath.xml index daadaf2ce095..9d417c4c3645 100644 --- a/xml/langInjection/xpath/resources/intellij.xml.langInjection.xpath.xml +++ b/xml/langInjection/xpath/resources/intellij.xml.langInjection.xpath.xml @@ -1,7 +1,6 @@ - diff --git a/xml/tests/BUILD.bazel b/xml/tests/BUILD.bazel index a866c5305b36..02efebfd1b1f 100644 --- a/xml/tests/BUILD.bazel +++ b/xml/tests/BUILD.bazel @@ -51,7 +51,6 @@ jvm_library( "//RegExpSupport:regexp_test_lib", "//platform/util/nanoxml", "//plugins/IntelliLang:langInjection", - "//plugins/IntelliLang/plugin", "//java/langInjection", "//xml/xml-analysis-impl:analysis-impl", "//platform/core-ui", diff --git a/xml/tests/intellij.xml.tests.iml b/xml/tests/intellij.xml.tests.iml index f53ca3d61513..c488a0ecab06 100644 --- a/xml/tests/intellij.xml.tests.iml +++ b/xml/tests/intellij.xml.tests.iml @@ -36,7 +36,6 @@ -