Merge pull request #67 from rock-core/fix_tasks_from_new_folder

reload tasks after adding a folder
rock-core · Oct 8, 2019 · cd12693 · cd12693
2 parents 0e5d789 + 8d7f301
commit cd12693
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 0 deletions.
diff --git a/src/vscode_workspace_manager.ts b/src/vscode_workspace_manager.ts
@@ -89,6 +89,7 @@ export class Manager {
         this._configManager.setupPackage(path).catch((reason) => {
             vscode.window.showErrorMessage(reason.message);
         });
+        this._taskProvider.reloadTasks();
         return index;
     }
 

diff --git a/test/vscode_workspace_manager.test.ts b/test/vscode_workspace_manager.test.ts
@@ -43,6 +43,51 @@ describe("vscode_workspace_manager.Manager", function () {
                 TypeMoq.Times.never())
         })
 
+        it("adds the tasks of the new workspace", function() {
+            let root = s.createWorkspace('ws');
+            s.mockWrapper.setup(x => x.workspaceFolders).
+                returns(() => [{
+                    name: '',
+                    index: 0,
+                    uri: vscode.Uri.file(`${root}/autoproj`)
+                }])
+            s.mockConfigManager.setup(x => x.setupPackage(`${root}/base/types`)).
+                returns(() => Promise.resolve(true));
+            subject.handleNewFolder(0, `${root}/base/types`);
+            assert(s.taskProvider.watchTask(`${root}`))
+        })
+
+        it("adds the tasks of the new folder in a new workspace", function() {
+            let root = s.createWorkspace('ws');
+            s.mockWrapper.setup(x => x.workspaceFolders).
+                returns(() => [{
+                    name: '',
+                    index: 0,
+                    uri: vscode.Uri.file(`${root}/autoproj`)
+                }])
+            s.mockConfigManager.setup(x => x.setupPackage(`${root}/base/types`)).
+                returns(() => Promise.resolve(true));
+            subject.handleNewFolder(0, `${root}/base/types`);
+            assert(s.taskProvider.updateTask(`${root}/base/types`))
+        })
+
+        it("adds the tasks of a new folder in an existing workspace", function() {
+            let root = s.createWorkspace('ws');
+            s.mockWrapper.setup(x => x.workspaceFolders).
+                returns(() => [{
+                    name: '',
+                    index: 0,
+                    uri: vscode.Uri.file(`${root}/autoproj`)
+                }])
+            s.mockConfigManager.setup(x => x.setupPackage(`${root}/autoproj`)).
+                returns(() => Promise.resolve(true));
+            s.mockConfigManager.setup(x => x.setupPackage(`${root}/base/types`)).
+                returns(() => Promise.resolve(true));
+            subject.handleNewFolder(0, `${root}/autoproj`);
+            subject.handleNewFolder(0, `${root}/base/types`);
+            assert(s.taskProvider.updateTask(`${root}/base/types`))
+        })
+
         it("sets up the workspace if it was not there already", async function() {
             let { mock, ws } = s.createAndRegisterWorkspace('ws');
             let info = ws.info();