From b6161f490309e92d2c8f8b7a2f19cf0a2e8153dc Mon Sep 17 00:00:00 2001 From: Dave Shoup Date: Mon, 3 Feb 2025 16:32:33 -0500 Subject: [PATCH] move file decoration provider registration to extension.ts --- src/extension.ts | 7 +++++++ src/viewProviders/resources.ts | 14 ++------------ 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/src/extension.ts b/src/extension.ts index adf99bb6..20e9b796 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -88,6 +88,7 @@ import { getTelemetryLogger } from "./telemetry/telemetryLogger"; import { getUriHandler } from "./uriHandler"; import { ResourceViewProvider } from "./viewProviders/resources"; import { SchemasViewProvider } from "./viewProviders/schemas"; +import { SEARCH_DECORATION_PROVIDER } from "./viewProviders/search"; import { SupportViewProvider } from "./viewProviders/support"; import { TopicViewProvider } from "./viewProviders/topics"; @@ -236,6 +237,12 @@ async function _activateExtension( // ensure our diagnostic collection(s) are cleared when the extension is deactivated context.subscriptions.push(JSON_DIAGNOSTIC_COLLECTION); + // register the search decoration provider for the tree views so any matches can be highlighted + // with a dot to the right of the item label+description area + context.subscriptions.push( + vscode.window.registerFileDecorationProvider(SEARCH_DECORATION_PROVIDER), + ); + // XXX: used for testing; do not remove return context; } diff --git a/src/viewProviders/resources.ts b/src/viewProviders/resources.ts index 0f555bbf..0b4071f9 100644 --- a/src/viewProviders/resources.ts +++ b/src/viewProviders/resources.ts @@ -53,12 +53,7 @@ import { updateLocalConnection } from "../sidecar/connections/local"; import { ConnectionStateWatcher } from "../sidecar/connections/watcher"; import { DirectConnectionsById, getResourceManager } from "../storage/resourceManager"; import { updateCollapsibleStateFromSearch } from "./collapsing"; -import { - filterItems, - itemMatchesSearch, - SEARCH_DECORATION_PROVIDER, - SEARCH_DECORATION_URI_SCHEME, -} from "./search"; +import { filterItems, itemMatchesSearch, SEARCH_DECORATION_URI_SCHEME } from "./search"; const logger = new Logger("viewProviders.resources"); @@ -131,13 +126,8 @@ export class ResourceViewProvider implements vscode.TreeDataProvider