Add other debug args for dap

Author: ericdallo

lsp-dart-dap.el

@@ -115,6 +115,12 @@ 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--capabilities-debugger-args (conf)
+  "Add capabilities args on CONF checking dart SDK version."
+  (-> conf
+      (dap--put-if-absent :useWriteServiceInfo (lsp-dart-version-at-least-p "2.7.1"))
+      (dap--put-if-absent :debuggerHandlesPathsEverywhereForBreakpoints (lsp-dart-version-at-least-p "2.2.1-edge"))))
+
 (defun lsp-dart-dap--base-debugger-args (conf)
   "Return the base args for debugging merged with CONF."
   (-> conf
@@ -128,7 +134,8 @@ Required to support 'Inspect Widget'."
       (dap--put-if-absent :debugSdkLibraries lsp-dart-dap-debug-sdk-libraries)
       (dap--put-if-absent :flutterPath (lsp-dart-flutter-command))
       (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 :useFlutterStructuredErrors lsp-dart-dap-flutter-structured-errors)
+      lsp-dart-dap--capabilities-debugger-args))
 
 ;; Dart
 

lsp-dart-test-support.el

@@ -167,6 +167,7 @@ TEST-RANGE is the test method range."
     (overlay-put overlay 'before-string
                  (concat spaces
                          (propertize "Run"
+                                     'pointer 'hand
                                      'help-echo "mouse-1: Run this test"
                                      'mouse-face 'lsp-lens-mouse-face
                                      'local-map (-doto (make-sparse-keymap)
@@ -178,6 +179,7 @@ TEST-RANGE is the test method range."
                          (propertize "|" 'font-lock-face 'lsp-lens-face)
                          separator
                          (propertize "Debug"
+                                     'pointer 'hand
                                      'help-echo "mouse-1: Debug this test"
                                      'mouse-face 'lsp-lens-mouse-face
                                      'local-map (-doto (make-sparse-keymap)

lsp-dart-utils.el

@@ -139,9 +139,20 @@ FLUTTER_ROOT environment variable."
        split-string
        (nth 3)))
 
+(defun lsp-dart-version->number (version)
+  "Transform VERSION into a comparable version number."
+  (--> version
+       (replace-regexp-in-string "[[:alpha:]|-]+" "" it nil 'literal)))
+
+(defun lsp-dart-version-at-least-p (version)
+  "Return non-nil if Dart SDK version is at least VERSION."
+  (let ((sdk-version (lsp-dart--get-dart-version)))
+    (version<= (lsp-dart-version->number version)
+               (lsp-dart-version->number sdk-version))))
+
 (defun lsp-dart-assert-sdk-min-version (version)
   "Assert dart sdk min version is VERSION."
-  (cl-assert (string< version (lsp-dart--get-dart-version))
+  (cl-assert (lsp-dart-version-at-least-p version)
              t
              "Feature not supported before dart SDK %s"))