Rename ltex-ls.languageTool* settings

valentjn · Oct 19, 2021 · 834a7ab · 834a7ab
1 parent ac0a00b
commit 834a7ab
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 4 deletions.
diff --git a/changelog.xml b/changelog.xml
@@ -13,6 +13,15 @@
   </properties>
   <body>
     <release version="14.1.0" date="upcoming">
+      <action type="update">
+        Rename `ltex.ltex-ls.languageToolHttpServerUri` &#x2192; [`ltex.languageToolHttpServerUri`](https://valentjn.github.io/ltex/settings.html#ltexlanguagetoolhttpserveruri); the previous name is deprecated
+      </action>
+      <action type="update">
+        Rename `ltex.ltex-ls.languageToolOrgUsername` &#x2192; [`ltex.languageToolOrg.username`](https://valentjn.github.io/ltex/settings.html#ltexlanguagetoolorgusername); the previous name is deprecated
+      </action>
+      <action type="update">
+        Rename `ltex.ltex-ls.languageToolOrgApiKey` &#x2192; [`ltex.languageToolOrg.apiKey`](https://valentjn.github.io/ltex/settings.html#ltexlanguagetoolorgapikey); the previous name is deprecated
+      </action>
       <action type="add" issue="vscode-ltex#409">
         Add support for completion requests for English and German
       </action>

diff --git a/src/main/kotlin/org/bsplines/ltexls/settings/Settings.kt b/src/main/kotlin/org/bsplines/ltexls/settings/Settings.kt
@@ -120,7 +120,7 @@ data class Settings(
     }
 
     if (languageToolHttpServerUri != other.languageToolHttpServerUri) {
-      differences.add(SettingsDifference("ltex-ls.languageToolHttpServerUri",
+      differences.add(SettingsDifference("languageToolHttpServerUri",
           this.languageToolHttpServerUri, other.languageToolHttpServerUri))
     }
 
@@ -213,12 +213,43 @@ data class Settings(
           getSettingFromJsonAsString(jsonSettings, "additionalRules.neuralNetworkModel")
       val word2VecModelRulesDirectory: String? =
           getSettingFromJsonAsString(jsonSettings, "additionalRules.word2VecModel")
-      val languageToolHttpServerUri: String? =
+
+      val languageToolHttpServerUri: String? = getSettingFromJsonAsString(
+        jsonSettings,
+        "languageToolHttpServerUri",
+      ).let {
+        if (it?.isNotEmpty() == true) {
+          it
+        } else {
+          // deprecated in 14.1.0
           getSettingFromJsonAsString(jsonSettings, "ltex-ls.languageToolHttpServerUri")
-      val languageToolOrgUsername: String? =
+        }
+      }
+
+      val languageToolOrgUsername: String? = getSettingFromJsonAsString(
+        jsonSettings,
+        "languageToolOrg.username",
+      ).let {
+        if (it?.isNotEmpty() == true) {
+          it
+        } else {
+          // deprecated in 14.1.0
           getSettingFromJsonAsString(jsonSettings, "ltex-ls.languageToolOrgUsername")
-      val languageToolOrgApiKey: String? =
+        }
+      }
+
+      val languageToolOrgApiKey: String? = getSettingFromJsonAsString(
+        jsonSettings,
+        "languageToolOrg.apiKey",
+      ).let {
+        if (it?.isNotEmpty() == true) {
+          it
+        } else {
+          // deprecated in 14.1.0
           getSettingFromJsonAsString(jsonSettings, "ltex-ls.languageToolOrgApiKey")
+        }
+      }
+
       val logLevel: Level? = getSettingFromJsonAsEnum(
         jsonSettings,
         "ltex-ls.logLevel",