Skip to content
Snippets Groups Projects
Commit b9ef51ee authored by Tim Zallmann's avatar Tim Zallmann
Browse files

Merge branch 'ide-wordwrap' into 'master'

Enable word wrap in IDE

Closes #44303

See merge request gitlab-org/gitlab-ce!17994
parents c113b700 fb5f908d
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -6,6 +6,7 @@ export const defaultEditorOptions = {
minimap: {
enabled: false,
},
wordWrap: 'bounded',
};
 
export default [
Loading
Loading
Loading
Loading
@@ -64,22 +64,20 @@ describe('Multi-file editor library', () => {
 
instance.createDiffInstance(holder);
 
expect(instance.monaco.editor.createDiffEditor).toHaveBeenCalledWith(
holder,
{
model: null,
contextmenu: true,
minimap: {
enabled: false,
},
readOnly: true,
scrollBeyondLastLine: false,
quickSuggestions: false,
occurrencesHighlight: false,
renderLineHighlight: 'none',
hideCursorInOverviewRuler: true,
expect(instance.monaco.editor.createDiffEditor).toHaveBeenCalledWith(holder, {
model: null,
contextmenu: true,
minimap: {
enabled: false,
},
);
readOnly: true,
scrollBeyondLastLine: false,
quickSuggestions: false,
occurrencesHighlight: false,
renderLineHighlight: 'none',
hideCursorInOverviewRuler: true,
wordWrap: 'bounded',
});
});
});
 
Loading
Loading
@@ -117,9 +115,7 @@ describe('Multi-file editor library', () => {
});
 
it('sets original & modified when diff editor', () => {
spyOn(instance.instance, 'getEditorType').and.returnValue(
'vs.editor.IDiffEditor',
);
spyOn(instance.instance, 'getEditorType').and.returnValue('vs.editor.IDiffEditor');
spyOn(instance.instance, 'setModel');
 
instance.attachModel(model);
Loading
Loading
@@ -135,9 +131,7 @@ describe('Multi-file editor library', () => {
 
instance.attachModel(model);
 
expect(instance.dirtyDiffController.attachModel).toHaveBeenCalledWith(
model,
);
expect(instance.dirtyDiffController.attachModel).toHaveBeenCalledWith(model);
});
 
it('re-decorates with the dirty diff controller', () => {
Loading
Loading
@@ -145,9 +139,7 @@ describe('Multi-file editor library', () => {
 
instance.attachModel(model);
 
expect(instance.dirtyDiffController.reDecorate).toHaveBeenCalledWith(
model,
);
expect(instance.dirtyDiffController.reDecorate).toHaveBeenCalledWith(model);
});
});
 
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment