Revamp tasks with cleaner dependencies

* Implement buildAndRunMain by invoking a build task and a run task.
* Introduce properties to configure the build task and run task called
  by a buildAndRunMain task.

Author: eliericha

.vscode/tasks.json

@@ -46,10 +46,6 @@
          }
       },
       {
-         // This task starts a background npm process that monitors changes to
-         // TS files and recompiles them as needed. It is configured to be run
-         // before the (vscode)-based launch configurations to make sure the TS
-         // files are compiled and re-compiled upon changes.
          "type": "npm",
          "script": "watch",
          "path": "integration/vscode/ada",
@@ -68,6 +64,24 @@
          "problemMatcher": ["$ada"],
          "group": "build",
          "label": "ada: Check current file"
+      },
+      {
+         "type": "npm",
+         "script": "watch",
+         "path": "integration/vscode/ada",
+         "group": "build",
+         "problemMatcher": [
+            {
+               "base": "$tsc-watch",
+               "fileLocation": [
+                  "relative",
+                  "${workspaceFolder}/integration/vscode/ada"
+               ]
+            }
+         ],
+         "label": "npm: watch - integration/vscode/ada",
+         "detail": "node ./node_modules/typescript/bin/tsc -watch",
+         "isBackground": true
       }
    ]
 }

integration/vscode/ada/package.json

@@ -482,8 +482,7 @@
                     "configuration": {
                         "type": "object",
                         "required": [
-                            "kind",
-                            "projectFile"
+                            "kind"
                         ],
                         "properties": {
                             "kind": {
@@ -494,7 +493,16 @@
                                     "checkFile",
                                     "cleanProject",
                                     "buildMain",
+                                    "runMain",
                                     "buildAndRunMain"
+                                ],
+                                "enumDescriptions": [
+                                    "Build a GPR project",
+                                    "Run semantic checks on an Ada file",
+                                    "Clean a GPR project",
+                                    "Build a main program specified in a GPR project",
+                                    "Run a main program specified in a GPR project",
+                                    "Run a build task and a run task in sequence for a given main program"
                                 ]
                             },
                             "projectFile": {
@@ -554,19 +562,14 @@
                                 "properties": {
                                     "kind": {
                                         "enum": [
-                                            "buildAndRunMain"
+                                            "runMain"
                                         ]
                                     },
                                     "projectFile": true,
-                                    "args": true,
                                     "main": {
                                         "type": "string",
                                         "description": "Path to main source file"
                                     },
-                                    "executable": {
-                                        "type": "string",
-                                        "description": "Path to main executable file (if it cannot be computed automatically)"
-                                    },
                                     "mainArgs": {
                                         "type": "array",
                                         "items": {
@@ -576,6 +579,29 @@
                                     }
                                 },
                                 "additionalProperties": false
+                            },
+                            {
+                                "required": [
+                                    "buildTask",
+                                    "runTask"
+                                ],
+                                "$comment": "Each oneOf is evaluated regardless of the parent schema. That's why valid properties of the parent must be repeated here in order to be allowed.",
+                                "properties": {
+                                    "kind": {
+                                        "enum": [
+                                            "buildAndRunMain"
+                                        ]
+                                    },
+                                    "buildTask": {
+                                        "type": "string",
+                                        "description": "Name of the task that builds the main executable"
+                                    },
+                                    "runTask": {
+                                        "type": "string",
+                                        "description": "Name of the task that runs the main executable"
+                                    }
+                                },
+                                "additionalProperties": false
                             }
                         ]
                     }

integration/vscode/ada/src/commands.ts

@@ -8,7 +8,12 @@ import { ExtensionState } from './ExtensionState';
 import { getOrAskForProgram } from './debugConfigProvider';
 import { adaExtState, mainOutputChannel } from './extension';
 import { getProjectFileRelPath } from './helpers';
-import { CustomTaskDefinition, getEnclosingSymbol } from './taskProviders';
+import {
+    CustomTaskDefinition,
+    getConventionalTaskLabel,
+    getEnclosingSymbol,
+    isFromWorkspace,
+} from './taskProviders';
 
 export function registerCommands(context: vscode.ExtensionContext, clients: ExtensionState) {
     context.subscriptions.push(vscode.commands.registerCommand('ada.otherFile', otherFileHandler));
@@ -159,27 +164,6 @@ function getTaskLabel(task: vscode.Task): string {
     return isFromWorkspace(task) ? `(From Workspace) ${task.name}` : getConventionalTaskLabel(task);
 }
 
-/**
- *
- * @param task - a task
- * @returns the label typically generated for that task by vscode. For tasks not
- * defined explicitely in the workspace, this is `ada: <task name>`. For tasks
- * defined in the workspace simply return the name which should already include
- * the convention.
- */
-function getConventionalTaskLabel(task: vscode.Task): string {
-    return isFromWorkspace(task) ? task.name : `${task.source}: ${task.name}`;
-}
-
-/**
- *
- * @param task - a task
- * @returns `true` if the task is defined explicitely in the workspace's tasks.json
- */
-function isFromWorkspace(task: vscode.Task) {
-    return task.source == 'Workspace';
-}
-
 interface TaskQuickPickItem extends vscode.QuickPickItem {
     task: vscode.Task;
 }

integration/vscode/ada/src/debugConfigProvider.ts

@@ -227,11 +227,6 @@ const setupCmd = [
         text: '-enable-pretty-printing',
         ignoreFailures: true,
     },
-    {
-        description: 'Set Disassembly Flavor to Intel',
-        text: '-gdb-set disassembly-flavor intel',
-        ignoreFailures: true,
-    },
 ];
 
 type QuickPickAdaMain = {
@@ -363,6 +358,11 @@ function createAttachConfig(adaMain: AdaMain): AdaConfig {
         program: `\${workspaceFolder}/${adaMain.execRelPath()}`,
         processId: '${command:pickProcess}',
         MIMode: 'gdb',
-        preLaunchTask: adaMain ? getBuildTaskName(adaMain) : BUILD_PROJECT_TASK_NAME,
+        /**
+         * If the User is trying to attach to a running process, we have to
+         * assume that they already built the project. It would be detrimental
+         * to trigger an unwanted rebuild, so we don't set a preLaunchTask.
+         */
+        // preLaunchTask: adaMain ? getBuildTaskName(adaMain) : BUILD_PROJECT_TASK_NAME,
     };
 }