added editor options to redcue EE conflicts
This commit is contained in:
parent
d22bb0397b
commit
1880809d8e
3 changed files with 19 additions and 0 deletions
|
@ -2,6 +2,7 @@ import DecorationsController from './decorations/controller';
|
|||
import DirtyDiffController from './diff/controller';
|
||||
import Disposable from './common/disposable';
|
||||
import ModelManager from './common/model_manager';
|
||||
import editorOptions from './editor_options';
|
||||
|
||||
export default class Editor {
|
||||
static create(monaco) {
|
||||
|
@ -49,6 +50,15 @@ export default class Editor {
|
|||
|
||||
this.currentModel = model;
|
||||
|
||||
this.instance.updateOptions(editorOptions.reduce((acc, obj) => {
|
||||
Object.keys(obj).forEach((key) => {
|
||||
Object.assign(acc, {
|
||||
[key]: obj[key](model),
|
||||
});
|
||||
});
|
||||
return acc;
|
||||
}, {}));
|
||||
|
||||
this.dirtyDiffController.reDecorate(model);
|
||||
}
|
||||
|
||||
|
|
2
app/assets/javascripts/repo/lib/editor_options.js
Normal file
2
app/assets/javascripts/repo/lib/editor_options.js
Normal file
|
@ -0,0 +1,2 @@
|
|||
export default [{
|
||||
}];
|
7
spec/javascripts/repo/lib/editor_options_spec.js
Normal file
7
spec/javascripts/repo/lib/editor_options_spec.js
Normal file
|
@ -0,0 +1,7 @@
|
|||
import editorOptions from '~/repo/lib/editor_options';
|
||||
|
||||
describe('Multi-file editor library editor options', () => {
|
||||
it('returns an array', () => {
|
||||
expect(editorOptions).toEqual(jasmine.any(Array));
|
||||
});
|
||||
});
|
Loading…
Reference in a new issue