Avoid bundled-plugin collisions with distinct Protocol Buffers language IDs (#297)

* WIP: migrate protobuf language registrations and preserve file type names

Co-authored-by: devkanro <9367842+devkanro@users.noreply.github.com>

* Document safe language ID upgrades and test settings preservation

Co-authored-by: devkanro <9367842+devkanro@users.noreply.github.com>

* Use supported code style option in migration regression tests

Co-authored-by: devkanro <9367842+devkanro@users.noreply.github.com>

* chore: bump plugin patch version to 2.6.1

Co-authored-by: devkanro <9367842+devkanro@users.noreply.github.com>

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: devkanro <9367842+devkanro@users.noreply.github.com>

Author: Copilot

.github/docmap.md

@@ -1,5 +1,5 @@
 ---
-updated: 2026-03-09
+updated: 2026-09-11
 ---
 
 # Documentation Map
@@ -8,14 +8,14 @@ updated: 2026-03-09
 
 | File | Purpose | Related Code |
 |---|---|---|
-| README.md | Project overview, features, install, Copilot workflow | — |
+| README.md | Project overview, features, install, language ID migration, Copilot workflow | lang/ProtobufLanguage.kt, lang/ProtoTextLanguage.kt, lang/*FileType.kt |
 | CHANGELOG.md | Version history, release notes | All changes |
 | docs/README.md | Documentation index / navigation page | — |
 | docs/overview.md | What the plugin does, key concepts | — |
 | docs/architecture.md | High-level layer diagram, subsystem overview | All `src/main/kotlin/` |
 | docs/getting-started.md | Build, run, test guide | build.gradle.kts, gradle.properties, .github/workflows/ |
 | docs/contributing.md | Code style, adding features/modules, Copilot workflow | lang/, META-INF/ |
-| docs/extension-points.md | Custom extension point API docs | lang/root/, lang/psi/feature/, compile/ |
+| docs/extension-points.md | Language bindings and custom extension point API docs | lang/ProtobufLanguage.kt, lang/ProtoTextLanguage.kt, META-INF/, lang/root/, lang/psi/feature/, compile/ |
 | docs/design/psi-and-mixin.md | Why mixin pattern for PSI elements | lang/psi/, lang/psi/proto/mixin/, lang/psi/feature/ |
 | docs/design/symbol-resolution.md | Why two-phase resolve, scope hierarchy | lang/psi/proto/ProtobufSymbolResolver, lang/psi/proto/ProtobufScope, lang/root/ |
 | docs/design/stub-indexing.md | Why stubs, index design tradeoffs | lang/psi/stub/, lang/psi/stub/type/, lang/psi/stub/index/ |

CHANGELOG.md

@@ -4,6 +4,16 @@
 
 ## Unreleased
 
+### Changed
+
+- Rename language IDs from `protobuf` to `protocol_buffers` and from `prototext` to
+  `protocol_buffers_text` to avoid collisions with bundled languages ([#296](https://github.com/devkanro/intellij-protobuf-plugin/pull/296)).
+  Update core, Java, Sisyphus, and HTTP Client language bindings without registering legacy aliases.
+- Preserve file type names, extensions, display names, settings storage, stub/index IDs, and color
+  scheme keys. Language-ID-based settings and external integrations may require
+  [manual migration](README.md#upgrading-from-the-old-language-ids); existing settings are not overwritten.
+  Full coexistence with bundled Protocol Buffer and gRPC plugins remains unverified.
+
 ## 1.7.50 - 2023-12-25
 
 - Remove support for buf

README.md

@@ -32,6 +32,29 @@ This plugin turns your JetBrains IDE into a protobuf-aware development environme
 2. Search for **"Protobuf"** by kanro
 3. Install and restart
 
+### Upgrading from the old language IDs
+
+The language IDs are now `protocol_buffers` (previously `protobuf`) and
+`protocol_buffers_text` (previously `prototext`). File type names, extensions, display names,
+plugin settings, and color scheme keys are unchanged. No aliases for the old language IDs are registered.
+
+Language-specific code style settings and custom integrations that reference the old IDs may need
+manual migration. Back up your IDE and project settings first. For code style schemes, copy only
+the `codeStyleSettings` entry for the old language to the new language ID **if the destination is
+absent**; keep the original entry and never overwrite existing settings for the new ID.
+The separate `ProtobufCodeStyleSettings` entry does not need renaming.
+Update custom language injection targets, `@Language` annotations, and language injection comments
+that reference the old IDs only when they are intended for this plugin, not the bundled plugin.
+Live Template context IDs are separate from language IDs and are not renamed; review custom template
+applicability rather than replacing their context IDs. Third-party plugins must update their language
+bindings or lookups to the new IDs.
+
+Migration is not automatic: the old IDs can also identify JetBrains' bundled languages, so their
+settings cannot safely be attributed to this plugin. Legacy code style entries are retained by the
+platform, but are not automatically applied to the new languages. Ordinary file associations retain their
+existing file type names. This change does **not** establish full coexistence with the bundled
+Protocol Buffer and gRPC plugins; the compatibility warning above still applies.
+
 ## 🔍 Feature Highlights
 
 ### Schema Intelligence

build.gradle.kts

@@ -41,6 +41,8 @@ dependencies {
     implementation("com.bybutter.sisyphus:sisyphus-jackson-protobuf:2.1.22")
     implementation("io.grpc:grpc-netty:1.65.0")
 
+    testImplementation(libs.junit)
+
     // IntelliJ Platform Gradle Plugin Dependencies Extension - read more: https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-dependencies-extension.html
     intellijPlatform {
         create(providers.gradleProperty("platformType"), providers.gradleProperty("platformVersion")) {

docs/extension-points.md

@@ -2,6 +2,22 @@
 
 The plugin defines custom extension points that allow third-party plugins to extend its functionality. All extension points are dynamic (support runtime loading/unloading).
 
+## Language Bindings
+
+Use the following IDs for IntelliJ language extension registrations and language lookups:
+
+| Language | Language ID | File type name (unchanged) |
+|----------|-------------|----------------------------|
+| Protocol Buffers | `protocol_buffers` | `protobuf` |
+| Protocol Buffers text format | `protocol_buffers_text` | `prototext` |
+
+The old language IDs `protobuf` and `prototext` are not aliases. Bindings using them may resolve
+to JetBrains' bundled languages instead of this plugin. Code using `ProtobufLanguage` or
+`ProtoTextLanguage` directly follows the new IDs without changing the class names.
+The plugin ID and custom extension point namespace remain `io.kanro.idea.plugin.protobuf`;
+stub external IDs and index keys also remain unchanged.
+See the [upgrade guidance](../README.md#upgrading-from-the-old-language-ids) for persisted settings.
+
 ## rootProvider
 
 **Interface**: `io.kanro.idea.plugin.protobuf.lang.root.ProtobufRootProvider`

gradle.properties

@@ -4,7 +4,7 @@ pluginName=IntelliJ Protobuf Language Plugin
 pluginRepositoryUrl=https://github.com/devkanro/intellij-protobuf-plugin
 
 # SemVer format -> https://semver.org
-pluginVersion=2.6.0
+pluginVersion=2.6.1
 
 # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 pluginSinceBuild=262

src/main/kotlin/io/kanro/idea/plugin/protobuf/lang/ProtoTextFileType.kt

@@ -16,7 +16,7 @@ class ProtoTextFileType : LanguageFileType(ProtoTextLanguage) {
     }
 
     override fun getName(): String {
-        return ProtoTextLanguage.id
+        return "prototext"
     }
 
     override fun getDescription(): String {

src/main/kotlin/io/kanro/idea/plugin/protobuf/lang/ProtoTextLanguage.kt

@@ -2,4 +2,6 @@ package io.kanro.idea.plugin.protobuf.lang
 
 import com.intellij.lang.Language
 
-object ProtoTextLanguage : Language("prototext")
+object ProtoTextLanguage : Language("protocol_buffers_text") {
+    override fun getDisplayName(): String = "prototext"
+}

src/main/kotlin/io/kanro/idea/plugin/protobuf/lang/ProtobufFileType.kt

@@ -16,7 +16,7 @@ class ProtobufFileType : LanguageFileType(ProtobufLanguage) {
     }
 
     override fun getName(): String {
-        return ProtobufLanguage.id
+        return "protobuf"
     }
 
     override fun getDescription(): String {

src/main/kotlin/io/kanro/idea/plugin/protobuf/lang/ProtobufLanguage.kt

@@ -2,4 +2,6 @@ package io.kanro.idea.plugin.protobuf.lang
 
 import com.intellij.lang.Language
 
-object ProtobufLanguage : Language("protobuf")
+object ProtobufLanguage : Language("protocol_buffers") {
+    override fun getDisplayName(): String = "protobuf"
+}