Merge branch 'topic/fix-gnatef2' into 'master'

Add extra quotes around `-cargs:ada` in vscode tasks Closes #1268 See merge request eng/ide/ada_language_server!1467
AdaCore · Dec 13, 2023 · 80a91c4 · 80a91c4
2 parents c65738f + 8b2b475
commit 80a91c4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/integration/vscode/ada/src/taskProviders.ts b/integration/vscode/ada/src/taskProviders.ts
@@ -80,7 +80,8 @@ async function computeProject(taskDef?: CustomTaskDefinition): Promise<string> {
 
 // Call commonArgs on args and append `-gnatef` to generate full file names in errors/warnings
 export const getDiagnosticArgs = (): string[] => {
-    const p_gnatef = ['-cargs:ada', '-gnatef'];
+    const p_gnatef = ['"-cargs:ada"', '-gnatef'];
+    //  PowerShell splits arguments on `:`, so we need extra quotes around `-cargs:ada`
     return p_gnatef;
 };
 

diff --git a/integration/vscode/ada/test/suite/general/tasks.test.ts b/integration/vscode/ada/test/suite/general/tasks.test.ts
@@ -84,7 +84,7 @@ suite('GPR Tasks Provider', function () {
         const exec = resolved.execution as vscode.ShellExecution;
         const actualCmd = [exec.command].concat(exec.args).join(' ');
 
-        const expectedCmd = `gprbuild -P ${def.configuration.projectFile} -cargs -gnatef`;
+        const expectedCmd = `gprbuild -P ${def.configuration.projectFile} "-cargs:ada" -gnatef`;
 
         assert.strictEqual(actualCmd, expectedCmd);
     });
@@ -111,7 +111,7 @@ suite('GPR Tasks Provider', function () {
 
         const expectedCmd = `gprbuild -P ${def.configuration.projectFile} ${
             def.configuration.main ?? ''
-        } -cargs -gnatef`;
+        } "-cargs:ada" -gnatef`;
 
         assert.strictEqual(actualCmd, expectedCmd);
     });
@@ -140,7 +140,7 @@ suite('GPR Tasks Provider', function () {
         // via project attributes
         const expectedCmd = `gprbuild -P ${def.configuration.projectFile} ${
             def.configuration.main ?? ''
-        } -cargs -gnatef && obj/main1exec${process.platform == 'win32' ? '.exe' : ''}`;
+        } "-cargs:ada" -gnatef && obj/main1exec${process.platform == 'win32' ? '.exe' : ''}`;
 
         assert.strictEqual(actualCmd, expectedCmd);
     });