Fix saving the code

Author: CompuIves

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

@@ -365,6 +365,32 @@ export const onOperationApplied: Action<{
   }
 };
 
+export const setCode: Action<{
+  moduleShortid: string;
+  code: string;
+}> = ({ effects, state, actions }, { code, moduleShortid }) => {
+  if (!state.editor.currentSandbox) {
+    return;
+  }
+
+  const module = state.editor.currentSandbox.modules.find(
+    m => m.shortid === moduleShortid
+  );
+
+  if (!module) {
+    return;
+  }
+
+  // If the code is opened in VSCode, change the code in VSCode and let
+  // other clients know via the event triggered by VSCode. Otherwise
+  // send a manual event and just change the state.
+  if (effects.vscode.isModuleOpened(module)) {
+    effects.vscode.setModuleCode({ ...module, code }, true);
+  } else {
+    actions.editor.codeChanged({ moduleShortid, code });
+  }
+};
+
 export const codeChanged: Action<{
   moduleShortid: string;
   code: string;

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

@@ -169,6 +169,7 @@ export const saveCode: AsyncAction<{
     if (savedCode === null) {
       // If the savedCode is also module.code
       effects.moduleRecover.remove(sandbox.id, module);
+      effects.vscode.syncModule(module);
     }
 
     if (
@@ -305,8 +306,7 @@ export const removeNpmDependencyFromPackageJson: AsyncAction<string> = async (
     return;
   }
 
-  effects.vscode.setModuleCode({ ...module, code }, true);
-  module.code = code;
+  actions.editor.setCode({ moduleShortid, code });
 
   await actions.editor.codeSaved({
     code,
@@ -347,8 +347,7 @@ export const addNpmDependencyToPackageJson: AsyncAction<{
     return;
   }
 
-  effects.vscode.setModuleCode({ ...module, code }, true);
-  module.code = code;
+  actions.editor.setCode({ moduleShortid, code });
 
   await actions.editor.codeSaved({
     code,
@@ -542,8 +541,7 @@ export const updateSandboxPackageJson: AsyncAction = async ({
     return;
   }
 
-  effects.vscode.setModuleCode({ ...module, code }, true);
-  module.code = code;
+  actions.editor.setCode({ moduleShortid, code });
 
   await actions.editor.codeSaved({
     code,

packages/app/src/app/overmind/namespaces/live/liveMessageOperators.ts

@@ -35,11 +35,15 @@ export const onSave: Operator<LiveMessage<{
     return;
   }
 
-  module.savedCode = data.saved_code;
+  module.savedCode = module.code === data.saved_code ? null : data.saved_code;
   module.updatedAt = data.updated_at;
   module.insertedAt = data.inserted_at;
   sandbox.version = data.version;
   effects.vscode.sandboxFsSync.writeFile(state.editor.modulesByPath, module);
+
+  if (module.savedCode === null) {
+    effects.vscode.syncModule(module);
+  }
 });
 
 export const onJoin: Operator<LiveMessage<{