IJPL-201509 TextMate plugin converted to v2

- remdev-friendly v2 layout
- tests moved to a separate module and merged
- introduced JBC plugin
- fe part located separately, see IJPL-179111

GitOrigin-RevId: 2f5b378387779fecccd2902e56bc5c4bd644650c

.idea/modules.xml

@@ -1162,8 +1162,12 @@
       <module fileurl="file://$PROJECT_DIR$/plugins/testng_rt/intellij.testng.rt.iml" filepath="$PROJECT_DIR$/plugins/testng_rt/intellij.testng.rt.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/testng_rt/tests/intellij.testng.rt.tests.iml" filepath="$PROJECT_DIR$/plugins/testng_rt/tests/intellij.testng.rt.tests.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/textmate/intellij.textmate.iml" filepath="$PROJECT_DIR$/plugins/textmate/intellij.textmate.iml" />
+      <module fileurl="file://$PROJECT_DIR$/plugins/textmate/backend/intellij.textmate.backend.iml" filepath="$PROJECT_DIR$/plugins/textmate/backend/intellij.textmate.backend.iml" />
+      <module fileurl="file://$PROJECT_DIR$/plugins/textmate/common/intellij.textmate.common.iml" filepath="$PROJECT_DIR$/plugins/textmate/common/intellij.textmate.common.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/textmate/core/intellij.textmate.core.iml" filepath="$PROJECT_DIR$/plugins/textmate/core/intellij.textmate.core.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/textmate/joni/intellij.textmate.joni.iml" filepath="$PROJECT_DIR$/plugins/textmate/joni/intellij.textmate.joni.iml" />
+      <module fileurl="file://$PROJECT_DIR$/plugins/textmate/plugin/intellij.textmate.plugin.iml" filepath="$PROJECT_DIR$/plugins/textmate/plugin/intellij.textmate.plugin.iml" />
+      <module fileurl="file://$PROJECT_DIR$/plugins/textmate/tests/intellij.textmate.tests.iml" filepath="$PROJECT_DIR$/plugins/textmate/tests/intellij.textmate.tests.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/toml/intellij.toml.iml" filepath="$PROJECT_DIR$/plugins/toml/intellij.toml.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/toml/backend/intellij.toml.backend.iml" filepath="$PROJECT_DIR$/plugins/toml/backend/intellij.toml.backend.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/toml/core/intellij.toml.core.iml" filepath="$PROJECT_DIR$/plugins/toml/core/intellij.toml.core.iml" />

BUILD.bazel

@@ -293,8 +293,7 @@ jvm_library(
     "//plugins/testng_rt/tests:tests_test_lib",
     "//platform/workspace/storage/tests:tests_test_lib",
     "//platform/workspace/jps/tests:tests_test_lib",
-    "//plugins/textmate",
-    "//plugins/textmate:textmate_test_lib",
+    "//plugins/textmate/plugin",
     "//plugins/space/jps-plugin:java-jps",
     "//build/tasks",
     "//build/tasks:tasks_test_lib",
@@ -360,6 +359,7 @@ jvm_library(
     "//python/python-pyproject:pyproject_test_lib",
     "//platform/indexing-tests:indexing-tests_test_lib",
     "//platform/testFramework/monorepo:monorepo_test_lib",
+    "//plugins/textmate/tests:tests_test_lib",
   ],
   runtime_deps = [
     "//platform/main/intellij.platform.monolith.main:monolith-main",

build/bazel-generated-file-list.txt

@@ -1249,8 +1249,12 @@ plugins/testng
 plugins/testng_rt
 plugins/testng_rt/tests
 plugins/textmate
+plugins/textmate/backend
+plugins/textmate/common
 plugins/textmate/core
 plugins/textmate/joni
+plugins/textmate/plugin
+plugins/textmate/tests
 plugins/toml
 plugins/toml/backend
 plugins/toml/core

intellij.idea.community.main.iml

@@ -149,7 +149,7 @@
     <orderEntry type="module" module-name="intellij.gradle.java.maven" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.markdown" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.markdown.plugin.main" scope="RUNTIME" />
-    <orderEntry type="module" module-name="intellij.textmate" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.textmate.plugin" scope="TEST" />
     <orderEntry type="module" module-name="intellij.webp" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.space.java.jps" scope="TEST" />
     <orderEntry type="module" module-name="intellij.emojipicker" scope="RUNTIME" />
@@ -255,5 +255,6 @@
     <orderEntry type="module" module-name="intellij.maven.server.m36.impl" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.maven.server.m40" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.mcpserver" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.textmate.tests" scope="TEST" />
   </component>
 </module>

platform/build-scripts/src/org/jetbrains/intellij/build/BaseIdeaProperties.kt

@@ -20,7 +20,7 @@ val IDEA_BUNDLED_PLUGINS: PersistentList<String> = DEFAULT_BUNDLED_PLUGINS + seq
   "intellij.copyright",
   "intellij.properties",
   "intellij.terminal",
-  "intellij.textmate",
+  "intellij.textmate.plugin",
   "intellij.editorconfig.plugin",
   "intellij.configurationScript",
   "intellij.json",

platform/build-scripts/src/org/jetbrains/intellij/build/CommunityRepositoryModules.kt

@@ -186,8 +186,8 @@ object CommunityRepositoryModules {
       spec.withModule("intellij.terminal.completion")
       spec.withResource("resources/shell-integrations", "shell-integrations")
     },
-    pluginAuto(listOf("intellij.textmate")) { spec ->
-      spec.withResource("lib/bundles", "lib/bundles")
+    pluginAuto(listOf("intellij.textmate.plugin")) { spec ->
+      spec.withResourceFromModule("intellij.textmate", "lib/bundles", "lib/bundles")
     },
     PythonCommunityPluginModules.pythonCommunityPluginLayout(),
     androidDesignPlugin(),

platform/platform-tests/testSrc/com/intellij/ide/plugins/PluginGraphWriter.kt

@@ -1,4 +1,4 @@
-// Copyright 2000-2021 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 com.intellij.ide.plugins
 
 import com.fasterxml.jackson.core.JsonFactory
@@ -10,7 +10,6 @@ import com.intellij.util.io.jackson.array
 import com.intellij.util.io.jackson.obj
 import it.unimi.dsi.fastutil.bytes.ByteArrays
 import it.unimi.dsi.fastutil.objects.Object2IntOpenCustomHashMap
-import java.io.File
 import java.io.StringWriter
 import java.io.Writer
 import java.nio.file.Files

plugins/textmate/BUILD.bazel

@@ -39,53 +39,4 @@ jvm_library(
   ],
   runtime_deps = [":textmate_resources"]
 )
-
-jvm_library(
-  name = "textmate_test_lib",
-  visibility = ["//visibility:public"],
-  srcs = glob(["tests/**/*.kt", "tests/**/*.java"], allow_empty = True),
-  associates = [":textmate"],
-  deps = [
-    "//platform/analysis-api:analysis",
-    "//platform/code-style-api:codeStyle",
-    "//platform/core-api:core",
-    "//platform/editor-ui-api:editor-ui",
-    "//platform/lang-impl",
-    "//platform/ide-core-impl",
-    "//platform/projectModel-api:projectModel",
-    "//platform/testFramework",
-    "//platform/testFramework:testFramework_test_lib",
-    "//spellchecker",
-    "//spellchecker:spellchecker_test_lib",
-    "//platform/diff-api:diff",
-    "//plugins/textmate/core",
-    "//plugins/textmate/core:core_test_lib",
-    "//platform/indexing-impl",
-    "//platform/core-ui",
-    "//platform/editor-ui-ex:editor-ex",
-    "@lib//:jackson",
-    "@lib//:jackson-databind",
-    "//platform/platform-impl:ide-impl",
-    "@lib//:kotlinx-serialization-core",
-    "//platform/code-style-impl:codeStyle-impl",
-    "//tools/intellij.tools.ide.metrics.benchmark:ide-metrics-benchmark",
-    "//tools/intellij.tools.ide.metrics.benchmark:ide-metrics-benchmark_test_lib",
-    "@lib//:caffeine",
-    "//fleet/fastutil",
-    "@lib//:fastutil-min",
-    "//plugins/textmate/joni",
-    "//plugins/textmate/joni:joni_test_lib",
-    "//platform/util/xmlDom",
-  ],
-  runtime_deps = [":textmate_resources"]
-)
-### auto-generated section `build intellij.textmate` end
-
-### auto-generated section `test intellij.textmate` start
-load("@community//build:tests-options.bzl", "jps_test")
-
-jps_test(
-  name = "textmate_test",
-  runtime_deps = [":textmate_test_lib"]
-)
-### auto-generated section `test intellij.textmate` end
+### auto-generated section `build intellij.textmate` end

plugins/textmate/backend/BUILD.bazel

@@ -0,0 +1,16 @@
+### auto-generated section `build intellij.textmate.backend` start
+load("@rules_jvm//:jvm.bzl", "jvm_library", "jvm_resources")
+
+jvm_resources(
+  name = "backend_resources",
+  files = glob(["resources/**/*"]),
+  strip_prefix = "resources"
+)
+
+jvm_library(
+  name = "backend",
+  visibility = ["//visibility:public"],
+  srcs = glob([], allow_empty = True),
+  runtime_deps = [":backend_resources"]
+)
+### auto-generated section `build intellij.textmate.backend` end

plugins/textmate/backend/intellij.textmate.backend.iml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

plugins/textmate/backend/resources/intellij.textmate.backend.xml

@@ -0,0 +1,6 @@
+<idea-plugin>
+  <dependencies>
+    <module name="intellij.platform.backend"/>
+    <module name="intellij.textmate.common"/>
+  </dependencies>
+</idea-plugin>

plugins/textmate/common/BUILD.bazel

@@ -0,0 +1,16 @@
+### auto-generated section `build intellij.textmate.common` start
+load("@rules_jvm//:jvm.bzl", "jvm_library", "jvm_resources")
+
+jvm_resources(
+  name = "common_resources",
+  files = glob(["resources/**/*"]),
+  strip_prefix = "resources"
+)
+
+jvm_library(
+  name = "common",
+  visibility = ["//visibility:public"],
+  srcs = glob([], allow_empty = True),
+  runtime_deps = [":common_resources"]
+)
+### auto-generated section `build intellij.textmate.common` end

plugins/textmate/common/intellij.textmate.common.iml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

plugins/textmate/common/resources/intellij.textmate.common.xml

@@ -0,0 +1,7 @@
+<idea-plugin>
+  <dependencies>
+    <module name="intellij.textmate"/>
+    <module name="intellij.textmate.core"/>
+    <module name="intellij.textmate.joni"/>
+  </dependencies>
+</idea-plugin>

plugins/textmate/core/BUILD.bazel

@@ -1,12 +1,18 @@
 ### auto-generated section `build intellij.textmate.core` start
 load("//build:compiler-options.bzl", "create_kotlinc_options")
-load("@rules_jvm//:jvm.bzl", "jvm_library")
+load("@rules_jvm//:jvm.bzl", "jvm_library", "jvm_resources")
 
 create_kotlinc_options(
   name = "custom_core",
   opt_in = ["kotlin.concurrent.atomics.ExperimentalAtomicApi"]
 )
 
+jvm_resources(
+  name = "core_resources",
+  files = glob(["resources/**/*"]),
+  strip_prefix = "resources"
+)
+
 jvm_library(
   name = "core",
   module_name = "intellij.textmate.core",
@@ -19,42 +25,13 @@ jvm_library(
     "@lib//:kotlinx-serialization-json",
     "@lib//:kotlin-stdlib",
     "@lib//:kotlin-reflect",
-    "@lib//:kotlinx-coroutines-core",
     "@lib//:slf4j-api",
-    "@lib//:kotlinx-collections-immutable",
+    "@lib//:kotlinx-coroutines-core-provided",
+    "@lib//:kotlinx-collections-immutable-provided",
   ],
-  runtime_deps = ["//platform/backend"]
-)
-
-jvm_library(
-  name = "core_test_lib",
-  visibility = ["//visibility:public"],
-  srcs = glob(["tests/**/*.kt", "tests/**/*.java", "testsMultiplatform/**/*.kt", "testsMultiplatform/**/*.java"], allow_empty = True),
-  kotlinc_opts = ":custom_core",
-  associates = [":core"],
-  deps = [
-    "@lib//:jetbrains-annotations",
-    "@lib//:kotlinx-serialization-core",
-    "@lib//:kotlinx-serialization-json",
-    "@lib//:kotlin-stdlib",
-    "@lib//:kotlin-reflect",
-    "@lib//:kotlinx-coroutines-core",
-    "@lib//:slf4j-api",
-    "@lib//:kotlinx-collections-immutable",
-    "@lib//:kotlin-test",
-    "//platform/util",
-    "@lib//:junit5",
-    "//platform/util/xmlDom",
-    "@lib//:kotlinx-coroutines-test",
+  runtime_deps = [
+    ":core_resources",
+    "//platform/backend",
   ]
 )
-### auto-generated section `build intellij.textmate.core` end
-
-### auto-generated section `test intellij.textmate.core` start
-load("@community//build:tests-options.bzl", "jps_test")
-
-jps_test(
-  name = "core_test",
-  runtime_deps = [":core_test_lib"]
-)
-### auto-generated section `test intellij.textmate.core` end
+### auto-generated section `build intellij.textmate.core` end

plugins/textmate/core/intellij.textmate.core.iml

@@ -26,10 +26,9 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/srcJvmMain" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/srcMultiplatform" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/testsMultiplatform" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
@@ -38,14 +37,9 @@
     <orderEntry type="library" name="kotlinx-serialization-json" level="project" />
     <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="library" name="kotlin-reflect" level="project" />
-    <orderEntry type="library" name="kotlinx-coroutines-core" level="project" />
     <orderEntry type="library" name="slf4j-api" level="project" />
-    <orderEntry type="library" name="kotlinx-collections-immutable" level="project" />
-    <orderEntry type="library" scope="TEST" name="kotlin-test" level="project" />
-    <orderEntry type="module" module-name="intellij.platform.util" scope="TEST" />
-    <orderEntry type="library" scope="TEST" name="JUnit5" level="project" />
-    <orderEntry type="module" module-name="intellij.platform.util.xmlDom" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.backend" scope="RUNTIME" />
-    <orderEntry type="library" scope="TEST" name="kotlinx-coroutines-test" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="kotlinx-coroutines-core" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="kotlinx-collections-immutable" level="project" />
   </component>
 </module>

plugins/textmate/core/resources/intellij.textmate.core.xml

@@ -0,0 +1,2 @@
+<idea-plugin>
+</idea-plugin>

plugins/textmate/core/src/org/jetbrains/plugins/textmate/language/syntax/lexer/SyntaxMatchUtils.kt

@@ -3,7 +3,7 @@ package org.jetbrains.plugins.textmate.language.syntax.lexer
 import org.jetbrains.plugins.textmate.regex.MatchData
 import org.jetbrains.plugins.textmate.regex.TextMateString
 
-internal object SyntaxMatchUtils {
+object SyntaxMatchUtils {
 
   /**
    * Replaces parts like \1 or \20 in string parameter with group captures from matchData.

plugins/textmate/core/src/org/jetbrains/plugins/textmate/regex/RegexUtil.kt

@@ -3,7 +3,7 @@ package org.jetbrains.plugins.textmate.regex
 import kotlin.Char.Companion.MIN_HIGH_SURROGATE
 import kotlin.Char.Companion.MIN_LOW_SURROGATE
 
-internal fun byteOffsetByCharOffset(
+fun byteOffsetByCharOffset(
   charSequence: CharSequence,
   startOffset: TextMateCharOffset,
   targetOffset: TextMateCharOffset,

plugins/textmate/core/src/org/jetbrains/plugins/textmate/regex/TextMateRange.kt

@@ -1,7 +1,5 @@
 package org.jetbrains.plugins.textmate.regex
 
-import kotlin.jvm.JvmInline
-
 @JvmInline
 value class TextMateCharOffset(val offset: Int): Comparable<TextMateCharOffset> {
   operator fun plus(other: TextMateCharOffset): TextMateCharOffset {
@@ -28,13 +26,13 @@ value class TextMateByteOffset(val offset: Int): Comparable<TextMateByteOffset>
   }
 }
 
-internal fun Int.byteOffset(): TextMateByteOffset = TextMateByteOffset(this)
-internal fun Int.charOffset(): TextMateCharOffset = TextMateCharOffset(this)
+fun Int.byteOffset(): TextMateByteOffset = TextMateByteOffset(this)
+fun Int.charOffset(): TextMateCharOffset = TextMateCharOffset(this)
 
-internal operator fun CharSequence.get(offset: TextMateCharOffset): Char = get(offset.offset)
-internal fun CharSequence.subSequence(start: TextMateCharOffset, end: TextMateCharOffset): CharSequence = subSequence(start.offset, end.offset)
-internal fun CharSequence.subSequence(range: TextMateCharRange): CharSequence = subSequence(range.start.offset, range.end.offset)
-internal fun CharSequence.indexOf(char: Char, startIndex: TextMateCharOffset): TextMateCharOffset {
+operator fun CharSequence.get(offset: TextMateCharOffset): Char = get(offset.offset)
+fun CharSequence.subSequence(start: TextMateCharOffset, end: TextMateCharOffset): CharSequence = subSequence(start.offset, end.offset)
+fun CharSequence.subSequence(range: TextMateCharRange): CharSequence = subSequence(range.start.offset, range.end.offset)
+fun CharSequence.indexOf(char: Char, startIndex: TextMateCharOffset): TextMateCharOffset {
   return indexOf(char, startIndex = startIndex.offset).charOffset()
 }
 

plugins/textmate/core/srcMultiplatform/org/jetbrains/plugins/textmate/Multiplatform.kt

@@ -21,7 +21,7 @@ import kotlin.reflect.KClass
  * and every target should provide its own implementation.
  */
 
-internal fun <T> AtomicReference<T>.update(f: (T) -> T) {
+fun <T> AtomicReference<T>.update(f: (T) -> T) {
   updateAndGet(f)
 }
 

plugins/textmate/intellij.textmate.iml

@@ -26,7 +26,6 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
     </content>
     <orderEntry type="inheritedJdk" />
@@ -38,7 +37,6 @@
     <orderEntry type="module" module-name="intellij.platform.lang.impl" />
     <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" />
-    <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
     <orderEntry type="module" module-name="intellij.spellchecker" />
     <orderEntry type="module" module-name="intellij.platform.diff" />
     <orderEntry type="module" module-name="intellij.textmate.core" />
@@ -50,7 +48,6 @@
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />
     <orderEntry type="library" name="kotlinx-serialization-core" level="project" />
     <orderEntry type="module" module-name="intellij.platform.codeStyle.impl" />
-    <orderEntry type="module" module-name="intellij.tools.ide.metrics.benchmark" scope="TEST" />
     <orderEntry type="library" name="caffeine" level="project" />
     <orderEntry type="module" module-name="fleet.fastutil" />
     <orderEntry type="library" name="fastutil-min" level="project" />

plugins/textmate/joni/BUILD.bazel

@@ -1,5 +1,11 @@
 ### auto-generated section `build intellij.textmate.joni` start
-load("@rules_jvm//:jvm.bzl", "jvm_library")
+load("@rules_jvm//:jvm.bzl", "jvm_library", "jvm_resources")
+
+jvm_resources(
+  name = "joni_resources",
+  files = glob(["resources/**/*"]),
+  strip_prefix = "resources"
+)
 
 jvm_library(
   name = "joni",
@@ -11,30 +17,7 @@ jvm_library(
     "//plugins/textmate/core",
     "@lib//:joni",
     "@lib//:slf4j-api",
-  ]
+  ],
+  runtime_deps = [":joni_resources"]
 )
-
-jvm_library(
-  name = "joni_test_lib",
-  visibility = ["//visibility:public"],
-  srcs = glob(["tests/**/*.kt", "tests/**/*.java"], allow_empty = True),
-  associates = [":joni"],
-  deps = [
-    "@lib//:kotlin-stdlib",
-    "//plugins/textmate/core",
-    "//plugins/textmate/core:core_test_lib",
-    "@lib//:joni",
-    "@lib//:slf4j-api",
-    "@lib//:junit5",
-  ]
-)
-### auto-generated section `build intellij.textmate.joni` end
-
-### auto-generated section `test intellij.textmate.joni` start
-load("@community//build:tests-options.bzl", "jps_test")
-
-jps_test(
-  name = "joni_test",
-  runtime_deps = [":joni_test_lib"]
-)
-### auto-generated section `test intellij.textmate.joni` end
+### auto-generated section `build intellij.textmate.joni` end

plugins/textmate/joni/intellij.textmate.joni.iml

@@ -4,7 +4,7 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
@@ -12,6 +12,5 @@
     <orderEntry type="module" module-name="intellij.textmate.core" />
     <orderEntry type="library" name="joni" level="project" />
     <orderEntry type="library" name="slf4j-api" level="project" />
-    <orderEntry type="library" scope="TEST" name="JUnit5" level="project" />
   </component>
 </module>

plugins/textmate/joni/resources/intellij.textmate.joni.xml

@@ -0,0 +1,5 @@
+<idea-plugin>
+  <dependencies>
+    <module name="intellij.textmate.core"/>
+  </dependencies>
+</idea-plugin>

plugins/textmate/plugin-content.yaml

@@ -1,13 +0,0 @@
-- name: lib/joni.jar
-  library: joni
-  files:
-  - name: $MAVEN_REPOSITORY$/org/jruby/joni/joni/2/joni-2.jar
-  - name: $MAVEN_REPOSITORY$/org/jruby/jcodings/jcodings/1/jcodings-1.jar
-  reason: <- intellij.textmate.joni
-- name: lib/textmate.jar
-  modules:
-  - name: intellij.textmate
-  - name: intellij.textmate.core
-    reason: <- intellij.textmate
-  - name: intellij.textmate.joni
-    reason: <- intellij.textmate

plugins/textmate/plugin/BUILD.bazel

@@ -0,0 +1,16 @@
+### auto-generated section `build intellij.textmate.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"]
+)
+### auto-generated section `build intellij.textmate.plugin` end

plugins/textmate/plugin/intellij.textmate.plugin.iml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

plugins/textmate/plugin/plugin-content.yaml

@@ -0,0 +1,26 @@
+- name: lib/modules/intellij.textmate.backend.jar
+  contentModules:
+  - name: intellij.textmate.backend
+- name: lib/modules/intellij.textmate.common.jar
+  contentModules:
+  - name: intellij.textmate.common
+- name: lib/modules/intellij.textmate.core.jar
+  contentModules:
+  - name: intellij.textmate.core
+- name: lib/modules/intellij.textmate.frontend.split.jar
+  contentModules:
+  - name: intellij.textmate.frontend.split
+- name: lib/modules/intellij.textmate.jar
+  contentModules:
+  - name: intellij.textmate
+- name: lib/modules/intellij.textmate.joni.jar
+  contentModules:
+  - name: intellij.textmate.joni
+  library: joni
+  files:
+  - name: $MAVEN_REPOSITORY$/org/jruby/joni/joni/2/joni-2.jar
+  - name: $MAVEN_REPOSITORY$/org/jruby/jcodings/jcodings/1/jcodings-1.jar
+  reason: <- intellij.textmate.joni
+- name: lib/textmate-plugin.jar
+  modules:
+  - name: intellij.textmate.plugin

plugins/textmate/plugin/resources/META-INF/plugin.xml

@@ -0,0 +1,26 @@
+<idea-plugin allow-bundled-update="true">
+  <id>org.jetbrains.plugins.textmate</id>
+  <name>TextMate Bundles</name>
+  <category>Languages</category>
+  <vendor>JetBrains</vendor>
+
+  <description><![CDATA[
+    Supports syntax highlighting for arbitrary file types,
+    controlled by <a href="https://macromates.com/textmate/manual/bundles">TextMate bundles</a>
+  ]]></description>
+
+  <dependencies>
+    <plugin id="com.intellij.modules.lang"/>
+    <plugin id="com.intellij.modules.spellchecker"/>
+  </dependencies>
+
+  <content>
+    <module name="intellij.textmate" loading="required"/>
+    <module name="intellij.textmate.common" loading="required"/>
+    <module name="intellij.textmate.core" loading="required"/>
+    <module name="intellij.textmate.joni" loading="required"/>
+    <module name="intellij.textmate.backend"/>
+    <module name="intellij.textmate.frontend.split"/>
+  </content>
+
+</idea-plugin>

plugins/textmate/resources/intellij.textmate.xml

@@ -1,17 +1,9 @@
-<idea-plugin allow-bundled-update="true">
-  <id>org.jetbrains.plugins.textmate</id>
-  <name>TextMate Bundles</name>
-  <category>Languages</category>
-  <vendor>JetBrains</vendor>
-
-  <description><![CDATA[
-    Supports syntax highlighting for arbitrary file types,
-    controlled by <a href="https://macromates.com/textmate/manual/bundles">TextMate bundles</a>
-  ]]></description>
-
-  <depends>com.intellij.modules.lang</depends>
-  <depends>com.intellij.modules.spellchecker</depends>
-
+<idea-plugin>
+  <dependencies>
+    <module name="intellij.spellchecker"/>
+    <module name="intellij.textmate.core"/>
+    <module name="intellij.textmate.joni"/>
+  </dependencies>
   <extensionPoints>
     <extensionPoint qualifiedName="com.intellij.textmate.bundleProvider"
                     interface="org.jetbrains.plugins.textmate.api.TextMateBundleProvider"/>

plugins/textmate/tests/BUILD.bazel

@@ -0,0 +1,58 @@
+### auto-generated section `build intellij.textmate.tests` start
+load("@rules_jvm//:jvm.bzl", "jvm_library", "jvm_resources")
+
+jvm_resources(
+  name = "tests_test_resources",
+  files = glob(["testData/**/*"]),
+  strip_prefix = "testData"
+)
+
+jvm_library(
+  name = "tests",
+  visibility = ["//visibility:public"],
+  srcs = glob([], allow_empty = True)
+)
+
+jvm_library(
+  name = "tests_test_lib",
+  module_name = "intellij.textmate.tests",
+  visibility = ["//visibility:public"],
+  srcs = glob(["tests/**/*.kt", "tests/**/*.java", "testsMultiplatform/**/*.kt", "testsMultiplatform/**/*.java"], allow_empty = True),
+  deps = [
+    "@lib//:kotlin-stdlib",
+    "@lib//:jetbrains-annotations",
+    "//plugins/textmate/core",
+    "//plugins/textmate/joni",
+    "//platform/testFramework",
+    "//platform/testFramework:testFramework_test_lib",
+    "//tools/intellij.tools.ide.metrics.benchmark:ide-metrics-benchmark",
+    "//tools/intellij.tools.ide.metrics.benchmark:ide-metrics-benchmark_test_lib",
+    "@lib//:junit5",
+    "@lib//:kotlin-test",
+    "@lib//:kotlinx-coroutines-test",
+    "//platform/util",
+    "//platform/util/xmlDom",
+    "@lib//:kotlinx-collections-immutable",
+    "@lib//:kotlinx-coroutines-core",
+    "//plugins/textmate",
+    "//platform/core-api:core",
+    "//platform/lang-impl",
+    "//platform/analysis-api:analysis",
+    "//platform/editor-ui-api:editor-ui",
+    "//spellchecker",
+    "//spellchecker:spellchecker_test_lib",
+    "//platform/projectModel-api:projectModel",
+    "//plugins/textmate/plugin",
+  ],
+  runtime_deps = [":tests_test_resources"]
+)
+### auto-generated section `build intellij.textmate.tests` end
+
+### auto-generated section `test intellij.textmate.tests` start
+load("@community//build:tests-options.bzl", "jps_test")
+
+jps_test(
+  name = "tests_test",
+  runtime_deps = [":tests_test_lib"]
+)
+### auto-generated section `test intellij.textmate.tests` end

plugins/textmate/tests/intellij.textmate.tests.iml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/testData" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/testsMultiplatform" isTestSource="true" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" scope="TEST" name="kotlin-stdlib" level="project" />
+    <orderEntry type="library" scope="TEST" name="jetbrains-annotations" level="project" />
+    <orderEntry type="module" module-name="intellij.textmate.core" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.textmate.joni" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.tools.ide.metrics.benchmark" scope="TEST" />
+    <orderEntry type="library" scope="TEST" name="JUnit5" level="project" />
+    <orderEntry type="library" scope="TEST" name="kotlin-test" level="project" />
+    <orderEntry type="library" scope="TEST" name="kotlinx-coroutines-test" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.util" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.util.xmlDom" scope="TEST" />
+    <orderEntry type="library" scope="TEST" name="kotlinx-collections-immutable" level="project" />
+    <orderEntry type="library" scope="TEST" name="kotlinx-coroutines-core" level="project" />
+    <orderEntry type="module" module-name="intellij.textmate" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.core" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.lang.impl" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.analysis" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.editor.ui" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.spellchecker" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.projectModel" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.textmate.plugin" scope="TEST" />
+  </component>
+</module>