Fix open workspace error

package.json

@@ -4,7 +4,7 @@
 	"description": "Bazel support for Java Linting, Intellisense, formatting, refactoring and more...",
 	"author": "Compass",
 	"license": "BSD-3-Clause",
-	"version": "0.0.2",
+	"version": "0.0.8",
 	"publisher": "COMP",
 	"bugs": "https://github.com/zhirui1994/bazel-vscode-java/issues",
 	"preview": true,

src/extension.api.ts

@@ -1,5 +1,5 @@
 import { BazelProjectView } from './types';
 
 export interface BazelVscodeExtensionAPI {
-	readonly parseProjectFile: BazelProjectView;
+	readonly parseProjectFile: BazelProjectView | undefined;
 }

src/extension.ts

@@ -165,7 +165,9 @@ export async function activate(
 	);
 
 	return Promise.resolve({
-		parseProjectFile: await getBazelProjectFile(),
+		parseProjectFile: isBazelWorkspaceRoot()
+			? await getBazelProjectFile()
+			: undefined,
 	});
 }
 

src/projectViewManager.ts

@@ -146,25 +146,33 @@ export namespace ProjectViewManager {
 			.then(() => displayFolders);
 	}
 
+	/**
+	 * Updates the project view for a multi-root workspace.
+	 * Adds directories from displayFolders as separate workspace folders in VSCode multi-root workspace.
+	 *
+	 * @param displayFolders List of directories to display
+	 * @returns The original displayFolders list
+	 */
 	function updateMultiRootProjectView(
 		displayFolders: string[]
 	): Thenable<string[]> {
+		// Build workspace folder entries array
+		const workspaceFolderEntries = [
+			// Add workspace root directory first
+			{ uri: Uri.file(workspaceRoot), name: workspaceRootName },
+			// Convert displayFolders to workspace folder entries
+			...displayFolders
+				// Filter out projectRootSymlinks directory (used for storing symlinks to root directory files)
+				.filter((f) => f !== projectRootSymlinks)
+				.map((f) => ({
+					uri: Uri.file(`${workspaceRoot}/${f}`),
+					name: f.replaceAll(sep, ' ⇾ '),
+				})),
+		];
 		workspace.updateWorkspaceFolders(
 			0,
 			workspace.workspaceFolders?.length,
-			...displayFolders.map((f) => {
-				if (f === projectRootSymlinks) {
-					return {
-						uri: Uri.file(projectRootSymlinks),
-						name: workspaceRootName,
-					};
-				} else {
-					return {
-						uri: Uri.file(`${workspaceRoot}/${f}`),
-						name: f.replaceAll(sep, ' ⇾ '),
-					};
-				}
-			})
+			...workspaceFolderEntries
 		);
 		return Promise.resolve(displayFolders);
 	}

src/provider/bazelTaskProvider.ts

@@ -61,7 +61,13 @@ async function getBazelTasks(): Promise<Task[]> {
 	const taskDefinitions: BazelTaskDefinition[] = [];
 
 	// add any ij converted run targets to vscode tasks
-	const bazelProjectFile = await getBazelProjectFile();
+	let bazelProjectFile;
+	try {
+		bazelProjectFile = await getBazelProjectFile();
+	} catch {
+		// No .bazelproject file exists, return empty tasks
+		return [];
+	}
 	if (bazelProjectFile.importRunConfigurations) {
 		const rootPath = getWorkspaceRoot();
 		bazelProjectFile.importRunConfigurations.forEach((runConfig) => {

src/util.ts

@@ -19,10 +19,15 @@ derive_targets_from_directories: true
 
 export function getWorkspaceRoot(): string {
 	if (workspace.workspaceFile) {
-		return dirname(workspace.workspaceFile.path);
+		let workspaceFileDir = dirname(workspace.workspaceFile.fsPath);
+		// If the workspace config file is in .vscode directory, go up one level to get the actual project root
+		if (workspaceFileDir.endsWith('.vscode')) {
+			workspaceFileDir = dirname(workspaceFileDir);
+		}
+		return workspaceFileDir;
 	} else {
 		if (workspace.workspaceFolders && workspace.workspaceFolders.length > 0) {
-			return workspace.workspaceFolders[0].uri.path;
+			return workspace.workspaceFolders[0].uri.fsPath;
 		}
 	}
 	throw new Error('invalid workspace root');