diff options
author | Isaac Smith <isaac@isrv.pw> | 2018-06-15 13:22:56 -0500 |
---|---|---|
committer | Isaac Smith <isaac@isrv.pw> | 2018-06-15 13:22:56 -0500 |
commit | 5104098fab7f72fff15d5e1a69f1597391b59b31 (patch) | |
tree | ac7cf630ecc6874a7ffb19c6f32491f40ccb6472 | |
parent | 15ad1a9767d5f6a5e45073d2463f9a4597185e77 (diff) | |
download | gitlab-ce-5104098fab7f72fff15d5e1a69f1597391b59b31.tar.gz |
Fix #47796 "Web IDE autocomplete should be disabled in markdown files"
-rw-r--r-- | app/assets/javascripts/ide/lib/editor_options.js | 1 | ||||
-rw-r--r-- | changelogs/unreleased/fix-web-ide-disable-markdown-autocomplete.yml | 5 | ||||
-rw-r--r-- | spec/javascripts/ide/lib/editor_spec.js | 19 |
3 files changed, 25 insertions, 0 deletions
diff --git a/app/assets/javascripts/ide/lib/editor_options.js b/app/assets/javascripts/ide/lib/editor_options.js index 9f895d49f2e..e35595ab1fd 100644 --- a/app/assets/javascripts/ide/lib/editor_options.js +++ b/app/assets/javascripts/ide/lib/editor_options.js @@ -12,5 +12,6 @@ export const defaultEditorOptions = { export default [ { readOnly: model => !!model.file.file_lock, + quickSuggestions: model => !(model.language === 'markdown'), }, ]; diff --git a/changelogs/unreleased/fix-web-ide-disable-markdown-autocomplete.yml b/changelogs/unreleased/fix-web-ide-disable-markdown-autocomplete.yml new file mode 100644 index 00000000000..6a4d9b6c8c4 --- /dev/null +++ b/changelogs/unreleased/fix-web-ide-disable-markdown-autocomplete.yml @@ -0,0 +1,5 @@ +--- +title: Disabled Web IDE autocomplete suggestions for Markdown files. +merge_request: +author: Isaac Smith +type: fixed diff --git a/spec/javascripts/ide/lib/editor_spec.js b/spec/javascripts/ide/lib/editor_spec.js index c1932284d53..c2cb964ea87 100644 --- a/spec/javascripts/ide/lib/editor_spec.js +++ b/spec/javascripts/ide/lib/editor_spec.js @@ -263,4 +263,23 @@ describe('Multi-file editor library', () => { expect(instance.isDiffEditorType).toBe(false); }); }); + + it('sets quickSuggestions to false when language is markdown', () => { + instance.createInstance(holder); + + spyOn(instance.instance, 'updateOptions').and.callThrough(); + + const model = instance.createModel({ + ...file(), + key: 'index.md', + path: 'index.md', + }); + + instance.attachModel(model); + + expect(instance.instance.updateOptions).toHaveBeenCalledWith({ + readOnly: false, + quickSuggestions: false, + }); + }); }); |