From 32e58c71fe9f5adcc8db3e3fedb73c4b4f883111 Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Thu, 18 Sep 2025 06:25:12 -0700 Subject: [PATCH] Refactor search addon interfaces - Move ISearchAddonOptions and ISearchResultChangeEvent to types - Make noScroll property required in IInternalSearchOptions - Change exported interfaces to internal scope where appropriate --- addons/addon-search/src/SearchAddon.ts | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/addons/addon-search/src/SearchAddon.ts b/addons/addon-search/src/SearchAddon.ts index 93d57bce..91e3bfe8 100644 --- a/addons/addon-search/src/SearchAddon.ts +++ b/addons/addon-search/src/SearchAddon.ts @@ -4,31 +4,22 @@ */ import type { Terminal, IDisposable, ITerminalAddon, IDecoration } from '@xterm/xterm'; -import type { SearchAddon as ISearchApi, ISearchOptions, ISearchDecorationOptions } from '@xterm/addon-search'; +import type { SearchAddon as ISearchApi, ISearchOptions, ISearchDecorationOptions, ISearchAddonOptions, ISearchResultChangeEvent } from '@xterm/addon-search'; import { Emitter, Event } from 'vs/base/common/event'; import { Disposable, dispose, MutableDisposable, toDisposable } from 'vs/base/common/lifecycle'; import { disposableTimeout } from 'vs/base/common/async'; import { SearchLineCache } from './SearchLineCache'; interface IInternalSearchOptions { - noScroll?: boolean; + noScroll: boolean; } -export interface ISearchPosition { +interface ISearchPosition { startCol: number; startRow: number; } -export interface ISearchResultChangeEvent { - resultIndex: number; - resultCount: number; -} - -export interface ISearchAddonOptions { - highlightLimit: number; -} - -export interface ISearchResult { +interface ISearchResult { term: string; col: number; row: number;