Progress

Author: CompuIves

packages/app/src/app/components/CodeEditor/VSCode/MonacoReactComponent.js

@@ -142,6 +142,7 @@ class MonacoEditor extends React.PureComponent {
         { ICodeEditorService },
         { ITextFileService },
         { CodeSandboxRequestService },
+        { ILifecycleService, LifecyclePhase },
       ] = [
         r('vs/codesandbox/commandService'),
         r('vs/codesandbox/hashService'),
@@ -191,8 +192,11 @@ class MonacoEditor extends React.PureComponent {
         r('vs/editor/browser/services/codeEditorService'),
         r('vs/workbench/services/textfile/common/textfiles'),
         r('vs/codesandbox/requestService'),
+        r('vs/platform/lifecycle/common/lifecycle'),
       ];
 
+      document.body.className += ' vs-dark';
+
       const container = document.createElement('div');
       const part = document.createElement('div');
 
@@ -286,6 +290,12 @@ class MonacoEditor extends React.PureComponent {
           const textFileService = services.get(ITextFileService);
           const editorService = services.get(IEditorService);
 
+          const lifecycleService = services.get(ILifecycleService);
+
+          lifecycleService.phase = LifecyclePhase.Running;
+
+          console.log(LifecyclePhase.Running);
+
           const editorApi = {
             openFile(path: string) {
               return codeEditorService.openCodeEditor({

packages/app/src/app/store/modules/editor/actions.js

@@ -25,13 +25,17 @@ export function getIdFromModulePath({ props, state, utils }) {
 
   const sandbox = state.get('editor.currentSandbox');
 
-  const module = utils.resolveModule(
-    props.path.replace(/^\//, ''),
-    sandbox.modules,
-    sandbox.directories
-  );
+  try {
+    const module = utils.resolveModule(
+      props.path.replace(/^\//, ''),
+      sandbox.modules,
+      sandbox.directories
+    );
 
-  return { id: module.id };
+    return { id: module.id };
+  } catch (e) {
+    return {};
+  }
 }
 
 export function addNpmDependencyToPackage({ state, props }) {

packages/app/src/app/store/modules/editor/sequences.js

@@ -61,21 +61,27 @@ export const changeCurrentModule = [
   track('Open File', {}),
   setReceivingStatus,
   actions.getIdFromModulePath,
-  setCurrentModule(props`id`),
-  equals(state`live.isLive`),
+  when(props`id`),
   {
     true: [
-      equals(state`live.isCurrentEditor`),
+      setCurrentModule(props`id`),
+      equals(state`live.isLive`),
       {
         true: [
-          getSelectionsForCurrentModule,
-          set(state`editor.pendingUserSelections`, props`selections`),
-          sendChangeCurrentModule,
+          equals(state`live.isCurrentEditor`),
+          {
+            true: [
+              getSelectionsForCurrentModule,
+              set(state`editor.pendingUserSelections`, props`selections`),
+              sendChangeCurrentModule,
+            ],
+            false: [],
+          },
         ],
         false: [],
       },
     ],
-    false: [],
+    false: [clearCurrentModule],
   },
 ];