Commit fb5f908d authored by Phil Hughes's avatar Phil Hughes

Enable word wrap in IDE

Closes #44303
parent 1d7ca033
...@@ -6,6 +6,7 @@ export const defaultEditorOptions = { ...@@ -6,6 +6,7 @@ export const defaultEditorOptions = {
minimap: { minimap: {
enabled: false, enabled: false,
}, },
wordWrap: 'bounded',
}; };
export default [ export default [
......
...@@ -64,9 +64,7 @@ describe('Multi-file editor library', () => { ...@@ -64,9 +64,7 @@ describe('Multi-file editor library', () => {
instance.createDiffInstance(holder); instance.createDiffInstance(holder);
expect(instance.monaco.editor.createDiffEditor).toHaveBeenCalledWith( expect(instance.monaco.editor.createDiffEditor).toHaveBeenCalledWith(holder, {
holder,
{
model: null, model: null,
contextmenu: true, contextmenu: true,
minimap: { minimap: {
...@@ -78,8 +76,8 @@ describe('Multi-file editor library', () => { ...@@ -78,8 +76,8 @@ describe('Multi-file editor library', () => {
occurrencesHighlight: false, occurrencesHighlight: false,
renderLineHighlight: 'none', renderLineHighlight: 'none',
hideCursorInOverviewRuler: true, hideCursorInOverviewRuler: true,
}, wordWrap: 'bounded',
); });
}); });
}); });
...@@ -117,9 +115,7 @@ describe('Multi-file editor library', () => { ...@@ -117,9 +115,7 @@ describe('Multi-file editor library', () => {
}); });
it('sets original & modified when diff editor', () => { it('sets original & modified when diff editor', () => {
spyOn(instance.instance, 'getEditorType').and.returnValue( spyOn(instance.instance, 'getEditorType').and.returnValue('vs.editor.IDiffEditor');
'vs.editor.IDiffEditor',
);
spyOn(instance.instance, 'setModel'); spyOn(instance.instance, 'setModel');
instance.attachModel(model); instance.attachModel(model);
...@@ -135,9 +131,7 @@ describe('Multi-file editor library', () => { ...@@ -135,9 +131,7 @@ describe('Multi-file editor library', () => {
instance.attachModel(model); instance.attachModel(model);
expect(instance.dirtyDiffController.attachModel).toHaveBeenCalledWith( expect(instance.dirtyDiffController.attachModel).toHaveBeenCalledWith(model);
model,
);
}); });
it('re-decorates with the dirty diff controller', () => { it('re-decorates with the dirty diff controller', () => {
...@@ -145,9 +139,7 @@ describe('Multi-file editor library', () => { ...@@ -145,9 +139,7 @@ describe('Multi-file editor library', () => {
instance.attachModel(model); instance.attachModel(model);
expect(instance.dirtyDiffController.reDecorate).toHaveBeenCalledWith( expect(instance.dirtyDiffController.reDecorate).toHaveBeenCalledWith(model);
model,
);
}); });
}); });
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment