From a191370d54e355f8e549c5131cc1ceeac919a2e5 Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Thu, 18 Sep 2025 13:26:43 -0700 Subject: [PATCH] refactor: remove unnecessary interface exports - Remove export from IHighlight and IMultiHighlight interfaces - Remove export from ISelectedDecoration interface - Remove export from ISearchPosition interface - Keep ISearchResult exported as it's used across multiple files - Make ISelectedDecoration extend IDisposable for consistency --- addons/addon-search/src/DecorationManager.ts | 4 ++-- addons/addon-search/src/SearchEngine.ts | 2 +- addons/addon-search/src/SearchResultTracker.ts | 4 ++-- addons/addon-search/src/tsconfig.json | 6 ++++++ 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/addons/addon-search/src/DecorationManager.ts b/addons/addon-search/src/DecorationManager.ts index ba3848da..d347f77a 100644 --- a/addons/addon-search/src/DecorationManager.ts +++ b/addons/addon-search/src/DecorationManager.ts @@ -11,7 +11,7 @@ import type { ISearchResult } from './SearchEngine'; /** * Interface for managing a highlight decoration. */ -export interface IHighlight extends IDisposable { +interface IHighlight extends IDisposable { decoration: IDecoration; match: ISearchResult; } @@ -19,7 +19,7 @@ export interface IHighlight extends IDisposable { /** * Interface for managing multiple decorations for a single match. */ -export interface IMultiHighlight extends IDisposable { +interface IMultiHighlight extends IDisposable { decorations: IDecoration[]; match: ISearchResult; } diff --git a/addons/addon-search/src/SearchEngine.ts b/addons/addon-search/src/SearchEngine.ts index ff0e861c..7d3a6ab2 100644 --- a/addons/addon-search/src/SearchEngine.ts +++ b/addons/addon-search/src/SearchEngine.ts @@ -10,7 +10,7 @@ import type { SearchLineCache } from './SearchLineCache'; /** * Represents the position to start a search from. */ -export interface ISearchPosition { +interface ISearchPosition { startCol: number; startRow: number; } diff --git a/addons/addon-search/src/SearchResultTracker.ts b/addons/addon-search/src/SearchResultTracker.ts index b0e8faa7..f81d5291 100644 --- a/addons/addon-search/src/SearchResultTracker.ts +++ b/addons/addon-search/src/SearchResultTracker.ts @@ -4,6 +4,7 @@ */ import type { ISearchResultChangeEvent } from '@xterm/addon-search'; +import type { IDisposable } from '@xterm/xterm'; import { Emitter, Event } from 'vs/base/common/event'; import { Disposable } from 'vs/base/common/lifecycle'; import type { ISearchResult } from './SearchEngine'; @@ -11,9 +12,8 @@ import type { ISearchResult } from './SearchEngine'; /** * Interface for managing a currently selected decoration. */ -export interface ISelectedDecoration { +interface ISelectedDecoration extends IDisposable { match: ISearchResult; - dispose(): void; } /** diff --git a/addons/addon-search/src/tsconfig.json b/addons/addon-search/src/tsconfig.json index a926a66f..03f148d1 100644 --- a/addons/addon-search/src/tsconfig.json +++ b/addons/addon-search/src/tsconfig.json @@ -18,6 +18,9 @@ "common/*": [ "../../../src/common/*" ], + "browser/*": [ + "../../../src/browser/*" + ], "vs/*": [ "../../../src/vs/*" ], @@ -34,6 +37,9 @@ { "path": "../../../src/common" }, + { + "path": "../../../src/browser" + }, { "path": "../../../src/vs" }