Merge b38707a into b11fb07

rock-core · Apr 27, 2020 · 10f2729 · 10f2729
2 parents b11fb07 + b38707a
commit 10f2729
Show file tree

Hide file tree

Showing 8 changed files with 367 additions and 245 deletions.
diff --git a/package.json b/package.json
@@ -351,11 +351,11 @@
                     "mode": {
                         "type": "string",
                         "enum": [
-                            "update",
-                            "checkout",
                             "build",
+                            "checkout",
+                            "force-build",
                             "build-no-deps",
-                            "force-build"
+                            "update"
                         ],
                         "description": "The operation mode"
                     }
@@ -375,11 +375,12 @@
                     "mode": {
                         "type": "string",
                         "enum": [
-                            "osdeps",
                             "watch",
+                            "build",
+                            "checkout",
+                            "osdeps",
                             "update-config",
-                            "update",
-                            "checkout"
+                            "update"
                         ],
                         "description": "The operation mode"
                     }

diff --git a/src/extension.ts b/src/extension.ts
@@ -29,14 +29,18 @@ export function activate(extensionContext: vscode.ExtensionContext) {
 
     let outputChannel = vscode.window.createOutputChannel('Rock');
     let workspaces = new autoproj.Workspaces(null, outputChannel);
-    let autoprojTaskProvider = new tasks.AutoprojProvider(workspaces);
+    let autoprojWorkspaceTaskProvider =
+        new tasks.AutoprojWorkspaceTaskProvider(workspaces);
+    let autoprojPackageTaskProvider =
+        new tasks.AutoprojPackageTaskProvider(workspaces);
     let rockContext = new context.Context(vscodeWrapper, workspaces,
         new packages.PackageFactory(vscodeWrapper),
         outputChannel);
 
     let configManager = new config.ConfigManager(workspaces, vscodeWrapper);
     let vscodeWorkspaceManager = new VSCodeWorkspaceManager(
-        rockContext, workspaces, autoprojTaskProvider, configManager, fileWatcher);
+        rockContext, workspaces, autoprojWorkspaceTaskProvider,
+        autoprojPackageTaskProvider, configManager, fileWatcher);
     let rockCommands = new commands.Commands(rockContext, vscodeWrapper, configManager);
     let rockLint = new linter.Linter(rockContext, vscodeWrapper,
         vscode.languages.createDiagnosticCollection('lint'));
@@ -52,10 +56,13 @@ export function activate(extensionContext: vscode.ExtensionContext) {
     )
 
     extensionContext.subscriptions.push(
-        vscode.workspace.registerTaskProvider('autoproj', autoprojTaskProvider));
+        vscode.workspace.registerTaskProvider('autoproj-workspace', autoprojWorkspaceTaskProvider));
+    extensionContext.subscriptions.push(
+        vscode.workspace.registerTaskProvider('autoproj-package', autoprojPackageTaskProvider));
 
     vscodeWorkspaceManager.initializeWorkspaces(vscodeWrapper.workspaceFolders);
-    autoprojTaskProvider.reloadTasks();
+    autoprojPackageTaskProvider.reloadTasks();
+    autoprojWorkspaceTaskProvider.reloadTasks();
     extensionContext.subscriptions.push(
         vscode.workspace.onDidChangeWorkspaceFolders((event) => {
             vscodeWorkspaceManager.handleWorkspaceChangeEvent(event)