From c244b199e2edc3bf4e149cb3ff32a068072992b5 Mon Sep 17 00:00:00 2001 From: Tyler James Leonhardt <2644648+TylerLeonhardt@users.noreply.github.com> Date: Mon, 24 Mar 2025 17:48:56 -0700 Subject: [PATCH] Delete Unused API (#244529) ref https://github.com/microsoft/vscode/issues/243615 --- extensions/vscode-api-tests/package.json | 1 - .../extensions/common/extensionsApiProposals.ts | 3 --- src/vs/workbench/api/browser/mainThreadUrls.ts | 17 ----------------- src/vs/workbench/api/common/extHost.api.impl.ts | 8 -------- src/vs/workbench/api/common/extHost.protocol.ts | 2 -- src/vs/workbench/api/common/extHostUrls.ts | 15 --------------- .../vscode.proposed.envExtractUri.d.ts | 14 -------------- 7 files changed, 60 deletions(-) delete mode 100644 src/vscode-dts/vscode.proposed.envExtractUri.d.ts diff --git a/extensions/vscode-api-tests/package.json b/extensions/vscode-api-tests/package.json index 0998d2fff63..66a80b8867f 100644 --- a/extensions/vscode-api-tests/package.json +++ b/extensions/vscode-api-tests/package.json @@ -17,7 +17,6 @@ "documentFiltersExclusive", "editorInsets", "embeddings", - "envExtractUri", "extensionRuntime", "extensionsAny", "externalUriOpener", diff --git a/src/vs/platform/extensions/common/extensionsApiProposals.ts b/src/vs/platform/extensions/common/extensionsApiProposals.ts index 03510fbfd14..2a7f17fce61 100644 --- a/src/vs/platform/extensions/common/extensionsApiProposals.ts +++ b/src/vs/platform/extensions/common/extensionsApiProposals.ts @@ -174,9 +174,6 @@ const _allApiProposals = { embeddings: { proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.embeddings.d.ts', }, - envExtractUri: { - proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.envExtractUri.d.ts', - }, extensionRuntime: { proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.extensionRuntime.d.ts', }, diff --git a/src/vs/workbench/api/browser/mainThreadUrls.ts b/src/vs/workbench/api/browser/mainThreadUrls.ts index b79155fb8d6..b0d6b1b34b2 100644 --- a/src/vs/workbench/api/browser/mainThreadUrls.ts +++ b/src/vs/workbench/api/browser/mainThreadUrls.ts @@ -11,9 +11,6 @@ import { Disposable, IDisposable } from '../../../base/common/lifecycle.js'; import { IExtensionContributedURLHandler, IExtensionUrlHandler } from '../../services/extensions/browser/extensionUrlHandler.js'; import { ExtensionIdentifier } from '../../../platform/extensions/common/extensions.js'; import { ITrustedDomainService } from '../../contrib/url/browser/trustedDomainService.js'; -import { readStaticTrustedDomains } from '../../contrib/url/browser/trustedDomains.js'; -import { IInstantiationService } from '../../../platform/instantiation/common/instantiation.js'; -import { IWebContentExtractorService } from '../../../platform/webContentExtractor/common/webContentExtractor.js'; class ExtensionUrlHandler implements IExtensionContributedURLHandler { @@ -44,15 +41,11 @@ export class MainThreadUrls extends Disposable implements MainThreadUrlsShape { context: IExtHostContext, @ITrustedDomainService trustedDomainService: ITrustedDomainService, @IURLService private readonly urlService: IURLService, - @IInstantiationService private readonly instantiationService: IInstantiationService, - @IWebContentExtractorService private readonly webContentExtractorService: IWebContentExtractorService, @IExtensionUrlHandler private readonly extensionUrlHandler: IExtensionUrlHandler ) { super(); this.proxy = context.getProxy(ExtHostContext.ExtHostUrls); - this._register(trustedDomainService.onDidChangeTrustedDomains(() => this.handleTrustedDomainsChange())); - void this.handleTrustedDomainsChange(); } async $registerUriHandler(handle: number, extensionId: ExtensionIdentifier, extensionDisplayName: string): Promise { @@ -85,16 +78,6 @@ export class MainThreadUrls extends Disposable implements MainThreadUrlsShape { return this.urlService.create(uri); } - async handleTrustedDomainsChange() { - const { defaultTrustedDomains, trustedDomains, } = this.instantiationService.invokeFunction(readStaticTrustedDomains); - await this.proxy.$updateTrustedDomains([...defaultTrustedDomains, ...trustedDomains]); - } - - async $extractExternalUris(uris: UriComponents[]): Promise { - const extractedUris = await this.webContentExtractorService.extract(uris.map(uri => URI.revive(uri))); - return extractedUris; - } - override dispose(): void { super.dispose(); diff --git a/src/vs/workbench/api/common/extHost.api.impl.ts b/src/vs/workbench/api/common/extHost.api.impl.ts index befec49c93b..6d9aee51c46 100644 --- a/src/vs/workbench/api/common/extHost.api.impl.ts +++ b/src/vs/workbench/api/common/extHost.api.impl.ts @@ -416,14 +416,6 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I throw err; } }, - isTrustedExternalUris(uris: URI[]): boolean[] { - checkProposedApiEnabled(extension, 'envExtractUri'); - return extHostUrls.isTrustedExternalUris(uris); - }, - extractExternalUris(uris: URI[]): Promise { - checkProposedApiEnabled(extension, 'envExtractUri'); - return extHostUrls.extractExternalUris(uris); - }, get remoteName() { return getRemoteName(initData.remote.authority); }, diff --git a/src/vs/workbench/api/common/extHost.protocol.ts b/src/vs/workbench/api/common/extHost.protocol.ts index 6d70c149495..a24df956dff 100644 --- a/src/vs/workbench/api/common/extHost.protocol.ts +++ b/src/vs/workbench/api/common/extHost.protocol.ts @@ -1399,7 +1399,6 @@ export interface MainThreadUrlsShape extends IDisposable { $registerUriHandler(handle: number, extensionId: ExtensionIdentifier, extensionDisplayName: string): Promise; $unregisterUriHandler(handle: number): Promise; $createAppUri(uri: UriComponents): Promise; - $extractExternalUris(uris: UriComponents[]): Promise; } export interface IChatDto { @@ -1437,7 +1436,6 @@ export type IChatProgressDto = export interface ExtHostUrlsShape { $handleExternalUri(handle: number, uri: UriComponents): Promise; - $updateTrustedDomains(trustedDomains: string[]): Promise; } export interface MainThreadUriOpenersShape extends IDisposable { diff --git a/src/vs/workbench/api/common/extHostUrls.ts b/src/vs/workbench/api/common/extHostUrls.ts index d2fce5fdfcf..c75ce2d4ca1 100644 --- a/src/vs/workbench/api/common/extHostUrls.ts +++ b/src/vs/workbench/api/common/extHostUrls.ts @@ -9,7 +9,6 @@ import { URI, UriComponents } from '../../../base/common/uri.js'; import { toDisposable } from '../../../base/common/lifecycle.js'; import { onUnexpectedError } from '../../../base/common/errors.js'; import { ExtensionIdentifierSet, IExtensionDescription } from '../../../platform/extensions/common/extensions.js'; -import { isURLDomainTrusted } from '../../contrib/url/common/trustedDomains.js'; export class ExtHostUrls implements ExtHostUrlsShape { @@ -19,8 +18,6 @@ export class ExtHostUrls implements ExtHostUrlsShape { private handles = new ExtensionIdentifierSet(); private handlers = new Map(); - private _trustedDomains: string[] = []; - constructor( mainContext: IMainContext ) { @@ -63,16 +60,4 @@ export class ExtHostUrls implements ExtHostUrlsShape { async createAppUri(uri: URI): Promise { return URI.revive(await this._proxy.$createAppUri(uri)); } - - async $updateTrustedDomains(trustedDomains: string[]): Promise { - this._trustedDomains = trustedDomains; - } - - isTrustedExternalUris(uris: URI[]): boolean[] { - return uris.map(uri => isURLDomainTrusted(uri, this._trustedDomains)); - } - - extractExternalUris(uris: URI[]): Promise { - return this._proxy.$extractExternalUris(uris); - } } diff --git a/src/vscode-dts/vscode.proposed.envExtractUri.d.ts b/src/vscode-dts/vscode.proposed.envExtractUri.d.ts deleted file mode 100644 index 73d116bcc96..00000000000 --- a/src/vscode-dts/vscode.proposed.envExtractUri.d.ts +++ /dev/null @@ -1,14 +0,0 @@ -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ - -declare module 'vscode' { - - // https://github.com/microsoft/vscode/issues/243615 - - export namespace env { - export function isTrustedExternalUris(uri: Uri[]): boolean[]; - export function extractExternalUris(uris: Uri[]): Thenable; - } -}