From d29045be2d319516fb0cbd4889ee11d3d91b2034 Mon Sep 17 00:00:00 2001
From: ymc9 <104139426+ymc9@users.noreply.github.com>
Date: Mon, 1 Jan 2024 20:38:19 +0800
Subject: [PATCH] fix: disable textmate bundle when JetBrains plugin is
 uninstalled

---
 packages/ide/jetbrains/.idea/gradle.xml       |  1 +
 packages/ide/jetbrains/.idea/vcs.xml          |  2 +-
 packages/ide/jetbrains/build.gradle.kts       |  2 +-
 .../src/main/kotlin/dev/zenstack/Utils.kt     | 28 +++++++++++++++++++
 .../lsp/ZenStackLspServerDescriptor.kt        | 11 ++------
 .../zenstack/plugin/PluginStateListener.kt    | 18 ++++++++++++
 .../src/main/resources/META-INF/plugin.xml    | 10 +++++++
 7 files changed, 61 insertions(+), 11 deletions(-)
 create mode 100644 packages/ide/jetbrains/src/main/kotlin/dev/zenstack/Utils.kt
 create mode 100644 packages/ide/jetbrains/src/main/kotlin/dev/zenstack/plugin/PluginStateListener.kt

diff --git a/packages/ide/jetbrains/.idea/gradle.xml b/packages/ide/jetbrains/.idea/gradle.xml
index f9163b40e..ce1c62c7c 100644
--- a/packages/ide/jetbrains/.idea/gradle.xml
+++ b/packages/ide/jetbrains/.idea/gradle.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
diff --git a/packages/ide/jetbrains/.idea/vcs.xml b/packages/ide/jetbrains/.idea/vcs.xml
index b2bdec2d7..c2365ab11 100644
--- a/packages/ide/jetbrains/.idea/vcs.xml
+++ b/packages/ide/jetbrains/.idea/vcs.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$/../.." vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/../../.." vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/packages/ide/jetbrains/build.gradle.kts b/packages/ide/jetbrains/build.gradle.kts
index fa0e3ed31..18f83ebf0 100644
--- a/packages/ide/jetbrains/build.gradle.kts
+++ b/packages/ide/jetbrains/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 }
 
 group = "dev.zenstack"
-version = "0.5.0"
+version = "1.6.0"
 
 repositories {
     mavenCentral()
diff --git a/packages/ide/jetbrains/src/main/kotlin/dev/zenstack/Utils.kt b/packages/ide/jetbrains/src/main/kotlin/dev/zenstack/Utils.kt
new file mode 100644
index 000000000..b35ae1ec0
--- /dev/null
+++ b/packages/ide/jetbrains/src/main/kotlin/dev/zenstack/Utils.kt
@@ -0,0 +1,28 @@
+package dev.zenstack
+
+import com.intellij.lang.javascript.service.JSLanguageServiceUtil
+import org.jetbrains.plugins.textmate.TextMateService
+import org.jetbrains.plugins.textmate.configuration.TextMateUserBundlesSettings
+
+class Utils {
+    companion object {
+        fun addTextMateBundle() {
+            println("Adding ZenStack textmate bundle")
+            val textMateBundle = JSLanguageServiceUtil.getPluginDirectory(javaClass, "res/zmodel.tmbundle")
+            TextMateUserBundlesSettings.instance?.addBundle(textMateBundle.path, "zmodel")
+            reloadTextMateBundles()
+        }
+
+        fun disableTextMateBundle() {
+            println("Disabling ZenStack textmate bundle")
+            val textMateBundle = JSLanguageServiceUtil.getPluginDirectory(javaClass, "res/zmodel.tmbundle")
+            TextMateUserBundlesSettings.instance?.disableBundle(textMateBundle.path)
+            reloadTextMateBundles()
+        }
+
+        private fun reloadTextMateBundles() {
+            val textMateService = TextMateService.getInstance();
+            textMateService.reloadEnabledBundles()
+        }
+    }
+}
\ No newline at end of file
diff --git a/packages/ide/jetbrains/src/main/kotlin/dev/zenstack/lsp/ZenStackLspServerDescriptor.kt b/packages/ide/jetbrains/src/main/kotlin/dev/zenstack/lsp/ZenStackLspServerDescriptor.kt
index 3d1219574..524d9e812 100644
--- a/packages/ide/jetbrains/src/main/kotlin/dev/zenstack/lsp/ZenStackLspServerDescriptor.kt
+++ b/packages/ide/jetbrains/src/main/kotlin/dev/zenstack/lsp/ZenStackLspServerDescriptor.kt
@@ -1,6 +1,5 @@
 package dev.zenstack.lsp
 
-import com.intellij.codeInsight.completion.CompletionParameters
 import com.intellij.execution.ExecutionException
 import com.intellij.execution.configurations.GeneralCommandLine
 import com.intellij.javascript.nodejs.interpreter.NodeCommandLineConfigurator
@@ -11,11 +10,9 @@ import com.intellij.lang.javascript.service.JSLanguageServiceUtil
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.platform.lsp.api.ProjectWideLspServerDescriptor
-import com.intellij.platform.lsp.api.customization.LspCompletionSupport
 import com.intellij.platform.lsp.api.customization.LspFormattingSupport
-import org.jetbrains.plugins.textmate.configuration.TextMateUserBundlesSettings
-import org.jetbrains.plugins.textmate.TextMateService;
 import dev.zenstack.lang.ZModelFileType
+import dev.zenstack.Utils
 
 class ZenStackLspServerDescriptor(project: Project) : ProjectWideLspServerDescriptor(project, "ZenStack") {
 
@@ -23,11 +20,7 @@ class ZenStackLspServerDescriptor(project: Project) : ProjectWideLspServerDescri
 
     override fun createCommandLine(): GeneralCommandLine {
 
-        // install TextMate bundle
-        val textMateBundle = JSLanguageServiceUtil.getPluginDirectory(javaClass, "res/zmodel.tmbundle")
-        TextMateUserBundlesSettings.instance?.addBundle(textMateBundle.path, "zmodel")
-        val textMateService = TextMateService.getInstance();
-        textMateService.reloadEnabledBundles()
+        Utils.Companion.addTextMateBundle()
 
         // start language server
         val interpreter = NodeJsInterpreterManager.getInstance(project).interpreter
diff --git a/packages/ide/jetbrains/src/main/kotlin/dev/zenstack/plugin/PluginStateListener.kt b/packages/ide/jetbrains/src/main/kotlin/dev/zenstack/plugin/PluginStateListener.kt
new file mode 100644
index 000000000..984f3f0ba
--- /dev/null
+++ b/packages/ide/jetbrains/src/main/kotlin/dev/zenstack/plugin/PluginStateListener.kt
@@ -0,0 +1,18 @@
+package dev.zenstack.plugin
+
+import com.intellij.ide.plugins.DynamicPluginListener
+import com.intellij.ide.plugins.IdeaPluginDescriptor
+import dev.zenstack.Utils
+import org.jetbrains.plugins.textmate.TextMateService
+
+class PluginStateListener: DynamicPluginListener {
+    override fun beforePluginLoaded(pluginDescriptor: IdeaPluginDescriptor) {
+        // install TextMate bundle
+        Utils.Companion.addTextMateBundle()
+    }
+
+    override fun beforePluginUnload(pluginDescriptor: IdeaPluginDescriptor, isUpdate: Boolean) {
+        // uninstall TextMate bundle
+        Utils.disableTextMateBundle()
+    }
+}
\ No newline at end of file
diff --git a/packages/ide/jetbrains/src/main/resources/META-INF/plugin.xml b/packages/ide/jetbrains/src/main/resources/META-INF/plugin.xml
index 3ee6bf887..9c5ddb5f8 100644
--- a/packages/ide/jetbrains/src/main/resources/META-INF/plugin.xml
+++ b/packages/ide/jetbrains/src/main/resources/META-INF/plugin.xml
@@ -20,8 +20,10 @@
 
         <ul>
             <li>Syntax highlighting</li>
+            <li>Error highlighting</li>
             <li>Go to definition</li>
             <li>Code completion</li>
+            <li>Formatting</li>
         </ul>
     ]]></description>
 
@@ -54,4 +56,12 @@
                 implementationClass="org.jetbrains.plugins.textmate.language.syntax.highlighting.TextMateSyntaxHighlighterFactory"/>
 
     </extensions>
+
+    <applicationListeners>
+        <listener
+                class="dev.zenstack.plugin.PluginStateListener"
+                topic="com.intellij.ide.plugins.DynamicPluginListener"/>
+    </applicationListeners>
+
+    <idea-version since-build="233.2" />
 </idea-plugin>
\ No newline at end of file