@codingame/monaco-vscode-api 13.1.7 → 14.0.1

package/vscode/src/vs/platform/contextkey/common/contextkeys.js

@@ -3,16 +3,16 @@ import { isMacintosh, isLinux, isWindows, isWeb, isIOS, isMobile } from '../../.
 import { localize } from '../../../nls.js';
 import { RawContextKey } from './contextkey.js';
 
-const IsMacContext = ( new RawContextKey('isMac', isMacintosh, ( localize(1639, "Whether the operating system is macOS"))));
-const IsLinuxContext = ( new RawContextKey('isLinux', isLinux, ( localize(1640, "Whether the operating system is Linux"))));
-const IsWindowsContext = ( new RawContextKey('isWindows', isWindows, ( localize(1641, "Whether the operating system is Windows"))));
-const IsWebContext = ( new RawContextKey('isWeb', isWeb, ( localize(1642, "Whether the platform is a web browser"))));
-const IsMacNativeContext = ( new RawContextKey('isMacNative', isMacintosh && !isWeb, ( localize(1643, "Whether the operating system is macOS on a non-browser platform"))));
-const IsIOSContext = ( new RawContextKey('isIOS', isIOS, ( localize(1644, "Whether the operating system is iOS"))));
-const IsMobileContext = ( new RawContextKey('isMobile', isMobile, ( localize(1645, "Whether the platform is a mobile web browser"))));
+const IsMacContext = ( new RawContextKey('isMac', isMacintosh, ( localize(1675, "Whether the operating system is macOS"))));
+const IsLinuxContext = ( new RawContextKey('isLinux', isLinux, ( localize(1676, "Whether the operating system is Linux"))));
+const IsWindowsContext = ( new RawContextKey('isWindows', isWindows, ( localize(1677, "Whether the operating system is Windows"))));
+const IsWebContext = ( new RawContextKey('isWeb', isWeb, ( localize(1678, "Whether the platform is a web browser"))));
+const IsMacNativeContext = ( new RawContextKey('isMacNative', isMacintosh && !isWeb, ( localize(1679, "Whether the operating system is macOS on a non-browser platform"))));
+const IsIOSContext = ( new RawContextKey('isIOS', isIOS, ( localize(1680, "Whether the operating system is iOS"))));
+const IsMobileContext = ( new RawContextKey('isMobile', isMobile, ( localize(1681, "Whether the platform is a mobile web browser"))));
 const IsDevelopmentContext = ( new RawContextKey('isDevelopment', false, true));
-const ProductQualityContext = ( new RawContextKey('productQualityType', '', ( localize(1646, "Quality type of VS Code"))));
+const ProductQualityContext = ( new RawContextKey('productQualityType', '', ( localize(1682, "Quality type of VS Code"))));
 const InputFocusedContextKey = 'inputFocus';
-const InputFocusedContext = ( new RawContextKey(InputFocusedContextKey, false, ( localize(1647, "Whether keyboard focus is inside an input box"))));
+const InputFocusedContext = ( new RawContextKey(InputFocusedContextKey, false, ( localize(1683, "Whether keyboard focus is inside an input box"))));
 
 export { InputFocusedContext, InputFocusedContextKey, IsDevelopmentContext, IsIOSContext, IsLinuxContext, IsMacContext, IsMacNativeContext, IsMobileContext, IsWebContext, IsWindowsContext, ProductQualityContext };

package/vscode/src/vs/platform/contextkey/common/scanner.js

@@ -30,18 +30,18 @@ var TokenType;
 function hintDidYouMean(...meant) {
     switch (meant.length) {
         case 1:
-            return localize(1648, "Did you mean {0}?", meant[0]);
+            return localize(1684, "Did you mean {0}?", meant[0]);
         case 2:
-            return localize(1649, "Did you mean {0} or {1}?", meant[0], meant[1]);
+            return localize(1685, "Did you mean {0} or {1}?", meant[0], meant[1]);
         case 3:
-            return localize(1650, "Did you mean {0}, {1} or {2}?", meant[0], meant[1], meant[2]);
+            return localize(1686, "Did you mean {0}, {1} or {2}?", meant[0], meant[1], meant[2]);
         default:
             return undefined;
     }
 }
-const hintDidYouForgetToOpenOrCloseQuote = ( localize(1651, "Did you forget to open or close the quote?"));
+const hintDidYouForgetToOpenOrCloseQuote = ( localize(1687, "Did you forget to open or close the quote?"));
 const hintDidYouForgetToEscapeSlash = ( localize(
-    1652,
+    1688,
     "Did you forget to escape the '/' (slash) character? Put two backslashes before it to escape, e.g., '\\\\/\'."
 ));
 class Scanner {

package/vscode/src/vs/platform/contextview/browser/contextView.service.d.ts

@@ -1,7 +1,7 @@
-import { IContextViewProvider, AnchorAlignment } from "../../../base/browser/ui/contextview/contextview.js";
-import { IContextViewDelegate, IOpenContextView, type IContextMenuMenuDelegate } from "./contextView.js";
 import { IContextMenuDelegate } from "../../../base/browser/contextmenu.js";
+import { IContextViewProvider, AnchorAlignment } from "../../../base/browser/ui/contextview/contextview.js";
 import { Event } from "../../../base/common/event.js";
+import { IContextViewDelegate, IOpenContextView, type IContextMenuMenuDelegate } from "./contextView.js";
 export declare const IContextViewService: import("../../instantiation/common/instantiation.js").ServiceIdentifier<IContextViewService>;
 export interface IContextViewService extends IContextViewProvider {
     readonly _serviceBrand: undefined;

package/vscode/src/vs/platform/dialogs/common/dialogs.service.d.ts

@@ -1,6 +1,6 @@
 import { Event } from "../../../base/common/event.js";
-import { IConfirmation, IConfirmationResult, IPromptWithCustomCancel, IPromptResultWithCancel, IPromptWithDefaultCancel, IPromptResult, IPrompt, IInput, IInputResult, type ConfirmResult, type IOpenDialogOptions, type IPickAndOpenOptions, type ISaveDialogOptions } from "@codingame/monaco-vscode-d6e33d82-c101-549d-a885-0807ab3e0cfb-common/vscode/vs/platform/dialogs/common/dialogs";
 import { URI } from "../../../base/common/uri.js";
+import { IConfirmation, IConfirmationResult, IPromptWithCustomCancel, IPromptResultWithCancel, IPromptWithDefaultCancel, IPromptResult, IPrompt, IInput, IInputResult, type ConfirmResult, type IOpenDialogOptions, type IPickAndOpenOptions, type ISaveDialogOptions } from "@codingame/monaco-vscode-d4a98668-f793-5361-a9cf-1e6ae6d62ce3-common/vscode/vs/platform/dialogs/common/dialogs";
 export declare const IDialogService: import("../../instantiation/common/instantiation.js").ServiceIdentifier<IDialogService>;
 export interface IDialogService {
     readonly _serviceBrand: undefined;

package/vscode/src/vs/platform/dnd/browser/dnd.js

@@ -181,7 +181,7 @@ async function extractFileListData(accessor, files) {
         if (file) {
             if (file.size > 100 * ByteSize.MB) {
                 dialogService.warn(( localize(
-                    1658,
+                    1694,
                     "File is too large to open as untitled editor. Please upload it first into the file explorer and then try again."
                 )));
                 continue;

package/vscode/src/vs/platform/environment/common/argv.d.ts

@@ -26,6 +26,7 @@ export interface NativeParsedArgs {
     diff?: boolean;
     merge?: boolean;
     add?: boolean;
+    remove?: boolean;
     goto?: boolean;
     "new-window"?: boolean;
     "reuse-window"?: boolean;
@@ -72,6 +73,7 @@ export interface NativeParsedArgs {
     "install-builtin-extension"?: string[];
     "uninstall-extension"?: string[];
     "update-extensions"?: boolean;
+    "do-not-include-pack-dependencies"?: boolean;
     "locate-extension"?: string[];
     "enable-proposed-api"?: string[];
     "open-url"?: boolean;

package/vscode/src/vs/platform/environment/common/environment.service.d.ts

@@ -1,6 +1,6 @@
 import { URI } from "../../../base/common/uri.js";
-import { IExtensionHostDebugParams, ExtensionKind } from "./environment.js";
 import { NativeParsedArgs } from "./argv.js";
+import { IExtensionHostDebugParams, ExtensionKind } from "./environment.js";
 export declare const IEnvironmentService: import("../../instantiation/common/instantiation.js").ServiceIdentifier<IEnvironmentService>;
 export interface IEnvironmentService {
     readonly _serviceBrand: undefined;

package/vscode/src/vs/platform/extensionManagement/common/extensionManagement.d.ts

@@ -8,6 +8,7 @@ export declare const EXTENSION_IDENTIFIER_PATTERN = "^([a-z0-9A-Z][a-z0-9-A-Z]*)
 export declare const EXTENSION_IDENTIFIER_REGEX: RegExp;
 export declare const WEB_EXTENSION_TAG = "__web_extension";
 export declare const EXTENSION_INSTALL_SKIP_WALKTHROUGH_CONTEXT = "skipWalkthrough";
+export declare const EXTENSION_INSTALL_SKIP_PUBLISHER_TRUST_CONTEXT = "skipPublisherTrust";
 export declare const EXTENSION_INSTALL_SOURCE_CONTEXT = "extensionInstallSource";
 export declare const EXTENSION_INSTALL_DEP_PACK_CONTEXT = "dependecyOrPackExtensionInstall";
 export declare const EXTENSION_INSTALL_CLIENT_TARGET_PLATFORM_CONTEXT = "clientTargetPlatform";
@@ -180,7 +181,7 @@ export interface ISearchPrefferedResults {
     readonly preferredResults?: string[];
 }
 export interface IExtensionsControlManifest {
-    readonly malicious: IExtensionIdentifier[];
+    readonly malicious: ReadonlyArray<IExtensionIdentifier | string>;
     readonly deprecated: IStringDictionary<IDeprecationInfo>;
     readonly search: ISearchPrefferedResults[];
     readonly extensionsEnabledWithPreRelease?: string[];
@@ -271,8 +272,8 @@ export declare enum ExtensionManagementErrorCode {
     Extract = "Extract",
     Scanning = "Scanning",
     ScanningExtension = "ScanningExtension",
-    ReadUninstalled = "ReadUninstalled",
-    UnsetUninstalled = "UnsetUninstalled",
+    ReadRemoved = "ReadRemoved",
+    UnsetRemoved = "UnsetRemoved",
     Delete = "Delete",
     Rename = "Rename",
     IntializeDefaultProfile = "IntializeDefaultProfile",
@@ -379,6 +380,7 @@ export type IExecutableBasedExtensionTip = {
     readonly windowsPath?: string;
     readonly whenNotInstalled?: string[];
 };
+export type AllowedExtensionsConfigValueType = IStringDictionary<boolean | string | string[]>;
 export declare function computeSize(location: URI, fileService: IFileService): Promise<number>;
 export declare const ExtensionsLocalizedLabel: import("../../../nls.js").ILocalizedString;
 export declare const PreferencesLocalizedLabel: import("../../../nls.js").ILocalizedString;

package/vscode/src/vs/platform/extensionManagement/common/extensionManagement.js

@@ -2,11 +2,13 @@
 import { Platform } from '../../../base/common/platform.js';
 import { localize2 } from '../../../nls.js';
 import { TargetPlatform } from '../../extensions/common/extensions.js';
+import { FileOperationResult } from '../../files/common/files.js';
 
 const EXTENSION_IDENTIFIER_PATTERN = '^([a-z0-9A-Z][a-z0-9-A-Z]*)\\.([a-z0-9A-Z][a-z0-9-A-Z]*)$';
 const EXTENSION_IDENTIFIER_REGEX = ( new RegExp(EXTENSION_IDENTIFIER_PATTERN));
 const WEB_EXTENSION_TAG = '__web_extension';
 const EXTENSION_INSTALL_SKIP_WALKTHROUGH_CONTEXT = 'skipWalkthrough';
+const EXTENSION_INSTALL_SKIP_PUBLISHER_TRUST_CONTEXT = 'skipPublisherTrust';
 const EXTENSION_INSTALL_SOURCE_CONTEXT = 'extensionInstallSource';
 const EXTENSION_INSTALL_DEP_PACK_CONTEXT = 'dependecyOrPackExtensionInstall';
 var ExtensionInstallSource;
@@ -175,8 +177,8 @@ var ExtensionManagementErrorCode;
     ExtensionManagementErrorCode["Extract"] = "Extract";
     ExtensionManagementErrorCode["Scanning"] = "Scanning";
     ExtensionManagementErrorCode["ScanningExtension"] = "ScanningExtension";
-    ExtensionManagementErrorCode["ReadUninstalled"] = "ReadUninstalled";
-    ExtensionManagementErrorCode["UnsetUninstalled"] = "UnsetUninstalled";
+    ExtensionManagementErrorCode["ReadRemoved"] = "ReadRemoved";
+    ExtensionManagementErrorCode["UnsetRemoved"] = "UnsetRemoved";
     ExtensionManagementErrorCode["Delete"] = "Delete";
     ExtensionManagementErrorCode["Rename"] = "Rename";
     ExtensionManagementErrorCode["IntializeDefaultProfile"] = "IntializeDefaultProfile";
@@ -234,16 +236,25 @@ class ExtensionManagementError extends Error {
 const DISABLED_EXTENSIONS_STORAGE_PATH = 'extensionsIdentifiers/disabled';
 const ENABLED_EXTENSIONS_STORAGE_PATH = 'extensionsIdentifiers/enabled';
 async function computeSize(location, fileService) {
-    const stat = await fileService.resolve(location);
+    let stat;
+    try {
+        stat = await fileService.resolve(location);
+    }
+    catch (e) {
+        if (e.fileOperationResult === FileOperationResult.FILE_NOT_FOUND) {
+            return 0;
+        }
+        throw e;
+    }
     if (stat.children) {
         const sizes = await Promise.all(( stat.children.map(c => computeSize(c.resource, fileService))));
         return sizes.reduce((r, s) => r + s, 0);
     }
     return stat.size ?? 0;
 }
-const ExtensionsLocalizedLabel = ( localize2(1680, "Extensions"));
-const PreferencesLocalizedLabel = ( localize2(1681, 'Preferences'));
+const ExtensionsLocalizedLabel = ( localize2(1715, "Extensions"));
+const PreferencesLocalizedLabel = ( localize2(1716, 'Preferences'));
 const UseUnpkgResourceApiConfigKey = 'extensions.gallery.useUnpkgResourceApi';
 const AllowedExtensionsConfigKey = 'extensions.allowed';
 
-export { AllowedExtensionsConfigKey, DISABLED_EXTENSIONS_STORAGE_PATH, ENABLED_EXTENSIONS_STORAGE_PATH, EXTENSION_IDENTIFIER_PATTERN, EXTENSION_IDENTIFIER_REGEX, EXTENSION_INSTALL_DEP_PACK_CONTEXT, EXTENSION_INSTALL_SKIP_WALKTHROUGH_CONTEXT, EXTENSION_INSTALL_SOURCE_CONTEXT, ExtensionGalleryError, ExtensionGalleryErrorCode, ExtensionInstallSource, ExtensionManagementError, ExtensionManagementErrorCode, ExtensionSignatureVerificationCode, ExtensionsLocalizedLabel, InstallOperation, PreferencesLocalizedLabel, SortBy, SortOrder, StatisticType, TargetPlatformToString, UseUnpkgResourceApiConfigKey, WEB_EXTENSION_TAG, computeSize, getTargetPlatform, isIExtensionIdentifier, isNotWebExtensionInWebTargetPlatform, isTargetPlatformCompatible, toTargetPlatform };
+export { AllowedExtensionsConfigKey, DISABLED_EXTENSIONS_STORAGE_PATH, ENABLED_EXTENSIONS_STORAGE_PATH, EXTENSION_IDENTIFIER_PATTERN, EXTENSION_IDENTIFIER_REGEX, EXTENSION_INSTALL_DEP_PACK_CONTEXT, EXTENSION_INSTALL_SKIP_PUBLISHER_TRUST_CONTEXT, EXTENSION_INSTALL_SKIP_WALKTHROUGH_CONTEXT, EXTENSION_INSTALL_SOURCE_CONTEXT, ExtensionGalleryError, ExtensionGalleryErrorCode, ExtensionInstallSource, ExtensionManagementError, ExtensionManagementErrorCode, ExtensionSignatureVerificationCode, ExtensionsLocalizedLabel, InstallOperation, PreferencesLocalizedLabel, SortBy, SortOrder, StatisticType, TargetPlatformToString, UseUnpkgResourceApiConfigKey, WEB_EXTENSION_TAG, computeSize, getTargetPlatform, isIExtensionIdentifier, isNotWebExtensionInWebTargetPlatform, isTargetPlatformCompatible, toTargetPlatform };

package/vscode/src/vs/platform/extensionManagement/common/extensionManagement.service.d.ts

@@ -1,10 +1,10 @@
 import { CancellationToken } from "../../../base/common/cancellation.js";
+import { Event } from "../../../base/common/event.js";
+import { IMarkdownString } from "../../../base/common/htmlContent.js";
 import { IPager } from "@codingame/monaco-vscode-extension-gallery-service-override/vscode/vs/base/common/paging";
 import { URI } from "../../../base/common/uri.js";
 import { TargetPlatform, IExtensionManifest, type ExtensionType, type IExtension } from "../../extensions/common/extensions.js";
-import { IQueryOptions, IGalleryExtension, IExtensionInfo, IExtensionQueryOptions, IProductVersion, IExtensionIdentifier, IGalleryExtensionVersion, InstallOperation, StatisticType, ITranslation, IExtensionsControlManifest, type DidUninstallExtensionEvent, type DidUpdateExtensionMetadata, type IExtensionManagementParticipant, type ILocalExtension, type InstallExtensionEvent, type InstallExtensionInfo, type InstallExtensionResult, type InstallOptions, type Metadata, type UninstallExtensionEvent, type UninstallExtensionInfo, type UninstallOptions, type IConfigBasedExtensionTip, type IExecutableBasedExtensionTip } from "./extensionManagement.js";
-import { Event } from "../../../base/common/event.js";
-import { IMarkdownString } from "../../../base/common/htmlContent.js";
+import { IQueryOptions, IGalleryExtension, IExtensionInfo, IExtensionQueryOptions, IProductVersion, IExtensionIdentifier, IGalleryExtensionVersion, InstallOperation, StatisticType, ITranslation, IExtensionsControlManifest, type DidUninstallExtensionEvent, type DidUpdateExtensionMetadata, type IExtensionManagementParticipant, type ILocalExtension, type InstallExtensionEvent, type InstallExtensionInfo, type InstallExtensionResult, type InstallOptions, type Metadata, type UninstallExtensionEvent, type UninstallExtensionInfo, type UninstallOptions, type IConfigBasedExtensionTip, type IExecutableBasedExtensionTip, type AllowedExtensionsConfigValueType } from "./extensionManagement.js";
 export declare const IExtensionGalleryService: import("../../instantiation/common/instantiation.js").ServiceIdentifier<IExtensionGalleryService>;
 export interface IExtensionGalleryService {
     readonly _serviceBrand: undefined;
@@ -43,7 +43,6 @@ export interface IExtensionManagementService {
     uninstall(extension: ILocalExtension, options?: UninstallOptions): Promise<void>;
     uninstallExtensions(extensions: UninstallExtensionInfo[]): Promise<void>;
     toggleAppliationScope(extension: ILocalExtension, fromProfileLocation: URI): Promise<ILocalExtension>;
-    reinstallFromGallery(extension: ILocalExtension): Promise<ILocalExtension>;
     getInstalled(type?: ExtensionType, profileLocation?: URI, productVersion?: IProductVersion): Promise<ILocalExtension[]>;
     getExtensionsControlManifest(): Promise<IExtensionsControlManifest>;
     copyExtensions(fromProfileLocation: URI, toProfileLocation: URI): Promise<void>;
@@ -75,7 +74,8 @@ export interface IExtensionTipsService {
 export declare const IAllowedExtensionsService: import("../../instantiation/common/instantiation.js").ServiceIdentifier<IAllowedExtensionsService>;
 export interface IAllowedExtensionsService {
     readonly _serviceBrand: undefined;
-    readonly onDidChangeAllowedExtensions: Event<void>;
+    readonly allowedExtensionsConfigValue: AllowedExtensionsConfigValueType | undefined;
+    readonly onDidChangeAllowedExtensionsConfigValue: Event<void>;
     isAllowed(extension: IGalleryExtension | IExtension): true | IMarkdownString;
     isAllowed(extension: {
         id: string;

package/vscode/src/vs/platform/extensionManagement/common/extensionManagementUtil.d.ts

@@ -1,4 +1,4 @@
-import { IExtensionIdentifier, IGalleryExtension, ILocalExtension } from "./extensionManagement.js";
+import { IExtensionIdentifier, IExtensionsControlManifest, IGalleryExtension, ILocalExtension } from "./extensionManagement.js";
 import { ExtensionIdentifier, IExtension, TargetPlatform } from "../../extensions/common/extensions.js";
 import { IFileService } from "../../files/common/files.service.js";
 import { ILogService } from "../../log/common/log.service.js";
@@ -35,3 +35,4 @@ export declare function getGalleryExtensionTelemetryData(extension: IGalleryExte
 export declare const BetterMergeId: ExtensionIdentifier;
 export declare function getExtensionDependencies(installedExtensions: ReadonlyArray<IExtension>, extension: IExtension): IExtension[];
 export declare function computeTargetPlatform(fileService: IFileService, logService: ILogService): Promise<TargetPlatform>;
+export declare function isMalicious(identifier: IExtensionIdentifier, controlManifest: IExtensionsControlManifest): boolean;

package/vscode/src/vs/platform/extensionManagement/common/extensionManagementUtil.js

@@ -7,6 +7,7 @@ import { URI } from '../../../base/common/uri.js';
 import { getErrorMessage } from '../../../base/common/errors.js';
 import { arch } from '../../../base/common/process.js';
 import { TelemetryTrustedValue } from '../../telemetry/common/telemetryUtils.js';
+import { isString } from '../../../base/common/types.js';
 
 function areSameExtensions(a, b) {
     if (a.uuid && b.uuid) {
@@ -152,5 +153,13 @@ async function computeTargetPlatform(fileService, logService) {
     logService.debug('ComputeTargetPlatform:', targetPlatform);
     return targetPlatform;
 }
+function isMalicious(identifier, controlManifest) {
+    return ( controlManifest.malicious.some(publisherOrIdentifier => {
+        if (isString(publisherOrIdentifier)) {
+            return compareIgnoreCase(identifier.id.split('.')[0], publisherOrIdentifier) === 0;
+        }
+        return areSameExtensions(identifier, publisherOrIdentifier);
+    }));
+}
 
-export { BetterMergeId, ExtensionKey, adoptToGalleryExtensionId, areSameExtensions, computeTargetPlatform, getExtensionDependencies, getExtensionId, getGalleryExtensionId, getGalleryExtensionTelemetryData, getIdAndVersion, getLocalExtensionTelemetryData, groupByExtension };
+export { BetterMergeId, ExtensionKey, adoptToGalleryExtensionId, areSameExtensions, computeTargetPlatform, getExtensionDependencies, getExtensionId, getGalleryExtensionId, getGalleryExtensionTelemetryData, getIdAndVersion, getLocalExtensionTelemetryData, groupByExtension, isMalicious };

package/vscode/src/vs/platform/extensionManagement/common/extensionNls.js

@@ -28,7 +28,7 @@ function replaceNLStrings(logger, extensionManifest, messages, originalMessages)
                 const originalMessage = typeof original === 'string' ? original : original?.message;
                 if (!message) {
                     if (!originalMessage) {
-                        logger.warn(`[${extensionManifest.name}]: ${( localize(1713, "Couldn't find message for key {0}.", messageKey))}`);
+                        logger.warn(`[${extensionManifest.name}]: ${( localize(1748, "Couldn't find message for key {0}.", messageKey))}`);
                     }
                     return;
                 }

package/vscode/src/vs/platform/extensionManagement/common/extensionsProfileScannerService.d.ts

@@ -6,7 +6,6 @@ import { IFileService } from "../../files/common/files.service.js";
 import { ILogService } from "../../log/common/log.service.js";
 import { IUserDataProfilesService } from "../../userDataProfile/common/userDataProfile.service.js";
 import { IUriIdentityService } from "../../uriIdentity/common/uriIdentity.service.js";
-import { ITelemetryService } from "../../telemetry/common/telemetry.service.js";
 import { IExtensionsProfileScannerService } from "./extensionsProfileScannerService.service.js";
 export declare enum ExtensionsProfileScanningErrorCode {
     ERROR_PROFILE_NOT_FOUND = "ERROR_PROFILE_NOT_FOUND",
@@ -40,7 +39,6 @@ export declare abstract class AbstractExtensionsProfileScannerService extends Di
     private readonly fileService;
     private readonly userDataProfilesService;
     private readonly uriIdentityService;
-    private readonly telemetryService;
     private readonly logService;
     readonly _serviceBrand: undefined;
     private readonly _onAddExtensions;
@@ -52,7 +50,7 @@ export declare abstract class AbstractExtensionsProfileScannerService extends Di
     private readonly _onDidRemoveExtensions;
     readonly onDidRemoveExtensions: import("../../../base/common/event.js").Event<DidRemoveProfileExtensionsEvent>;
     private readonly resourcesAccessQueueMap;
-    constructor(extensionsLocation: URI, fileService: IFileService, userDataProfilesService: IUserDataProfilesService, uriIdentityService: IUriIdentityService, telemetryService: ITelemetryService, logService: ILogService);
+    constructor(extensionsLocation: URI, fileService: IFileService, userDataProfilesService: IUserDataProfilesService, uriIdentityService: IUriIdentityService, logService: ILogService);
     scanProfileExtensions(profileLocation: URI, options?: IProfileExtensionsScanOptions): Promise<IScannedProfileExtension[]>;
     addExtensionsToProfile(extensions: [
         IExtension,
@@ -62,9 +60,9 @@ export declare abstract class AbstractExtensionsProfileScannerService extends Di
         IExtension,
         Metadata
     ][], profileLocation: URI): Promise<IScannedProfileExtension[]>;
-    removeExtensionFromProfile(extension: IExtension, profileLocation: URI): Promise<void>;
+    removeExtensionsFromProfile(extensions: IExtensionIdentifier[], profileLocation: URI): Promise<void>;
     private withProfileExtensions;
-    private reportAndThrowInvalidConentError;
+    private throwInvalidConentError;
     private toRelativePath;
     private resolveExtensionLocation;
     private _migrationPromise;

package/vscode/src/vs/platform/extensionManagement/common/extensionsProfileScannerService.js

@@ -15,7 +15,6 @@ import { IUserDataProfilesService } from '../../userDataProfile/common/userDataP
 import { IUriIdentityService } from '../../uriIdentity/common/uriIdentity.service.js';
 import { isString, isUndefined, isObject } from '../../../base/common/types.js';
 import { getErrorMessage } from '../../../base/common/errors.js';
-import { ITelemetryService } from '../../telemetry/common/telemetry.service.js';
 
 var ExtensionsProfileScanningErrorCode;
 (function (ExtensionsProfileScanningErrorCode) {
@@ -29,13 +28,12 @@ class ExtensionsProfileScanningError extends Error {
     }
 }
 let AbstractExtensionsProfileScannerService = class AbstractExtensionsProfileScannerService extends Disposable {
-    constructor(extensionsLocation, fileService, userDataProfilesService, uriIdentityService, telemetryService, logService) {
+    constructor(extensionsLocation, fileService, userDataProfilesService, uriIdentityService, logService) {
         super();
         this.extensionsLocation = extensionsLocation;
         this.fileService = fileService;
         this.userDataProfilesService = userDataProfilesService;
         this.uriIdentityService = uriIdentityService;
-        this.telemetryService = telemetryService;
         this.logService = logService;
         this._onAddExtensions = this._register(( new Emitter()));
         this.onAddExtensions = this._onAddExtensions.event;
@@ -127,13 +125,13 @@ let AbstractExtensionsProfileScannerService = class AbstractExtensionsProfileSca
         });
         return updatedExtensions;
     }
-    async removeExtensionFromProfile(extension, profileLocation) {
+    async removeExtensionsFromProfile(extensions, profileLocation) {
         const extensionsToRemove = [];
         try {
             await this.withProfileExtensions(profileLocation, profileExtensions => {
                 const result = [];
                 for (const e of profileExtensions) {
-                    if (areSameExtensions(e.identifier, extension.identifier)) {
+                    if (( extensions.some(extension => areSameExtensions(e.identifier, extension)))) {
                         extensionsToRemove.push(e);
                     }
                     else {
@@ -180,12 +178,12 @@ let AbstractExtensionsProfileScannerService = class AbstractExtensionsProfileSca
             }
             if (storedProfileExtensions) {
                 if (!Array.isArray(storedProfileExtensions)) {
-                    this.reportAndThrowInvalidConentError(file);
+                    this.throwInvalidConentError(file);
                 }
                 let migrate = false;
                 for (const e of storedProfileExtensions) {
                     if (!isStoredProfileExtension(e)) {
-                        this.reportAndThrowInvalidConentError(file);
+                        this.throwInvalidConentError(file);
                     }
                     let location;
                     if (isString(e.relativeLocation) && e.relativeLocation) {
@@ -232,10 +230,8 @@ let AbstractExtensionsProfileScannerService = class AbstractExtensionsProfileSca
             return extensions;
         });
     }
-    reportAndThrowInvalidConentError(file) {
-        const error = ( new ExtensionsProfileScanningError(`Invalid extensions content in ${( file.toString())}`, ExtensionsProfileScanningErrorCode.ERROR_INVALID_CONTENT));
-        this.telemetryService.publicLogError2('extensionsProfileScanningError', { code: error.code });
-        throw error;
+    throwInvalidConentError(file) {
+        throw ( new ExtensionsProfileScanningError(`Invalid extensions content in ${( file.toString())}`, ExtensionsProfileScanningErrorCode.ERROR_INVALID_CONTENT));
     }
     toRelativePath(extensionLocation) {
         return this.uriIdentityService.extUri.isEqual(this.uriIdentityService.extUri.dirname(extensionLocation), this.extensionsLocation)
@@ -322,8 +318,7 @@ AbstractExtensionsProfileScannerService = ( __decorate([
     ( __param(1, IFileService)),
     ( __param(2, IUserDataProfilesService)),
     ( __param(3, IUriIdentityService)),
-    ( __param(4, ITelemetryService)),
-    ( __param(5, ILogService))
+    ( __param(4, ILogService))
 ], AbstractExtensionsProfileScannerService));
 function isStoredProfileExtension(candidate) {
     return isObject(candidate)

package/vscode/src/vs/platform/extensionManagement/common/extensionsProfileScannerService.service.d.ts

@@ -1,6 +1,6 @@
 import { Event } from "../../../base/common/event.js";
 import { URI } from "../../../base/common/uri.js";
-import { IExtension } from "../../extensions/common/extensions.js";
+import { IExtension, IExtensionIdentifier } from "../../extensions/common/extensions.js";
 import { Metadata } from "./extensionManagement.js";
 import { ProfileExtensionsEvent, DidAddProfileExtensionsEvent, DidRemoveProfileExtensionsEvent, IProfileExtensionsScanOptions, IScannedProfileExtension } from "./extensionsProfileScannerService.js";
 export declare const IExtensionsProfileScannerService: import("../../instantiation/common/instantiation.js").ServiceIdentifier<IExtensionsProfileScannerService>;
@@ -19,5 +19,5 @@ export interface IExtensionsProfileScannerService {
         IExtension,
         Metadata | undefined
     ][], profileLocation: URI): Promise<IScannedProfileExtension[]>;
-    removeExtensionFromProfile(extension: IExtension, profileLocation: URI): Promise<void>;
+    removeExtensionsFromProfile(extensions: IExtensionIdentifier[], profileLocation: URI): Promise<void>;
 }

package/vscode/src/vs/platform/extensionManagement/common/extensionsScannerService.d.ts

@@ -42,16 +42,21 @@ export interface Translations {
 export declare namespace Translations {
     function equals(a: Translations, b: Translations): boolean;
 }
-export type ScanOptions = {
-    readonly profileLocation?: URI;
-    readonly includeInvalid?: boolean;
-    readonly includeAllVersions?: boolean;
-    readonly includeUninstalled?: boolean;
+export type SystemExtensionsScanOptions = {
     readonly checkControlFile?: boolean;
     readonly language?: string;
+};
+export type UserExtensionsScanOptions = {
+    readonly profileLocation: URI;
+    readonly includeInvalid?: boolean;
+    readonly language?: string;
     readonly useCache?: boolean;
     readonly productVersion?: IProductVersion;
 };
+export type ScanOptions = {
+    readonly includeInvalid?: boolean;
+    readonly language?: string;
+};
 export declare abstract class AbstractExtensionsScannerService extends Disposable implements IExtensionsScannerService {
     readonly systemExtensionsLocation: URI;
     readonly userExtensionsLocation: URI;
@@ -69,21 +74,23 @@ export declare abstract class AbstractExtensionsScannerService extends Disposabl
     protected abstract getTranslations(language: string): Promise<Translations>;
     private readonly _onDidChangeCache;
     readonly onDidChangeCache: import("../../../base/common/event.js").Event<ExtensionType>;
-    private readonly obsoleteFile;
     private readonly systemExtensionsCachedScanner;
     private readonly userExtensionsCachedScanner;
     private readonly extensionsScanner;
     constructor(systemExtensionsLocation: URI, userExtensionsLocation: URI, extensionsControlLocation: URI, currentProfile: IUserDataProfile, userDataProfilesService: IUserDataProfilesService, extensionsProfileScannerService: IExtensionsProfileScannerService, fileService: IFileService, logService: ILogService, environmentService: IEnvironmentService, productService: IProductService, uriIdentityService: IUriIdentityService, instantiationService: IInstantiationService);
     private _targetPlatformPromise;
-    getTargetPlatform(): Promise<TargetPlatform>;
-    scanAllExtensions(systemScanOptions: ScanOptions, userScanOptions: ScanOptions, includeExtensionsUnderDev: boolean): Promise<IScannedExtension[]>;
-    scanSystemExtensions(scanOptions: ScanOptions): Promise<IScannedExtension[]>;
-    scanUserExtensions(scanOptions: ScanOptions): Promise<IScannedExtension[]>;
-    scanExtensionsUnderDevelopment(scanOptions: ScanOptions, existingExtensions: IScannedExtension[]): Promise<IScannedExtension[]>;
+    private getTargetPlatform;
+    scanAllExtensions(systemScanOptions: SystemExtensionsScanOptions, userScanOptions: UserExtensionsScanOptions): Promise<IScannedExtension[]>;
+    scanSystemExtensions(scanOptions: SystemExtensionsScanOptions): Promise<IScannedExtension[]>;
+    scanUserExtensions(scanOptions: UserExtensionsScanOptions): Promise<IScannedExtension[]>;
+    scanAllUserExtensions(scanOptions?: {
+        includeAllVersions?: boolean;
+        includeInvalid: boolean;
+    }): Promise<IScannedExtension[]>;
+    scanExtensionsUnderDevelopment(existingExtensions: IScannedExtension[], scanOptions: ScanOptions): Promise<IScannedExtension[]>;
     scanExistingExtension(extensionLocation: URI, extensionType: ExtensionType, scanOptions: ScanOptions): Promise<IScannedExtension | null>;
     scanOneOrMultipleExtensions(extensionLocation: URI, extensionType: ExtensionType, scanOptions: ScanOptions): Promise<IScannedExtension[]>;
     scanMultipleExtensions(extensionLocations: URI[], extensionType: ExtensionType, scanOptions: ScanOptions): Promise<IScannedExtension[]>;
-    scanMetadata(extensionLocation: URI): Promise<Metadata | undefined>;
     updateMetadata(extensionLocation: URI, metaData: Partial<Metadata>): Promise<void>;
     initializeDefaultProfileExtensions(): Promise<void>;
     private initializeDefaultProfileExtensionsPromise;
@@ -105,7 +112,6 @@ export declare class ExtensionScannerInput {
     readonly profile: boolean;
     readonly profileScanOptions: IProfileExtensionsScanOptions | undefined;
     readonly type: ExtensionType;
-    readonly excludeObsolete: boolean;
     readonly validate: boolean;
     readonly productVersion: string;
     readonly productDate: string | undefined;
@@ -113,7 +119,7 @@ export declare class ExtensionScannerInput {
     readonly devMode: boolean;
     readonly language: string | undefined;
     readonly translations: Translations;
-    constructor(location: URI, mtime: number | undefined, applicationExtensionslocation: URI | undefined, applicationExtensionslocationMtime: number | undefined, profile: boolean, profileScanOptions: IProfileExtensionsScanOptions | undefined, type: ExtensionType, excludeObsolete: boolean, validate: boolean, productVersion: string, productDate: string | undefined, productCommit: string | undefined, devMode: boolean, language: string | undefined, translations: Translations);
+    constructor(location: URI, mtime: number | undefined, applicationExtensionslocation: URI | undefined, applicationExtensionslocationMtime: number | undefined, profile: boolean, profileScanOptions: IProfileExtensionsScanOptions | undefined, type: ExtensionType, validate: boolean, productVersion: string, productDate: string | undefined, productCommit: string | undefined, devMode: boolean, language: string | undefined, translations: Translations);
     static createNlsConfiguration(input: ExtensionScannerInput): NlsConfiguration;
     static equals(a: ExtensionScannerInput, b: ExtensionScannerInput): boolean;
 }