feat: save yapi tokens in project scope

tangcent · Aug 28, 2021 · 2eb0b0d · 2eb0b0d
1 parent 59194bb
commit 2eb0b0d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/idea-plugin/src/main/kotlin/com/itangcent/idea/plugin/settings/XmlSettingBinder.kt b/idea-plugin/src/main/kotlin/com/itangcent/idea/plugin/settings/XmlSettingBinder.kt
@@ -32,13 +32,13 @@ class XmlSettingBinder : SettingBinder {
             return
         }
 
-        val projectSettings = projectSettingsComponent?.state ?: ProjectSettings()
-        t.copyTo(projectSettings)
-        projectSettingsComponent?.loadState(projectSettings)
-
         val applicationSettings = applicationSettingsComponent.state ?: ApplicationSettings()
         t.copyTo(applicationSettings)
         applicationSettingsComponent.loadState(applicationSettings)
+
+        val projectSettings = projectSettingsComponent?.state ?: ProjectSettings()
+        t.copyTo(projectSettings)
+        projectSettingsComponent?.loadState(projectSettings)
     }
 
     override fun tryRead(): Settings? {
@@ -49,8 +49,8 @@ class XmlSettingBinder : SettingBinder {
         }
 
         val settings = Settings()
-        projectSettings?.copyTo(settings)
         applicationSettings?.copyTo(settings)
+        projectSettings?.copyTo(settings)
         return settings
     }
 }
diff --git a/idea-plugin/src/main/kotlin/com/itangcent/idea/plugin/settings/xml/ProjectSettings.kt b/idea-plugin/src/main/kotlin/com/itangcent/idea/plugin/settings/xml/ProjectSettings.kt
@@ -4,15 +4,20 @@ interface ProjectSettingsSupport {
 
     var postmanWorkspace: String?
 
+    var yapiTokens: String?
+
     fun copyTo(newSetting: ProjectSettingsSupport) {
         newSetting.postmanWorkspace = this.postmanWorkspace
+        this.yapiTokens?.let { newSetting.yapiTokens = it }
     }
 }
 
 class ProjectSettings : ProjectSettingsSupport {
 
     override var postmanWorkspace: String? = null
 
+    override var yapiTokens: String? = null
+
     fun copy(): ProjectSettings {
         val projectSettings = ProjectSettings()
         this.copyTo(projectSettings)