Improve flutter widget guide performance

Author: ericdallo

lsp-dart-flutter-widget-guide.el

@@ -95,23 +95,21 @@ Return nil if the widget guilde does not apply."
 (defun lsp-dart-flutter-widget-guide--guides->guides-by-line (guides)
   "Convert a widget guide GUIDES to a map by line."
   (let ((guides-by-line '()))
-    (seq-doseq (guide guides)
-      (-let (((&Range :start (&Position :line start-line)
-                      :end (&Position :line end-line)) guide))
-        (while (<= start-line end-line)
-          (if-let ((cur-guides (plist-get guides-by-line start-line)))
-              (setq guides-by-line (plist-put guides-by-line start-line (append cur-guides (list guide))))
-            (setq guides-by-line (plist-put guides-by-line start-line (list guide))))
-          (setq start-line (1+ start-line)))))
+    (-map (-lambda ((guide &as &Range :start (&Position :line start-line)
+                           :end (&Position :line end-line)))
+            (while (<= start-line end-line)
+              (if-let ((cur-guides (alist-get start-line guides-by-line)))
+                  (setcdr (assq start-line guides-by-line) (append cur-guides (list guide)))
+                (add-to-list 'guides-by-line (cons start-line (list guide)) t))
+              (setq start-line (1+ start-line)))) guides)
     guides-by-line))
 
 (defun lsp-dart-flutter-widget-guide--build-chars (line guide-lines size last-line-char anchor)
   "Return the widget guides characters list by LINE from GUIDE-LINES.
 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))
-        (max-lisp-eval-depth 1800))
+  (let ((chars (make-list size lsp-dart-flutter-widget-guide-space)))
     (seq-doseq (guide guide-lines)
       (-let* (((&Range :start (&Position :character start-char)
                        :end (&Position :line end-line :character end-char)) guide)
@@ -144,19 +142,20 @@ ANCHOR is the anchor point of the widget guide at LINE."
     (with-current-buffer buffer
       (remove-overlays (point-min) (point-max) 'category 'lsp-dart-flutter-widget-guide)
       (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))))))))))
+        (let ((guides-by-lines (->> outline
+                                    (lsp-dart-flutter-widget-guide--outline->guides)
+                                    (lsp-dart-flutter-widget-guide--guides->guides-by-line))))
+          (seq-doseq (guides-by-line guides-by-lines)
+            (let* ((line (car guides-by-line))
+                   (guide-lines (alist-get line guides-by-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."

lsp-dart-utils.el

@@ -64,13 +64,6 @@ FLUTTER_ROOT environment variable and the PATH environment variable."
   "Remove item with KEY from ALIST."
   (delq (assoc key alist) alist))
 
-(defun lsp-dart-plist-each (fn plist)
-  "Iterate FN (a two-argument fn) over PLIST.
-Error checking is for weenies."
-  (when plist
-    (funcall fn (car plist) (cadr plist))
-    (lsp-dart-plist-each fn (cddr plist))))
-
 
 ;; SDKs