Skip to content

Commit

Permalink
Revert "Stop the cursor from jumping when changing prefix in QuickAcc…
Browse files Browse the repository at this point in the history
…ess (microsoft#198821)" (microsoft#204638)

This reverts commit 3154b5f.
  • Loading branch information
TylerLeonhardt authored Feb 7, 2024
1 parent bc056d2 commit 348e88d
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 42 deletions.
12 changes: 0 additions & 12 deletions src/vs/base/browser/ui/inputbox/inputBox.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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');
}
Expand Down
8 changes: 0 additions & 8 deletions src/vs/platform/quickinput/browser/quickAccess.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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;
Expand Down
20 changes: 2 additions & 18 deletions src/vs/platform/quickinput/browser/quickInput.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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();
Expand Down
4 changes: 0 additions & 4 deletions src/vs/platform/quickinput/browser/quickInputBox.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand Down

0 comments on commit 348e88d

Please sign in to comment.