Migrate widget guide to have hooks with it own mode

Author: ericdallo

lsp-dart-flutter-daemon.el

@@ -37,9 +37,10 @@
 
 (defun lsp-dart-flutter-daemon--log (level msg &rest args)
   "Log for LEVEL, MSG with ARGS adding lsp-dart-flutter-daemon prefix."
-  (apply #'lsp-dart-custom-log (concat "[FLUTTER " (upcase level) "] ")
-         msg
-         args))
+  (unless (string= "STATUS" (upcase level))
+    (apply #'lsp-dart-custom-log (concat "[FLUTTER " (upcase level) "] ")
+           msg
+           args)))
 
 (defun lsp-dart-flutter-daemon--generate-command-id ()
   "Generate a random command id."

lsp-dart-flutter-widget-guide.el

@@ -50,20 +50,18 @@
 
 (defun lsp-dart-flutter-widget-guide--first-non-whitespace-pos (line)
   "Return the first non whitepaces position at LINE."
-  (save-excursion
-    (goto-char (point-min))
-    (forward-line line)
-    (back-to-indentation)
-    (lsp-make-position :line line
-                       :character (current-column))))
+  (goto-char (point-min))
+  (forward-line line)
+  (back-to-indentation)
+  (lsp-make-position :line line
+                     :character (current-column)))
 
 (defun lsp-dart-flutter-widget-guide--last-col-at (line)
   "Return the last col at LINE."
-  (save-excursion
-    (goto-char (point-min))
-    (forward-line line)
-    (end-of-line)
-    (current-column)))
+  (goto-char (point-min))
+  (forward-line line)
+  (end-of-line)
+  (current-column))
 
 (lsp-defun lsp-dart-flutter-widget-guide--outline->guide ((&FlutterOutline :kind :children :range
                                                                            (&Range :start
@@ -112,7 +110,8 @@ Return nil if the widget guilde does not apply."
 SIZE is the length of the characters list.
 LAST-LINE-CHAR is the last column position of LINE.
 ANCHOR is the anchor point of the widget guide at LINE."
-  (let ((chars (make-list size lsp-dart-flutter-widget-guide-space)))
+  (let ((chars (make-list size lsp-dart-flutter-widget-guide-space))
+        (max-lisp-eval-depth 1800))
     (seq-doseq (guide guide-lines)
       (-let* (((&Range :start (&Position :character start-char)
                        :end (&Position :line end-line :character end-char)) guide)
@@ -141,22 +140,23 @@ ANCHOR is the anchor point of the widget guide at LINE."
 
 (lsp-defun lsp-dart-flutter-widget-guide-check ((&FlutterOutlineNotification :uri :outline))
   "Check if there is any widget guide on buffer from uri of OUTLINE-PARAMS."
-  (-when-let (buffer (find-buffer-visiting (lsp--uri-to-path uri)))
+  (when-let (buffer (find-buffer-visiting (lsp--uri-to-path uri)))
     (with-current-buffer buffer
       (remove-overlays (point-min) (point-max) 'category 'lsp-dart-flutter-widget-guide)
-      (let* ((guides (lsp-dart-flutter-widget-guide--outline->guides outline))
-             (guides-by-line (lsp-dart-flutter-widget-guide--guides->guides-by-line guides)))
-        (lsp-dart-plist-each
-         (lambda (line guide-lines)
-           (let* ((first-guide-char (-min (--map (min (-> it lsp:range-start lsp:position-character)
-                                                      (-> it lsp:range-end lsp:position-character)) guide-lines)))
-                  (last-guide-char (-max (--map (max (-> it lsp:range-start lsp:position-character)
-                                                     (-> it lsp:range-end lsp:position-character)) guide-lines)))
-                  (last-line-char (lsp-dart-flutter-widget-guide--last-col-at line))
-                  (anchor (max 0 (if (< last-line-char first-guide-char) 0 first-guide-char)))
-                  (chars (lsp-dart-flutter-widget-guide--build-chars line guide-lines last-guide-char last-line-char anchor)))
-             (--each-indexed chars (lsp-dart-flutter-widget-guide--add-overlay-to buffer line (+ it-index anchor) it))))
-         guides-by-line)))))
+      (save-excursion
+        (->> outline
+             (lsp-dart-flutter-widget-guide--outline->guides)
+             (lsp-dart-flutter-widget-guide--guides->guides-by-line)
+             (lsp-dart-plist-each
+              (lambda (line guide-lines)
+                (let* ((first-guide-char (-min (--map (min (-> it lsp:range-start lsp:position-character)
+                                                           (-> it lsp:range-end lsp:position-character)) guide-lines)))
+                       (last-guide-char (-max (--map (max (-> it lsp:range-start lsp:position-character)
+                                                          (-> it lsp:range-end lsp:position-character)) guide-lines)))
+                       (last-line-char (lsp-dart-flutter-widget-guide--last-col-at line))
+                       (anchor (max 0 (if (< last-line-char first-guide-char) 0 first-guide-char)))
+                       (chars (lsp-dart-flutter-widget-guide--build-chars line guide-lines last-guide-char last-line-char anchor)))
+                  (--each-indexed chars (lsp-dart-flutter-widget-guide--add-overlay-to buffer line (+ it-index anchor) it))))))))))
 
 (define-minor-mode lsp-dart-flutter-widget-guides-mode
   "Mode for displaying flutter widget guide lines."
@@ -169,9 +169,5 @@ ANCHOR is the anchor point of the widget guide at LINE."
       (remove-overlays (point-min) (point-max) 'category 'lsp-dart-flutter-widget-guide)
       (remove-hook 'lsp-dart-outline-arrived-hook #'lsp-dart-flutter-widget-guide-check t)))))
 
-(add-hook 'lsp-before-open-hook (lambda ()
-                                  (when lsp-dart-flutter-widget-guides
-                                    (lsp-dart-flutter-widget-guides-mode 1))))
-
 (provide 'lsp-dart-flutter-widget-guide)
 ;;; lsp-dart-flutter-widget-guide.el ends here

lsp-dart.el

@@ -101,9 +101,14 @@ PARAMS is the data sent from server."
       (lsp-dart-workspace-status "Analyzing project..." workspace)
     (lsp-dart-workspace-status nil workspace)))
 
+(defun lsp-dart--activate-features ()
+  "Activate lsp-dart features if enabled."
+  (when lsp-dart-flutter-widget-guides
+    (lsp-dart-flutter-widget-guides-mode 1)))
+
 (lsp-register-client
  (make-lsp-client :new-connection
-                  (lsp-stdio-connection 'lsp-dart--server-command)
+                  (lsp-stdio-connection #'lsp-dart--server-command)
                   :major-modes '(dart-mode)
                   :priority -1
                   :initialization-options
@@ -117,6 +122,7 @@ PARAMS is the data sent from server."
                                                  ("dart/textDocument/publishOutline" #'lsp-dart-outline-handle-outline)
                                                  ("dart/textDocument/publishFlutterOutline" #'lsp-dart-outline-handle-flutter-outline)
                                                  ("$/analyzerStatus" #'lsp-dart--handle-analyzer-status))
+                  :after-open-fn #'lsp-dart--activate-features
                   :server-id 'dart_analysis_server))