Merge from vscode 5e80bf449c995aa32a59254c0ff845d37da11b70 (#9317)

src/vs/monaco.d.ts

@@ -3031,6 +3031,11 @@ declare namespace monaco.editor {
 		 * 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'.
@@ -3824,85 +3829,86 @@ declare namespace monaco.editor {
 		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
 	}
 	export const EditorOptions: {
 		acceptSuggestionOnCommitCharacter: IEditorOption<EditorOption.acceptSuggestionOnCommitCharacter, boolean>;
@@ -3939,6 +3945,7 @@ declare namespace monaco.editor {
 		folding: IEditorOption<EditorOption.folding, boolean>;
 		foldingStrategy: IEditorOption<EditorOption.foldingStrategy, 'auto' | 'indentation'>;
 		foldingHighlight: IEditorOption<EditorOption.foldingHighlight, boolean>;
+		unfoldOnClickInEmptyContent: IEditorOption<EditorOption.unfoldOnClickInEmptyContent, boolean>;
 		fontFamily: IEditorOption<EditorOption.fontFamily, string>;
 		fontInfo: IEditorOption<EditorOption.fontInfo, FontInfo>;
 		fontLigatures2: IEditorOption<EditorOption.fontLigatures, string>;