removing the interface for revealData

microsoft · Feb 16, 2024 · ac46564 · ac46564
1 parent 746c6d8
commit ac46564
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/src/vs/editor/browser/widget/multiDiffEditorWidget/multiDiffEditorWidget.ts b/src/vs/editor/browser/widget/multiDiffEditorWidget/multiDiffEditorWidget.ts
@@ -8,7 +8,7 @@ import { Disposable } from 'vs/base/common/lifecycle';
 import { derived, derivedWithStore, observableValue, recomputeInitiallyAndOnChange } from 'vs/base/common/observable';
 import { readHotReloadableExport } from 'vs/editor/browser/widget/diffEditor/utils';
 import { IMultiDiffEditorModel } from 'vs/editor/browser/widget/multiDiffEditorWidget/model';
-import { IMultiDiffEditorOptionRevealData, IMultiDiffEditorViewState, MultiDiffEditorWidgetImpl } from 'vs/editor/browser/widget/multiDiffEditorWidget/multiDiffEditorWidgetImpl';
+import { IMultiDiffEditorViewState, IMultiDiffResource, MultiDiffEditorWidgetImpl } from 'vs/editor/browser/widget/multiDiffEditorWidget/multiDiffEditorWidgetImpl';
 import { MultiDiffEditorViewModel } from './multiDiffEditorViewModel';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import './colors';
@@ -19,6 +19,7 @@ import { URI } from 'vs/base/common/uri';
 import { IDiffEditor } from 'vs/editor/common/editorCommon';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 import { DiffEditorWidget } from 'vs/editor/browser/widget/diffEditor/diffEditorWidget';
+import { Range } from 'vs/editor/common/core/range';
 
 export class MultiDiffEditorWidget extends Disposable {
 	private readonly _dimension = observableValue<Dimension | undefined>(this, undefined);
@@ -45,7 +46,7 @@ export class MultiDiffEditorWidget extends Disposable {
 		this._register(recomputeInitiallyAndOnChange(this._widgetImpl));
 	}
 
-	public reveal(revealData: IMultiDiffEditorOptionRevealData): void {
+	public reveal(revealData: { resource: IMultiDiffResource; range: Range }): void {
 		this._widgetImpl.get().reveal(revealData);
 	}
 

diff --git a/src/vs/editor/browser/widget/multiDiffEditorWidget/multiDiffEditorWidgetImpl.ts b/src/vs/editor/browser/widget/multiDiffEditorWidget/multiDiffEditorWidgetImpl.ts
@@ -191,7 +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: IMultiDiffEditorOptionRevealData): void {
+	public reveal(revealData: { resource: IMultiDiffResource; range: Range }): void {
 		const resource = revealData.resource;
 		const viewItems = this._viewItems.get();
 		let searchCallback: (item: VirtualizedViewItem) => boolean;
@@ -306,12 +306,10 @@ export interface IMultiDiffEditorOptions extends ITextEditorOptions {
 }
 
 export interface IMultiDiffEditorOptionsViewState {
-	revealData?: IMultiDiffEditorOptionRevealData;
-}
-
-export interface IMultiDiffEditorOptionRevealData {
-	resource: IMultiDiffResource;
-	range: Range;
+	revealData?: {
+		resource: IMultiDiffResource;
+		range: Range;
+	};
 }
 
 export type IMultiDiffResource = { original: URI } | { modified: URI };