even more refactor

Author: christianalfoni

packages/app/src/app/components/CodeEditor/index.tsx

@@ -35,11 +35,7 @@ export class CodeEditor extends React.PureComponent<
     const { isModuleSynced, sandbox, currentModule: module, settings } = props;
 
     const template = getDefinition(sandbox.template);
-    const modulePath = getModulePath(
-      sandbox.modules,
-      sandbox.directories,
-      module.id
-    );
+    const modulePath = module.path;
     const config = template.configurationFiles[modulePath];
 
     return (

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

@@ -77,52 +77,13 @@ export class ModelsHandler {
   }
 
   public changeModule = (module: Module) => {
-    const { sandbox } = this;
-
-    const path = getModulePath(sandbox.modules, sandbox.directories, module.id);
-
-    if (path && getCurrentModelPath(this.editorApi) !== path) {
-      return this.editorApi.openFile(path);
+    if (getCurrentModelPath(this.editorApi) !== module.path) {
+      return this.editorApi.openFile(module.path);
     }
 
     return Promise.resolve();
   };
 
-  public updateModules = () =>
-    Promise.all(
-      Object.keys(this.modelListeners).map(path => {
-        const shortid = this.modelListeners[path].moduleShortid;
-        const { model } = this.modelListeners[path];
-        const module = this.sandbox.modules.find(m => m.shortid === shortid);
-        if (!module) {
-          // Deleted
-          return Promise.resolve();
-        }
-
-        const modulePath = getVSCodePath(this.sandbox, module.id);
-
-        if (modulePath !== model.uri.path) {
-          return this.editorApi.textFileService
-            .move(model.uri, this.monaco.Uri.file(modulePath))
-            .then(() => {
-              const editor = this.editorApi.getActiveCodeEditor();
-              const currentModel = editor && editor.getModel();
-              const isCurrentFile =
-                currentModel && currentModel.uri.path === path;
-              if (isCurrentFile) {
-                return this.editorApi.openFile(
-                  modulePath.replace('/sandbox', '')
-                );
-              }
-
-              return Promise.resolve();
-            });
-        }
-
-        return Promise.resolve();
-      })
-    );
-
   public applyOperations(operations: { [moduleShortid: string]: any }) {
     const operationsJSON = operations.toJSON ? operations.toJSON() : operations;
 
@@ -138,15 +99,7 @@ export class ModelsHandler {
           return Promise.resolve();
         }
 
-        const moduleId = foundModule.id;
-
-        const modulePath =
-          '/sandbox' +
-          getModulePath(
-            this.sandbox.modules,
-            this.sandbox.directories,
-            moduleId
-          );
+        const modulePath = '/sandbox' + foundModule.path;
 
         const modelEditor = this.editorApi.editorService.editors.find(
           editor => editor.resource && editor.resource.path === modulePath

packages/app/src/app/overmind/effects/vscode/extensionHostWorker/common/fs.ts

@@ -1,4 +1,10 @@
-import { writeFile, rename, rmdir, unlink, mkdir } from '../../fs/utils';
+import {
+  writeFile,
+  rename,
+  rmdir,
+  unlink,
+  mkdir,
+} from '../../sandboxFsSync/utils';
 import { FileSystemConfiguration } from '../../../../../../../../../standalone-packages/codesandbox-browserfs';
 import { getTypeFetcher } from './type-downloader';
 import { EXTENSIONS_LOCATION } from '../../constants';
@@ -87,17 +93,15 @@ export async function initializeBrowserFS({
             case 'sandbox-fs': {
               currentSandboxFs = evt.data.$data;
 
-              console.log('HEEEEEY', currentSandboxFs);
-
               if (!resolved) {
                 resolve();
                 resolved = true;
               }
               break;
             }
             case 'writeFile': {
-              const { path, module } = evt.data.$data;
-              writeFile(currentSandboxFs, path, module);
+              const module = evt.data.$data;
+              writeFile(currentSandboxFs, module);
               break;
             }
             case 'rename': {
@@ -106,18 +110,18 @@ export async function initializeBrowserFS({
               break;
             }
             case 'rmdir': {
-              const { removePath } = evt.data.$data;
-              rmdir(currentSandboxFs, removePath);
+              const directory = evt.data.$data;
+              rmdir(currentSandboxFs, directory);
               break;
             }
             case 'unlink': {
-              const { removePath } = evt.data.$data;
-              unlink(currentSandboxFs, removePath);
+              const module = evt.data.$data;
+              unlink(currentSandboxFs, module);
               break;
             }
             case 'mkdir': {
-              const { path, directory } = evt.data.$data;
-              mkdir(currentSandboxFs, path, directory);
+              const directory = evt.data.$data;
+              mkdir(currentSandboxFs, directory);
               break;
             }
           }

packages/app/src/app/overmind/effects/vscode/extensionHostWorker/workers/ext-host-worker.ts

@@ -42,7 +42,7 @@ self.addEventListener('message', async e => {
       process.env = data.data.env || {};
       process.env.HOME = '/home';
 
-      loader(true)(() => {
+      loader()(() => {
         ctx.require(
           ['vs/workbench/services/extensions/node/extensionHostProcess'],
           () => {