fix forking

Author: christianalfoni

packages/app/src/app/overmind/effects/vscode/index.ts

@@ -432,6 +432,7 @@ export class VSCodeEffect {
       { IEditorService },
       { ICodeEditorService },
       { ITextFileService },
+
       { IEditorGroupsService },
       { IStatusbarService },
       { IExtensionService },
@@ -446,6 +447,7 @@ export class VSCodeEffect {
       r('vs/workbench/services/editor/common/editorService'),
       r('vs/editor/browser/services/codeEditorService'),
       r('vs/workbench/services/textfile/common/textfiles'),
+
       r('vs/workbench/services/editor/common/editorGroupsService'),
       r('vs/platform/statusbar/common/statusbar'),
       r('vs/workbench/services/extensions/common/extensions'),
@@ -491,6 +493,7 @@ export class VSCodeEffect {
 
       this.commandService.resolve(commandService);
       this.extensionService.resolve(extensionService);
+
       this.extensionEnablementService.resolve(extensionEnablementService);
 
       const editorPart = accessor.get(IEditorGroupsService);

packages/app/src/app/overmind/namespaces/editor/actions.ts

@@ -77,23 +77,18 @@ export const sandboxChanged: AsyncAction<{ id: string }> = withLoadApp<{
 
   newId = actions.editor.internal.ensureSandboxId(newId);
 
-  if (state.live.isLive) {
-    actions.live.internal.disconnect();
+  // This happens when we fork. This can be avoided with state first routing
+  if (state.editor.currentId === newId) {
+    return;
   }
 
-  if (state.editor.sandboxes[newId] && !state.editor.sandboxes[newId].team) {
-    const sandbox = await effects.api.getSandbox(newId);
-
-    actions.internal.updateCurrentSandbox(sandbox);
-    state.editor.currentId = newId;
-    state.editor.isLoading = false;
-
-    await actions.editor.internal.initializeLiveSandbox(sandbox);
+  const hasExistingSandbox = Boolean(state.editor.currentId);
 
-    return;
+  if (state.live.isLive) {
+    actions.live.internal.disconnect();
   }
 
-  state.editor.isLoading = !state.editor.currentId;
+  state.editor.isLoading = !hasExistingSandbox;
   state.editor.notFound = false;
 
   // Only reset changed modules if sandbox wasn't in memory, otherwise a fork
@@ -103,12 +98,9 @@ export const sandboxChanged: AsyncAction<{ id: string }> = withLoadApp<{
   try {
     const sandbox = await effects.api.getSandbox(newId);
 
-    if (state.editor.sandboxes[newId]) {
-      actions.internal.updateCurrentSandbox(sandbox);
-    } else {
-      await effects.vscode.closeAllTabs();
-      actions.internal.setCurrentSandbox(sandbox);
-    }
+    await effects.vscode.closeAllTabs();
+
+    actions.internal.setCurrentSandbox(sandbox);
 
     state.editor.modulesByPath = effects.vscode.fs.create(sandbox);
   } catch (error) {

packages/app/src/app/overmind/namespaces/editor/internalActions.ts

@@ -298,6 +298,8 @@ export const forkSandbox: AsyncAction<{
 
     await actions.internal.setCurrentSandbox(forkedSandbox);
     state.editor.modulesByPath = effects.vscode.fs.create(forkedSandbox);
+    await effects.vscode.changeSandbox(forkedSandbox);
+    effects.vscode.openModule(state.editor.currentModule);
     effects.notificationToast.success('Forked sandbox!');
     effects.router.updateSandboxUrl(forkedSandbox);
   } catch (error) {