Fix findWorkspaceRoot failing in CI

willcrichton · Nov 26, 2022 · 4346dad · 4346dad
1 parent 23135ab
commit 4346dad
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/ide/src/logging.ts b/ide/src/logging.ts
@@ -6,4 +6,5 @@ export let log = (...strs: any[]) => {
   let s = strs.map((obj) => String(obj)).join("\t");
   logs.push(s);
   channel.appendLine(s);
+  console.log(...strs);
 };
diff --git a/ide/src/setup.ts b/ide/src/setup.ts
@@ -115,6 +115,7 @@ export let cargo_command = (): [string, string[]] => {
 let findWorkspaceRoot = async (): Promise<string | null> => {
   let folders = vscode.workspace.workspaceFolders;
   if (!folders || folders.length === 0) {
+    log("No folders exist");
     return null;
   }
 
@@ -129,12 +130,18 @@ let findWorkspaceRoot = async (): Promise<string | null> => {
     }
   };
 
+  let folderPath = folders[0].uri.fsPath;
+  if (hasCargoToml(folderPath)) return folderPath;
+
   let activeEditor = vscode.window.activeTextEditor;
-  if (!activeEditor) return null;
+  if (!activeEditor) {
+    log("No active editor exists");
+    return null;
+  }
 
-  let folderPath = folders[0].uri.fsPath;
   let activeFilePath = activeEditor.document.fileName;
   log(`Looking for workspace root between ${folderPath} and ${activeFilePath}`);
+
   let components = path.relative(folderPath, activeFilePath).split(path.sep);
   let folderSubdirTil = (idx: number) =>
     path.join(folderPath, ...components.slice(0, idx));