Skip to content

Commit 2cbc33b

Browse files
rename to syncModule and avoid sending operation (codesandbox#3774)
* rename to syncModule and avoid sending operation * Apply suggestions from code review Co-authored-by: Ives van Hoorne <[email protected]>
1 parent e374523 commit 2cbc33b

File tree

5 files changed

+10
-8
lines changed

5 files changed

+10
-8
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ export class ModelsHandler {
101101
return null;
102102
}
103103

104-
public async revertModule(module: Module) {
104+
public async syncModule(module: Module) {
105105
const fileModel = this.editorApi.textFileService
106106
.getFileModels()
107107
.find(
@@ -110,7 +110,9 @@ export class ModelsHandler {
110110
);
111111

112112
if (fileModel) {
113+
this.isApplyingOperation = true;
113114
fileModel.revert();
115+
this.isApplyingOperation = false;
114116
}
115117
}
116118

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -317,8 +317,8 @@ export class VSCodeEffect {
317317
}
318318
}
319319

320-
public revertModule(module: Module) {
321-
this.modelsHandler.revertModule(module);
320+
public syncModule(module: Module) {
321+
this.modelsHandler.syncModule(module);
322322
}
323323

324324
public async applyOperation(

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ export const onOperationApplied: Action<{
329329
actions.editor.internal.updatePreviewCode();
330330

331331
if (module.savedCode !== null && module.code === module.savedCode) {
332-
effects.vscode.revertModule(module);
332+
effects.vscode.syncModule(module);
333333
}
334334
};
335335

@@ -394,7 +394,7 @@ export const codeChanged: Action<{
394394
code,
395395
});
396396
if (module.savedCode !== null && module.code === module.savedCode) {
397-
effects.vscode.revertModule(module);
397+
effects.vscode.syncModule(module);
398398
}
399399

400400
const { isServer } = getTemplate(state.editor.currentSandbox.template);
@@ -734,7 +734,7 @@ export const discardModuleChanges: Action<{
734734
}
735735

736736
module.updatedAt = new Date().toString();
737-
effects.vscode.revertModule(module);
737+
effects.vscode.syncModule(module);
738738
};
739739

740740
export const fetchEnvironmentVariables: AsyncAction = async ({

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ export const initializeModuleState: Action<IModuleState> = (
141141
);
142142
}
143143
if (moduleInfo.synced) {
144-
effects.vscode.revertModule(module);
144+
effects.vscode.syncModule(module);
145145
} else {
146146
effects.vscode.setModuleCode(module);
147147
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ export const onModuleSaved: Operator<LiveMessage<{
181181

182182
effects.vscode.sandboxFsSync.writeFile(state.editor.modulesByPath, module);
183183
// We revert the module so that VSCode will flag saved indication correctly
184-
effects.vscode.revertModule(module);
184+
effects.vscode.syncModule(module);
185185
actions.editor.internal.updatePreviewCode();
186186
}
187187
});

0 commit comments

Comments
 (0)