Migrate code lens

Author: ericdallo

lsp-dart-code-lens.el

@@ -175,21 +175,18 @@ NAMES arg is optional and are the group of tests representing a test name."
       (unless (seq-empty-p children)
         (lsp-dart-code-lens--add-test buffer children concatened-names)))))
 
-
-;; Public
-
-(lsp-defun lsp-dart-code-lens-check-main (uri (&Outline :children))
+(lsp-defun lsp-dart--main-code-lens-check ((&OutlineNotification :uri :outline (&Outline :children)))
   "Check URI and outline for main method adding lens to it."
   (-let* ((buffer (find-buffer-visiting (lsp--uri-to-path uri)))
           (main-outline (lsp-dart-code-lens--find-main-outline children)))
     (when buffer
       (with-current-buffer buffer
         (remove-overlays (point-min) (point-max) 'lsp-dart-main-code-lens t)
-        (save-excursion
-          (when main-outline
+        (when main-outline
+          (save-excursion
             (lsp-dart-code-lens--build-main-overlay buffer main-outline)))))))
 
-(lsp-defun lsp-dart-code-lens-check-test (uri (&Outline :children))
+(lsp-defun lsp-dart--test-code-lens-check ((&OutlineNotification :uri :outline (&Outline :children)))
   "Check URI and outline for test adding lens to it."
   (when (lsp-dart-test-file-p uri)
     (when-let (buffer (find-buffer-visiting (lsp--uri-to-path uri)))
@@ -198,5 +195,30 @@ NAMES arg is optional and are the group of tests representing a test name."
         (save-excursion
           (lsp-dart-code-lens--add-test buffer children))))))
 
+
+;; Public
+
+(define-minor-mode lsp-dart-main-code-lens-mode
+  "Mode for displaying code lens on main methods."
+  nil nil nil
+  (cond
+   (lsp-dart-main-code-lens-mode
+    (add-hook 'lsp-dart-outline-arrived-hook #'lsp-dart--main-code-lens-check nil t))
+   (t
+    (progn
+      (remove-overlays (point-min) (point-max) 'lsp-dart-main-code-lens t)
+      (remove-hook 'lsp-dart-outline-arrived-hook #'lsp-dart--main-code-lens-check t)))))
+
+(define-minor-mode lsp-dart-test-code-lens-mode
+  "Mode for displaying code lens on main methods."
+  nil nil nil
+  (cond
+   (lsp-dart-test-code-lens-mode
+    (add-hook 'lsp-dart-outline-arrived-hook #'lsp-dart--test-code-lens-check nil t))
+   (t
+    (progn
+      (remove-overlays (point-min) (point-max) 'lsp-dart-test-code-lens t)
+      (remove-hook 'lsp-dart-outline-arrived-hook #'lsp-dart--test-code-lens-check t)))))
+
 (provide 'lsp-dart-code-lens)
 ;;; lsp-dart-code-lens.el ends here

lsp-dart-outline.el

@@ -23,7 +23,6 @@
 
 (require 'lsp-dart-protocol)
 (require 'lsp-dart-utils)
-(require 'lsp-dart-code-lens)
 
 (defcustom lsp-dart-outline t
   "Enable the analysis server outline custom method.
@@ -215,14 +214,10 @@ Focus on it if IGNORE-FOCUS? is nil."
         (set-window-dedicated-p window t)))
     (lsp-dart-log "No Flutter outline data found")))
 
-(lsp-defun lsp-dart--outline-check ((notification &as &OutlineNotification :uri :outline))
+(lsp-defun lsp-dart--outline-check ((notification &as &OutlineNotification :uri))
   "Outline notification handling from WORKSPACE.
 NOTIFICATION is outline notification data received from server.
 It updates the outline view if it already exists."
-  (when lsp-dart-main-code-lens
-    (lsp-dart-code-lens-check-main uri outline))
-  (when lsp-dart-test-code-lens
-    (lsp-dart-code-lens-check-test uri outline))
    (when-let (buffer (find-buffer-visiting (lsp--uri-to-path uri)))
      (with-current-buffer buffer
       (setq lsp-dart-current-outline notification)

lsp-dart.el

@@ -32,6 +32,7 @@
 (require 'lsp-dart-utils)
 (require 'lsp-dart-flutter-daemon)
 (require 'lsp-dart-closing-labels)
+(require 'lsp-dart-code-lens)
 (require 'lsp-dart-outline)
 (require 'lsp-dart-flutter-fringe-colors)
 (require 'lsp-dart-flutter-widget-guide)
@@ -112,7 +113,11 @@ PARAMS is the data sent from server."
   (when lsp-dart-outline
     (lsp-dart-outline-mode 1))
   (when lsp-dart-flutter-outline
-    (lsp-dart-flutter-outline-mode 1)))
+    (lsp-dart-flutter-outline-mode 1))
+  (when lsp-dart-main-code-lens
+    (lsp-dart-main-code-lens-mode 1))
+  (when lsp-dart-test-code-lens
+    (lsp-dart-test-code-lens-mode 1)))
 
 (lsp-register-client
  (make-lsp-client :new-connection