Revert changes in listWidget and instead pass different arguments in …

…quickInputList
microsoft · Feb 10, 2024 · f7f0921 · f7f0921
1 parent 8645f7b
commit f7f0921
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 16 deletions.
diff --git a/src/vs/base/browser/ui/list/listWidget.ts b/src/vs/base/browser/ui/list/listWidget.ts
@@ -1868,7 +1868,7 @@ export class List<T> implements ISpliceable<T>, IDisposable {
 		return this.getFocus().map(i => this.view.element(i));
 	}
 
-	reveal(index: number, relativeTop?: number, paddingTop: number = 0, applyRelativeTopOnlyIfNotVisible: boolean = false): void {
+	reveal(index: number, relativeTop?: number, paddingTop: number = 0): void {
 		if (index < 0 || index >= this.length) {
 			throw new ListError(this.user, `Invalid index ${index}`);
 		}
@@ -1878,20 +1878,9 @@ export class List<T> implements ISpliceable<T>, IDisposable {
 		const elementHeight = this.view.elementHeight(index);
 
 		if (isNumber(relativeTop)) {
-			let applyRelativeTop: boolean;
-			if (applyRelativeTopOnlyIfNotVisible) {
-				const viewItemBottom = elementTop + elementHeight;
-				const scrollBottom = scrollTop + this.view.renderHeight;
-
-				applyRelativeTop = elementTop < scrollTop + paddingTop || viewItemBottom >= scrollBottom;
-			} else {
-				applyRelativeTop = true;
-			}
-			if (applyRelativeTop) {
-				// y = mx + b
-				const m = elementHeight - this.view.renderHeight + paddingTop;
-				this.view.setScrollTop(m * clamp(relativeTop, 0, 1) + elementTop - paddingTop);
-			}
+			// y = mx + b
+			const m = elementHeight - this.view.renderHeight + paddingTop;
+			this.view.setScrollTop(m * clamp(relativeTop, 0, 1) + elementTop - paddingTop);
 		} else {
 			const viewItemBottom = elementTop + elementHeight;
 			const scrollBottom = scrollTop + this.view.renderHeight;

diff --git a/src/vs/platform/quickinput/browser/quickInputList.ts b/src/vs/platform/quickinput/browser/quickInputList.ts
@@ -741,7 +741,11 @@ export class QuickInputList {
 		if (items.length > 0) {
 			const focused = this.list.getFocus()[0];
 			if (typeof focused === 'number') {
-				this.list.reveal(focused, 0, 0, true);
+				if (this.list.firstVisibleIndex <= focused && focused <= this.list.lastVisibleIndex) {
+					this.list.reveal(focused);
+				} else {
+					this.list.reveal(focused, 0);
+				}
 			}
 		}
 	}