Merge from vscode 33a65245075e4d18908652865a79cf5489c30f40 (#9279)

* Merge from vscode 33a65245075e4d18908652865a79cf5489c30f40 * remove github
2026-02-16 10:58:30 -05:00 · 2020-02-21 23:42:19 -08:00
parent c446cea3a0
commit de5f1eb780
250 changed files with 3724 additions and 2756 deletions
--- a/src/vs/monaco.d.ts
+++ b/src/vs/monaco.d.ts
@@ -1884,7 +1884,7 @@ declare namespace monaco.editor {
 		 * @param cursorStateComputer A callback that can compute the resulting cursors state after the edit operations have been executed.
 		 * @return The cursor state returned by the `cursorStateComputer`.
 		 */
-		pushEditOperations(beforeCursorState: Selection[], editOperations: IIdentifiedSingleEditOperation[], cursorStateComputer: ICursorStateComputer): Selection[] | null;
+		pushEditOperations(beforeCursorState: Selection[] | null, editOperations: IIdentifiedSingleEditOperation[], cursorStateComputer: ICursorStateComputer): Selection[] | null;
 		/**
 		 * Change the end of line sequence. This is the preferred way of
 		 * changing the eol sequence. This will land on the undo stack.
@@ -2849,6 +2849,11 @@ declare namespace monaco.editor {
 		 * Defaults to true.
 		 */
 		scrollPredominantAxis?: boolean;
+		/**
+		 * Enable that the selection with the mouse and keys is doing column selection.
+		 * Defaults to false.
+		 */
+		columnSelection?: boolean;
 		/**
 		 * The modifier to be used to add multiple cursors with the mouse.
 		 * Defaults to 'alt'
@@ -3798,105 +3803,106 @@ declare namespace monaco.editor {
 		autoSurround = 10,
 		codeLens = 11,
 		colorDecorators = 12,
-		comments = 13,
-		contextmenu = 14,
-		copyWithSyntaxHighlighting = 15,
-		cursorBlinking = 16,
-		cursorSmoothCaretAnimation = 17,
-		cursorStyle = 18,
-		cursorSurroundingLines = 19,
-		cursorSurroundingLinesStyle = 20,
-		cursorWidth = 21,
-		disableLayerHinting = 22,
-		disableMonospaceOptimizations = 23,
-		dragAndDrop = 24,
-		emptySelectionClipboard = 25,
-		extraEditorClassName = 26,
-		fastScrollSensitivity = 27,
-		find = 28,
-		fixedOverflowWidgets = 29,
-		folding = 30,
-		foldingStrategy = 31,
-		foldingHighlight = 32,
-		fontFamily = 33,
-		fontInfo = 34,
-		fontLigatures = 35,
-		fontSize = 36,
-		fontWeight = 37,
-		formatOnPaste = 38,
-		formatOnType = 39,
-		glyphMargin = 40,
-		gotoLocation = 41,
-		hideCursorInOverviewRuler = 42,
-		highlightActiveIndentGuide = 43,
-		hover = 44,
-		inDiffEditor = 45,
-		letterSpacing = 46,
-		lightbulb = 47,
-		lineDecorationsWidth = 48,
-		lineHeight = 49,
-		lineNumbers = 50,
-		lineNumbersMinChars = 51,
-		links = 52,
-		matchBrackets = 53,
-		minimap = 54,
-		mouseStyle = 55,
-		mouseWheelScrollSensitivity = 56,
-		mouseWheelZoom = 57,
-		multiCursorMergeOverlapping = 58,
-		multiCursorModifier = 59,
-		multiCursorPaste = 60,
-		occurrencesHighlight = 61,
-		overviewRulerBorder = 62,
-		overviewRulerLanes = 63,
-		padding = 64,
-		parameterHints = 65,
-		peekWidgetDefaultFocus = 66,
-		definitionLinkOpensInPeek = 67,
-		quickSuggestions = 68,
-		quickSuggestionsDelay = 69,
-		readOnly = 70,
-		renderControlCharacters = 71,
-		renderIndentGuides = 72,
-		renderFinalNewline = 73,
-		renderLineHighlight = 74,
-		renderValidationDecorations = 75,
-		renderWhitespace = 76,
-		revealHorizontalRightPadding = 77,
-		roundedSelection = 78,
-		rulers = 79,
-		scrollbar = 80,
-		scrollBeyondLastColumn = 81,
-		scrollBeyondLastLine = 82,
-		scrollPredominantAxis = 83,
-		selectionClipboard = 84,
-		selectionHighlight = 85,
-		selectOnLineNumbers = 86,
-		showFoldingControls = 87,
-		showUnused = 88,
-		snippetSuggestions = 89,
-		smoothScrolling = 90,
-		stopRenderingLineAfter = 91,
-		suggest = 92,
-		suggestFontSize = 93,
-		suggestLineHeight = 94,
-		suggestOnTriggerCharacters = 95,
-		suggestSelection = 96,
-		tabCompletion = 97,
-		useTabStops = 98,
-		wordSeparators = 99,
-		wordWrap = 100,
-		wordWrapBreakAfterCharacters = 101,
-		wordWrapBreakBeforeCharacters = 102,
-		wordWrapColumn = 103,
-		wordWrapMinified = 104,
-		wrappingIndent = 105,
-		wrappingStrategy = 106,
-		editorClassName = 107,
-		pixelRatio = 108,
-		tabFocusMode = 109,
-		layoutInfo = 110,
-		wrappingInfo = 111
+		columnSelection = 13,
+		comments = 14,
+		contextmenu = 15,
+		copyWithSyntaxHighlighting = 16,
+		cursorBlinking = 17,
+		cursorSmoothCaretAnimation = 18,
+		cursorStyle = 19,
+		cursorSurroundingLines = 20,
+		cursorSurroundingLinesStyle = 21,
+		cursorWidth = 22,
+		disableLayerHinting = 23,
+		disableMonospaceOptimizations = 24,
+		dragAndDrop = 25,
+		emptySelectionClipboard = 26,
+		extraEditorClassName = 27,
+		fastScrollSensitivity = 28,
+		find = 29,
+		fixedOverflowWidgets = 30,
+		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
 	}
 	export const EditorOptions: {
 		acceptSuggestionOnCommitCharacter: IEditorOption<EditorOption.acceptSuggestionOnCommitCharacter, boolean>;
@@ -3912,6 +3918,7 @@ declare namespace monaco.editor {
 		autoSurround: IEditorOption<EditorOption.autoSurround, EditorAutoSurroundStrategy>;
 		codeLens: IEditorOption<EditorOption.codeLens, boolean>;
 		colorDecorators: IEditorOption<EditorOption.colorDecorators, boolean>;
+		columnSelection: IEditorOption<EditorOption.columnSelection, boolean>;
 		comments: IEditorOption<EditorOption.comments, EditorCommentsOptions>;
 		contextmenu: IEditorOption<EditorOption.contextmenu, boolean>;
 		copyWithSyntaxHighlighting: IEditorOption<EditorOption.copyWithSyntaxHighlighting, boolean>;