Refactor

Author: ericdallo

lsp-dart-dap-devtools.el

@@ -79,7 +79,7 @@ If URI is not found on buffer, schedule re-check."
 (defun lsp-dart-dap-devtools--activated-p ()
   "Return non-nil if devtools is activated otherwise nil."
   (lsp-dart-dap-devtools--clean-buffer lsp-dart-dap-devtools--pub-list-packages-buffer-name)
-  (let* ((pub (lsp-dart-project-get-pub-command))
+  (let* ((pub (lsp-dart-project-pub-command))
          (_proc (call-process pub
                               nil
                               lsp-dart-dap-devtools--pub-list-packages-buffer-name
@@ -91,7 +91,7 @@ If URI is not found on buffer, schedule re-check."
 (defun lsp-dart-dap-devtools--activate (callback)
   "Activate Dart Devtools via pub then call CALLBACK."
   (lsp-dart-dap-devtools-log "Activating...")
-  (let ((pub (lsp-dart-project-get-pub-command)))
+  (let ((pub (lsp-dart-project-pub-command)))
     (lsp-async-start-process
      (lambda ()
        (lsp-dart-dap-devtools-log "Activated successfully!")
@@ -123,7 +123,7 @@ If it is already activated or after activated successfully, call CALLBACK."
    (lambda ()
      (if-let ((uri (lsp-workspace-get-metadata "dart-debug-devtools-uri")))
       (funcall callback uri)
-    (let* ((pub (lsp-dart-project-get-pub-command))
+    (let* ((pub (lsp-dart-project-pub-command))
            (proc (start-process "Start DevTools"
                                 lsp-dart-dap-devtools--buffer-name
                                 pub "global" "run" "devtools"

lsp-dart-dap.el

@@ -120,6 +120,21 @@ Required to support 'Inspect Widget'."
    "npm" "install" "--prefix" (f-join lsp-dart-dap-debugger-path "extension")
    "--no-package-lock" "--silent" "--no-save"))
 
+(defun lsp-dart-dap--base-debugger-args (conf)
+  "Return the base args for debugging merged with CONF."
+  (-> conf
+      (dap--put-if-absent :request "launch")
+      (dap--put-if-absent :dartPath (lsp-dart-project-dart-command))
+      (dap--put-if-absent :cwd (lsp-dart-project-get-root))
+      (dap--put-if-absent :pubPath (lsp-dart-project-pub-command))
+      (dap--put-if-absent :pubSnapshotPath (lsp-dart-project-pub-snapshot-command))
+      (dap--put-if-absent :vmAdditionalArgs lsp-dart-dap-vm-additional-args)
+      (dap--put-if-absent :debugExternalLibraries lsp-dart-dap-debug-external-libraries)
+      (dap--put-if-absent :debugSdkLibraries lsp-dart-dap-debug-sdk-libraries)
+      (dap--put-if-absent :flutterPath (lsp-dart-project-get-flutter-path))
+      (dap--put-if-absent :flutterTrackWidgetCreation lsp-dart-dap-flutter-track-widget-creation)
+      (dap--put-if-absent :useFlutterStructuredErrors lsp-dart-dap-flutter-structured-errors)))
+
 ;; Dart
 
 (dap-utils-github-extension-setup-function
@@ -133,40 +148,26 @@ Required to support 'Inspect Widget'."
 (defun lsp-dart-dap--populate-dart-start-file-args (conf)
   "Populate CONF with the required arguments for dart debug."
   (-> conf
+      lsp-dart-dap--base-debugger-args
       (dap--put-if-absent :type "dart")
       (dap--put-if-absent :name "Dart")
-      (dap--put-if-absent :request "launch")
       (dap--put-if-absent :dap-server-path lsp-dart-dap-dart-debugger-program)
-      (dap--put-if-absent :cwd (lsp-dart-project-get-root))
-      (dap--put-if-absent :program (buffer-file-name))
-      (dap--put-if-absent :dartPath (lsp-dart-project-dart-command))
-      (dap--put-if-absent :pubPath (lsp-dart-project-get-pub-command))
-      (dap--put-if-absent :pubSnapshotPath (lsp-dart-project-pub-snapshot-command))
-      (dap--put-if-absent :vmAdditionalArgs lsp-dart-dap-vm-additional-args)
-      (dap--put-if-absent :debugExternalLibraries lsp-dart-dap-debug-external-libraries)
-      (dap--put-if-absent :debugSdkLibraries lsp-dart-dap-debug-sdk-libraries)))
+      (dap--put-if-absent :program (buffer-file-name))))
 
 (dap-register-debug-provider "dart" 'lsp-dart-dap--populate-dart-start-file-args)
 (dap-register-debug-template "Dart :: Debug"
                              (list :type "dart"))
 
 (defun lsp-dart-dap-debug-dart-test (path args)
   "Start dart test debugging from PATH with ARGS."
-  (-> (list :name "Tests"
-            :type "dart"
-            :request "launch"
+  (-> (list :type "dart"
+            :name "Dart Tests"
             :dap-server-path lsp-dart-dap-dart-test-debugger-program
+            :program path
             :noDebug nil
             :shouldConnectDebugger t
-            :cwd (lsp-dart-project-get-root)
-            :dartPath (lsp-dart-project-dart-command)
-            :pubPath (lsp-dart-project-get-pub-command)
-            :pubSnapshotPath (lsp-dart-project-pub-snapshot-command)
-            :vmAdditionalArgs lsp-dart-dap-vm-additional-args
-            :debugExternalLibraries lsp-dart-dap-debug-external-libraries
-            :debugSdkLibraries lsp-dart-dap-debug-sdk-libraries
-            :program path
             :args args)
+      lsp-dart-dap--base-debugger-args
       dap-start-debugging))
 
 ;; Flutter
@@ -201,26 +202,18 @@ Call CALLBACK when the device is chosen and started successfully."
 (defun lsp-dart-dap--populate-flutter-start-file-args (conf)
   "Populate CONF with the required arguments for Flutter debug."
   (let ((pre-conf (-> conf
+                      lsp-dart-dap--base-debugger-args
                       (dap--put-if-absent :type "flutter")
-                      (dap--put-if-absent :request "launch")
                       (dap--put-if-absent :flutterMode "debug")
                       (dap--put-if-absent :dap-server-path lsp-dart-dap-flutter-debugger-program)
-                      (dap--put-if-absent :cwd (lsp-dart-project-get-root))
-                      (dap--put-if-absent :program (lsp-dart-project-get-entrypoint))
-                      (dap--put-if-absent :dartPath (lsp-dart-project-dart-command))
-                      (dap--put-if-absent :flutterPath (lsp-dart-project-get-flutter-path))
-                      (dap--put-if-absent :flutterTrackWidgetCreation lsp-dart-dap-flutter-track-widget-creation)
-                      (dap--put-if-absent :useFlutterStructuredErrors lsp-dart-dap-flutter-structured-errors)
-                      (dap--put-if-absent :debugExternalLibraries lsp-dart-dap-debug-external-libraries)
-                      (dap--put-if-absent :debugSdkLibraries lsp-dart-dap-debug-sdk-libraries))))
+                      (dap--put-if-absent :program (lsp-dart-project-get-entrypoint)))))
     (lambda (start-debugging-callback)
       (lsp-dart-dap--flutter-get-or-create-device
        (-lambda ((&hash "id" device-id "name" device-name))
          (funcall start-debugging-callback
                   (-> pre-conf
                       (dap--put-if-absent :deviceId device-id)
                       (dap--put-if-absent :deviceName device-name)
-                      (dap--put-if-absent :vmAdditionalArgs lsp-dart-dap-vm-additional-args)
                       (dap--put-if-absent :flutterPlatform "default")
                       (dap--put-if-absent :name (concat "Flutter (" device-name ")")))))))))
 
@@ -304,23 +297,15 @@ Call CALLBACK when the device is chosen and started successfully."
 
 (defun lsp-dart-dap-debug-flutter-test (path args)
   "Start dart test debugging from PATH with ARGS."
-  (-> (list :name "Tests"
+  (-> (list :name "Flutter Tests"
             :type "flutter"
-            :request "launch"
             :dap-server-path lsp-dart-dap-flutter-test-debugger-program
+            :program path
             :noDebug nil
             :shouldConnectDebugger t
-            :cwd (lsp-dart-project-get-root)
-            :dartPath (lsp-dart-project-dart-command)
-            :pubPath (lsp-dart-project-get-pub-command)
-            :pubSnapshotPath (lsp-dart-project-pub-snapshot-command)
-            :flutterPath (lsp-dart-project-get-flutter-path)
             :flutterMode "debug"
-            :vmAdditionalArgs lsp-dart-dap-vm-additional-args
-            :debugExternalLibraries lsp-dart-dap-debug-external-libraries
-            :debugSdkLibraries lsp-dart-dap-debug-sdk-libraries
-            :program path
             :args args)
+      lsp-dart-dap--base-debugger-args
       dap-start-debugging))
 
 ;;;###autoload

lsp-dart-project.el

@@ -66,7 +66,7 @@ flutter cache dir."
             (locate-dominating-file "bin")
             file-truename))))
 
-(defun lsp-dart-project-get-pub-command ()
+(defun lsp-dart-project-pub-command ()
   "Return the pub executable path from dart SDK path."
   (-> (lsp-dart-project-get-sdk-dir)
       file-name-as-directory

lsp-dart-test-support.el

@@ -131,7 +131,7 @@ If TEST is non nil, it will run only this test."
                         (lambda (_) lsp-dart-test-support-tests-buffer-name)))))
 
 (defun lsp-dart-test-support-debug (test)
-  "Debug Dart/Flutter TEST in a compilation buffer."
+  "Debug Dart/Flutter TEST."
   (let* ((file-name (lsp-dart-test-file-name test))
          (names (lsp-dart-test-names test))
          (kind (lsp-dart-test-kind test))
@@ -218,11 +218,17 @@ PARAMS is the notification data from outline."
   (string-match "_test.dart" file-name))
 
 (defun lsp-dart-test-support-run-last-test ()
-  "Visit the last ran test going to the test definition."
+  "Run last ran test."
   (if-let ((test (lsp-workspace-get-metadata "last-ran-test")))
       (lsp-dart-test-support-run test)
     (lsp-dart-project-log "No last test found.")))
 
+(defun lsp-dart-test-support-debug-last-test ()
+  "Debug last ran test."
+  (if-let ((test (lsp-workspace-get-metadata "last-ran-test")))
+      (lsp-dart-test-support-debug test)
+    (lsp-dart-project-log "No last test found.")))
+
 (defun lsp-dart-test-support-visit-last-test ()
   "Visit the last ran test going to the test definition."
   (-if-let* ((test (lsp-workspace-get-metadata "last-ran-test"))

lsp-dart.el

@@ -439,10 +439,16 @@ all test overlays in the current buffer."
 
 ;;;###autoload
 (defun lsp-dart-run-last-test ()
-  "Visit the last ran test going to test definition."
+  "Run the last ran test."
   (interactive)
   (lsp-dart-test-support-run-last-test))
 
+;;;###autoload
+(defun lsp-dart-debug-last-test ()
+  "Debug the last ran test."
+  (interactive)
+  (lsp-dart-test-support-debug-last-test))
+
 
 ;;;###autoload(with-eval-after-load 'lsp-mode (require 'lsp-dart))