fix: 修复使用的状态类名与其他插件同名的问题（本质上是官方 ide 的内部实现错误，不过暂且先使用其他方法修复）

ref: #17
rxliuli · Feb 2, 2022 · be6753f · be6753f
1 parent ace689b
commit be6753f
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 13 deletions.
diff --git a/...ins/vite-jetbrains-plugin/src/main/kotlin/com/rxliuli/vite/cli/ViteCliProjectGenerator.kt b/...ins/vite-jetbrains-plugin/src/main/kotlin/com/rxliuli/vite/cli/ViteCliProjectGenerator.kt
@@ -13,7 +13,7 @@ import com.intellij.platform.ProjectGeneratorPeer
 import com.intellij.util.ui.UIUtil
 import com.rxliuli.vite.ViteIcons
 import com.rxliuli.vite.ViteMessage
-import com.rxliuli.vite.settings.AppSettingsState
+import com.rxliuli.vite.settings.ViteAppSettingsState
 import org.jetbrains.annotations.Nullable
 import java.io.File
 import javax.swing.DefaultComboBoxModel
@@ -54,7 +54,7 @@ class ViteCliProjectGenerator : NpmPackageProjectGenerator() {
     }
 
     val settingsTemplateKey = Key.create<String>("template")
-    private val globalSettings: AppSettingsState = AppSettingsState.instance
+    private val globalSettings: ViteAppSettingsState = ViteAppSettingsState.instance
 
     override fun createPeer(): ProjectGeneratorPeer<Settings> {
         val templateComponent = ComboBox(DefaultComboBoxModel(globalSettings.templates))

diff --git a/...s/vite-jetbrains-plugin/src/main/kotlin/com/rxliuli/vite/settings/AppSettingsComponent.kt b/...s/vite-jetbrains-plugin/src/main/kotlin/com/rxliuli/vite/settings/AppSettingsComponent.kt
@@ -40,7 +40,7 @@ class AddInputDialog : DialogWrapper(true) {
 }
 
 class AppSettingsComponent {
-    private val globalSettings: AppSettingsState = AppSettingsState.instance
+    private val globalSettings: ViteAppSettingsState = ViteAppSettingsState.instance
 
     val panel: DialogPanel = panel {
         row("Default template:") {

diff --git a/...rxliuli/vite/settings/AppSettingsState.kt → ...uli/vite/settings/ViteAppSettingsState.kt b/...rxliuli/vite/settings/AppSettingsState.kt → ...uli/vite/settings/ViteAppSettingsState.kt
@@ -7,7 +7,7 @@ import com.intellij.openapi.components.Storage
 import com.intellij.util.xmlb.XmlSerializerUtil
 
 @State(name = "org.intellij.sdk.settings.AppSettingsState", storages = [Storage("SdkSettingsPlugin.xml")])
-class AppSettingsState : PersistentStateComponent<AppSettingsState?> {
+class ViteAppSettingsState : PersistentStateComponent<ViteAppSettingsState?> {
     var template = "react-ts"
     val templates = arrayOf(
         "vanilla",
@@ -24,16 +24,16 @@ class AppSettingsState : PersistentStateComponent<AppSettingsState?> {
         "svelte-ts",
     )
 
-    override fun getState(): AppSettingsState {
+    override fun getState(): ViteAppSettingsState {
         return this
     }
 
-    override fun loadState(state: AppSettingsState) {
+    override fun loadState(state: ViteAppSettingsState) {
         XmlSerializerUtil.copyBean(state, this)
     }
 
     companion object {
-        val instance: AppSettingsState
-            get() = ApplicationManager.getApplication().getService(AppSettingsState::class.java)
+        val instance: ViteAppSettingsState
+            get() = ApplicationManager.getApplication().getService(ViteAppSettingsState::class.java)
     }
 }
diff --git a/jetbrains-plugins/vite-jetbrains-plugin/src/main/resources/META-INF/plugin.xml b/jetbrains-plugins/vite-jetbrains-plugin/src/main/resources/META-INF/plugin.xml
@@ -1,7 +1,9 @@
 <idea-plugin>
     <id>com.rxliuli.vite-jetbrains-plugin</id>
     <name>Vite Integrated</name>
-    <vendor email="rxliuli@gmail.com" url="https://github.com/rxliuli/liuli-tools/tree/master/jetbrains-plugins/vite-jetbrains-plugin">rxliuli</vendor>
+    <vendor email="rxliuli@gmail.com"
+            url="https://github.com/rxliuli/liuli-tools/tree/master/jetbrains-plugins/vite-jetbrains-plugin">rxliuli
+    </vendor>
 
     <!-- please see https://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/plugin_compatibility.html
          on how to target different products -->
@@ -14,10 +16,10 @@
         <projectTemplatesFactory
                 implementation="com.rxliuli.vite.cli.ViteProjectTemplateFactory"/> <!-- works in IntelliJ IDEA -->
 
-        <applicationService serviceImplementation="com.rxliuli.vite.settings.AppSettingsState"/>
-<!--        <applicationConfigurable parentId="tools" instance="com.rxliuli.vite.settings.AppSettingsConfigurable"-->
-<!--                                 id="com.rxliuli.vite.settings.AppSettingsConfigurable"-->
-<!--                                 displayName="Vite Settings"/>-->
+        <applicationService serviceImplementation="com.rxliuli.vite.settings.ViteAppSettingsState"/>
+        <!--        <applicationConfigurable parentId="tools" instance="com.rxliuli.vite.settings.AppSettingsConfigurable"-->
+        <!--                                 id="com.rxliuli.vite.settings.AppSettingsConfigurable"-->
+        <!--                                 displayName="Vite Settings"/>-->
     </extensions>
 
     <actions>