Add latest changes from gitlab-org/gitlab@master

1 files changed, 9 insertions, 5 deletions

diff --git a/app/assets/javascripts/ide/lib/editor.js b/app/assets/javascripts/ide/lib/editor.js
index 02038fcb534..d1056ea6b98 100644
--- a/app/assets/javascripts/ide/lib/editor.js
+++ b/app/assets/javascripts/ide/lib/editor.js
@@ -23,20 +23,24 @@ export const clearDomElement = el => {
 };
 
 export default class Editor {
-  static create() {
+  static create(options = {}) {
     if (!this.editorInstance) {
-      this.editorInstance = new Editor();
+      this.editorInstance = new Editor(options);
     }
     return this.editorInstance;
   }
 
-  constructor() {
+  constructor(options = {}) {
     this.currentModel = null;
     this.instance = null;
     this.dirtyDiffController = null;
     this.disposable = new Disposable();
     this.modelManager = new ModelManager();
     this.decorationsController = new DecorationsController(this);
+    this.options = {
+      ...defaultEditorOptions,
+      ...options,
+    };
 
     setupMonacoTheme();
 
@@ -51,7 +55,7 @@ export default class Editor {
 
       this.disposable.add(
         (this.instance = monacoEditor.create(domElement, {
-          ...defaultEditorOptions,
+          ...this.options,
         })),
         (this.dirtyDiffController = new DirtyDiffController(
           this.modelManager,
@@ -71,7 +75,7 @@ export default class Editor {
 
       this.disposable.add(
         (this.instance = monacoEditor.createDiffEditor(domElement, {
-          ...defaultEditorOptions,
+          ...this.options,
           quickSuggestions: false,
           occurrencesHighlight: false,
           renderSideBySide: Editor.renderSideBySide(domElement),