Migrate closing labels

Author: ericdallo

lsp-dart-closing-labels.el

@@ -21,6 +21,8 @@
 
 (require 'lsp-mode)
 
+(require 'lsp-dart-protocol)
+
 (defcustom lsp-dart-closing-labels t
   "Enable the analysis server closing labels feature.
 When set to non-nil, dart/textDocument/publishClosingLabel notifications will
@@ -38,28 +40,23 @@ be sent with information to render editor closing labels."
   :type 'float
   :group 'lsp-dart)
 
-(defun lsp-dart-closing-labels-handle (_workspace params)
-  "Closing labels notification handling.
-PARAMS closing labels notification data sent from WORKSPACE."
-  (-let* (((&hash "uri" "labels") params)
-          (buffer (lsp--buffer-for-file (lsp--uri-to-path uri))))
-    (when buffer
-      (with-current-buffer buffer
-        (remove-overlays (point-min) (point-max) 'lsp-dart-closing-labels t)
-        (seq-doseq (label-ht labels)
-          (save-excursion
-            (-let* ((label (gethash "label" label-ht))
-                    (range (gethash "range" label-ht))
-                    ((beg . end) (lsp--range-to-region range))
-                    (end-line (progn
-                                (goto-char end)
-                                (line-end-position)))
-                    (overlay (make-overlay beg end-line buffer)))
-              (overlay-put overlay 'lsp-dart-closing-labels t)
-              (overlay-put overlay 'after-string (propertize (concat lsp-dart-closing-labels-prefix " " label)
-                                                             'display `((height ,lsp-dart-closing-labels-size))
-                                                             'cursor t
-                                                             'font-lock-face 'font-lock-comment-face)))))))))
+(lsp-defun lsp-dart-closing-labels-handle (_workspace (&ClosingLabelsNotification :uri :labels))
+  "Closing labels notification handler."
+  (when-let (buffer (lsp--buffer-for-file (lsp--uri-to-path uri)))
+    (with-current-buffer buffer
+      (remove-overlays (point-min) (point-max) 'lsp-dart-closing-labels t)
+      (seq-doseq (label labels)
+        (save-excursion
+          (-let* (((beg . end) (lsp--range-to-region (lsp:closing-label-range label)))
+                  (end-line (progn
+                              (goto-char end)
+                              (line-end-position)))
+                  (overlay (make-overlay beg end-line buffer)))
+            (overlay-put overlay 'lsp-dart-closing-labels t)
+            (overlay-put overlay 'after-string (propertize (concat lsp-dart-closing-labels-prefix " " (lsp:closing-label-label label))
+                                                           'display `((height ,lsp-dart-closing-labels-size))
+                                                           'cursor t
+                                                           'font-lock-face 'font-lock-comment-face))))))))
 
 (provide 'lsp-dart-closing-labels)
 ;;; lsp-dart-closing-labels.el ends here

lsp-dart-protocol.el

@@ -24,6 +24,10 @@
 (lsp-interface
  (AnalyzerStatusNotification (:isAnalyzing) nil))
 
+(lsp-interface
+ (ClosingLabelsNotification (:uri :labels) nil)
+ (ClosingLabel (:label :range) nil))
+
 (lsp-interface
  (OutlineNotification (:uri :outline) nil)
  (Outline (:element :range :codeRange :children) nil)