Merge branch 'topic/gnat_task' into 'master'

Extra arguments in vscode tasks

Closes #1113

See merge request eng/ide/ada_language_server!1156

Author: reznikmm

README.md

@@ -174,6 +174,28 @@ You can bind keyboard shortcuts to them by adding to the `keybindings.json` file
 
 [A demo for auto-detected tasks](https://github.com/AdaCore/ada_language_server/wiki/auto_detected_tasks.mp4)
 
+#### Task customization
+You can [customize autodetected tasks](https://code.visualstudio.com/docs/editor/tasks#_customizing-autodetected-tasks)
+by providing extra tool command line options via `args` property in the `tasks.json`:
+
+```json
+{
+	"version": "2.0.0",
+	"tasks": [
+		{
+			"type": "gnat",
+			"taskKind": "buildProject",
+			"problemMatcher": [
+				"$ada"
+			],
+			"group": "build",
+			"label": "ada: Build project",
+			"args": ["-gargs", "-vh"]
+		}
+	]
+}
+```
+
 ### Commands and shortcuts
 
 The extension contributes a few commands and corresponding key bindings.

integration/vscode/Code Samples/hello/.vscode/tasks.json

@@ -4,21 +4,14 @@
     "version": "2.0.0",
     "tasks": [
         {
-            "label": "build",
-            "type": "shell",
-            "command": "gprbuild",
-            "args": [
-                "-p",
-                "-P",
-                "${config:ada.projectFile}",
-                "-cargs",
-                "-gnatef"
+            "type": "gnat",
+            "taskKind": "buildProject",
+            "problemMatcher": [
+                "$ada"
             ],
-            "problemMatcher": ["$ada"],
-            "group": {
-                "kind": "build",
-                "isDefault": true
-            }
+            "group": "build",
+            "label": "ada: Build project",
+            "args": ["-gargs", "-q"]
         }
     ]
 }

integration/vscode/ada/package.json

@@ -16,10 +16,7 @@
         "ms-vscode.cpptools"
     ],
     "activationEvents": [
-        "onLanguage:ada",
-        "onLanguage:gpr",
-        "onCommand:workbench.action.tasks.runTask",
-        "onCommand:ada.otherFile"
+        "onCommand:workbench.action.tasks.runTask"
     ],
     "main": "./out/extension",
     "icon": "icons/ada.png",
@@ -374,46 +371,18 @@
         ],
         "taskDefinitions": [
             {
-                "type": "gprbuild",
+                "type": "gnat",
                 "required": [
-                    "projectFile"
+                    "taskKind"
                 ],
                 "properties": {
-                    "projectFile": {
-                        "type": "string",
-                        "description": "The project file"
-                    },
-                    "checkFile": {
-                        "type": "boolean",
-                        "description": "Just check the current file only"
-                    }
-                }
-            },
-            {
-                "type": "gprclean",
-                "required": [
-                    "projectFile"
-                ],
-                "properties": {
-                    "projectFile": {
-                        "type": "string",
-                        "description": "The project file"
-                    }
-                }
-            },
-            {
-                "type": "gnatprove",
-                "required": [
-                    "projectFile"
-                ],
-                "properties": {
-                    "projectFile": {
+                    "taskKind": {
                         "type": "string",
-                        "description": "The project file"
+                        "description": "Tool and action kind"
                     },
-                    "taskKind": {
-                        "type": "integer",
-                        "description": "Check the current file only or whole project"
+                    "args": {
+                        "type": "array",
+                        "description": "Extra command arguments"
                     }
                 }
             }

integration/vscode/ada/src/cleanTaskProvider.ts

@@ -25,21 +25,13 @@ import {
 } from 'vscode-languageclient/node';
 import { platform } from 'os';
 import * as process from 'process';
-import GPRTaskProvider from './gprTaskProvider';
-import cleanTaskProvider from './cleanTaskProvider';
-import gnatproveTaskProvider from './gnatproveTaskProvider';
-import { getSubprogramSymbol } from './gnatproveTaskProvider';
+import GnatTaskProvider from './gnatTaskProvider';
+import { getSubprogramSymbol } from './gnatTaskProvider';
 import { alsCommandExecutor } from './alsExecuteCommand';
 import { ALSClientFeatures } from './alsClientFeatures';
 
 let alsTaskProvider: vscode.Disposable[] = [
-    vscode.tasks.registerTaskProvider(GPRTaskProvider.gprBuildType, new GPRTaskProvider()),
-    vscode.tasks.registerTaskProvider(cleanTaskProvider.cleanTaskType, new cleanTaskProvider()),
-
-    vscode.tasks.registerTaskProvider(
-        gnatproveTaskProvider.gnatproveType,
-        new gnatproveTaskProvider()
-    ),
+    vscode.tasks.registerTaskProvider(GnatTaskProvider.gnatType, new GnatTaskProvider()),
 ];
 
 /**
@@ -182,22 +174,17 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
     //  React to changes in configuration to recompute predefined tasks if the user
     //  changes scenario variables' values.
     function configChanged(e: vscode.ConfigurationChangeEvent) {
-        if (e.affectsConfiguration('ada.scenarioVariables')) {
+        if (
+            e.affectsConfiguration('ada.scenarioVariables') ||
+            e.affectsConfiguration('ada.projectFile')
+        ) {
             for (const item of alsTaskProvider) {
                 item.dispose();
             }
             alsTaskProvider = [
                 vscode.tasks.registerTaskProvider(
-                    GPRTaskProvider.gprBuildType,
-                    new GPRTaskProvider()
-                ),
-                vscode.tasks.registerTaskProvider(
-                    cleanTaskProvider.cleanTaskType,
-                    new cleanTaskProvider()
-                ),
-                vscode.tasks.registerTaskProvider(
-                    gnatproveTaskProvider.gnatproveType,
-                    new gnatproveTaskProvider()
+                    GnatTaskProvider.gnatType,
+                    new GnatTaskProvider()
                 ),
             ];
         }