@codingame/monaco-vscode-api 9.0.3 → 10.0.1

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

@@ -11,23 +11,23 @@ import { Schemas, FileAccess } from '../../../base/common/network.js';
 import { basename, normalize, join } from '../../../base/common/path.js';
 import { language } from '../../../base/common/platform.js';
 import { joinPath, isEqual, basename as basename$1 } from '../../../base/common/resources.js';
-import { semverExports } from '../../../../../../external/vscode-semver/semver.js';
+import { semverExports } from '../../../../../../_virtual/semver.js';
 import Severity$1 from '../../../base/common/severity.js';
 import { isEmptyObject } from '../../../base/common/types.js';
 import { URI } from '../../../base/common/uri.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';
+import { UNDEFINED_PUBLISHER, parseEnabledApiProposalNames, BUILTIN_MANIFEST_CACHE_FILE, USER_MANIFEST_CACHE_FILE, ExtensionIdentifierMap } from '../../extensions/common/extensions.js';
 import { validateExtensionManifest } from '../../extensions/common/extensionValidator.js';
-import { toFileOperationResult, FileOperationResult } from '../../files/common/files.js';
+import { toFileOperationResult } from '../../files/common/files.js';
 import { IFileService } from '../../files/common/files.service.js';
 import { IInstantiationService } from '../../instantiation/common/instantiation.js';
 import { ILogService } from '../../log/common/log.service.js';
 import { IProductService } from '../../product/common/productService.service.js';
 import { Emitter } from '../../../base/common/event.js';
 import { revive } from '../../../base/common/marshalling.js';
-import { ExtensionsProfileScanningError, ExtensionsProfileScanningErrorCode } from './extensionsProfileScannerService.js';
+import { ExtensionsProfileScanningError } from './extensionsProfileScannerService.js';
 import { IExtensionsProfileScannerService } from './extensionsProfileScannerService.service.js';
 import { IUserDataProfilesService } from '../../userDataProfile/common/userDataProfile.service.js';
 import { IUriIdentityService } from '../../uriIdentity/common/uriIdentity.service.js';
@@ -78,8 +78,8 @@ let AbstractExtensionsScannerService = class AbstractExtensionsScannerService ex
         this.userExtensionsCachedScanner = this._register(this.instantiationService.createInstance(CachedExtensionsScanner, this.currentProfile, this.obsoleteFile));
         this.extensionsScanner = this._register(this.instantiationService.createInstance(ExtensionsScanner, this.obsoleteFile));
         this.initializeDefaultProfileExtensionsPromise = undefined;
-        this._register(this.systemExtensionsCachedScanner.onDidChangeCache(() => this._onDidChangeCache.fire(ExtensionType.System)));
-        this._register(this.userExtensionsCachedScanner.onDidChangeCache(() => this._onDidChangeCache.fire(ExtensionType.User)));
+        this._register(this.systemExtensionsCachedScanner.onDidChangeCache(() => this._onDidChangeCache.fire(0 )));
+        this._register(this.userExtensionsCachedScanner.onDidChangeCache(() => this._onDidChangeCache.fire(1 )));
     }
     getTargetPlatform() {
         if (!this._targetPlatformPromise) {
@@ -100,20 +100,20 @@ let AbstractExtensionsScannerService = class AbstractExtensionsScannerService ex
         promises.push(this.scanDefaultSystemExtensions(!!scanOptions.useCache, scanOptions.language));
         promises.push(this.scanDevSystemExtensions(scanOptions.language, !!scanOptions.checkControlFile));
         const [defaultSystemExtensions, devSystemExtensions] = await Promise.all(promises);
-        return this.applyScanOptions([...defaultSystemExtensions, ...devSystemExtensions], ExtensionType.System, scanOptions, false);
+        return this.applyScanOptions([...defaultSystemExtensions, ...devSystemExtensions], 0 , scanOptions, false);
     }
     async scanUserExtensions(scanOptions) {
         const location = scanOptions.profileLocation ?? this.userExtensionsLocation;
         this.logService.trace('Started scanning user extensions', location);
         const profileScanOptions = this.uriIdentityService.extUri.isEqual(scanOptions.profileLocation, this.userDataProfilesService.defaultProfile.extensionsResource) ? { bailOutWhenFileNotFound: true } : undefined;
-        const extensionsScannerInput = await this.createExtensionScannerInput(location, !!scanOptions.profileLocation, ExtensionType.User, !scanOptions.includeUninstalled, scanOptions.language, true, profileScanOptions, scanOptions.productVersion ?? this.getProductVersion());
+        const extensionsScannerInput = await this.createExtensionScannerInput(location, !!scanOptions.profileLocation, 1 , !scanOptions.includeUninstalled, scanOptions.language, true, profileScanOptions, scanOptions.productVersion ?? this.getProductVersion());
         const extensionsScanner = scanOptions.useCache && !extensionsScannerInput.devMode && extensionsScannerInput.excludeObsolete ? this.userExtensionsCachedScanner : this.extensionsScanner;
         let extensions;
         try {
             extensions = await extensionsScanner.scanExtensions(extensionsScannerInput);
         }
         catch (error) {
-            if (error instanceof ExtensionsProfileScanningError && error.code === ExtensionsProfileScanningErrorCode.ERROR_PROFILE_NOT_FOUND) {
+            if (error instanceof ExtensionsProfileScanningError && error.code === "ERROR_PROFILE_NOT_FOUND" ) {
                 await this.doInitializeDefaultProfileExtensions();
                 extensions = await extensionsScanner.scanExtensions(extensionsScannerInput);
             }
@@ -121,7 +121,7 @@ let AbstractExtensionsScannerService = class AbstractExtensionsScannerService ex
                 throw error;
             }
         }
-        extensions = await this.applyScanOptions(extensions, ExtensionType.User, scanOptions, true);
+        extensions = await this.applyScanOptions(extensions, 1 , scanOptions, true);
         this.logService.trace('Scanned user extensions:', extensions.length);
         return extensions;
     }
@@ -129,7 +129,7 @@ let AbstractExtensionsScannerService = class AbstractExtensionsScannerService ex
         if (this.environmentService.isExtensionDevelopment && this.environmentService.extensionDevelopmentLocationURI) {
             const extensions = (await Promise.all(( (this.environmentService.extensionDevelopmentLocationURI.filter(extLoc => extLoc.scheme === Schemas.file)
                 .map(async (extensionDevelopmentLocationURI) => {
-                const input = await this.createExtensionScannerInput(extensionDevelopmentLocationURI, false, ExtensionType.User, true, scanOptions.language, false , undefined, scanOptions.productVersion ?? this.getProductVersion());
+                const input = await this.createExtensionScannerInput(extensionDevelopmentLocationURI, false, 1 , true, scanOptions.language, false , undefined, scanOptions.productVersion ?? this.getProductVersion());
                 const extensions = await this.extensionsScanner.scanOneOrMultipleExtensions(input);
                 return (
                      (extensions.map(extension => {
@@ -191,7 +191,7 @@ let AbstractExtensionsScannerService = class AbstractExtensionsScannerService ex
             await this.extensionsProfileScannerService.scanProfileExtensions(this.userDataProfilesService.defaultProfile.extensionsResource, { bailOutWhenFileNotFound: true });
         }
         catch (error) {
-            if (error instanceof ExtensionsProfileScanningError && error.code === ExtensionsProfileScanningErrorCode.ERROR_PROFILE_NOT_FOUND) {
+            if (error instanceof ExtensionsProfileScanningError && error.code === "ERROR_PROFILE_NOT_FOUND" ) {
                 await this.doInitializeDefaultProfileExtensions();
             }
             else {
@@ -213,7 +213,7 @@ let AbstractExtensionsScannerService = class AbstractExtensionsScannerService ex
                             await this.fileService.createFile(this.userDataProfilesService.defaultProfile.extensionsResource, VSBuffer.fromString(JSON.stringify([])));
                         }
                         catch (error) {
-                            if (toFileOperationResult(error) !== FileOperationResult.FILE_NOT_FOUND) {
+                            if (toFileOperationResult(error) !== 1 ) {
                                 this.logService.warn('Failed to create default profile extensions manifest in extensions installation folder.', ( (this.userExtensionsLocation.toString())), getErrorMessage(error));
                             }
                         }
@@ -232,7 +232,7 @@ let AbstractExtensionsScannerService = class AbstractExtensionsScannerService ex
     }
     async applyScanOptions(extensions, type, scanOptions, pickLatest) {
         if (!scanOptions.includeAllVersions) {
-            extensions = this.dedupExtensions(type === ExtensionType.System ? extensions : undefined, type === ExtensionType.User ? extensions : undefined, type === 'development' ? extensions : undefined, await this.getTargetPlatform(), pickLatest);
+            extensions = this.dedupExtensions(type === 0  ? extensions : undefined, type === 1  ? extensions : undefined, type === 'development' ? extensions : undefined, await this.getTargetPlatform(), pickLatest);
         }
         if (!scanOptions.includeInvalid) {
             extensions = extensions.filter(extension => extension.isValid);
@@ -260,7 +260,7 @@ let AbstractExtensionsScannerService = class AbstractExtensionsScannerService ex
                     return false;
                 }
                 if (semverExports.eq(existing.manifest.version, extension.manifest.version)) {
-                    if (existing.type === ExtensionType.System) {
+                    if (existing.type === 0 ) {
                         this.logService.debug(`Skipping extension ${extension.location.path} in favour of system extension ${existing.location.path} with same version`);
                         return false;
                     }
@@ -287,7 +287,7 @@ let AbstractExtensionsScannerService = class AbstractExtensionsScannerService ex
         });
         user?.forEach((extension) => {
             const existing = result.get(extension.identifier.id);
-            if (!existing && system && extension.type === ExtensionType.System) {
+            if (!existing && system && extension.type === 0 ) {
                 this.logService.debug(`Skipping obsolete system extension ${extension.location.path}.`);
                 return;
             }
@@ -306,7 +306,7 @@ let AbstractExtensionsScannerService = class AbstractExtensionsScannerService ex
     }
     async scanDefaultSystemExtensions(useCache, language) {
         this.logService.trace('Started scanning system extensions');
-        const extensionsScannerInput = await this.createExtensionScannerInput(this.systemExtensionsLocation, false, ExtensionType.System, true, language, true, undefined, this.getProductVersion());
+        const extensionsScannerInput = await this.createExtensionScannerInput(this.systemExtensionsLocation, false, 0 , true, language, true, undefined, this.getProductVersion());
         const extensionsScanner = useCache && !extensionsScannerInput.devMode ? this.systemExtensionsCachedScanner : this.extensionsScanner;
         const result = await extensionsScanner.scanExtensions(extensionsScannerInput);
         this.logService.trace('Scanned system extensions:', result.length);
@@ -335,7 +335,7 @@ let AbstractExtensionsScannerService = class AbstractExtensionsScannerService ex
             }
         }
         const result = await Promise.all(( (devSystemExtensionsLocations.map(
-            async (location) => this.extensionsScanner.scanExtension((await this.createExtensionScannerInput(location, false, ExtensionType.System, true, language, true, undefined, this.getProductVersion())))
+            async (location) => this.extensionsScanner.scanExtension((await this.createExtensionScannerInput(location, false, 0 , true, language, true, undefined, this.getProductVersion())))
         ))));
         this.logService.trace('Scanned dev system extensions:', result.length);
         return coalesce(result);
@@ -457,7 +457,7 @@ let ExtensionManifestTranslator = class ExtensionManifestTranslator extends Disp
         const reportErrors = (localized, errors) => {
             errors.forEach((error) => {
                 this.logService.error(this.formatMessage(extensionLocation, ( localize(
-                    444,
+                    447,
                     "Failed to parse {0}: {1}.",
                     localized?.path,
                     getParseErrorMessage(error.error)
@@ -465,7 +465,7 @@ let ExtensionManifestTranslator = class ExtensionManifestTranslator extends Disp
             });
         };
         const reportInvalidFormat = (localized) => {
-            this.logService.error(this.formatMessage(extensionLocation, ( localize(445, "Invalid format {0}: JSON object expected.", localized?.path))));
+            this.logService.error(this.formatMessage(extensionLocation, ( localize(448, "Invalid format {0}: JSON object expected.", localized?.path))));
         };
         const translationId = `${extensionManifest.publisher}.${extensionManifest.name}`;
         const translationPath = nlsConfiguration.translations[translationId];
@@ -535,7 +535,7 @@ let ExtensionManifestTranslator = class ExtensionManifestTranslator extends Disp
                 if (errors.length > 0) {
                     errors.forEach((error) => {
                         this.logService.error(this.formatMessage(extensionLocation, ( localize(
-                            444,
+                            447,
                             "Failed to parse {0}: {1}.",
                             localizedMessages.default?.path,
                             getParseErrorMessage(error.error)
@@ -545,7 +545,7 @@ let ExtensionManifestTranslator = class ExtensionManifestTranslator extends Disp
                 }
                 else if (getNodeType(localizedMessages) !== 'object') {
                     this.logService.error(this.formatMessage(extensionLocation, ( localize(
-                        445,
+                        448,
                         "Invalid format {0}: JSON object expected.",
                         localizedMessages.default?.path
                     ))));
@@ -616,7 +616,7 @@ let ExtensionsScanner = class ExtensionsScanner extends ExtensionManifestTransla
     async scanExtensions(input) {
         const extensions = input.profile ? await this.scanExtensionsFromProfile(input) : await this.scanExtensionsFromLocation(input);
         let obsolete = {};
-        if (input.excludeObsolete && input.type === ExtensionType.User) {
+        if (input.excludeObsolete && input.type === 1 ) {
             try {
                 const raw = ( ((await this.fileService.readFile(this.obsoleteFile)).value.toString()));
                 obsolete = JSON.parse(raw);
@@ -634,7 +634,7 @@ let ExtensionsScanner = class ExtensionsScanner extends ExtensionManifestTransla
             if (!c.isDirectory) {
                 return null;
             }
-            if (input.type === ExtensionType.User && basename$1(c.resource).indexOf('.') === 0) {
+            if (input.type === 1  && basename$1(c.resource).indexOf('.') === 0) {
                 return null;
             }
             const extensionScannerInput = ( (new ExtensionScannerInput(
@@ -724,8 +724,8 @@ let ExtensionsScanner = class ExtensionsScanner extends ExtensionManifestTransla
                 delete manifest.__metadata;
                 const id = getGalleryExtensionId(manifest.publisher, manifest.name);
                 const identifier = metadata?.id ? { id, uuid: metadata.id } : { id };
-                const type = metadata?.isSystem ? ExtensionType.System : input.type;
-                const isBuiltin = type === ExtensionType.System || !!metadata?.isBuiltin;
+                const type = metadata?.isSystem ? 0  : input.type;
+                const isBuiltin = type === 0  || !!metadata?.isBuiltin;
                 manifest = await this.translateManifest(input.location, manifest, ExtensionScannerInput.createNlsConfiguration(input));
                 let extension = {
                     type,
@@ -733,7 +733,7 @@ let ExtensionsScanner = class ExtensionsScanner extends ExtensionManifestTransla
                     manifest,
                     location: input.location,
                     isBuiltin,
-                    targetPlatform: metadata?.targetPlatform ?? TargetPlatform.UNDEFINED,
+                    targetPlatform: metadata?.targetPlatform ?? "undefined" ,
                     publisherDisplayName: metadata?.publisherDisplayName,
                     metadata,
                     isValid: true,
@@ -750,7 +750,7 @@ let ExtensionsScanner = class ExtensionsScanner extends ExtensionManifestTransla
             }
         }
         catch (e) {
-            if (input.type !== ExtensionType.System) {
+            if (input.type !== 0 ) {
                 this.logService.error(e);
             }
         }
@@ -777,8 +777,8 @@ let ExtensionsScanner = class ExtensionsScanner extends ExtensionManifestTransla
             content = ( ((await this.fileService.readFile(manifestLocation)).value.toString()));
         }
         catch (error) {
-            if (toFileOperationResult(error) !== FileOperationResult.FILE_NOT_FOUND) {
-                this.logService.error(this.formatMessage(extensionLocation, ( localize(446, "Cannot read file {0}: {1}.", manifestLocation.path, error.message))));
+            if (toFileOperationResult(error) !== 1 ) {
+                this.logService.error(this.formatMessage(extensionLocation, ( localize(449, "Cannot read file {0}: {1}.", manifestLocation.path, error.message))));
             }
             return null;
         }
@@ -791,7 +791,7 @@ let ExtensionsScanner = class ExtensionsScanner extends ExtensionManifestTransla
             parse(content, errors);
             for (const e of errors) {
                 this.logService.error(this.formatMessage(extensionLocation, ( localize(
-                    447,
+                    450,
                     "Failed to parse {0}: [{1}, {2}] {3}.",
                     manifestLocation.path,
                     e.offset,
@@ -803,7 +803,7 @@ let ExtensionsScanner = class ExtensionsScanner extends ExtensionManifestTransla
         }
         if (getNodeType(manifest) !== 'object') {
             this.logService.error(this.formatMessage(extensionLocation, ( localize(
-                448,
+                451,
                 "Invalid manifest file {0}: Not a JSON object.",
                 manifestLocation.path
             ))));
@@ -834,7 +834,7 @@ let CachedExtensionsScanner = class CachedExtensionsScanner extends ExtensionsSc
         const cacheContents = await this.readExtensionCache(cacheFile);
         this.input = input;
         if (cacheContents && cacheContents.input && ExtensionScannerInput.equals(cacheContents.input, this.input)) {
-            this.logService.debug('Using cached extensions scan result', input.type === ExtensionType.System ? 'system' : 'user', ( (input.location.toString())));
+            this.logService.debug('Using cached extensions scan result', input.type === 0  ? 'system' : 'user', ( (input.location.toString())));
             this.cacheValidatorThrottler.trigger(() => this.validateCache());
             return (
                  (cacheContents.result.map((extension) => {
@@ -891,10 +891,10 @@ let CachedExtensionsScanner = class CachedExtensionsScanner extends ExtensionsSc
     }
     getCacheFile(input) {
         const profile = this.getProfile(input);
-        return this.uriIdentityService.extUri.joinPath(profile.cacheHome, input.type === ExtensionType.System ? BUILTIN_MANIFEST_CACHE_FILE : USER_MANIFEST_CACHE_FILE);
+        return this.uriIdentityService.extUri.joinPath(profile.cacheHome, input.type === 0  ? BUILTIN_MANIFEST_CACHE_FILE : USER_MANIFEST_CACHE_FILE);
     }
     getProfile(input) {
-        if (input.type === ExtensionType.System) {
+        if (input.type === 0 ) {
             return this.userDataProfilesService.defaultProfile;
         }
         if (!input.profile) {

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

@@ -2,10 +2,8 @@ import { isWeb } from '../../../base/common/platform.js';
 import { format2 } from '../../../base/common/strings.js';
 import { URI } from '../../../base/common/uri.js';
 import { getServiceMachineId } from '../../externalServices/common/serviceMachineId.js';
-import { TelemetryLevel } from '../../telemetry/common/telemetry.js';
 import { supportsTelemetry, getTelemetryLevel } from '../../telemetry/common/telemetryUtils.js';
 import { RemoteAuthorities } from '../../../base/common/network.js';
-import { TargetPlatform } from '../../extensions/common/extensions.js';
 const WEB_EXTENSION_RESOURCE_END_POINT_SEGMENT = '/web-extension-resource/';
 function migratePlatformSpecificExtensionGalleryResourceURL(resource, targetPlatform) {
     if (resource.query !== `target=${targetPlatform}`) {
@@ -39,9 +37,9 @@ class AbstractExtensionResourceLoaderService {
                 publisher,
                 name,
                 version: targetPlatform !== undefined
-                    && targetPlatform !== TargetPlatform.UNDEFINED
-                    && targetPlatform !== TargetPlatform.UNKNOWN
-                    && targetPlatform !== TargetPlatform.UNIVERSAL
+                    && targetPlatform !== "undefined"
+                    && targetPlatform !== "unknown"
+                    && targetPlatform !== "universal"
                     ? `${version}+${targetPlatform}`
                     : version,
                 path: 'extension'
@@ -58,7 +56,7 @@ class AbstractExtensionResourceLoaderService {
             'X-Client-Name': `${this._productService.applicationName}${isWeb ? '-web' : ''}`,
             'X-Client-Version': this._productService.version
         };
-        if (supportsTelemetry(this._productService, this._environmentService) && getTelemetryLevel(this._configurationService) === TelemetryLevel.USAGE) {
+        if (supportsTelemetry(this._productService, this._environmentService) && getTelemetryLevel(this._configurationService) === 3 ) {
             headers['X-Machine-Id'] = await this._getServiceMachineId();
         }
         if (this._productService.commit) {

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

@@ -1,7 +1,7 @@
 import { joinPath, isEqualOrParent } from '../../../base/common/resources.js';
 import Severity$1 from '../../../base/common/severity.js';
 import { localize } from '../../../nls.js';
-import { semverExports } from '../../../../../../external/vscode-semver/semver.js';
+import { semverExports } from '../../../../../../_virtual/semver.js';
 import { parseApiProposals } from './extensions.js';
 import { allApiProposals } from './extensionsApiProposals.js';
 const VERSION_REGEXP = /^(\^|>=)?((\d+)|x)\.((\d+)|x)\.((\d+)|x)(\-.*)?$/;
@@ -169,16 +169,16 @@ 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, ( localize(1311, "property publisher must be of type `string`."))]);
+        validations.push([Severity$1.Error, ( localize(1325, "property publisher must be of type `string`."))]);
         return validations;
     }
     if (typeof extensionManifest.name !== 'string') {
-        validations.push([Severity$1.Error, ( localize(1312, "property `{0}` is mandatory and must be of type `string`", 'name'))]);
+        validations.push([Severity$1.Error, ( localize(1326, "property `{0}` is mandatory and must be of type `string`", 'name'))]);
         return validations;
     }
     if (typeof extensionManifest.version !== 'string') {
         validations.push([Severity$1.Error, ( localize(
-            1313,
+            1327,
             "property `{0}` is mandatory and must be of type `string`",
             'version'
         ))]);
@@ -186,7 +186,7 @@ function validateExtensionManifest(productVersion, productDate, extensionLocatio
     }
     if (!extensionManifest.engines) {
         validations.push([Severity$1.Error, ( localize(
-            1314,
+            1328,
             "property `{0}` is mandatory and must be of type `object`",
             'engines'
         ))]);
@@ -194,7 +194,7 @@ function validateExtensionManifest(productVersion, productDate, extensionLocatio
     }
     if (typeof extensionManifest.engines.vscode !== 'string') {
         validations.push([Severity$1.Error, ( localize(
-            1315,
+            1329,
             "property `{0}` is mandatory and must be of type `string`",
             'engines.vscode'
         ))]);
@@ -203,7 +203,7 @@ function validateExtensionManifest(productVersion, productDate, extensionLocatio
     if (typeof extensionManifest.extensionDependencies !== 'undefined') {
         if (!isStringArray(extensionManifest.extensionDependencies)) {
             validations.push([Severity$1.Error, ( localize(
-                1316,
+                1330,
                 "property `{0}` can be omitted or must be of type `string[]`",
                 'extensionDependencies'
             ))]);
@@ -213,7 +213,7 @@ function validateExtensionManifest(productVersion, productDate, extensionLocatio
     if (typeof extensionManifest.activationEvents !== 'undefined') {
         if (!isStringArray(extensionManifest.activationEvents)) {
             validations.push([Severity$1.Error, ( localize(
-                1317,
+                1331,
                 "property `{0}` can be omitted or must be of type `string[]`",
                 'activationEvents'
             ))]);
@@ -221,7 +221,7 @@ function validateExtensionManifest(productVersion, productDate, extensionLocatio
         }
         if (typeof extensionManifest.main === 'undefined' && typeof extensionManifest.browser === 'undefined') {
             validations.push([Severity$1.Error, ( localize(
-                1318,
+                1332,
                 "property `{0}` should be omitted if the extension doesn't have a `{1}` or `{2}` property.",
                 'activationEvents',
                 'main',
@@ -233,7 +233,7 @@ function validateExtensionManifest(productVersion, productDate, extensionLocatio
     if (typeof extensionManifest.extensionKind !== 'undefined') {
         if (typeof extensionManifest.main === 'undefined') {
             validations.push([Severity$1.Warning, ( localize(
-                1319,
+                1333,
                 "property `{0}` can be defined only if property `main` is also defined.",
                 'extensionKind'
             ))]);
@@ -241,14 +241,14 @@ function validateExtensionManifest(productVersion, productDate, extensionLocatio
     }
     if (typeof extensionManifest.main !== 'undefined') {
         if (typeof extensionManifest.main !== 'string') {
-            validations.push([Severity$1.Error, ( localize(1320, "property `{0}` can be omitted or must be of type `string`", 'main'))]);
+            validations.push([Severity$1.Error, ( localize(1334, "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, ( localize(
-                    1321,
+                    1335,
                     "Expected `main` ({0}) to be included inside extension's folder ({1}). This might make the extension non-portable.",
                     mainLocation.path,
                     extensionLocation.path
@@ -259,7 +259,7 @@ function validateExtensionManifest(productVersion, productDate, extensionLocatio
     if (typeof extensionManifest.browser !== 'undefined') {
         if (typeof extensionManifest.browser !== 'string') {
             validations.push([Severity$1.Error, ( localize(
-                1322,
+                1336,
                 "property `{0}` can be omitted or must be of type `string`",
                 'browser'
             ))]);
@@ -269,7 +269,7 @@ function validateExtensionManifest(productVersion, productDate, extensionLocatio
             const browserLocation = joinPath(extensionLocation, extensionManifest.browser);
             if (!isEqualOrParent(browserLocation, extensionLocation)) {
                 validations.push([Severity$1.Warning, ( localize(
-                    1323,
+                    1337,
                     "Expected `browser` ({0}) to be included inside extension's folder ({1}). This might make the extension non-portable.",
                     browserLocation.path,
                     extensionLocation.path
@@ -278,7 +278,7 @@ function validateExtensionManifest(productVersion, productDate, extensionLocatio
         }
     }
     if (!semverExports.valid(extensionManifest.version)) {
-        validations.push([Severity$1.Error, ( localize(1324, "Extension version is not semver compatible."))]);
+        validations.push([Severity$1.Error, ( localize(1338, "Extension version is not semver compatible."))]);
         return validations;
     }
     const notices = [];
@@ -313,7 +313,7 @@ function areApiProposalsCompatible(apiProposals, arg1) {
     }
     const notices = Array.isArray(arg1) ? arg1 : undefined;
     const productApiProposals = (notices ? undefined : arg1) ?? allApiProposals;
-    const incompatibleNotices = [];
+    const incompatibleProposals = [];
     const parsedProposals = parseApiProposals(apiProposals);
     for (const { proposalName, version } of parsedProposals) {
         const existingProposal = productApiProposals[proposalName];
@@ -324,21 +324,36 @@ function areApiProposalsCompatible(apiProposals, arg1) {
             continue;
         }
         if (existingProposal.version !== version) {
-            incompatibleNotices.push(( localize(
-                1325,
-                "Extension is using an API proposal '{0}' that is not compatible with the current version of VS Code.",
-                proposalName
-            )));
+            incompatibleProposals.push(proposalName);
         }
     }
-    notices?.push(...incompatibleNotices);
-    return incompatibleNotices.length === 0;
+    if (incompatibleProposals.length) {
+        if (notices) {
+            if (incompatibleProposals.length === 1) {
+                notices.push(( localize(
+                    1339,
+                    "This extension is using the API proposal '{0}' that is not compatible with the current version of VS Code.",
+                    incompatibleProposals[0]
+                )));
+            }
+            else {
+                notices.push(( localize(
+                    1340,
+                    "This extension is using the API proposals {0} and '{1}' that are not compatible with the current version of VS Code.",
+                    ( (incompatibleProposals.slice(0, incompatibleProposals.length - 1).map(p => `'${p}'`))).join(', '),
+                    incompatibleProposals[incompatibleProposals.length - 1]
+                )));
+            }
+        }
+        return false;
+    }
+    return true;
 }
 function isVersionValid(currentVersion, date, requestedVersion, notices = []) {
     const desiredVersion = normalizeVersion(parseVersion(requestedVersion));
     if (!desiredVersion) {
         notices.push(( localize(
-            1326,
+            1341,
             "Could not parse `engines.vscode` value {0}. Please use, for example: ^1.22.0, ^1.22.x, etc.",
             requestedVersion
         )));
@@ -347,7 +362,7 @@ function isVersionValid(currentVersion, date, requestedVersion, notices = []) {
     if (desiredVersion.majorBase === 0) {
         if (!desiredVersion.majorMustEqual || !desiredVersion.minorMustEqual) {
             notices.push(( localize(
-                1327,
+                1342,
                 "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
             )));
@@ -357,7 +372,7 @@ function isVersionValid(currentVersion, date, requestedVersion, notices = []) {
     else {
         if (!desiredVersion.majorMustEqual) {
             notices.push(( localize(
-                1328,
+                1343,
                 "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
             )));
@@ -366,7 +381,7 @@ function isVersionValid(currentVersion, date, requestedVersion, notices = []) {
     }
     if (!isValidVersion(currentVersion, date, desiredVersion)) {
         notices.push(( localize(
-            1329,
+            1344,
             "Extension is not compatible with Code {0}. Extension requires: {1}.",
             currentVersion,
             requestedVersion

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

@@ -34,27 +34,6 @@ const EXTENSION_CATEGORIES = [
     'Visualization',
     'Other',
 ];
-var ExtensionType;
-( (function(ExtensionType) {
-    ExtensionType[ExtensionType["System"] = 0] = "System";
-    ExtensionType[ExtensionType["User"] = 1] = "User";
-})(ExtensionType || (ExtensionType = {})));
-var TargetPlatform;
-( (function(TargetPlatform) {
-    TargetPlatform["WIN32_X64"] = "win32-x64";
-    TargetPlatform["WIN32_ARM64"] = "win32-arm64";
-    TargetPlatform["LINUX_X64"] = "linux-x64";
-    TargetPlatform["LINUX_ARM64"] = "linux-arm64";
-    TargetPlatform["LINUX_ARMHF"] = "linux-armhf";
-    TargetPlatform["ALPINE_X64"] = "alpine-x64";
-    TargetPlatform["ALPINE_ARM64"] = "alpine-arm64";
-    TargetPlatform["DARWIN_X64"] = "darwin-x64";
-    TargetPlatform["DARWIN_ARM64"] = "darwin-arm64";
-    TargetPlatform["WEB"] = "web";
-    TargetPlatform["UNIVERSAL"] = "universal";
-    TargetPlatform["UNKNOWN"] = "unknown";
-    TargetPlatform["UNDEFINED"] = "undefined";
-})(TargetPlatform || (TargetPlatform = {})));
 class ExtensionIdentifier {
     constructor(value) {
         this.value = value;
@@ -157,4 +136,4 @@ function parseApiProposals(enabledApiProposals) {
 function parseEnabledApiProposalNames(enabledApiProposals) {
     return ( enabledApiProposals.map(proposal => proposal.split('@')[0]));
 }
-export { ALL_EXTENSION_KINDS, BUILTIN_MANIFEST_CACHE_FILE, EXTENSION_CATEGORIES, ExtensionIdentifier, ExtensionIdentifierMap, ExtensionIdentifierSet, ExtensionType, TargetPlatform, UNDEFINED_PUBLISHER, USER_MANIFEST_CACHE_FILE, getWorkspaceSupportTypeMessage, isApplicationScopedExtension, isAuthenticationProviderExtension, isLanguagePackExtension, isResolverExtension, parseApiProposals, parseEnabledApiProposalNames };
+export { ALL_EXTENSION_KINDS, BUILTIN_MANIFEST_CACHE_FILE, EXTENSION_CATEGORIES, ExtensionIdentifier, ExtensionIdentifierMap, ExtensionIdentifierSet, UNDEFINED_PUBLISHER, USER_MANIFEST_CACHE_FILE, getWorkspaceSupportTypeMessage, isApplicationScopedExtension, isAuthenticationProviderExtension, isLanguagePackExtension, isResolverExtension, parseApiProposals, parseEnabledApiProposalNames };

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

@@ -117,12 +117,6 @@ const _allApiProposals = {
     contribShareMenu: {
         proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribShareMenu.d.ts',
     },
-    contribSourceControlHistoryItemChangesMenu: {
-        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribSourceControlHistoryItemChangesMenu.d.ts',
-    },
-    contribSourceControlHistoryItemGroupMenu: {
-        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribSourceControlHistoryItemGroupMenu.d.ts',
-    },
     contribSourceControlHistoryItemMenu: {
         proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribSourceControlHistoryItemMenu.d.ts',
     },
@@ -158,6 +152,7 @@ const _allApiProposals = {
     },
     defaultChatParticipant: {
         proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.defaultChatParticipant.d.ts',
+        version: 2
     },
     diffCommand: {
         proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.diffCommand.d.ts',
@@ -242,7 +237,7 @@ const _allApiProposals = {
     },
     lmTools: {
         proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.lmTools.d.ts',
-        version: 6
+        version: 7
     },
     mappedEditsProvider: {
         proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.mappedEditsProvider.d.ts',

package/vscode/src/vs/platform/externalServices/common/serviceMachineId.js

@@ -1,8 +1,7 @@
 import { VSBuffer } from '../../../base/common/buffer.js';
 import { isUUID, generateUuid } from '../../../base/common/uuid.js';
-import { StorageScope, StorageTarget } from '../../storage/common/storage.js';
 async function getServiceMachineId(environmentService, fileService, storageService) {
-    let uuid = storageService ? storageService.get('storage.serviceMachineId', StorageScope.APPLICATION) || null : null;
+    let uuid = storageService ? storageService.get('storage.serviceMachineId', -1 ) || null : null;
     if (uuid) {
         return uuid;
     }
@@ -22,7 +21,7 @@ async function getServiceMachineId(environmentService, fileService, storageServi
         catch (error) {
         }
     }
-    storageService?.store('storage.serviceMachineId', uuid, StorageScope.APPLICATION, StorageTarget.MACHINE);
+    storageService?.store('storage.serviceMachineId', uuid, -1 , 1 );
     return uuid;
 }
 export { getServiceMachineId };

package/vscode/src/vs/platform/files/browser/htmlFileSystemProvider.js

@@ -8,16 +8,16 @@ import { extname, basename, normalize } from '../../../base/common/path.js';
 import { isLinux } from '../../../base/common/platform.js';
 import { extUri, extUriIgnorePathCase } from '../../../base/common/resources.js';
 import { newWriteableStream } from '../../../base/common/stream.js';
-import { FileSystemProviderCapabilities, FileSystemProviderErrorCode, FileType, FileSystemProviderError, createFileSystemProviderError } from '../common/files.js';
+import { FileSystemProviderErrorCode, FileType, FileSystemProviderError, createFileSystemProviderError } from '../common/files.js';
 import { WebFileSystemAccess } from './webFileSystemAccess.js';
 class HTMLFileSystemProvider {
     get capabilities() {
         if (!this._capabilities) {
             this._capabilities =
-                FileSystemProviderCapabilities.FileReadWrite |
-                    FileSystemProviderCapabilities.FileReadStream;
+                2  |
+                    16 ;
             if (isLinux) {
-                this._capabilities |= FileSystemProviderCapabilities.PathCaseSensitive;
+                this._capabilities |= 1024 ;
             }
         }
         return this._capabilities;
@@ -203,7 +203,7 @@ class HTMLFileSystemProvider {
                 await this.delete(from, { recursive: false, useTrash: false, atomic: false });
             }
             else {
-                throw this.createFileSystemProviderError(from, localize(726, "Rename is only supported for files."), FileSystemProviderErrorCode.Unavailable);
+                throw this.createFileSystemProviderError(from, localize(744, "Rename is only supported for files."), FileSystemProviderErrorCode.Unavailable);
             }
         }
         catch (error) {
@@ -333,7 +333,7 @@ class HTMLFileSystemProvider {
         }
         let code = FileSystemProviderErrorCode.Unknown;
         if (error.name === 'NotAllowedError') {
-            error = ( (new Error(( localize(727, "Insufficient permissions. Please retry and allow the operation.")))));
+            error = ( (new Error(( localize(745, "Insufficient permissions. Please retry and allow the operation.")))));
             code = FileSystemProviderErrorCode.Unavailable;
         }
         return createFileSystemProviderError(error, code);