Merge branch 'master' into drop/26

Author: jcs090218

.github/workflows/test.yml

@@ -11,15 +11,26 @@ on:
 jobs:
   test:
     runs-on: ${{ matrix.os }}
+    continue-on-error: ${{ matrix.experimental }}
     strategy:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
         emacs-version:
-          - 27.1
           - 27.2
-          - 28.1
-          - snapshot
+          - 28.2
+          - 29.1
+        experimental: [false]
+        include:
+          - os: ubuntu-latest
+            emacs-version: snapshot
+            experimental: true
+          - os: macos-latest
+            emacs-version: snapshot
+            experimental: true
+          - os: windows-latest
+            emacs-version: snapshot
+            experimental: true
 
     steps:
     - uses: actions/checkout@v3

CHANGELOG.md

@@ -1,6 +1,10 @@
 # Changelog
 
-## Unreleased
+## 1.24.3
+
+* Add `lsp-dart-dap-tools-args` to configure custom args for DAP process.
+* Fix flutter daemon failing to initialize on recent emacs versions. #209
+* Ignore flutter DAP message avoiding unecessary warning during debug.
 
 ## 1.24.2
 

Eask

@@ -1,4 +1,4 @@
-(package "lsp-dart" "1.24.2" "Dart support lsp-mode")
+(package "lsp-dart" "1.24.3" "Dart support lsp-mode")
 
 (website-url "https://emacs-lsp.github.io/lsp-dart")
 (keywords "languages" "extensions")

README.md

@@ -203,7 +203,8 @@ lsp-dart supports running Flutter and Dart commands as following:
 | `lsp-dart-dap-flutter-test-debugger-program`     | The command to execute the test debugger extension on flutter projects.                                                                                                              | Check source file              |
 | `lsp-dart-dap-debug-external-libraries`          | Whether to enable the debug on external libraries                                                                                                                                    | `nil`                          |
 | `lsp-dart-dap-debug-sdk-libraries`               | Whether to enable the debug on Dart SDK libraries                                                                                                                                    | `nil`                          |
-| `lsp-dart-dap-vm-additional-args`                | Additional args for dart debugging VM when the debugging.                                                                                                                            | `""`                           |
+| `lsp-dart-dap-vm-additional-args`                | Additional args for dart debugging VM when the debugging.          
+| `lsp-dart-dap-tool-args`                         | Arguments to be passed to the Dart or Flutter tool.                                                                                                                       | `""`                           |
 | `lsp-dart-dap-flutter-track-widget-creation`     | Whether to pass –track-widget-creation to Flutter apps. Required to support 'Inspect Widget'.                                                                                        | `t`                            |
 | `lsp-dart-dap-flutter-structured-errors`         | Whether to use Flutter’s structured error support for improve error display.                                                                                                         | `t`                            |
 | `lsp-dart-dap-flutter-hot-reload-on-save`        | When enabled, every buffer save triggers a `lsp-dart-dap-flutter-hot-reload`                                                                                                         | `nil`                          |
@@ -216,6 +217,7 @@ lsp-dart supports running Flutter and Dart commands as following:
 * [lsp-treemacs](https://github.com/emacs-lsp/lsp-treemacs) : `lsp-mode` GUI controls implemented using treemacs.
 * [company-capf](https://github.com/company-mode/company-mode) : Completion back-end support.
 * [hover.el](https://github.com/ericdallo/hover.el) : Tool to run flutter mobile apps from desktop without the need of an emulator.
+* [flutter.el](https://github.com/amake/flutter.el) : Tool to run flutter binary as an inferior process and interact with it from Emacs.
 
 ## FAQ
 

lsp-dart-dap.el

@@ -101,6 +101,11 @@
   :group 'lsp-dart
   :type '(repeat string))
 
+(defcustom lsp-dart-dap-tool-args []
+  "Additional args for the dart or flutter tool"
+  :group 'lsp-dart
+  :type '(repeat string))
+
 (defcustom lsp-dart-dap-vm-service-port 0
   "Service port for dart debugging VM."
   :group 'lsp-dart
@@ -164,6 +169,7 @@ Required to support 'Inspect Widget'."
   (dap--put-if-absent conf :maxLogLineLength lsp-dart-dap-max-log-line-length)
   (dap--put-if-absent conf :cwd (lsp-dart-get-project-root))
   (dap--put-if-absent conf :vmAdditionalArgs lsp-dart-dap-vm-additional-args)
+  (dap--put-if-absent conf :toolArgs lsp-dart-dap-tool-args)
   (dap--put-if-absent conf :vmServicePort lsp-dart-dap-vm-service-port)
   (dap--put-if-absent conf :debugExternalLibraries lsp-dart-dap-debug-external-libraries)
   (dap--put-if-absent conf :debugSdkLibraries lsp-dart-dap-debug-sdk-libraries)
@@ -374,6 +380,8 @@ Call CALLBACK when the device is chosen and started successfully."
   "Ignore this event.")
 (cl-defmethod dap-handle-event ((_event (eql flutter.appStarted)) _session _params)
   "Ignore this event.")
+(cl-defmethod dap-handle-event ((_event (eql flutter.appStart)) _session _params)
+  "Ignore this event.")
 
 (cl-defmethod dap-handle-event ((_event (eql dart.testRunNotification)) _session _params)
   "Ignore this event.")

lsp-dart-flutter-daemon.el

@@ -60,9 +60,8 @@ CONN ARGS METHOD PARAMS"
      (jsonrpc--process conn)
      json)))
 
-(cl-defmethod initialize-instance ((conn lsp-dart-flutter-daemon-connection) _slots)
+(cl-defmethod initialize-instance :after ((conn lsp-dart-flutter-daemon-connection) _slots)
   "CONN."
-  (cl-call-next-method)
   (let ((proc (jsonrpc--process conn)))
     (when proc
       (set-process-filter proc #'lsp-dart-flutter-daemon--process-filter))))

lsp-dart.el

@@ -2,8 +2,9 @@
 
 ;; Copyright (C) 2022 Eric Dallo
 
-;; Version: 1.24.2
+;; Version: 1.24.3
 ;; Package-Requires: ((emacs "27.1") (lsp-treemacs "0.3") (lsp-mode "7.0.1") (dap-mode "0.6") (f "0.20.0") (dash "2.14.1") (dart-mode "1.0.5") (jsonrpc "1.0.15") (ht "2.2"))
+
 ;; Keywords: languages, extensions
 ;; URL: https://emacs-lsp.github.io/lsp-dart
 
@@ -99,7 +100,7 @@ If unspecified, diagnostics will not be generated."
 
 ;;; Internal
 
-(defvar lsp-dart-version-string "1.24.2")
+(defvar lsp-dart-version-string "1.24.3")
 
 (defun lsp-dart--library-folders ()
   "Return the library folders path to analyze."