Don't change editor selection if invoked for line containing selection (

microsoft#178083)
mwerschy · Mar 22, 2023 · 06fb8fd · 06fb8fd
1 parent 324d1a2
commit 06fb8fd
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/src/vs/workbench/contrib/codeEditor/browser/editorLineNumberMenu.ts b/src/vs/workbench/contrib/codeEditor/browser/editorLineNumberMenu.ts
@@ -99,15 +99,15 @@ export class EditorLineNumberContextMenu extends Disposable implements IEditorCo
 			// set the selection to the clicked line number
 			if (e.target.type === MouseTargetType.GUTTER_LINE_NUMBERS) {
 				const currentSelections = this.editor.getSelections();
-				const containsSelection = currentSelections?.some(selection => selection.containsPosition({ lineNumber, column: 1 }));
+				const lineRange = {
+					startLineNumber: lineNumber,
+					endLineNumber: lineNumber,
+					startColumn: 1,
+					endColumn: model.getLineLength(lineNumber) + 1
+				};
+				const containsSelection = currentSelections?.some(selection => !selection.isEmpty() && selection.intersectRanges(lineRange) !== null);
 				if (!containsSelection) {
-					const selection = {
-						startLineNumber: lineNumber,
-						endLineNumber: lineNumber,
-						startColumn: 1,
-						endColumn: model.getLineLength(lineNumber) + 1
-					};
-					this.editor.setSelection(selection, TextEditorSelectionSource.PROGRAMMATIC);
+					this.editor.setSelection(lineRange, TextEditorSelectionSource.PROGRAMMATIC);
 				}
 			}