Skip to content

Commit e23e9a9

Browse files
trying to fix vim issue
1 parent d0013d6 commit e23e9a9

File tree

4 files changed

+6
-11
lines changed

4 files changed

+6
-11
lines changed

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,9 @@ class MonacoEditor extends React.PureComponent {
3535
}
3636

3737
// eslint-disable-next-line global-require
38-
require('app/overmind/effects/vscode/vscode-script-loader').default(
39-
['vs/editor/editor.main'],
40-
false
41-
)(() => {
38+
require('app/overmind/effects/vscode/vscode-script-loader').default(false, [
39+
'vs/editor/editor.main',
40+
])(() => {
4241
this.initMonaco();
4342
});
4443
};

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ self.addEventListener('message', async e => {
4242
process.env = data.data.env || {};
4343
process.env.HOME = '/home';
4444

45-
loader()(() => {
45+
loader(true)(() => {
4646
ctx.require(
4747
['vs/workbench/services/extensions/node/extensionHostProcess'],
4848
() => {

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ export class VSCodeEffect {
118118
this.initialized = Promise.all([
119119
new FontFaceObserver('dm').load(),
120120
new Promise(resolve => {
121-
loadScript(['vs/editor/codesandbox.editor.main'])(resolve);
121+
loadScript(true, ['vs/editor/codesandbox.editor.main'])(resolve);
122122
}),
123123
sandboxFsSync.initialize({
124124
getSandboxFs: options.getSandboxFs,
@@ -174,8 +174,6 @@ export class VSCodeEffect {
174174
}
175175

176176
public setVimExtensionEnabled(enabled: boolean) {
177-
// eslint-disable-next-line
178-
console.log('SET VIM MODE!!', enabled);
179177
if (enabled) {
180178
this.enableExtension(VIM_EXTENSION_ID);
181179
} else {
@@ -400,8 +398,6 @@ export class VSCodeEffect {
400398
initializeSettings();
401399

402400
if (localStorage.getItem('settings.vimmode') === 'true') {
403-
// eslint-disable-next-line
404-
console.log('SET VIM MODE IN INITIALIZE!!');
405401
this.enableExtension(VIM_EXTENSION_ID);
406402
}
407403

packages/app/src/app/overmind/effects/vscode/vscode-script-loader.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ function initializeRequires() {
364364
});
365365
}
366366

367-
export default function(requiredModule?: string[], isVSCode = true) {
367+
export default function(isVSCode: boolean, requiredModule?: string[]) {
368368
var METADATA = isVSCode ? VSCODE_METADATA : MONACO_METADATA;
369369
var IS_FILE_PROTOCOL = global.location.protocol === 'file:';
370370
var DIRNAME = null;

0 commit comments

Comments
 (0)