inlining the resource and the range

microsoft · Feb 16, 2024 · 0fd2b0c · 0fd2b0c
1 parent ac46564
commit 0fd2b0c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/src/vs/editor/browser/widget/multiDiffEditorWidget/multiDiffEditorWidget.ts b/src/vs/editor/browser/widget/multiDiffEditorWidget/multiDiffEditorWidget.ts
@@ -46,8 +46,8 @@ export class MultiDiffEditorWidget extends Disposable {
 		this._register(recomputeInitiallyAndOnChange(this._widgetImpl));
 	}
 
-	public reveal(revealData: { resource: IMultiDiffResource; range: Range }): void {
-		this._widgetImpl.get().reveal(revealData);
+	public reveal(resource: IMultiDiffResource, range: Range): void {
+		this._widgetImpl.get().reveal(resource, range);
 	}
 
 	public createViewModel(model: IMultiDiffEditorModel): MultiDiffEditorViewModel {

diff --git a/src/vs/editor/browser/widget/multiDiffEditorWidget/multiDiffEditorWidgetImpl.ts b/src/vs/editor/browser/widget/multiDiffEditorWidget/multiDiffEditorWidgetImpl.ts
@@ -191,8 +191,7 @@ export class MultiDiffEditorWidgetImpl extends Disposable {
 	}
 
 	// todo@aiday-mar need to reveal the range instead of just the start line number
-	public reveal(revealData: { resource: IMultiDiffResource; range: Range }): void {
-		const resource = revealData.resource;
+	public reveal(resource: IMultiDiffResource, range: Range): void {
 		const viewItems = this._viewItems.get();
 		let searchCallback: (item: VirtualizedViewItem) => boolean;
 		if ('original' in resource) {
@@ -201,7 +200,7 @@ export class MultiDiffEditorWidgetImpl extends Disposable {
 			searchCallback = (item) => item.viewModel.modifiedUri?.toString() === resource.modified.toString();
 		}
 		const index = viewItems.findIndex(searchCallback);
-		let scrollTop = (revealData.range.startLineNumber - 1) * this._configurationService.getValue<number>('editor.lineHeight');
+		let scrollTop = (range.startLineNumber - 1) * this._configurationService.getValue<number>('editor.lineHeight');
 		for (let i = 0; i < index; i++) {
 			scrollTop += viewItems[i].contentHeight.get() + this._spaceBetweenPx;
 		}

diff --git a/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditor.ts b/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditor.ts
@@ -92,7 +92,7 @@ export class MultiDiffEditor extends AbstractEditorWithViewState<IMultiDiffEdito
 		if (!viewState || !viewState.revealData) {
 			return;
 		}
-		this._multiDiffEditorWidget?.reveal(viewState.revealData);
+		this._multiDiffEditorWidget?.reveal(viewState.revealData.resource, viewState.revealData.range);
 	}
 
 	override async clearInput(): Promise<void> {