Toggle Word Wrap can unwrap also minified files (#21552)

src/vs/editor/common/config/commonEditorConfig.ts

@@ -194,6 +194,7 @@ class InternalEditorOptionsHelper {
 		{
 			let wordWrap = opts.wordWrap;
 			let wordWrapColumn = toInteger(opts.wordWrapColumn, 1);
+			let wordWrapMinified = toBoolean(opts.wordWrapMinified);
 
 			// Compatibility with old true or false values
 			if (<any>wordWrap === true) {
@@ -202,7 +203,7 @@ class InternalEditorOptionsHelper {
 				wordWrap = 'off';
 			}
 
-			if (isDominatedByLongLines) {
+			if (wordWrapMinified && isDominatedByLongLines) {
 				// Force viewport width wrapping if model is dominated by long lines
 				bareWrappingInfo = {
 					isViewportWrapping: true,

src/vs/editor/common/config/defaultConfig.ts

@@ -74,6 +74,7 @@ class ConfigClass implements IConfiguration {
 			automaticLayout: false,
 			wordWrap: 'off',
 			wordWrapColumn: 80,
+			wordWrapMinified: true,
 			wrappingIndent: 'same',
 			wordWrapBreakBeforeCharacters: '([{‘“〈《「『【〔（［｛｢£¥＄￡￥+＋',
 			wordWrapBreakAfterCharacters: ' \t})]?|&,;¢°′″‰℃、。｡､￠，．：；？！％・･ゝゞヽヾーァィゥェォッャュョヮヵヶぁぃぅぇぉっゃゅょゎゕゖㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿ々〻ｧｨｩｪｫｬｭｮｯｰ’”〉》」』】〕）］｝｣',

src/vs/editor/common/editorCommon.ts

@@ -357,6 +357,11 @@ export interface IEditorOptions {
 	 * Defaults to 80.
 	 */
 	wordWrapColumn?: number;
+	/**
+	 * Force word wrapping when the text appears to be of a minified/generated file.
+	 * Defaults to true.
+	 */
+	wordWrapMinified?: boolean;
 	/**
 	 * Control indentation of wrapped lines. Can be: 'none', 'same' or 'indent'.
 	 * Defaults to 'same' in vscode and to 'none' in monaco-editor.

src/vs/monaco.d.ts

@@ -1279,6 +1279,11 @@ declare module monaco.editor {
          * Defaults to 80.
          */
         wordWrapColumn?: number;
+        /**
+         * Force word wrapping when the text appears to be of a minified/generated file.
+         * Defaults to true.
+         */
+        wordWrapMinified?: boolean;
         /**
          * Control indentation of wrapped lines. Can be: 'none', 'same' or 'indent'.
          * Defaults to 'same' in vscode and to 'none' in monaco-editor.

src/vs/workbench/parts/codeEditor/electron-browser/toggleWordWrap.ts

@@ -28,14 +28,18 @@ class ToggleWordWrapAction extends EditorAction {
 	public run(accessor: ServicesAccessor, editor: ICommonCodeEditor): void {
 		let wrappingInfo = editor.getConfiguration().wrappingInfo;
 		let newWordWrap: 'on' | 'off';
+		let newWordWrapMinified: boolean;
 		if (!wrappingInfo.isViewportWrapping) {
 			newWordWrap = 'on';
+			newWordWrapMinified = true;
 		} else {
 			newWordWrap = 'off';
+			newWordWrapMinified = false;
 		}
 
 		editor.updateOptions({
-			wordWrap: newWordWrap
+			wordWrap: newWordWrap,
+			wordWrapMinified: newWordWrapMinified
 		});
 	}
 }