[folding] add setting to allow clicking in empty space to unfold. Fixes microsoft#88522

aeschli · aeschli · commit 03b30ff3ccee · 2020-02-23T21:15:13.000+01:00
diff --git a/src/vs/editor/common/config/editorOptions.ts b/src/vs/editor/common/config/editorOptions.ts
@@ -506,6 +506,11 @@ export interface IEditorOptions {
 	 * Defaults to 'mouseover'.
 	 */
 	showFoldingControls?: 'always' | 'mouseover';
+	/**
+	 * Controls whether clicking on the empty content after a folded line will unfold the line.
+	 * Defaults to false.
+	 */
+	unfoldOnClickInEmptyContent?: boolean;
 	/**
 	 * Enable highlighting of matching brackets.
 	 * Defaults to 'always'.
@@ -3320,6 +3325,7 @@ export const enum EditorOption {
 	folding,
 	foldingStrategy,
 	foldingHighlight,
+	unfoldOnClickInEmptyContent,
 	fontFamily,
 	fontInfo,
 	fontLigatures,
@@ -3619,6 +3625,10 @@ export const EditorOptions = {
 		EditorOption.foldingHighlight, 'foldingHighlight', true,
 		{ description: nls.localize('foldingHighlight', "Controls whether the editor should highlight folded ranges.") }
 	)),
+	unfoldOnClickInEmptyContent: register(new EditorBooleanOption(
+		EditorOption.unfoldOnClickInEmptyContent, 'unfoldOnClickInEmptyContent', false,
+		{ description: nls.localize('unfoldOnClickInEmptyContent', "Controls whether clicking on the empty content after a folded line will unfold the line.") }
+	)),
 	fontFamily: register(new EditorStringOption(
 		EditorOption.fontFamily, 'fontFamily', EDITOR_FONT_DEFAULTS.fontFamily,
 		{ description: nls.localize('fontFamily', "Controls the font family.") }
diff --git a/src/vs/editor/common/standalone/standaloneEnums.ts b/src/vs/editor/common/standalone/standaloneEnums.ts
@@ -199,85 +199,86 @@ export enum EditorOption {
 	folding = 31,
 	foldingStrategy = 32,
 	foldingHighlight = 33,
-	fontFamily = 34,
-	fontInfo = 35,
-	fontLigatures = 36,
-	fontSize = 37,
-	fontWeight = 38,
-	formatOnPaste = 39,
-	formatOnType = 40,
-	glyphMargin = 41,
-	gotoLocation = 42,
-	hideCursorInOverviewRuler = 43,
-	highlightActiveIndentGuide = 44,
-	hover = 45,
-	inDiffEditor = 46,
-	letterSpacing = 47,
-	lightbulb = 48,
-	lineDecorationsWidth = 49,
-	lineHeight = 50,
-	lineNumbers = 51,
-	lineNumbersMinChars = 52,
-	links = 53,
-	matchBrackets = 54,
-	minimap = 55,
-	mouseStyle = 56,
-	mouseWheelScrollSensitivity = 57,
-	mouseWheelZoom = 58,
-	multiCursorMergeOverlapping = 59,
-	multiCursorModifier = 60,
-	multiCursorPaste = 61,
-	occurrencesHighlight = 62,
-	overviewRulerBorder = 63,
-	overviewRulerLanes = 64,
-	padding = 65,
-	parameterHints = 66,
-	peekWidgetDefaultFocus = 67,
-	definitionLinkOpensInPeek = 68,
-	quickSuggestions = 69,
-	quickSuggestionsDelay = 70,
-	readOnly = 71,
-	renderControlCharacters = 72,
-	renderIndentGuides = 73,
-	renderFinalNewline = 74,
-	renderLineHighlight = 75,
-	renderValidationDecorations = 76,
-	renderWhitespace = 77,
-	revealHorizontalRightPadding = 78,
-	roundedSelection = 79,
-	rulers = 80,
-	scrollbar = 81,
-	scrollBeyondLastColumn = 82,
-	scrollBeyondLastLine = 83,
-	scrollPredominantAxis = 84,
-	selectionClipboard = 85,
-	selectionHighlight = 86,
-	selectOnLineNumbers = 87,
-	showFoldingControls = 88,
-	showUnused = 89,
-	snippetSuggestions = 90,
-	smoothScrolling = 91,
-	stopRenderingLineAfter = 92,
-	suggest = 93,
-	suggestFontSize = 94,
-	suggestLineHeight = 95,
-	suggestOnTriggerCharacters = 96,
-	suggestSelection = 97,
-	tabCompletion = 98,
-	useTabStops = 99,
-	wordSeparators = 100,
-	wordWrap = 101,
-	wordWrapBreakAfterCharacters = 102,
-	wordWrapBreakBeforeCharacters = 103,
-	wordWrapColumn = 104,
-	wordWrapMinified = 105,
-	wrappingIndent = 106,
-	wrappingStrategy = 107,
-	editorClassName = 108,
-	pixelRatio = 109,
-	tabFocusMode = 110,
-	layoutInfo = 111,
-	wrappingInfo = 112
+	unfoldOnClickInEmptyContent = 34,
+	fontFamily = 35,
+	fontInfo = 36,
+	fontLigatures = 37,
+	fontSize = 38,
+	fontWeight = 39,
+	formatOnPaste = 40,
+	formatOnType = 41,
+	glyphMargin = 42,
+	gotoLocation = 43,
+	hideCursorInOverviewRuler = 44,
+	highlightActiveIndentGuide = 45,
+	hover = 46,
+	inDiffEditor = 47,
+	letterSpacing = 48,
+	lightbulb = 49,
+	lineDecorationsWidth = 50,
+	lineHeight = 51,
+	lineNumbers = 52,
+	lineNumbersMinChars = 53,
+	links = 54,
+	matchBrackets = 55,
+	minimap = 56,
+	mouseStyle = 57,
+	mouseWheelScrollSensitivity = 58,
+	mouseWheelZoom = 59,
+	multiCursorMergeOverlapping = 60,
+	multiCursorModifier = 61,
+	multiCursorPaste = 62,
+	occurrencesHighlight = 63,
+	overviewRulerBorder = 64,
+	overviewRulerLanes = 65,
+	padding = 66,
+	parameterHints = 67,
+	peekWidgetDefaultFocus = 68,
+	definitionLinkOpensInPeek = 69,
+	quickSuggestions = 70,
+	quickSuggestionsDelay = 71,
+	readOnly = 72,
+	renderControlCharacters = 73,
+	renderIndentGuides = 74,
+	renderFinalNewline = 75,
+	renderLineHighlight = 76,
+	renderValidationDecorations = 77,
+	renderWhitespace = 78,
+	revealHorizontalRightPadding = 79,
+	roundedSelection = 80,
+	rulers = 81,
+	scrollbar = 82,
+	scrollBeyondLastColumn = 83,
+	scrollBeyondLastLine = 84,
+	scrollPredominantAxis = 85,
+	selectionClipboard = 86,
+	selectionHighlight = 87,
+	selectOnLineNumbers = 88,
+	showFoldingControls = 89,
+	showUnused = 90,
+	snippetSuggestions = 91,
+	smoothScrolling = 92,
+	stopRenderingLineAfter = 93,
+	suggest = 94,
+	suggestFontSize = 95,
+	suggestLineHeight = 96,
+	suggestOnTriggerCharacters = 97,
+	suggestSelection = 98,
+	tabCompletion = 99,
+	useTabStops = 100,
+	wordSeparators = 101,
+	wordWrap = 102,
+	wordWrapBreakAfterCharacters = 103,
+	wordWrapBreakBeforeCharacters = 104,
+	wordWrapColumn = 105,
+	wordWrapMinified = 106,
+	wrappingIndent = 107,
+	wrappingStrategy = 108,
+	editorClassName = 109,
+	pixelRatio = 110,
+	tabFocusMode = 111,
+	layoutInfo = 112,
+	wrappingInfo = 113
 }
 
 /**
diff --git a/src/vs/editor/contrib/folding/folding.ts b/src/vs/editor/contrib/folding/folding.ts
@@ -19,7 +19,7 @@ import { FoldingDecorationProvider } from './foldingDecorations';
 import { FoldingRegions, FoldingRegion } from './foldingRanges';
 import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
 import { ConfigurationChangedEvent, EditorOption } from 'vs/editor/common/config/editorOptions';
-import { IMarginData } from 'vs/editor/browser/controller/mouseTarget';
+import { IMarginData, IEmptyContentData } from 'vs/editor/browser/controller/mouseTarget';
 import { HiddenRangeModel } from 'vs/editor/contrib/folding/hiddenRangeModel';
 import { IRange } from 'vs/editor/common/core/range';
 import { LanguageConfigurationRegistry } from 'vs/editor/common/modes/languageConfigurationRegistry';
@@ -62,6 +62,7 @@ export class FoldingController extends Disposable implements IEditorContribution
 	private readonly editor: ICodeEditor;
 	private _isEnabled: boolean;
 	private _useFoldingProviders: boolean;
+	private _unfoldOnClickInEmptyContent: boolean;
 
 	private readonly foldingDecorationProvider: FoldingDecorationProvider;
 
@@ -91,6 +92,7 @@ export class FoldingController extends Disposable implements IEditorContribution
 		const options = this.editor.getOptions();
 		this._isEnabled = options.get(EditorOption.folding);
 		this._useFoldingProviders = options.get(EditorOption.foldingStrategy) !== 'indentation';
+		this._unfoldOnClickInEmptyContent = options.get(EditorOption.unfoldOnClickInEmptyContent);
 
 		this.foldingModel = null;
 		this.hiddenRangeModel = null;
@@ -128,6 +130,9 @@ export class FoldingController extends Disposable implements IEditorContribution
 				this._useFoldingProviders = options.get(EditorOption.foldingStrategy) !== 'indentation';
 				this.onFoldingStrategyChanged();
 			}
+			if (e.hasChanged(EditorOption.unfoldOnClickInEmptyContent)) {
+				this._unfoldOnClickInEmptyContent = options.get(EditorOption.unfoldOnClickInEmptyContent);
+			}
 		}));
 		this.onModelChanged();
 	}
@@ -364,6 +369,15 @@ export class FoldingController extends Disposable implements IEditorContribution
 
 				iconClicked = true;
 				break;
+			case MouseTargetType.CONTENT_EMPTY: {
+				if (this._unfoldOnClickInEmptyContent && this.hiddenRangeModel.hasRanges()) {
+					const data = e.target.detail as IEmptyContentData;
+					if (!data.isAfterLines) {
+						break;
+					}
+				}
+				return;
+			}
 			case MouseTargetType.CONTENT_TEXT: {
 				if (this.hiddenRangeModel.hasRanges()) {
 					let model = this.editor.getModel();
diff --git a/src/vs/monaco.d.ts b/src/vs/monaco.d.ts
