Merge pull request #29 from abougouffa/fix/lsp-use-plists

Take `lsp-use-plists` into account

Author: jcs090218

lsp-ltex.el

@@ -287,6 +287,20 @@ The editor need to send a completion request.")
                                              (cl-remove-if #'null args)
                                              " ")))))))
 
+(defun lsp-ltex--plist-keys (plist)
+  "Return the keys of PLIST."
+  (let (keys)
+    (while plist
+      (push (car plist) keys)
+      (setq plist (cddr plist)))
+    keys))
+
+(defun lsp-ltex--lsp-keys (table)
+  "Similar to `lsp-get' and `lsp-put', it return the keys in TABLE."
+  (if lsp-use-plists
+      (lsp-ltex--plist-keys table)
+    (hash-table-keys table)))
+
 (defun lsp-ltex--serialize-symbol (sym dir)
   "Serialize SYM to DIR.
 Return the written file name, or nil if SYM is not bound."
@@ -320,13 +334,12 @@ Return the deserialized object, or nil if the SYM.el file dont exist."
 
 (defun lsp-ltex--add-rule (lang rule rules-plist)
   "Add RULE of language LANG to the plist named RULES-PLIST (symbol)."
-  (let ((lang-key (intern (concat ":" lang))))
-    (when (null (eval rules-plist))
-      (set rules-plist (list lang-key [])))
-    (plist-put (eval rules-plist) lang-key
-               (vconcat (list rule) (plist-get (eval rules-plist) lang-key)))
-    (when-let (out-file (lsp-ltex--serialize-symbol rules-plist lsp-ltex-user-rules-path))
-      (lsp-message "[INFO] Rule for language %s saved to file \"%s\"" lang out-file))))
+  (when (null (eval rules-plist))
+    (set rules-plist (list lang [])))
+  (plist-put (eval rules-plist) lang
+             (vconcat (list rule) (plist-get (eval rules-plist) lang)))
+  (when-let (out-file (lsp-ltex--serialize-symbol rules-plist lsp-ltex-user-rules-path))
+    (lsp-message "[INFO] Rule for language %s saved to file \"%s\"" (symbol-name lang) out-file)))
 
 (defun lsp-ltex-combine-plists (&rest plists)
   "Create a single property list from all plists in PLISTS.
@@ -523,20 +536,21 @@ This file is use to activate the language server."
   "Execute action ACTION-HT by getting KEY and storing it in the RULES-PLIST.
 When STORE is non-nil, this will also store the new plist in the directory
 `lsp-ltex-user-rules-path'."
-  (let ((args-ht (gethash key action-ht)))
-    (dolist (lang (hash-table-keys args-ht))
-      (mapc (lambda (rule)
-              (lsp-ltex--add-rule lang rule rules-plist)
-              (when store
-                (lsp-ltex--serialize-symbol rules-plist lsp-ltex-user-rules-path)))
-            (gethash lang args-ht)))))
+  (let ((args-ht (lsp-get (if (vectorp action-ht) (elt action-ht 0) action-ht) key)))
+    (dolist (lang (lsp-ltex--lsp-keys args-ht))
+      (let ((lang-key (if (stringp lang) (intern (concat ":" lang)) lang)))
+        (mapc (lambda (rule)
+                (lsp-ltex--add-rule lang-key rule rules-plist)
+                (when store
+                  (lsp-ltex--serialize-symbol rules-plist lsp-ltex-user-rules-path)))
+              (lsp-get args-ht lang-key))))))
 
 (lsp-defun lsp-ltex--code-action-add-to-dictionary ((&Command :arguments?))
   "Handle action for \"_ltex.addToDictionary\"."
   ;; Add rule internally to the `lsp-ltex--stored-dictionary' plist and
   ;; store it in the directory `lsp-ltex-user-rules-path'
   (lsp-ltex--action-add-to-rules
-   (elt arguments? 0) "words" 'lsp-ltex--stored-dictionary t)
+   arguments? :words 'lsp-ltex--stored-dictionary t)
   ;; Combine user configured words `lsp-ltex-dictionary' and the internal
   ;; interactively generated `lsp-ltex--stored-dictionary', and store them in
   ;; the internal `lsp-ltex--combined-dictionary', which is sent to ltex-ls
@@ -546,7 +560,7 @@ When STORE is non-nil, this will also store the new plist in the directory
 
 (lsp-defun lsp-ltex--code-action-hide-false-positives ((&Command :arguments?))
   "Handle action for \"_ltex.hideFalsePositives\"."
-  (lsp-ltex--action-add-to-rules (elt arguments? 0) "falsePositives"
+  (lsp-ltex--action-add-to-rules arguments? :falsePositives
                                  'lsp-ltex--stored-hidden-false-positives t)
   (setq lsp-ltex--combined-hidden-false-positives
         (lsp-ltex-combine-plists lsp-ltex-hidden-false-positives
@@ -555,7 +569,7 @@ When STORE is non-nil, this will also store the new plist in the directory
 
 (lsp-defun lsp-ltex--code-action-disable-rules ((&Command :arguments?))
   "Handle action for \"_ltex.disableRules\"."
-  (lsp-ltex--action-add-to-rules (elt arguments? 0) "ruleIds"
+  (lsp-ltex--action-add-to-rules arguments? :ruleIds
                                  'lsp-ltex--stored-disabled-rules t)
   (setq lsp-ltex--combined-disabled-rules
         (lsp-ltex-combine-plists lsp-ltex-disabled-rules