Emit for no workspace.

moonrepo · Dec 31, 2023 · 0a9b67f · 0a9b67f
1 parent d202a34
commit 0a9b67f
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 14 deletions.
diff --git a/packages/vscode-extension/src/lastRunView.ts b/packages/vscode-extension/src/lastRunView.ts
@@ -19,6 +19,12 @@ export class LastRunProvider implements vscode.WebviewViewProvider {
 		this.workspace = workspace;
 
 		workspace.onDidChangeWorkspace((folder) => {
+			this.renderView();
+
+			if (!folder) {
+				return undefined;
+			}
+
 			// When the report is changed, refresh view
 			const watcher = vscode.workspace.createFileSystemWatcher(
 				new vscode.RelativePattern(folder.uri, workspace.getMoonDirPath('cache/runReport.json')),
@@ -28,8 +34,6 @@ export class LastRunProvider implements vscode.WebviewViewProvider {
 			watcher.onDidCreate(this.renderView, this);
 			watcher.onDidDelete(this.renderView, this);
 
-			this.renderView();
-
 			return watcher;
 		});
 	}

diff --git a/packages/vscode-extension/src/projectsView.ts b/packages/vscode-extension/src/projectsView.ts
@@ -213,6 +213,12 @@ export class ProjectsProvider implements vscode.TreeDataProvider<TreeItem> {
 		);
 
 		workspace.onDidChangeWorkspace((folder) => {
+			this.refresh();
+
+			if (!folder) {
+				return undefined;
+			}
+
 			// When `.moon/**/*.yml` is changed, refresh projects
 			const watcher1 = vscode.workspace.createFileSystemWatcher(
 				new vscode.RelativePattern(folder.uri, workspace.getMoonDirPath('**/*.yml')),
@@ -226,8 +232,6 @@ export class ProjectsProvider implements vscode.TreeDataProvider<TreeItem> {
 			watcher1.onDidChange(this.refresh, this);
 			watcher2.onDidChange(this.refresh, this);
 
-			this.refresh();
-
 			return Disposable.from(watcher1, watcher2);
 		});
 	}
@@ -241,7 +245,11 @@ export class ProjectsProvider implements vscode.TreeDataProvider<TreeItem> {
 	}
 
 	async getChildren(element?: TreeItem | undefined): Promise<TreeItem[]> {
-		if (element instanceof TaskItem || !this.workspace.root) {
+		if (!this.workspace.root) {
+			return [];
+		}
+
+		if (element instanceof TaskItem) {
 			return [];
 		}
 

diff --git a/packages/vscode-extension/src/workspace.ts b/packages/vscode-extension/src/workspace.ts
@@ -26,7 +26,7 @@ export class Workspace {
 
 	rootPrefix: string = '';
 
-	onDidChangeWorkspaceEmitter: vscode.EventEmitter<vscode.WorkspaceFolder>;
+	onDidChangeWorkspaceEmitter: vscode.EventEmitter<vscode.WorkspaceFolder | null>;
 
 	disposables: vscode.Disposable[] = [];
 
@@ -49,7 +49,9 @@ export class Workspace {
 		});
 	}
 
-	onDidChangeWorkspace(listener: (folder: vscode.WorkspaceFolder) => vscode.Disposable | void) {
+	onDidChangeWorkspace(
+		listener: (folder: vscode.WorkspaceFolder | null) => vscode.Disposable | void,
+	) {
 		this.onDidChangeWorkspaceEmitter.event((folder) => {
 			const disposable = listener(folder);
 
@@ -60,10 +62,6 @@ export class Workspace {
 	}
 
 	fireDidChangeWorkspace() {
-		if (!this.folder) {
-			return;
-		}
-
 		// Remove previous watchers
 		this.disposables.forEach((disposable) => {
 			disposable.dispose();
@@ -139,9 +137,9 @@ export class Workspace {
 				}
 			}
 
-			if (foundRoot) {
-				this.fireDidChangeWorkspace();
-			} else {
+			this.fireDidChangeWorkspace();
+
+			if (!foundRoot) {
 				this.logger.appendLine('Did not find a moon installation, disabling');
 			}
 		} else {