Revert "Stop the cursor from jumping when changing prefix in QuickAccess (microsoft#198821)" (microsoft#204638)

TylerLeonhardt · web-flow · commit 348e88dc0099 · 2024-02-07T10:06:45.000-08:00
This reverts commit 3154b5f.
diff --git a/src/vs/base/browser/ui/inputbox/inputBox.ts b/src/vs/base/browser/ui/inputbox/inputBox.ts
@@ -305,18 +305,6 @@ export class InputBox extends Widget {
 		return this.input.selectionEnd === this.input.value.length && this.input.selectionStart === this.input.selectionEnd;
 	}
 
-	public getSelection(): IRange | null {
-		const selectionStart = this.input.selectionStart;
-		if (selectionStart === null) {
-			return null;
-		}
-		const selectionEnd = this.input.selectionEnd ?? selectionStart;
-		return {
-			start: selectionStart,
-			end: selectionEnd,
-		};
-	}
-
 	public enable(): void {
 		this.input.removeAttribute('disabled');
 	}
diff --git a/src/vs/platform/quickinput/browser/quickAccess.ts b/src/vs/platform/quickinput/browser/quickAccess.ts
@@ -92,9 +92,6 @@ export class QuickAccessController extends Disposable implements IQuickAccessCon
 			}
 		}
 
-		// Store the existing selection if there was one.
-		const visibleSelection = visibleQuickAccess?.picker?.valueSelection;
-
 		// Create a picker for the provider to use with the initial value
 		// and adjust the filtering to exclude the prefix from filtering
 		const disposables = new DisposableStore();
@@ -151,11 +148,6 @@ export class QuickAccessController extends Disposable implements IQuickAccessCon
 		// on the onDidHide event.
 		picker.show();
 
-		// If the previous picker had a selection, we should set that in the new picker.
-		if (visibleSelection) {
-			picker.valueSelection = visibleSelection;
-		}
-
 		// Pick mode: return with promise
 		if (pick) {
 			return pickPromise?.p;
diff --git a/src/vs/platform/quickinput/browser/quickInput.ts b/src/vs/platform/quickinput/browser/quickInput.ts
@@ -725,15 +725,7 @@ export class QuickPick<T extends IQuickPickItem> extends QuickInput implements I
 		return this.ui.keyMods;
 	}
 
-	get valueSelection() {
-		const selection = this.ui.inputBox.getSelection();
-		if (!selection) {
-			return undefined;
-		}
-		return [selection.start, selection.end];
-	}
-
-	set valueSelection(valueSelection: Readonly<[number, number]> | undefined) {
+	set valueSelection(valueSelection: Readonly<[number, number]>) {
 		this._valueSelection = valueSelection;
 		this.valueSelectionUpdated = true;
 		this.update();
@@ -1162,15 +1154,7 @@ export class InputBox extends QuickInput implements IInputBox {
 		this.update();
 	}
 
-	get valueSelection() {
-		const selection = this.ui.inputBox.getSelection();
-		if (!selection) {
-			return undefined;
-		}
-		return [selection.start, selection.end];
-	}
-
-	set valueSelection(valueSelection: Readonly<[number, number]> | undefined) {
+	set valueSelection(valueSelection: Readonly<[number, number]>) {
 		this._valueSelection = valueSelection;
 		this.valueSelectionUpdated = true;
 		this.update();
diff --git a/src/vs/platform/quickinput/browser/quickInputBox.ts b/src/vs/platform/quickinput/browser/quickInputBox.ts
@@ -59,10 +59,6 @@ export class QuickInputBox extends Disposable {
 		this.findInput.inputBox.select(range);
 	}
 
-	getSelection(): IRange | null {
-		return this.findInput.inputBox.getSelection();
-	}
-
 	isSelectionAtEnd(): boolean {
 		return this.findInput.inputBox.isSelectionAtEnd();
 	}

Original file line number	Diff line number	Diff line change
`@@ -59,10 +59,6 @@ export class QuickInputBox extends Disposable {`
`59`	`59`	`this.findInput.inputBox.select(range);`
`60`	`60`	`}`
`61`	`61`
`62`		`- getSelection(): IRange \| null {`
`63`		`- return this.findInput.inputBox.getSelection();`
`64`		`- }`
`65`		`-`
`66`	`62`	`isSelectionAtEnd(): boolean {`
`67`	`63`	`return this.findInput.inputBox.isSelectionAtEnd();`
`68`	`64`	`}`