change lsp-yaml-schemas to work with native json-serialize (#2357)

* change lsp-yaml-schemas to be compatible with emacs 27's native json

* remove seq-contains-p, as it's new in emacs 27

* use -filter from 'dash instead of seq-filter

* use assq-delete-all instead of assoc-delete-all

Author: dellison

clients/lsp-yaml.el

@@ -25,6 +25,7 @@
 ;;; Code:
 
 (require 'lsp-mode)
+(require 'dash)
 
 (defgroup lsp-yaml nil
   "LSP support for YAML, using yaml-language-server."
@@ -88,7 +89,7 @@
 
 (defcustom lsp-yaml-schemas '()
   "Associate schemas to YAML files in a glob pattern."
-  :type '(alist :key-type (string :tag "schema") :value-type (string :tag "files (glob)"))
+  :type '(alist :key-type (symbol :tag "schema") :value-type (vector :tag "files (glob)"))
   :group 'lsp-yaml
   :package-version '(lsp-mode . "6.2"))
 
@@ -164,7 +165,7 @@
 (defconst lsp-yaml--built-in-kubernetes-schema
   '((name . "Kubernetes")
     (description . "Built-in kubernetes manifest schema definition")
-    (url . :kubernetes)
+    (url . "kubernetes")
     (fileMatch . ["*-k8s.yaml" "*-k8s.yml"])))
 
 (defun lsp-yaml-download-schema-store-db (&optional force-downloading)
@@ -185,22 +186,27 @@ Set FORCE-DOWNLOADING to non-nil to force re-download the database."
           (alist-get 'schemas (json-read-file lsp-yaml-schema-store-local-db))))
   (seq-concatenate 'list (list lsp-yaml--built-in-kubernetes-schema) lsp-yaml--schema-store-schemas-alist))
 
-(defun lsp-yaml-set-buffer-schema (uri)
-  "Set yaml schema for the current buffer to URI."
+(defun lsp-yaml-set-buffer-schema (uri-string)
+  "Set yaml schema for the current buffer to URI-STRING."
   (interactive "MURI: ")
-  (let* ((workspace-path (file-relative-name
+  (let* ((uri (intern uri-string))
+         (workspace-path (file-relative-name
                           (lsp--uri-to-path (lsp--buffer-uri))
                           (lsp-workspace-root (lsp--buffer-uri))))
-         (glob-pattern (concat "/" workspace-path))
-         (current-config (cl-assoc uri lsp-yaml-schemas :test 'equal))
+         (glob (concat "/" workspace-path))
+         (current-config (assoc uri lsp-yaml-schemas))
          (current-patterns (and current-config (cdr current-config))))
     (if current-config
-        (or (cl-member glob-pattern current-patterns :test 'equal)
+        (or (member glob (append current-patterns nil))
             (setq lsp-yaml-schemas
-                  (cl-acons uri (cl-list* glob-pattern current-patterns)
-                            (cl-remove current-config lsp-yaml-schemas))))
+                  (cl-acons uri
+                            (vconcat (vector glob) current-patterns)
+                            (assq-delete-all uri
+                                             (mapcar (lambda (x) (lsp-yaml--remove-glob x glob))
+                                                     lsp-yaml-schemas)))))
       (setq lsp-yaml-schemas
-            (cl-acons uri (cl-list* glob-pattern nil) lsp-yaml-schemas)))
+            (cl-acons uri (vector glob) (mapcar (lambda (x) (lsp-yaml--remove-glob x glob))
+                                                lsp-yaml-schemas))))
     (lsp--set-configuration (lsp-configuration-section "yaml"))))
 
 (defun lsp-yaml-select-buffer-schema ()
@@ -214,5 +220,11 @@ Set FORCE-DOWNLOADING to non-nil to force re-download the database."
          (uri (alist-get 'url schema)))
     (lsp-yaml-set-buffer-schema uri)))
 
+(defun lsp-yaml--remove-glob (mapping glob)
+  (let ((patterns (cdr mapping)))
+    (cons (car mapping)
+          (vconcat (-filter (lambda (p) (not (equal p glob)))
+                            (append patterns nil)) nil))))
+
 (provide 'lsp-yaml)
 ;;; lsp-yaml.el ends here