Migrate closing labels

Author: ericdallo

lsp-dart-closing-labels.el

@@ -40,7 +40,7 @@ be sent with information to render editor closing labels."
   :type 'float
   :group 'lsp-dart)
 
-(lsp-defun lsp-dart-closing-labels-handle (_workspace (&ClosingLabelsNotification :uri :labels))
+(lsp-defun lsp-dart--closing-labels-check ((&ClosingLabelsNotification :uri :labels))
   "Closing labels notification handler."
   (when-let (buffer (find-buffer-visiting (lsp--uri-to-path uri)))
     (with-current-buffer buffer
@@ -58,5 +58,16 @@ be sent with information to render editor closing labels."
                                                            'cursor t
                                                            'font-lock-face 'font-lock-comment-face))))))))
 
+(define-minor-mode lsp-dart-closing-labels-mode
+  "Mode for displaying flutter closing labels on the end of methods/contructors."
+  nil nil nil
+  (cond
+   (lsp-dart-closing-labels-mode
+    (add-hook 'lsp-dart-closing-labels-arrived-hook #'lsp-dart--closing-labels-check nil t))
+   (t
+    (progn
+      (remove-overlays (point-min) (point-max) 'lsp-dart-closing-labels t)
+      (remove-hook 'lsp-dart-closing-labels-arrived-hook #'lsp-dart--closing-labels-check t)))))
+
 (provide 'lsp-dart-closing-labels)
 ;;; lsp-dart-closing-labels.el ends here

lsp-dart.el

@@ -106,7 +106,9 @@ PARAMS is the data sent from server."
   (when lsp-dart-flutter-widget-guides
     (lsp-dart-flutter-widget-guides-mode 1))
   (when lsp-dart-flutter-fringe-colors
-    (lsp-dart-flutter-fringe-colors-mode 1)))
+    (lsp-dart-flutter-fringe-colors-mode 1))
+  (when lsp-dart-closing-labels
+    (lsp-dart-closing-labels-mode 1)))
 
 (lsp-register-client
  (make-lsp-client :new-connection
@@ -120,7 +122,8 @@ PARAMS is the data sent from server."
                     (outline . ,lsp-dart-outline)
                     (flutterOutline . ,lsp-dart-flutter-outline))
                   :library-folders-fn (lambda (_workspace) (lsp-dart--library-folders))
-                  :notification-handlers (lsp-ht ("dart/textDocument/publishClosingLabels" #'lsp-dart-closing-labels-handle)
+                  :notification-handlers (lsp-ht ("dart/textDocument/publishClosingLabels" (lambda (_workspace notification)
+                                                                                             (run-hook-with-args 'lsp-dart-closing-labels-arrived-hook notification)))
                                                  ("dart/textDocument/publishOutline" #'lsp-dart-outline-handle-outline)
                                                  ("dart/textDocument/publishFlutterOutline" #'lsp-dart-outline-handle-flutter-outline)
                                                  ("$/analyzerStatus" #'lsp-dart--handle-analyzer-status))