Merge branch 'topic/issue1154' into 'edge'

Fixed gpr tasks definition

See merge request eng/ide/ada_language_server!1264

Author: abdellah257

integration/vscode/ada/package.json

@@ -463,17 +463,20 @@
             {
                 "type": "gpr",
                 "required": [
-                    "projectFile",
-                    "mainFile"
+                    "main"
                 ],
                 "properties": {
                     "projectFile": {
                         "type": "string",
                         "description": "The project file"
                     },
+                    "main": {
+                        "type": "string",
+                        "description": "The main file targeted"
+                    },
                     "executable": {
                         "type": "string",
-                        "description": "The main file"
+                        "description": "The related executable"
                     }
                 }
             }

integration/vscode/ada/src/gprTaskProvider.ts

@@ -38,35 +38,48 @@ export default class GprTaskProvider implements vscode.TaskProvider<vscode.Task>
     }
 
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    public async provideTasks(): Promise<vscode.Task[] | undefined> {
+    async provideTasks(): Promise<vscode.Task[] | undefined> {
         if (!this.glsTasks) {
             const project_file = await getProjectFile(this.client);
             const mains_result: GlsMainResult = await this.client.sendRequest('$/glsMains');
-            this.glsTasks = getMainBuildTasks(project_file, mains_result.mains);
+            this.glsTasks = getBuildTasks(project_file, mains_result.mains);
             const execs: GlsExecutableResult = await this.client.sendRequest('$/glsExecutables');
             this.glsTasks = this.glsTasks.concat(
-                getExecutableRunTasks(project_file, execs.executables)
+                getBuildAndRunTasks(project_file, mains_result.mains, execs.executables)
             );
         }
         return this.glsTasks;
     }
 
-    resolveTask(
+    async resolveTask(
         task: vscode.Task,
         // eslint-disable-next-line @typescript-eslint/no-unused-vars
         _token: vscode.CancellationToken
-    ): vscode.ProviderResult<vscode.Task> {
+    ): Promise<vscode.Task | undefined> {
         const definition = task.definition;
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-        const projectFile: string = definition.projectFile;
         // Make sure that this looks like a execute task by checking that there is a projectFile.
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-        const executableFile: string = definition.executable;
-        if (projectFile || projectFile === '') {
+        if (definition.type == GprTaskProvider.gprTaskType) {
             //  Refresh gprbuild command line
-            const args = getMainBuildArgs(projectFile, executableFile);
-            const shell = new vscode.ShellExecution('gprbuild', args);
-            const title = `Build Executable for: ${executableFile}`;
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+            const projectFile: string =
+                definition.projectFile != undefined
+                    ? definition.projectFile
+                    : await getProjectFile(this.client);
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+            const args = getMainBuildArgs(projectFile, definition.main);
+            let shell: vscode.ShellExecution;
+            let title: string;
+            if (definition.executable != undefined) {
+                // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+                args.push('&&', 'clear', '&&', definition.executable);
+                shell = new vscode.ShellExecution(fullCommand('gprbuild', args));
+                // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
+                title = `Build And Run Main: ${definition.main}`;
+            } else {
+                shell = new vscode.ShellExecution(fullCommand('gprbuild', args));
+                // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
+                title = `Build Main: ${definition.main}`;
+            }
             // resolveTask requires that the same definition object be used.
             return new vscode.Task(
                 definition,
@@ -81,22 +94,35 @@ export default class GprTaskProvider implements vscode.TaskProvider<vscode.Task>
     }
 }
 
-const getMainBuildTasks = (project_file: string, mainFiles: string[]): vscode.Task[] => {
+/**
+ * Generates the build and run tasks for mains
+ * @param projectFile - the project file path
+ * @param mainFiles - a list of main files paths
+ * @param execs - a list of executable files paths
+ * @returns a list of tasks
+ */
+function getBuildAndRunTasks(
+    projectFile: string,
+    mainFiles: string[],
+    execs: string[]
+): vscode.Task[] {
     const result: vscode.Task[] = [];
     //  build current project file
     for (let i = 0; i < mainFiles.length; i++) {
         const kind = {
             type: GprTaskProvider.gprTaskType,
-            projectFile: project_file,
-            mainFile: vscode.workspace.asRelativePath(mainFiles[i]),
+            projectFile: projectFile,
+            main: vscode.workspace.asRelativePath(mainFiles[i]),
+            executable: vscode.workspace.asRelativePath(execs[i]),
         };
-        const args = getMainBuildArgs(kind.projectFile, kind.mainFile);
-        const shell = new vscode.ShellExecution('gprbuild', args);
+        const args = getMainBuildArgs(kind.projectFile, kind.main);
+        args.push('&&', 'clear', '&&', kind.executable);
+        const shell = new vscode.ShellExecution(fullCommand('gprbuild', args));
         const filename = mainFiles[i].replace(/^.*[\\/]/, '');
         const task = new vscode.Task(
             kind,
             vscode.TaskScope.Workspace,
-            'Build Executable for File ' + filename,
+            'Build And Run Main: ' + filename,
             'gpr',
             shell,
             '$gpr'
@@ -106,23 +132,30 @@ const getMainBuildTasks = (project_file: string, mainFiles: string[]): vscode.Ta
     }
 
     return result;
-};
+}
 
-const getExecutableRunTasks = (project_file: string, executables: string[]): vscode.Task[] => {
+/**
+ * Generates the build tasks for mains
+ * @param projectFile - the project file path
+ * @param mainFiles - a list of main files paths
+ * @returns a list of tasks
+ */
+function getBuildTasks(projectFile: string, mainFiles: string[]): vscode.Task[] {
     const result: vscode.Task[] = [];
     //  build current project file
-    for (let i = 0; i < executables.length; i++) {
+    for (let i = 0; i < mainFiles.length; i++) {
         const kind = {
             type: GprTaskProvider.gprTaskType,
-            projectFile: project_file,
-            executable: vscode.workspace.asRelativePath(executables[i]),
+            projectFile: projectFile,
+            main: vscode.workspace.asRelativePath(mainFiles[i]),
         };
-        const filename = executables[i].replace(/^.*[\\/]/, '');
-        const shell = new vscode.ShellExecution('./' + kind.executable, []);
+        const filename = mainFiles[i].replace(/^.*[\\/]/, '');
+        const args = getMainBuildArgs(kind.projectFile, kind.main);
+        const shell = new vscode.ShellExecution(fullCommand('gprbuild', args));
         const task = new vscode.Task(
             kind,
             vscode.TaskScope.Workspace,
-            'Run Executable: ' + filename,
+            'Build Main: ' + filename,
             'gpr',
             shell,
             '$gpr'
@@ -132,9 +165,15 @@ const getExecutableRunTasks = (project_file: string, executables: string[]): vsc
     }
 
     return result;
-};
+}
 
-const getMainBuildArgs = (projectFile?: string, mainFile?: string): string[] => {
+/**
+ * Adds relative arguments for the target build command
+ * @param projectFile - the project file path
+ * @param mainFile - the main file path
+ * @returns a list of arguments
+ */
+function getMainBuildArgs(projectFile?: string, mainFile?: string): string[] {
     const vars: string[][] = Object.entries(
         vscode.workspace.getConfiguration('ada').get('scenarioVariables') ?? []
     );
@@ -152,4 +191,18 @@ const getMainBuildArgs = (projectFile?: string, mainFile?: string): string[] =>
     args.unshift('-P');
     args.unshift('-d');
     return args;
-};
+}
+
+/**
+ * Return the command while ignoring unecessary spaces
+ * @param command - the command to execute
+ * @param args - the list of arguments
+ * @returns a string
+ */
+function fullCommand(command: string, args: string[]) {
+    let cmd: string = command + ' ';
+    for (const arg of args) {
+        cmd += arg.replace(/^\s+|\s+$/g, '') + ' ';
+    }
+    return cmd;
+}