|
29 | 29 | (require 'lsp-dart-flutter-daemon) |
30 | 30 | (require 'lsp-dart-devtools) |
31 | 31 |
|
32 | | -(defcustom lsp-dart-dap-extension-version "3.14.1" |
| 32 | +(defcustom lsp-dart-dap-extension-version "3.17.0" |
33 | 33 | "The extension version." |
34 | 34 | :group 'lsp-dart |
35 | 35 | :type 'string) |
36 | 36 |
|
37 | 37 | (defcustom lsp-dart-dap-debugger-path |
38 | | - (expand-file-name "vscode/Dart-Code.Dart-Code" |
| 38 | + (expand-file-name (concat "vscode/Dart-Code.Dart-Code/" lsp-dart-dap-extension-version) |
39 | 39 | dap-utils-extension-path) |
40 | 40 | "The path to dart vscode extension." |
41 | 41 | :group 'lsp-dart |
@@ -143,21 +143,16 @@ Required to support 'Inspect Widget'." |
143 | 143 | "Return the base args for debugging merged with CONF." |
144 | 144 | (let ((conf conf)) |
145 | 145 | (dap--put-if-absent conf :request "launch") |
146 | | - (dap--put-if-absent conf :dartPath (lsp-dart-dart-command)) |
147 | | - (dap--put-if-absent conf :dartVersion (lsp-dart-get-dart-version)) |
148 | | - (dap--put-if-absent conf :sendLogsToClient t) |
| 146 | + (dap--put-if-absent conf :dartSdkPath (lsp-dart-get-sdk-dir)) |
149 | 147 | (dap--put-if-absent conf :maxLogLineLength lsp-dart-dap-max-log-line-length) |
150 | 148 | (dap--put-if-absent conf :cwd (lsp-dart-get-project-root)) |
151 | | - (dap--put-if-absent conf :pubPath (lsp-dart-pub-command)) |
152 | | - (dap--put-if-absent conf :pubSnapshotPath (lsp-dart-pub-snapshot-command)) |
153 | 149 | (dap--put-if-absent conf :vmAdditionalArgs lsp-dart-dap-vm-additional-args) |
154 | 150 | (dap--put-if-absent conf :vmServicePort lsp-dart-dap-vm-service-port) |
155 | 151 | (dap--put-if-absent conf :debugExternalLibraries lsp-dart-dap-debug-external-libraries) |
156 | 152 | (dap--put-if-absent conf :debugSdkLibraries lsp-dart-dap-debug-sdk-libraries) |
157 | 153 | (dap--put-if-absent conf :evaluateGettersInDebugViews lsp-dart-dap-evaluate-getters-in-debug-views) |
158 | 154 | (dap--put-if-absent conf :evaluateToStringInDebugViews lsp-dart-dap-evaluate-tostring-in-debug-views) |
159 | | - (dap--put-if-absent conf :flutterPath (lsp-dart-flutter-command)) |
160 | | - (dap--put-if-absent conf :flutterVersion (lsp-dart-get-flutter-version)) |
| 155 | + (dap--put-if-absent conf :flutterSdkPath (lsp-dart-get-flutter-sdk-dir)) |
161 | 156 | (dap--put-if-absent conf :flutterTrackWidgetCreation lsp-dart-dap-flutter-track-widget-creation) |
162 | 157 | (dap--put-if-absent conf :useFlutterStructuredErrors lsp-dart-dap-flutter-structured-errors) |
163 | 158 | (lsp-dart-dap--capabilities-debugger-args conf))) |
|
0 commit comments