Merge remote branch 'origin/master' into edge

automatic-merge · automatic-merge · commit 4b3f236fa66d · 2024-03-20T00:55:42.000Z
diff --git a/integration/vscode/ada/test/suite/general/debug.test.ts b/integration/vscode/ada/test/suite/general/debug.test.ts
@@ -41,7 +41,7 @@ suite('Debug Configurations', function () {
         "ignoreFailures": true
       }
     ],
-    "miDebuggerPath": "${getOrFindGdb() ?? '<undefined>'}"
+    "miDebuggerPath": "${getOrFindGdb()?.replace(/\\/g, '\\\\') ?? '<undefined>'}"
   },
   {
     "name": "Ada: Attach debugger to running process - src/main1.adb",
@@ -50,7 +50,7 @@ suite('Debug Configurations', function () {
     "program": "\${workspaceFolder}/obj/main1exec${exe}",
     "processId": "\${command:pickProcess}",
     "MIMode": "gdb",
-    "miDebuggerPath": "${getOrFindGdb() ?? '<undefined>'}"
+    "miDebuggerPath": "${getOrFindGdb()?.replace(/\\/g, '\\\\') ?? '<undefined>'}"
   },
   {
     "type": "cppdbg",

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ suite('Debug Configurations', function () {`
`41`	`41`	`"ignoreFailures": true`
`42`	`42`	`}`
`43`	`43`	`],`
`44`		`- "miDebuggerPath": "${getOrFindGdb() ?? '<undefined>'}"`
	`44`	`+ "miDebuggerPath": "${getOrFindGdb()?.replace(/\\/g, '\\\\') ?? '<undefined>'}"`
`45`	`45`	`},`
`46`	`46`	`{`
`47`	`47`	`"name": "Ada: Attach debugger to running process - src/main1.adb",`
`@@ -50,7 +50,7 @@ suite('Debug Configurations', function () {`
`50`	`50`	`"program": "\${workspaceFolder}/obj/main1exec${exe}",`
`51`	`51`	`"processId": "\${command:pickProcess}",`
`52`	`52`	`"MIMode": "gdb",`
`53`		`- "miDebuggerPath": "${getOrFindGdb() ?? '<undefined>'}"`
	`53`	`+ "miDebuggerPath": "${getOrFindGdb()?.replace(/\\/g, '\\\\') ?? '<undefined>'}"`
`54`	`54`	`},`
`55`	`55`	`{`
`56`	`56`	`"type": "cppdbg",`