fix selection and code updates in live

Author: christianalfoni

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

@@ -1,19 +1,20 @@
-import { Socket } from 'phoenix';
-import _debug from '@codesandbox/common/lib/utils/debug';
-import uuid from 'uuid';
-import { TextOperation } from 'ot';
-import { camelizeKeys } from 'humps';
 import {
-  Module,
   Directory,
-  RoomInfo,
   LiveMessageEvent,
+  Module,
+  RoomInfo,
   Sandbox,
 } from '@codesandbox/common/lib/types';
+import _debug from '@codesandbox/common/lib/utils/debug';
 import { getTextOperation } from '@codesandbox/common/lib/utils/diff';
-import clientsFactory from './clients';
-import { transformSandbox } from '../utils/sandbox';
+import { camelizeKeys } from 'humps';
+import { TextOperation } from 'ot';
+import { Socket } from 'phoenix';
+import uuid from 'uuid';
+
 import { SandboxAPIResponse } from '../api/types';
+import { transformSandbox } from '../utils/sandbox';
+import clientsFactory from './clients';
 
 type Options = {
   onApplyOperation(args: { moduleShortid: string; operation: any }): void;

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

@@ -164,7 +164,7 @@ export class ModelsHandler {
     }
 
     const lines = model.getLinesContent() || [];
-    const activeEditor = this.editorApi.getActiveEditor();
+    const activeEditor = this.editorApi.getActiveCodeEditor();
 
     userSelections.forEach((data: EditorSelection & UserSelection) => {
       const { userId } = data;

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

@@ -188,7 +188,7 @@ export const codeChanged: Action<{
       actions.live.onTransformMade({
         moduleShortid,
         event,
-        code,
+        code: state.editor.currentModule.code,
       });
     } catch (e) {
       // Something went wrong while composing the operation, so we're opting for a full sync

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

@@ -3,8 +3,8 @@ import { Action, AsyncAction, Operator } from 'app/overmind';
 import { withLoadApp } from 'app/overmind/factories';
 import { TextOperation } from 'ot';
 import { filter, fork, pipe } from 'overmind';
-import eventToTransform from '../../utils/event-to-transform';
 
+import eventToTransform from '../../utils/event-to-transform';
 import * as internalActions from './internalActions';
 import * as liveMessage from './liveMessageOperators';
 
@@ -22,6 +22,9 @@ export const roomJoined: AsyncAction<{
   }
 
   actions.internal.setCurrentSandbox(sandbox);
+  state.editor.modulesByPath = effects.vscode.fs.create(sandbox);
+  await effects.vscode.changeSandbox(sandbox);
+  effects.vscode.openModule(state.editor.currentModule);
   state.live.isLoading = false;
 });
 
@@ -123,12 +126,13 @@ export const onCodeReceived: Action = ({ state }) => {
   state.live.receivingCode = false;
 };
 
-export const onSelectionChanged: Action<{
-  selection: any;
-  moduleShortid: string;
-}> = ({ state, effects }, { selection, moduleShortid }) => {
+export const onSelectionChanged: Action<any> = (
+  { state, effects },
+  selection
+) => {
   if (state.live.isCurrentEditor) {
     const { liveUserId } = state.live;
+    const moduleShortid = state.editor.currentModuleShortid;
     const userIndex = state.live.roomInfo.users.findIndex(
       u => u.id === liveUserId
     );

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

@@ -2,7 +2,6 @@ import {
   Directory,
   LiveDisconnectReason,
   LiveMessage,
-  LiveMessageEvent,
   Module,
   Selection,
 } from '@codesandbox/common/lib/types';
@@ -190,7 +189,7 @@ export const onModuleDeleted: Operator<
     return;
   }
   // Do not think this really works? Cause this would fork the sandbox
-  actions.files.removeModule({
+  actions.files.moduleDeleted({
     moduleShortid: data.moduleShortid,
   });
 });
@@ -234,7 +233,7 @@ export const onDirectoryDeleted: Operator<
   }
   state.editor.currentModuleShortid = state.editor.mainModule.shortid;
   // Again, this does not work very well?
-  actions.files.removeDirectory({
+  actions.files.directoryDeleted({
     directoryShortid: data.directoryShortid,
   });
 });
@@ -270,7 +269,7 @@ export const onUserSelection: Operator<
       u => u.id === userSelectionLiveUserId
     );
 
-    effects.vscode.editor.updateUserSelections([
+    effects.vscode.updateUserSelections([
       {
         userId: userSelectionLiveUserId,
         name: user.username,