Merge branch 'topic/regr' into 'master'

Always prepend ./ to main commands

See merge request eng/ide/ada_language_server!1708

Author: eliericha

integration/vscode/ada/src/taskProviders.ts

@@ -409,19 +409,25 @@ export class SimpleTaskProvider implements vscode.TaskProvider {
                         taskGroup: vscode.TaskGroup.Build,
                     };
 
-                    let execPath = main.execRelPath();
+                    let execRelPath = main.execRelPath();
                     /**
-                     * If the exec is directly at the root of the workspace,
-                     * prepend ./ to make it possible for shells to execute it.
+                     * Always prepend ./ to the relative path. When the path
+                     * only has one component, ./ is necessary for the shell to
+                     * spawn the executable. We choose to always prepend ./ for
+                     * consistency.
+                     *
+                     * We can't use path.join() because it calls
+                     * path.normalize() which removes ./
+                     *
+                     * We use path.normalize() to make sure the path uses
+                     * platform-specific separators.
                      */
-                    if (!execPath.includes(path.sep)) {
-                        execPath = './' + execPath;
-                    }
+                    execRelPath = '.' + path.sep + path.normalize(execRelPath);
                     const runTask: PredefinedTask = {
                         label: getRunTaskPlainName(main),
                         taskDef: {
                             type: this.taskType,
-                            command: execPath,
+                            command: execRelPath,
                             args: [],
                         },
                     };

integration/vscode/ada/test/suite/general/tasks.test.ts

@@ -71,9 +71,9 @@ ada: Check current file - gprbuild -q -f -c -u -gnatc -P ${projectPath} \${fileB
 ada: Compile current file - gprbuild -q -f -c -u -P ${projectPath} \${fileBasename} -cargs:ada -gnatef
 ada: Generate documentation from the project - gnatdoc -P ${projectPath}
 ada: Build main - src/main1.adb - gprbuild -P ${projectPath} src/main1.adb -cargs:ada -gnatef
-ada: Run main - src/main1.adb - obj/main1exec${exe}
+ada: Run main - src/main1.adb - .${path.sep}obj${path.sep}main1exec${exe}
 ada: Build main - src/test.adb - gprbuild -P ${projectPath} src/test.adb -cargs:ada -gnatef
-ada: Run main - src/test.adb - obj/test${exe}
+ada: Run main - src/test.adb - .${path.sep}obj${path.sep}test${exe}
 `.trim();
 
         const prov = createAdaTaskProvider();