@codingame/monaco-vscode-api 7.0.11 → 7.1.1

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

@@ -1,9 +1,8 @@
 import { basename } from '../../../base/common/resources.js';
 import Severity$1 from '../../../base/common/severity.js';
-import { localizeWithPath } from '../../../nls.js';
+import { localize } from '../../../nls.js';
 import '../../../base/common/labels.js';
 import '../../../base/common/platform.js';
-const _moduleId = "vs/platform/dialogs/common/dialogs";
 var DialogKind;
 ( ((function(DialogKind) {
     DialogKind[DialogKind["Confirmation"] = 1] = "Confirmation";
@@ -29,13 +28,13 @@ class AbstractDialogHandler {
                     buttons.push(confirmationDialog.primaryButton);
                 }
                 else {
-                    buttons.push(( localizeWithPath(_moduleId, 0, "&&Yes")));
+                    buttons.push(( localize(5687, "&&Yes")));
                 }
                 if (confirmationDialog.cancelButton) {
                     buttons.push(confirmationDialog.cancelButton);
                 }
                 else {
-                    buttons.push(( localizeWithPath(_moduleId, 1, "Cancel")));
+                    buttons.push(( localize(5688, "Cancel")));
                 }
                 break;
             }
@@ -46,7 +45,7 @@ class AbstractDialogHandler {
                 }
                 if (promptDialog.cancelButton) {
                     if (promptDialog.cancelButton === true) {
-                        buttons.push(( localizeWithPath(_moduleId, 1, "Cancel")));
+                        buttons.push(( localize(5688, "Cancel")));
                     }
                     else if (typeof promptDialog.cancelButton === 'string') {
                         buttons.push(promptDialog.cancelButton);
@@ -56,12 +55,12 @@ class AbstractDialogHandler {
                             buttons.push(promptDialog.cancelButton.label);
                         }
                         else {
-                            buttons.push(( localizeWithPath(_moduleId, 1, "Cancel")));
+                            buttons.push(( localize(5688, "Cancel")));
                         }
                     }
                 }
                 if (buttons.length === 0) {
-                    buttons.push(( localizeWithPath(_moduleId, 2, "&&OK")));
+                    buttons.push(( localize(5689, "&&OK")));
                 }
                 break;
             }
@@ -71,13 +70,13 @@ class AbstractDialogHandler {
                     buttons.push(inputDialog.primaryButton);
                 }
                 else {
-                    buttons.push(( localizeWithPath(_moduleId, 2, "&&OK")));
+                    buttons.push(( localize(5689, "&&OK")));
                 }
                 if (inputDialog.cancelButton) {
                     buttons.push(inputDialog.cancelButton);
                 }
                 else {
-                    buttons.push(( localizeWithPath(_moduleId, 1, "Cancel")));
+                    buttons.push(( localize(5689, "Cancel")));
                 }
                 break;
             }
@@ -119,12 +118,11 @@ function getFileNamesMessage(fileNamesOrResources) {
     ))));
     if (fileNamesOrResources.length > MAX_CONFIRM_FILES) {
         if (fileNamesOrResources.length - MAX_CONFIRM_FILES === 1) {
-            message.push(( localizeWithPath(_moduleId, 3, "...1 additional file not shown")));
+            message.push(( localize(5690, "...1 additional file not shown")));
         }
         else {
-            message.push(( localizeWithPath(
-                _moduleId,
-                4,
+            message.push(( localize(
+                5691,
                 "...{0} additional files not shown",
                 fileNamesOrResources.length - MAX_CONFIRM_FILES
             )));

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

@@ -8,7 +8,7 @@ import { parse } from '../../../base/common/marshalling.js';
 import { Schemas } from '../../../base/common/network.js';
 import { isWeb } from '../../../base/common/platform.js';
 import { URI } from '../../../base/common/uri.js';
-import { localizeWithPath } from '../../../nls.js';
+import { localize } from '../../../nls.js';
 import { IDialogService } from '../../dialogs/common/dialogs.service.js';
 import { HTMLFileSystemProvider } from '../../files/browser/htmlFileSystemProvider.js';
 import { WebFileSystemAccess } from '../../files/browser/webFileSystemAccess.js';
@@ -17,7 +17,6 @@ import { IFileService } from '../../files/common/files.service.js';
 import { IInstantiationService } from '../../instantiation/common/instantiation.js';
 import { extractSelection } from '../../opener/common/opener.js';
 import { Registry } from '../../registry/common/platform.js';
-const _moduleId = "vs/platform/dnd/browser/dnd";
 const CodeDataTransfers = {
     EDITORS: 'CodeEditors',
     FILES: 'CodeFiles'
@@ -178,9 +177,8 @@ async function extractFileListData(accessor, files) {
         const file = files.item(i);
         if (file) {
             if (file.size > 100 * ByteSize.MB) {
-                dialogService.warn(( localizeWithPath(
-                    _moduleId,
-                    0,
+                dialogService.warn(( localize(
+                    5639,
                     "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/extensionManagement/common/extensionManagement.d.ts

@@ -15,6 +15,7 @@ interface IGalleryExtensionProperties {
     localizedLanguages?: string[];
     targetPlatform: TargetPlatform;
     isPreReleaseVersion: boolean;
+    executesCode?: boolean;
 }
 interface IGalleryExtensionAsset {
     uri: string;
@@ -183,6 +184,7 @@ type InstallOptions = {
     profileLocation?: URI;
     installOnlyNewlyAddedFromExtensionPack?: boolean;
     productVersion?: IProductVersion;
+    keepExisting?: boolean;
     /**
      * Context passed through to InstallExtensionResult
      */
@@ -203,5 +205,9 @@ type InstallExtensionInfo = {
     readonly extension: IGalleryExtension;
     readonly options: InstallOptions;
 };
+type UninstallExtensionInfo = {
+    readonly extension: ILocalExtension;
+    readonly options?: UninstallOptions;
+};
 
-export { type DidUninstallExtensionEvent, type DidUpdateExtensionMetadata, type IDeprecationInfo, type IExtensionIdentifier, type IExtensionManagementParticipant, type IExtensionsControlManifest, type IGalleryExtension, type IGalleryExtensionAsset, type IGalleryExtensionAssets, type IGalleryExtensionIdentifier, type IGalleryExtensionProperties, type IGalleryMetadata, type ILocalExtension, type IProductVersion, type ISearchPrefferedResults, type InstallExtensionEvent, type InstallExtensionInfo, type InstallExtensionResult, InstallOperation, type InstallOptions, type InstallSource, type Metadata, type UninstallExtensionEvent, type UninstallOptions };
+export { type DidUninstallExtensionEvent, type DidUpdateExtensionMetadata, type IDeprecationInfo, type IExtensionIdentifier, type IExtensionManagementParticipant, type IExtensionsControlManifest, type IGalleryExtension, type IGalleryExtensionAsset, type IGalleryExtensionAssets, type IGalleryExtensionIdentifier, type IGalleryExtensionProperties, type IGalleryMetadata, type ILocalExtension, type IProductVersion, type ISearchPrefferedResults, type InstallExtensionEvent, type InstallExtensionInfo, type InstallExtensionResult, InstallOperation, type InstallOptions, type InstallSource, type Metadata, type UninstallExtensionEvent, type UninstallExtensionInfo, type UninstallOptions };

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

@@ -1,7 +1,6 @@
 import { Platform } from '../../../base/common/platform.js';
-import { localize2WithPath } from '../../../nls.js';
+import { localize2 } from '../../../nls.js';
 import { TargetPlatform } from '../../extensions/common/extensions.js';
-const _moduleId = "vs/platform/extensionManagement/common/extensionManagement";
 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';
@@ -169,7 +168,6 @@ var ExtensionManagementErrorCode;
     ExtensionManagementErrorCode["Download"] = "Download";
     ExtensionManagementErrorCode["DownloadSignature"] = "DownloadSignature";
     ExtensionManagementErrorCode["DownloadFailedWriting"] = "DownloadFailedWriting";
-    ExtensionManagementErrorCode["UpdateExistingMetadata"] = "UpdateExistingMetadata";
     ExtensionManagementErrorCode["UpdateMetadata"] = "UpdateMetadata";
     ExtensionManagementErrorCode["Extract"] = "Extract";
     ExtensionManagementErrorCode["Scanning"] = "Scanning";
@@ -200,6 +198,6 @@ class ExtensionManagementError extends Error {
 }
 const DISABLED_EXTENSIONS_STORAGE_PATH = 'extensionsIdentifiers/disabled';
 const ENABLED_EXTENSIONS_STORAGE_PATH = 'extensionsIdentifiers/enabled';
-const ExtensionsLocalizedLabel = ( localize2WithPath(_moduleId, 0, "Extensions"));
-const PreferencesLocalizedLabel = ( localize2WithPath(_moduleId, 1, 'Preferences'));
+const ExtensionsLocalizedLabel = ( localize2(705, "Extensions"));
+const PreferencesLocalizedLabel = ( localize2(706, 'Preferences'));
 export { 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, ExtensionsLocalizedLabel, InstallOperation, PreferencesLocalizedLabel, SortBy, SortOrder, StatisticType, TargetPlatformToString, WEB_EXTENSION_TAG, getTargetPlatform, isIExtensionIdentifier, isNotWebExtensionInWebTargetPlatform, isTargetPlatformCompatible, toTargetPlatform };

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

@@ -1,7 +1,7 @@
 import { ServiceIdentifier } from '../../instantiation/common/instantiation.js';
 import { URI } from '../../../base/common/uri.js';
 import { IExtensionManifest, ExtensionType, TargetPlatform } from '../../extensions/common/extensions.js';
-import { InstallExtensionEvent, InstallExtensionResult, UninstallExtensionEvent, DidUninstallExtensionEvent, DidUpdateExtensionMetadata, ILocalExtension, IExtensionIdentifier, InstallOptions, IGalleryExtension, InstallExtensionInfo, UninstallOptions, IProductVersion, IExtensionsControlManifest, Metadata, InstallOperation, IExtensionManagementParticipant } from './extensionManagement.js';
+import { InstallExtensionEvent, InstallExtensionResult, UninstallExtensionEvent, DidUninstallExtensionEvent, DidUpdateExtensionMetadata, ILocalExtension, InstallOptions, IGalleryExtension, InstallExtensionInfo, IExtensionIdentifier, UninstallOptions, UninstallExtensionInfo, IProductVersion, IExtensionsControlManifest, Metadata, InstallOperation, IExtensionManagementParticipant } from './extensionManagement.js';
 import { Event } from '../../../base/common/event.js';
 
 declare const IExtensionManagementService: ServiceIdentifier<IExtensionManagementService>;
@@ -13,7 +13,6 @@ interface IExtensionManagementService {
     onDidUninstallExtension: Event<DidUninstallExtensionEvent>;
     onDidUpdateExtensionMetadata: Event<DidUpdateExtensionMetadata>;
     zip(extension: ILocalExtension): Promise<URI>;
-    unzip(zipLocation: URI): Promise<IExtensionIdentifier>;
     getManifest(vsix: URI): Promise<IExtensionManifest>;
     install(vsix: URI, options?: InstallOptions): Promise<ILocalExtension>;
     canInstall(extension: IGalleryExtension): Promise<boolean>;
@@ -22,12 +21,14 @@ interface IExtensionManagementService {
     installFromLocation(location: URI, profileLocation: URI): Promise<ILocalExtension>;
     installExtensionsFromProfile(extensions: IExtensionIdentifier[], fromProfileLocation: URI, toProfileLocation: URI): Promise<ILocalExtension[]>;
     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>;
     updateMetadata(local: ILocalExtension, metadata: Partial<Metadata>, profileLocation: URI): Promise<ILocalExtension>;
+    resetPinnedStateForAllUserExtensions(pinned: boolean): Promise<void>;
     download(extension: IGalleryExtension, operation: InstallOperation, donotVerifySignature: boolean): Promise<URI>;
     registerParticipant(pariticipant: IExtensionManagementParticipant): void;
     getTargetPlatform(): Promise<TargetPlatform>;

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

@@ -1,6 +1,5 @@
 import { isString, isObject } from '../../../base/common/types.js';
-import { localizeWithPath } from '../../../nls.js';
-const _moduleId = "vs/platform/extensionManagement/common/extensionNls";
+import { localize } from '../../../nls.js';
 function localizeManifest(logger, extensionManifest, translations, fallbackTranslations) {
     try {
         replaceNLStrings(logger, extensionManifest, translations, fallbackTranslations);
@@ -27,7 +26,7 @@ function replaceNLStrings(logger, extensionManifest, messages, originalMessages)
                 const originalMessage = typeof original === 'string' ? original : original?.message;
                 if (!message) {
                     if (!originalMessage) {
-                        logger.warn(`[${extensionManifest.name}]: ${( localizeWithPath(_moduleId, 0, "Couldn't find message for key {0}.", messageKey))}`);
+                        logger.warn(`[${extensionManifest.name}]: ${( localize(867, "Couldn't find message for key {0}.", messageKey))}`);
                     }
                     return;
                 }

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

@@ -3,7 +3,7 @@ import { Emitter } from '../../../base/common/event.js';
 import { Disposable, DisposableStore } from '../../../base/common/lifecycle.js';
 import { StorageScope, StorageTarget } from '../../storage/common/storage.js';
 import { IStorageService } from '../../storage/common/storage.service.js';
-import { adoptToGalleryExtensionId, areSameExtensions, getExtensionId } from './extensionManagementUtil.js';
+import { adoptToGalleryExtensionId, getExtensionId, areSameExtensions } from './extensionManagementUtil.js';
 import { IProductService } from '../../product/common/productService.service.js';
 import { distinct } from '../../../base/common/arrays.js';
 import { ILogService } from '../../log/common/log.service.js';

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

@@ -15,7 +15,7 @@ import { semverExports } from '../../../../../../external/vscode-semver/semver.j
 import Severity$1 from '../../../base/common/severity.js';
 import { isEmptyObject } from '../../../base/common/types.js';
 import { URI } from '../../../base/common/uri.js';
-import { localizeWithPath } from '../../../nls.js';
+import { localize } from '../../../nls.js';
 import { IEnvironmentService } from '../../environment/common/environment.service.js';
 import { computeTargetPlatform, areSameExtensions, ExtensionKey, getGalleryExtensionId } from './extensionManagementUtil.js';
 import { ExtensionType, UNDEFINED_PUBLISHER, TargetPlatform, parseEnabledApiProposalNames, BUILTIN_MANIFEST_CACHE_FILE, USER_MANIFEST_CACHE_FILE, ExtensionIdentifierMap } from '../../extensions/common/extensions.js';
@@ -32,7 +32,6 @@ import { IExtensionsProfileScannerService } from './extensionsProfileScannerServ
 import { IUserDataProfilesService } from '../../userDataProfile/common/userDataProfile.service.js';
 import { IUriIdentityService } from '../../uriIdentity/common/uriIdentity.service.js';
 import { localizeManifest } from './extensionNls.js';
-const _moduleId = "vs/platform/extensionManagement/common/extensionsScannerService";
 var Translations;
 ( ((function(Translations) {
     function equals(a, b) {
@@ -457,9 +456,8 @@ let ExtensionManifestTranslator = class ExtensionManifestTranslator extends Disp
         const defaultPackageNLS = joinPath(extensionLocation, 'package.nls.json');
         const reportErrors = (localized, errors) => {
             errors.forEach((error) => {
-                this.logService.error(this.formatMessage(extensionLocation, ( localizeWithPath(
-                    _moduleId,
-                    0,
+                this.logService.error(this.formatMessage(extensionLocation, ( localize(
+                    444,
                     "Failed to parse {0}: {1}.",
                     localized?.path,
                     getParseErrorMessage(error.error)
@@ -467,7 +465,7 @@ let ExtensionManifestTranslator = class ExtensionManifestTranslator extends Disp
             });
         };
         const reportInvalidFormat = (localized) => {
-            this.logService.error(this.formatMessage(extensionLocation, ( localizeWithPath(_moduleId, 1, "Invalid format {0}: JSON object expected.", localized?.path))));
+            this.logService.error(this.formatMessage(extensionLocation, ( localize(445, "Invalid format {0}: JSON object expected.", localized?.path))));
         };
         const translationId = `${extensionManifest.publisher}.${extensionManifest.name}`;
         const translationPath = nlsConfiguration.translations[translationId];
@@ -536,9 +534,8 @@ let ExtensionManifestTranslator = class ExtensionManifestTranslator extends Disp
                 const defaults = await this.resolveOriginalMessageBundle(localizedMessages.default, errors);
                 if (errors.length > 0) {
                     errors.forEach((error) => {
-                        this.logService.error(this.formatMessage(extensionLocation, ( localizeWithPath(
-                            _moduleId,
-                            0,
+                        this.logService.error(this.formatMessage(extensionLocation, ( localize(
+                            445,
                             "Failed to parse {0}: {1}.",
                             localizedMessages.default?.path,
                             getParseErrorMessage(error.error)
@@ -547,9 +544,8 @@ let ExtensionManifestTranslator = class ExtensionManifestTranslator extends Disp
                     return extensionManifest;
                 }
                 else if (getNodeType(localizedMessages) !== 'object') {
-                    this.logService.error(this.formatMessage(extensionLocation, ( localizeWithPath(
-                        _moduleId,
-                        1,
+                    this.logService.error(this.formatMessage(extensionLocation, ( localize(
+                        445,
                         "Invalid format {0}: JSON object expected.",
                         localizedMessages.default?.path
                     ))));
@@ -609,11 +605,12 @@ ExtensionManifestTranslator = ( (__decorate([
     ( (__param(1, ILogService)))
 ], ExtensionManifestTranslator)));
 let ExtensionsScanner = class ExtensionsScanner extends ExtensionManifestTranslator {
-    constructor(obsoleteFile, extensionsProfileScannerService, uriIdentityService, fileService, productService, logService) {
+    constructor(obsoleteFile, extensionsProfileScannerService, uriIdentityService, fileService, productService, environmentService, logService) {
         super(fileService, logService);
         this.obsoleteFile = obsoleteFile;
         this.extensionsProfileScannerService = extensionsProfileScannerService;
         this.uriIdentityService = uriIdentityService;
+        this.environmentService = environmentService;
         this.extensionsEnabledWithApiProposalVersion = productService.extensionsEnabledWithApiProposalVersion?.map(id => id.toLowerCase()) ?? [];
     }
     async scanExtensions(input) {
@@ -745,7 +742,8 @@ let ExtensionsScanner = class ExtensionsScanner extends ExtensionManifestTransla
                 if (input.validate) {
                     extension = this.validate(extension, input);
                 }
-                if (manifest.enabledApiProposals && this.extensionsEnabledWithApiProposalVersion.includes(id.toLowerCase())) {
+                if (manifest.enabledApiProposals && (!this.environmentService.isBuilt || this.extensionsEnabledWithApiProposalVersion.includes(id.toLowerCase()))) {
+                    manifest.originalEnabledApiProposals = manifest.enabledApiProposals;
                     manifest.enabledApiProposals = parseEnabledApiProposalNames([...manifest.enabledApiProposals]);
                 }
                 return extension;
@@ -760,7 +758,7 @@ let ExtensionsScanner = class ExtensionsScanner extends ExtensionManifestTransla
     }
     validate(extension, input) {
         let isValid = true;
-        const validateApiVersion = this.extensionsEnabledWithApiProposalVersion.includes(extension.identifier.id.toLowerCase());
+        const validateApiVersion = this.environmentService.isBuilt && this.extensionsEnabledWithApiProposalVersion.includes(extension.identifier.id.toLowerCase());
         const validations = validateExtensionManifest(input.productVersion, input.productDate, input.location, extension.manifest, extension.isBuiltin, validateApiVersion);
         for (const [severity, message] of validations) {
             if (severity === Severity$1.Error) {
@@ -780,13 +778,7 @@ let ExtensionsScanner = class ExtensionsScanner extends ExtensionManifestTransla
         }
         catch (error) {
             if (toFileOperationResult(error) !== FileOperationResult.FILE_NOT_FOUND) {
-                this.logService.error(this.formatMessage(extensionLocation, ( localizeWithPath(
-                    _moduleId,
-                    2,
-                    "Cannot read file {0}: {1}.",
-                    manifestLocation.path,
-                    error.message
-                ))));
+                this.logService.error(this.formatMessage(extensionLocation, ( localize(446, "Cannot read file {0}: {1}.", manifestLocation.path, error.message))));
             }
             return null;
         }
@@ -798,9 +790,8 @@ let ExtensionsScanner = class ExtensionsScanner extends ExtensionManifestTransla
             const errors = [];
             parse(content, errors);
             for (const e of errors) {
-                this.logService.error(this.formatMessage(extensionLocation, ( localizeWithPath(
-                    _moduleId,
-                    3,
+                this.logService.error(this.formatMessage(extensionLocation, ( localize(
+                    447,
                     "Failed to parse {0}: [{1}, {2}] {3}.",
                     manifestLocation.path,
                     e.offset,
@@ -811,10 +802,9 @@ let ExtensionsScanner = class ExtensionsScanner extends ExtensionManifestTransla
             return null;
         }
         if (getNodeType(manifest) !== 'object') {
-            this.logService.error(this.formatMessage(extensionLocation, ( localizeWithPath(
-                _moduleId,
-                4,
-                "Invalid manifest file {0}: Not an JSON object.",
+            this.logService.error(this.formatMessage(extensionLocation, ( localize(
+                448,
+                "Invalid manifest file {0}: Not a JSON object.",
                 manifestLocation.path
             ))));
             return null;
@@ -827,11 +817,12 @@ ExtensionsScanner = ( (__decorate([
     ( (__param(2, IUriIdentityService))),
     ( (__param(3, IFileService))),
     ( (__param(4, IProductService))),
-    ( (__param(5, ILogService)))
+    ( (__param(5, IEnvironmentService))),
+    ( (__param(6, ILogService)))
 ], ExtensionsScanner)));
 let CachedExtensionsScanner = class CachedExtensionsScanner extends ExtensionsScanner {
-    constructor(currentProfile, obsoleteFile, userDataProfilesService, extensionsProfileScannerService, uriIdentityService, fileService, productService, logService) {
-        super(obsoleteFile, extensionsProfileScannerService, uriIdentityService, fileService, productService, logService);
+    constructor(currentProfile, obsoleteFile, userDataProfilesService, extensionsProfileScannerService, uriIdentityService, fileService, productService, environmentService, logService) {
+        super(obsoleteFile, extensionsProfileScannerService, uriIdentityService, fileService, productService, environmentService, logService);
         this.currentProfile = currentProfile;
         this.userDataProfilesService = userDataProfilesService;
         this.cacheValidatorThrottler = this._register(( (new ThrottledDelayer(3000))));
@@ -921,6 +912,7 @@ CachedExtensionsScanner = ( (__decorate([
     ( (__param(4, IUriIdentityService))),
     ( (__param(5, IFileService))),
     ( (__param(6, IProductService))),
-    ( (__param(7, ILogService)))
+    ( (__param(7, IEnvironmentService))),
+    ( (__param(8, ILogService)))
 ], CachedExtensionsScanner)));
 export { AbstractExtensionsScannerService, ExtensionManifestTranslator, ExtensionScannerInput, Translations };

package/vscode/src/vs/platform/extensions/common/extensionValidator.js

@@ -1,10 +1,9 @@
 import { joinPath, isEqualOrParent } from '../../../base/common/resources.js';
 import Severity$1 from '../../../base/common/severity.js';
-import { localizeWithPath } from '../../../nls.js';
+import { localize } from '../../../nls.js';
 import { semverExports } from '../../../../../../external/vscode-semver/semver.js';
 import { parseApiProposals } from './extensions.js';
 import { allApiProposals } from './extensionsApiProposals.js';
-const _moduleId = "vs/platform/extensions/common/extensionValidator";
 const VERSION_REGEXP = /^(\^|>=)?((\d+)|x)\.((\d+)|x)\.((\d+)|x)(\-.*)?$/;
 const NOT_BEFORE_REGEXP = /^-(\d{4})(\d{2})(\d{2})$/;
 function isValidVersionStr(version) {
@@ -170,40 +169,24 @@ function isValidVersion(_inputVersion, _inputDate, _desiredVersion) {
 function validateExtensionManifest(productVersion, productDate, extensionLocation, extensionManifest, extensionIsBuiltin, validateApiVersion) {
     const validations = [];
     if (typeof extensionManifest.publisher !== 'undefined' && typeof extensionManifest.publisher !== 'string') {
-        validations.push([Severity$1.Error, ( localizeWithPath(_moduleId, 0, "property publisher must be of type `string`."))]);
+        validations.push([Severity$1.Error, ( localize(848, "property publisher must be of type `string`."))]);
         return validations;
     }
     if (typeof extensionManifest.name !== 'string') {
-        validations.push([Severity$1.Error, ( localizeWithPath(
-            _moduleId,
-            1,
-            "property `{0}` is mandatory and must be of type `string`",
-            'name'
-        ))]);
+        validations.push([Severity$1.Error, ( localize(849, "property `{0}` is mandatory and must be of type `string`", 'name'))]);
         return validations;
     }
     if (typeof extensionManifest.version !== 'string') {
-        validations.push([Severity$1.Error, ( localizeWithPath(
-            _moduleId,
-            2,
-            "property `{0}` is mandatory and must be of type `string`",
-            'version'
-        ))]);
+        validations.push([Severity$1.Error, ( localize(850, "property `{0}` is mandatory and must be of type `string`", 'version'))]);
         return validations;
     }
     if (!extensionManifest.engines) {
-        validations.push([Severity$1.Error, ( localizeWithPath(
-            _moduleId,
-            3,
-            "property `{0}` is mandatory and must be of type `object`",
-            'engines'
-        ))]);
+        validations.push([Severity$1.Error, ( localize(851, "property `{0}` is mandatory and must be of type `object`", 'engines'))]);
         return validations;
     }
     if (typeof extensionManifest.engines.vscode !== 'string') {
-        validations.push([Severity$1.Error, ( localizeWithPath(
-            _moduleId,
-            4,
+        validations.push([Severity$1.Error, ( localize(
+            852,
             "property `{0}` is mandatory and must be of type `string`",
             'engines.vscode'
         ))]);
@@ -211,9 +194,8 @@ function validateExtensionManifest(productVersion, productDate, extensionLocatio
     }
     if (typeof extensionManifest.extensionDependencies !== 'undefined') {
         if (!isStringArray(extensionManifest.extensionDependencies)) {
-            validations.push([Severity$1.Error, ( localizeWithPath(
-                _moduleId,
-                5,
+            validations.push([Severity$1.Error, ( localize(
+                853,
                 "property `{0}` can be omitted or must be of type `string[]`",
                 'extensionDependencies'
             ))]);
@@ -222,18 +204,16 @@ function validateExtensionManifest(productVersion, productDate, extensionLocatio
     }
     if (typeof extensionManifest.activationEvents !== 'undefined') {
         if (!isStringArray(extensionManifest.activationEvents)) {
-            validations.push([Severity$1.Error, ( localizeWithPath(
-                _moduleId,
-                6,
+            validations.push([Severity$1.Error, ( localize(
+                854,
                 "property `{0}` can be omitted or must be of type `string[]`",
                 'activationEvents'
             ))]);
             return validations;
         }
         if (typeof extensionManifest.main === 'undefined' && typeof extensionManifest.browser === 'undefined') {
-            validations.push([Severity$1.Error, ( localizeWithPath(
-                _moduleId,
-                7,
+            validations.push([Severity$1.Error, ( localize(
+                855,
                 "property `{0}` should be omitted if the extension doesn't have a `{1}` or `{2}` property.",
                 'activationEvents',
                 'main',
@@ -244,9 +224,8 @@ function validateExtensionManifest(productVersion, productDate, extensionLocatio
     }
     if (typeof extensionManifest.extensionKind !== 'undefined') {
         if (typeof extensionManifest.main === 'undefined') {
-            validations.push([Severity$1.Warning, ( localizeWithPath(
-                _moduleId,
-                8,
+            validations.push([Severity$1.Warning, ( localize(
+                856,
                 "property `{0}` can be defined only if property `main` is also defined.",
                 'extensionKind'
             ))]);
@@ -254,20 +233,14 @@ function validateExtensionManifest(productVersion, productDate, extensionLocatio
     }
     if (typeof extensionManifest.main !== 'undefined') {
         if (typeof extensionManifest.main !== 'string') {
-            validations.push([Severity$1.Error, ( localizeWithPath(
-                _moduleId,
-                9,
-                "property `{0}` can be omitted or must be of type `string`",
-                'main'
-            ))]);
+            validations.push([Severity$1.Error, ( localize(857, "property `{0}` can be omitted or must be of type `string`", 'main'))]);
             return validations;
         }
         else {
             const mainLocation = joinPath(extensionLocation, extensionManifest.main);
             if (!isEqualOrParent(mainLocation, extensionLocation)) {
-                validations.push([Severity$1.Warning, ( localizeWithPath(
-                    _moduleId,
-                    10,
+                validations.push([Severity$1.Warning, ( localize(
+                    858,
                     "Expected `main` ({0}) to be included inside extension's folder ({1}). This might make the extension non-portable.",
                     mainLocation.path,
                     extensionLocation.path
@@ -277,9 +250,8 @@ function validateExtensionManifest(productVersion, productDate, extensionLocatio
     }
     if (typeof extensionManifest.browser !== 'undefined') {
         if (typeof extensionManifest.browser !== 'string') {
-            validations.push([Severity$1.Error, ( localizeWithPath(
-                _moduleId,
-                11,
+            validations.push([Severity$1.Error, ( localize(
+                859,
                 "property `{0}` can be omitted or must be of type `string`",
                 'browser'
             ))]);
@@ -288,9 +260,8 @@ function validateExtensionManifest(productVersion, productDate, extensionLocatio
         else {
             const browserLocation = joinPath(extensionLocation, extensionManifest.browser);
             if (!isEqualOrParent(browserLocation, extensionLocation)) {
-                validations.push([Severity$1.Warning, ( localizeWithPath(
-                    _moduleId,
-                    12,
+                validations.push([Severity$1.Warning, ( localize(
+                    860,
                     "Expected `browser` ({0}) to be included inside extension's folder ({1}). This might make the extension non-portable.",
                     browserLocation.path,
                     extensionLocation.path
@@ -299,7 +270,7 @@ function validateExtensionManifest(productVersion, productDate, extensionLocatio
         }
     }
     if (!semverExports.valid(extensionManifest.version)) {
-        validations.push([Severity$1.Error, ( localizeWithPath(_moduleId, 13, "Extension version is not semver compatible."))]);
+        validations.push([Severity$1.Error, ( localize(861, "Extension version is not semver compatible."))]);
         return validations;
     }
     const notices = [];
@@ -345,9 +316,8 @@ function areApiProposalsCompatible(apiProposals, arg1) {
             continue;
         }
         if (existingProposal.version !== version) {
-            incompatibleNotices.push(( localizeWithPath(
-                _moduleId,
-                14,
+            incompatibleNotices.push(( localize(
+                862,
                 "Extension is using an API proposal '{0}' that is not compatible with the current version of VS Code.",
                 proposalName
             )));
@@ -359,9 +329,8 @@ function areApiProposalsCompatible(apiProposals, arg1) {
 function isVersionValid(currentVersion, date, requestedVersion, notices = []) {
     const desiredVersion = normalizeVersion(parseVersion(requestedVersion));
     if (!desiredVersion) {
-        notices.push(( localizeWithPath(
-            _moduleId,
-            15,
+        notices.push(( localize(
+            863,
             "Could not parse `engines.vscode` value {0}. Please use, for example: ^1.22.0, ^1.22.x, etc.",
             requestedVersion
         )));
@@ -369,9 +338,8 @@ function isVersionValid(currentVersion, date, requestedVersion, notices = []) {
     }
     if (desiredVersion.majorBase === 0) {
         if (!desiredVersion.majorMustEqual || !desiredVersion.minorMustEqual) {
-            notices.push(( localizeWithPath(
-                _moduleId,
-                16,
+            notices.push(( localize(
+                864,
                 "Version specified in `engines.vscode` ({0}) is not specific enough. For vscode versions before 1.0.0, please define at a minimum the major and minor desired version. E.g. ^0.10.0, 0.10.x, 0.11.0, etc.",
                 requestedVersion
             )));
@@ -380,9 +348,8 @@ function isVersionValid(currentVersion, date, requestedVersion, notices = []) {
     }
     else {
         if (!desiredVersion.majorMustEqual) {
-            notices.push(( localizeWithPath(
-                _moduleId,
-                17,
+            notices.push(( localize(
+                865,
                 "Version specified in `engines.vscode` ({0}) is not specific enough. For vscode versions after 1.0.0, please define at a minimum the major desired version. E.g. ^1.10.0, 1.10.x, 1.x.x, 2.x.x, etc.",
                 requestedVersion
             )));
@@ -390,9 +357,8 @@ function isVersionValid(currentVersion, date, requestedVersion, notices = []) {
         }
     }
     if (!isValidVersion(currentVersion, date, desiredVersion)) {
-        notices.push(( localizeWithPath(
-            _moduleId,
-            18,
+        notices.push(( localize(
+            866,
             "Extension is not compatible with Code {0}. Extension requires: {1}.",
             currentVersion,
             requestedVersion