Changes after PR comments

Author: gjsjohnmurray

src/extension.ts

@@ -803,7 +803,7 @@ export async function activate(context: vscode.ExtensionContext): Promise<any> {
       continue;
     }
   }
-  for await (const workspaceFolder of vscode.workspace.workspaceFolders) {
+  for await (const workspaceFolder of vscode.workspace.workspaceFolders ?? []) {
     await addWsServerRootFolderData(workspaceFolder.uri);
   }
 
@@ -1344,7 +1344,7 @@ export async function activate(context: vscode.ExtensionContext): Promise<any> {
         }
         // Check connections sequentially for each workspace folder
         let refreshFilesExplorer = false;
-        for await (const folder of vscode.workspace.workspaceFolders) {
+        for await (const folder of vscode.workspace.workspaceFolders ?? []) {
           if (schemas.includes(folder.uri.scheme)) {
             refreshFilesExplorer = true;
           }

src/utils/index.ts

@@ -633,12 +633,15 @@ export async function addWsServerRootFolderData(uri: vscode.Uri): Promise<void>
   const value: WSServerRootFolderData = {
     redirectDotvscode: true,
   };
-  if (isCSPFile(uri)) {
-    // A CSP-type root folder that already has a .vscode/settings.json file must not redirect .vscode/* references
+  if (isCSPFile(uri) && !["", "/"].includes(uri.path)) {
+    // A CSP-type root folder for a specific webapp that already has a .vscode/settings.json file must not redirect .vscode/* references
     const api = new AtelierAPI(uri);
-    api.getDoc(`${uri.path}/.vscode/settings.json`).then(() => {
-      value.redirectDotvscode = false;
-    });
+    api
+      .headDoc(`${uri.path}/.vscode/settings.json`)
+      .then(() => {
+        value.redirectDotvscode = false;
+      })
+      .catch(() => {});
   }
   wsServerRootFolders.set(uri.toString(), value);
 }