Use new argument syntax for openFolder built-in command

Signed-off-by: paulober <[email protected]>
raspberrypi · Sep 17, 2024 · 9c6868c · 9c6868c
1 parent 03a78bd
commit 9c6868c
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 14 deletions.
diff --git a/src/webview/newMicroPythonProjectPanel.mts b/src/webview/newMicroPythonProjectPanel.mts
@@ -77,10 +77,16 @@ export class NewMicroPythonProjectPanel {
     if (!settings) {
       panel.dispose();
 
-      // TODO: maybe add restart button
-      void window.showErrorMessage(
-        "Failed to load settings. Please restart VSCode."
-      );
+      void window
+        .showErrorMessage(
+          "Failed to load settings. Please restart VS Code or reload the window.",
+          "Reload Window"
+        )
+        .then(selected => {
+          if (selected === "Reload Window") {
+            commands.executeCommand("workbench.action.reloadWindow");
+          }
+        });
 
       return;
     }
@@ -354,11 +360,9 @@ print("Finished.")\r\n`;
     await new Promise(resolve => setTimeout(resolve, 2000));
 
     // open and call initialise
-    void commands.executeCommand(
-      "vscode.openFolder",
-      Uri.file(projectFolder),
-      (workspace.workspaceFolders?.length ?? 0) > 0
-    );
+    void commands.executeCommand("vscode.openFolder", Uri.file(projectFolder), {
+      forceNewWindow: (workspace.workspaceFolders?.length ?? 0) > 0,
+    });
   }
 
   private async _update(): Promise<void> {

diff --git a/src/webview/newProjectPanel.mts b/src/webview/newProjectPanel.mts
@@ -384,10 +384,16 @@ export class NewProjectPanel {
     if (settings === undefined) {
       panel.dispose();
 
-      // TODO: maybe add restart button
-      void window.showErrorMessage(
-        "Failed to load settings. Please restart VSCode."
-      );
+      void window
+        .showErrorMessage(
+          "Failed to load settings. Please restart VS Code or reload the window.",
+          "Reload Window"
+        )
+        .then(selected => {
+          if (selected === "Reload Window") {
+            commands.executeCommand("workbench.action.reloadWindow");
+          }
+        });
 
       return;
     }
@@ -2230,7 +2236,9 @@ export class NewProjectPanel {
             ? options.projectRoot
             : join(options.projectRoot, projectName)
         ),
-        (workspace.workspaceFolders?.length ?? 0) > 0
+        {
+          forceNewWindow: (workspace.workspaceFolders?.length ?? 0) > 0,
+        }
       );
 
       // restart the extension if the folder was already open cause then vscode won't