Fix updating options when editor hasn't loaded yet

CompuIves · CompuIves · commit 329dc37c3876 · 2020-01-15T16:34:04.000Z
diff --git a/packages/app/src/app/overmind/effects/vscode/index.ts b/packages/app/src/app/overmind/effects/vscode/index.ts
@@ -250,7 +250,11 @@ export class VSCodeEffect {
   }
 
   public updateOptions(options: { readOnly: boolean }) {
-    this.editorApi.getActiveCodeEditor().updateOptions(options);
+    const editor = this.editorApi.getActiveCodeEditor();
+
+    if (editor) {
+      editor.updateOptions(options);
+    }
   }
 
   public updateUserSelections(userSelections: EditorSelection[]) {
@@ -267,9 +271,7 @@ export class VSCodeEffect {
   public setReadOnly(enabled: boolean) {
     this.readOnly = enabled;
 
-    const activeEditor = this.editorApi.getActiveCodeEditor();
-
-    activeEditor.updateOptions({ readOnly: enabled });
+    this.updateOptions({ readOnly: enabled });
   }
 
   public updateLayout = (width: number, height: number) => {

Original file line number	Diff line number	Diff line change
`@@ -250,7 +250,11 @@ export class VSCodeEffect {`
`250`	`250`	`}`
`251`	`251`
`252`	`252`	`public updateOptions(options: { readOnly: boolean }) {`
`253`		`- this.editorApi.getActiveCodeEditor().updateOptions(options);`
	`253`	`+ const editor = this.editorApi.getActiveCodeEditor();`
	`254`	`+`
	`255`	`+ if (editor) {`
	`256`	`+ editor.updateOptions(options);`
	`257`	`+ }`
`254`	`258`	`}`
`255`	`259`
`256`	`260`	`public updateUserSelections(userSelections: EditorSelection[]) {`
`@@ -267,9 +271,7 @@ export class VSCodeEffect {`
`267`	`271`	`public setReadOnly(enabled: boolean) {`
`268`	`272`	`this.readOnly = enabled;`
`269`	`273`
`270`		`- const activeEditor = this.editorApi.getActiveCodeEditor();`
`271`		`-`
`272`		`- activeEditor.updateOptions({ readOnly: enabled });`
	`274`	`+ this.updateOptions({ readOnly: enabled });`
`273`	`275`	`}`
`274`	`276`
`275`	`277`	`public updateLayout = (width: number, height: number) => {`