paste empty selection includes newline

BartolHrg · BartolHrg · commit 9457274b4894 · 2026-01-10T19:28:18.000+01:00
diff --git a/src/vs/editor/common/config/editorOptions.ts b/src/vs/editor/common/config/editorOptions.ts
@@ -850,6 +850,11 @@ export interface IEditorOptions {
 	 * Controls whether the accessibility hint should be provided to screen reader users when an inline completion is shown.
 	 */
 	inlineCompletionsAccessibilityVerbose?: boolean;
+	/**
+	 * Configure the behaviour when copy-pasting empty selection.
+	 * Defaults to 'always'.
+	 */
+	pasteEmptySelectionIncludesNewline?: 'always' | 'never' | 'singleOnly' | 'multipleOnly';
 }
 
 /**
@@ -5896,7 +5901,8 @@ export const enum EditorOption {
 	inlineCompletionsAccessibilityVerbose,
 	effectiveEditContext,
 	scrollOnMiddleClick,
-	effectiveAllowVariableFonts
+	effectiveAllowVariableFonts,
+	pasteEmptySelectionIncludesNewline,
 }
 
 export const EditorOptions = {
@@ -6804,7 +6810,21 @@ export const EditorOptions = {
 	wrappingIndent: register(new WrappingIndentOption()),
 	wrappingStrategy: register(new WrappingStrategy()),
 	effectiveEditContextEnabled: register(new EffectiveEditContextEnabled()),
-	effectiveAllowVariableFonts: register(new EffectiveAllowVariableFonts())
+	effectiveAllowVariableFonts: register(new EffectiveAllowVariableFonts()),
+	pasteEmptySelectionIncludesNewline: register(new EditorStringEnumOption(
+		EditorOption.pasteEmptySelectionIncludesNewline, 'pasteEmptySelectionIncludesNewline',
+		'always' as 'always' | 'never' | 'singleOnly' | 'multipleOnly',
+		['always', 'never', 'singleOnly', 'multipleOnly'] as const,
+		{
+			markdownEnumDescriptions: [
+				nls.localize('pasteEmptySelectionIncludesNewline.always', "Both single & multiple cursors paste with '\n' when copying empty selection"),
+				nls.localize('pasteEmptySelectionIncludesNewline.never', "Both single & multiple cursors trim '\n' from the end when copying empty selection"),
+				nls.localize('pasteEmptySelectionIncludesNewline.singleOnly', "Multiple cursors trim '\n' from the end when copying empty selection"),
+				nls.localize('pasteEmptySelectionIncludesNewline.multipleOnly', "Single cursor trims '\n' from the end when copying empty selection"),
+			],
+			markdownDescription: nls.localize('pasteEmptySelectionIncludesNewline', "Include '\n' character when copying empty selection")
+		}
+	)),
 };
 
 type EditorOptionsType = typeof EditorOptions;
diff --git a/src/vs/editor/common/cursor/cursorTypeEditOperations.ts b/src/vs/editor/common/cursor/cursorTypeEditOperations.ts
@@ -655,11 +655,17 @@ export class PasteOperation {
 
 	public static getEdits(config: CursorConfiguration, model: ICursorSimpleModel, selections: Selection[], text: string, pasteOnNewLine: boolean[] | null, multicursorText: string[]) {
 		const distributedPaste = this._distributePasteToCursors(config, selections, text, pasteOnNewLine, multicursorText);
+		const [singleIncludeNewline, multipleIncludeNewline] = {
+			'always': [true, true],
+			'never': [false, false],
+			'singleOnly': [true, false],
+			'multipleOnly': [false, true]
+		}[config.pasteEmptySelectionIncludesNewline];
 		if (distributedPaste) {
 			selections.sort(Range.compareRangesUsingStarts);
-			return this._distributedPaste(config, model, selections, distributedPaste, pasteOnNewLine);
+			return this._distributedPaste(config, model, selections, distributedPaste, pasteOnNewLine, multipleIncludeNewline);
 		} else {
-			return this._simplePaste(config, model, selections, text, pasteOnNewLine);
+			return this._simplePaste(config, model, selections, text, pasteOnNewLine, singleIncludeNewline);
 		}
 	}
 
@@ -688,15 +694,21 @@ export class PasteOperation {
 		return null;
 	}
 
-	private static _distributedPaste(config: CursorConfiguration, model: ICursorSimpleModel, selections: Selection[], texts: string[], pasteOnNewLine: boolean[] | null): EditOperationResult {
+	private static _distributedPaste(config: CursorConfiguration, model: ICursorSimpleModel, selections: Selection[], texts: string[], pasteOnNewLine: boolean[] | null, includeNewline: boolean): EditOperationResult {
 		if (!pasteOnNewLine) {
 			pasteOnNewLine = [];
 		}
 		const commands: ICommand[] = [];
 		for (let i = 0, len = selections.length; i < len; i++) {
 			const selection = selections[i];
-			const text = texts[i];
+			let text = texts[i];
 			const position = selection.getPosition();
+			if (!includeNewline) {
+				text = text.slice(0, text.length - 1);
+				if (text[text.length - 1] === '\r') {
+					text = text.slice(0, text.length - 1);
+				}
+			}
 			if (pasteOnNewLine[i] && selection.isEmpty() && text.indexOf('\n') === text.length - 1) {
 				// Paste entire line at the beginning of line
 				const typeSelection = new Range(position.lineNumber, 1, position.lineNumber, 1);
@@ -713,10 +725,16 @@ export class PasteOperation {
 		});
 	}
 
-	private static _simplePaste(config: CursorConfiguration, model: ICursorSimpleModel, selections: Selection[], text: string, pasteOnNewLine: boolean[] | null): EditOperationResult {
+	private static _simplePaste(config: CursorConfiguration, model: ICursorSimpleModel, selections: Selection[], text: string, pasteOnNewLine: boolean[] | null, includeNewline: boolean): EditOperationResult {
 		const commands: ICommand[] = [];
 		const singleCopyPasteOnNewLine = pasteOnNewLine?.length === 1 && pasteOnNewLine[0];
 		if (!pasteOnNewLine) { pasteOnNewLine = []; }
+		if (!includeNewline && text[text.length - 1] === '\n') {
+			text = text.slice(0, text.length - 1);
+			if (text[text.length - 1] === '\r') {
+				text = text.slice(0, text.length - 1);
+			}
+		}
 		for (let i = 0, len = selections.length; i < len; i++) {
 			const selection = selections[i];
 			const position = selection.getPosition();
diff --git a/src/vs/editor/common/cursorCommon.ts b/src/vs/editor/common/cursorCommon.ts
@@ -80,6 +80,7 @@ export class CursorConfiguration {
 	public readonly shouldAutoCloseBefore: { quote: (ch: string) => boolean; bracket: (ch: string) => boolean; comment: (ch: string) => boolean };
 	public readonly wordSegmenterLocales: string[];
 	public readonly overtypeOnPaste: boolean;
+	public readonly pasteEmptySelectionIncludesNewline: 'always' | 'never' | 'singleOnly' | 'multipleOnly';
 
 	private readonly _languageId: string;
 	private _electricChars: { [key: string]: boolean } | null;
@@ -104,6 +105,7 @@ export class CursorConfiguration {
 			|| e.hasChanged(EditorOption.readOnly)
 			|| e.hasChanged(EditorOption.wordSegmenterLocales)
 			|| e.hasChanged(EditorOption.overtypeOnPaste)
+			|| e.hasChanged(EditorOption.pasteEmptySelectionIncludesNewline)
 		);
 	}
 
@@ -144,6 +146,7 @@ export class CursorConfiguration {
 		this.autoIndent = options.get(EditorOption.autoIndent);
 		this.wordSegmenterLocales = options.get(EditorOption.wordSegmenterLocales);
 		this.overtypeOnPaste = options.get(EditorOption.overtypeOnPaste);
+		this.pasteEmptySelectionIncludesNewline = options.get(EditorOption.pasteEmptySelectionIncludesNewline);
 
 		this.surroundingPairs = {};
 		this._electricChars = null;
diff --git a/src/vs/editor/common/standalone/standaloneEnums.ts b/src/vs/editor/common/standalone/standaloneEnums.ts
@@ -346,7 +346,8 @@ export enum EditorOption {
 	inlineCompletionsAccessibilityVerbose = 169,
 	effectiveEditContext = 170,
 	scrollOnMiddleClick = 171,
-	effectiveAllowVariableFonts = 172
+	effectiveAllowVariableFonts = 172,
+	pasteEmptySelectionIncludesNewline = 173,
 }
 
 /**
diff --git a/src/vs/monaco.d.ts b/src/vs/monaco.d.ts
@@ -3989,6 +3989,11 @@ declare namespace monaco.editor {
 		 * Controls whether the accessibility hint should be provided to screen reader users when an inline completion is shown.
 		 */
 		inlineCompletionsAccessibilityVerbose?: boolean;
+		/**
+		 * Configure the behaviour when copy-pasting empty selection.
+		 * Defaults to 'always'.
+		 */
+		pasteEmptySelectionIncludesNewline?: 'always' | 'never' | 'singleOnly' | 'multipleOnly';
 	}
 
 	export interface IDiffEditorBaseOptions {
@@ -5236,7 +5241,8 @@ declare namespace monaco.editor {
 		inlineCompletionsAccessibilityVerbose = 169,
 		effectiveEditContext = 170,
 		scrollOnMiddleClick = 171,
-		effectiveAllowVariableFonts = 172
+		effectiveAllowVariableFonts = 172,
+		pasteEmptySelectionIncludesNewline = 173
 	}
 
 	export const EditorOptions: {
@@ -5413,6 +5419,7 @@ declare namespace monaco.editor {
 		wrappingStrategy: IEditorOption<EditorOption.wrappingStrategy, 'simple' | 'advanced'>;
 		effectiveEditContextEnabled: IEditorOption<EditorOption.effectiveEditContext, boolean>;
 		effectiveAllowVariableFonts: IEditorOption<EditorOption.effectiveAllowVariableFonts, boolean>;
+		pasteEmptySelectionIncludesNewline: IEditorOption<EditorOption.pasteEmptySelectionIncludesNewline, 'always' | 'never' | 'singleOnly' | 'multipleOnly'>;
 	};
 
 	type EditorOptionsType = typeof EditorOptions;

Original file line number	Diff line number	Diff line change
`@@ -346,7 +346,8 @@ export enum EditorOption {`
`346`	`346`	`inlineCompletionsAccessibilityVerbose = 169,`
`347`	`347`	`effectiveEditContext = 170,`
`348`	`348`	`scrollOnMiddleClick = 171,`
`349`		`- effectiveAllowVariableFonts = 172`
	`349`	`+ effectiveAllowVariableFonts = 172,`
	`350`	`+ pasteEmptySelectionIncludesNewline = 173,`
`350`	`351`	`}`
`351`	`352`
`352`	`353`	`/**`