@@ -20,12 +20,27 @@ export class ArduinoDebugConfigurationProvider implements vscode.DebugConfigurat
20
20
21
21
public provideDebugConfigurations ( folder : vscode . WorkspaceFolder | undefined , token ?: vscode . CancellationToken ) :
22
22
vscode . ProviderResult < vscode . DebugConfiguration [ ] > {
23
- return [ {
23
+ return [
24
+ this . getDefaultDebugSettings ( folder ) ,
25
+ ] ;
26
+ }
27
+
28
+ // Try to add all missing attributes to the debug configuration being launched.
29
+ public resolveDebugConfiguration ( folder : vscode . WorkspaceFolder | undefined , config : vscode . DebugConfiguration , token ?: vscode . CancellationToken ) :
30
+ vscode . ProviderResult < vscode . DebugConfiguration > {
31
+ if ( ! config || ! config . request ) {
32
+ config = this . getDefaultDebugSettings ( folder ) ;
33
+ }
34
+ return this . resolveDebugConfigurationAsync ( config ) ;
35
+ }
36
+
37
+ private getDefaultDebugSettings ( folder : vscode . WorkspaceFolder | undefined ) {
38
+ return {
24
39
name : "Arduino" ,
25
40
type : "arduino" ,
26
41
request : "launch" ,
27
42
program : "${file}" ,
28
- cwd : folder ,
43
+ cwd : "${workspaceFolder}" ,
29
44
MIMode : "gdb" ,
30
45
targetArchitecture : "arm" ,
31
46
miDebuggerPath : "" ,
@@ -53,16 +68,7 @@ export class ArduinoDebugConfigurationProvider implements vscode.DebugConfigurat
53
68
launchCompleteCommand : "exec-continue" ,
54
69
filterStderr : true ,
55
70
args : [ ] ,
56
- } ] ;
57
- }
58
-
59
- // Try to add all missing attributes to the debug configuration being launched.
60
- public resolveDebugConfiguration ( folder : vscode . WorkspaceFolder | undefined , config : vscode . DebugConfiguration , token ?: vscode . CancellationToken ) :
61
- vscode . ProviderResult < vscode . DebugConfiguration > {
62
- if ( config && ! config . cwd ) {
63
- config . cwd = folder ;
64
- }
65
- return this . resolveDebugConfigurationAsync ( config ) ;
71
+ } ;
66
72
}
67
73
68
74
private async resolveDebugConfigurationAsync ( config : vscode . DebugConfiguration ) {
0 commit comments