@codingame/monaco-vscode-extension-gallery-service-override 1.85.6 → 2.0.0-v2.1

package/extensionGallery.js

@@ -1,5 +1,5 @@
 import { __decorate, __param } from './external/tslib/tslib.es6.js';
-import { SyncDescriptor } from 'monaco-editor/esm/vs/platform/instantiation/common/descriptors.js';
+import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
 import { IExtensionGalleryService, IGlobalExtensionEnablementService, IExtensionManagementService, IExtensionTipsService } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagement';
 import { ExtensionGalleryService } from './vscode/src/vs/platform/extensionManagement/common/extensionGalleryService.js';
 import { GlobalExtensionEnablementService } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionEnablementService';
@@ -13,7 +13,7 @@ import { WebExtensionsScannerService } from './vscode/src/vs/workbench/services/
 import { IExtensionRecommendationNotificationService } from 'vscode/vscode/vs/platform/extensionRecommendations/common/extensionRecommendations';
 import { IIgnoredExtensionsManagementService, IgnoredExtensionsManagementService } from 'vscode/vscode/vs/platform/userDataSync/common/ignoredExtensions';
 import { IExtensionManifestPropertiesService, ExtensionManifestPropertiesService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensionManifestPropertiesService';
-import { IBuiltinExtensionsScannerService } from 'monaco-editor/esm/vs/platform/extensions/common/extensions.js';
+import { IBuiltinExtensionsScannerService } from 'vscode/vscode/vs/platform/extensions/common/extensions';
 import { BuiltinExtensionsScannerService } from './vscode/src/vs/workbench/services/extensionManagement/browser/builtinExtensionsScannerService.js';
 import { ExtensionIgnoredRecommendationsService } from './vscode/src/vs/workbench/services/extensionRecommendations/common/extensionIgnoredRecommendationsService.js';
 import { IWorkspaceExtensionsConfigService, WorkspaceExtensionsConfigService } from 'vscode/vscode/vs/workbench/services/extensionRecommendations/common/workspaceExtensionsConfig';
@@ -26,8 +26,8 @@ import './vscode/src/vs/workbench/contrib/extensions/browser/extensions.contribu
 import './vscode/src/vs/workbench/contrib/extensions/browser/extensions.web.contribution.js';
 import { IExtensionUrlHandler, ExtensionUrlHandler } from 'vscode/vscode/vs/workbench/services/extensions/browser/extensionUrlHandler';
 import { IRemoteAgentService } from 'vscode/vscode/vs/workbench/services/remote/common/remoteAgentService';
-import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
-import { ILabelService } from 'monaco-editor/esm/vs/platform/label/common/label.js';
+import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
+import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label';
 import { registerAssets } from 'vscode/assets';
 
 registerAssets({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-extension-gallery-service-override",
-  "version": "1.85.6",
+  "version": "2.0.0-v2.1",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -9,7 +9,7 @@
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/CodinGame/monaco-vscode-api.git"
+    "url": "git@github.com:CodinGame/monaco-vscode-api.git"
   },
   "type": "module",
   "private": false,
@@ -18,8 +18,8 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@1.85.6",
-    "monaco-editor": "0.45.0",
+    "vscode": "npm:@codingame/monaco-vscode-api@2.0.0-v2.1",
+    "vscode-marked": "npm:marked@=3.0.2",
     "vscode-semver": "npm:semver@=5.5.0"
   }
 }

package/vscode/src/vs/base/common/paging.js

@@ -0,0 +1,118 @@
+import { range } from 'vscode/vscode/vs/base/common/arrays';
+import { CancellationTokenSource } from 'vscode/vscode/vs/base/common/cancellation';
+import { canceled } from 'vscode/vscode/vs/base/common/errors';
+
+function createPage(elements) {
+    return {
+        isResolved: !!elements,
+        promise: null,
+        cts: null,
+        promiseIndexes: ( new Set()),
+        elements: elements || []
+    };
+}
+function singlePagePager(elements) {
+    return {
+        firstPage: elements,
+        total: elements.length,
+        pageSize: elements.length,
+        getPage: (pageIndex, cancellationToken) => {
+            return Promise.resolve(elements);
+        }
+    };
+}
+class PagedModel {
+    get length() { return this.pager.total; }
+    constructor(arg) {
+        this.pages = [];
+        this.pager = Array.isArray(arg) ? singlePagePager(arg) : arg;
+        const totalPages = Math.ceil(this.pager.total / this.pager.pageSize);
+        this.pages = [
+            createPage(this.pager.firstPage.slice()),
+            ...( range(totalPages - 1).map(() => createPage()))
+        ];
+    }
+    isResolved(index) {
+        const pageIndex = Math.floor(index / this.pager.pageSize);
+        const page = this.pages[pageIndex];
+        return !!page.isResolved;
+    }
+    get(index) {
+        const pageIndex = Math.floor(index / this.pager.pageSize);
+        const indexInPage = index % this.pager.pageSize;
+        const page = this.pages[pageIndex];
+        return page.elements[indexInPage];
+    }
+    resolve(index, cancellationToken) {
+        if (cancellationToken.isCancellationRequested) {
+            return Promise.reject(canceled());
+        }
+        const pageIndex = Math.floor(index / this.pager.pageSize);
+        const indexInPage = index % this.pager.pageSize;
+        const page = this.pages[pageIndex];
+        if (page.isResolved) {
+            return Promise.resolve(page.elements[indexInPage]);
+        }
+        if (!page.promise) {
+            page.cts = ( new CancellationTokenSource());
+            page.promise = this.pager.getPage(pageIndex, page.cts.token)
+                .then(elements => {
+                page.elements = elements;
+                page.isResolved = true;
+                page.promise = null;
+                page.cts = null;
+            }, err => {
+                page.isResolved = false;
+                page.promise = null;
+                page.cts = null;
+                return Promise.reject(err);
+            });
+        }
+        const listener = cancellationToken.onCancellationRequested(() => {
+            if (!page.cts) {
+                return;
+            }
+            page.promiseIndexes.delete(index);
+            if (page.promiseIndexes.size === 0) {
+                page.cts.cancel();
+            }
+        });
+        page.promiseIndexes.add(index);
+        return page.promise.then(() => page.elements[indexInPage])
+            .finally(() => listener.dispose());
+    }
+}
+class DelayedPagedModel {
+    get length() { return this.model.length; }
+    constructor(model, timeout = 500) {
+        this.model = model;
+        this.timeout = timeout;
+    }
+    isResolved(index) {
+        return this.model.isResolved(index);
+    }
+    get(index) {
+        return this.model.get(index);
+    }
+    resolve(index, cancellationToken) {
+        return ( new Promise((c, e) => {
+            if (cancellationToken.isCancellationRequested) {
+                return e(canceled());
+            }
+            const timer = setTimeout(() => {
+                if (cancellationToken.isCancellationRequested) {
+                    return e(canceled());
+                }
+                timeoutCancellation.dispose();
+                this.model.resolve(index, cancellationToken).then(c, e);
+            }, this.timeout);
+            const timeoutCancellation = cancellationToken.onCancellationRequested(() => {
+                clearTimeout(timer);
+                timeoutCancellation.dispose();
+                e(canceled());
+            });
+        }));
+    }
+}
+
+export { DelayedPagedModel, PagedModel, singlePagePager };

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

@@ -1,22 +1,22 @@
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
-import { distinct, isNonEmptyArray } from 'monaco-editor/esm/vs/base/common/arrays.js';
-import { Barrier, createCancelablePromise } from 'monaco-editor/esm/vs/base/common/async.js';
-import { CancellationToken } from 'monaco-editor/esm/vs/base/common/cancellation.js';
-import { getErrorMessage, CancellationError } from 'monaco-editor/esm/vs/base/common/errors.js';
-import { Emitter, Event } from 'monaco-editor/esm/vs/base/common/event.js';
-import { Disposable, toDisposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { isWeb } from 'monaco-editor/esm/vs/base/common/platform.js';
-import { isDefined } from 'monaco-editor/esm/vs/base/common/types.js';
-import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
-import * as nls from 'monaco-editor/esm/vs/nls.js';
+import { distinct, isNonEmptyArray } from 'vscode/vscode/vs/base/common/arrays';
+import { Barrier, createCancelablePromise } from 'vscode/vscode/vs/base/common/async';
+import { CancellationToken } from 'vscode/vscode/vs/base/common/cancellation';
+import { getErrorMessage, CancellationError } from 'vscode/vscode/vs/base/common/errors';
+import { Emitter, Event } from 'vscode/vscode/vs/base/common/event';
+import { Disposable, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { isWeb } from 'vscode/vscode/vs/base/common/platform';
+import { isDefined } from 'vscode/vscode/vs/base/common/types';
+import { URI } from 'vscode/vscode/vs/base/common/uri';
+import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { isTargetPlatformCompatible, ExtensionManagementError, ExtensionManagementErrorCode, EXTENSION_INSTALL_DEP_PACK_CONTEXT, TargetPlatformToString, IExtensionGalleryService } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagement';
 import { areSameExtensions, getGalleryExtensionTelemetryData, adoptToGalleryExtensionId, getGalleryExtensionId, ExtensionKey, getLocalExtensionTelemetryData } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagementUtil';
-import { isApplicationScopedExtension } from 'monaco-editor/esm/vs/platform/extensions/common/extensions.js';
-import { ILogService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
-import { IProductService } from 'monaco-editor/esm/vs/platform/product/common/productService.js';
-import { ITelemetryService } from 'monaco-editor/esm/vs/platform/telemetry/common/telemetry.js';
-import { IUriIdentityService } from 'monaco-editor/esm/vs/platform/uriIdentity/common/uriIdentity.js';
-import { IUserDataProfilesService } from 'monaco-editor/esm/vs/platform/userDataProfile/common/userDataProfile.js';
+import { isApplicationScopedExtension } from 'vscode/vscode/vs/platform/extensions/common/extensions';
+import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
+import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService';
+import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
+import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity';
+import { IUserDataProfilesService } from 'vscode/vscode/vs/platform/userDataProfile/common/userDataProfile';
 
 let AbstractExtensionManagementService = class AbstractExtensionManagementService extends Disposable {
     get onInstallExtension() { return this._onInstallExtension.event; }
@@ -72,7 +72,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
     }
     async installGalleryExtensions(extensions) {
         if (!this.galleryService.isEnabled()) {
-            throw new ExtensionManagementError(nls.localizeWithPath('vs/platform/extensionManagement/common/abstractExtensionManagementService', 'MarketPlaceDisabled', "Marketplace is not enabled"), ExtensionManagementErrorCode.Internal);
+            throw new ExtensionManagementError(localizeWithPath('vs/platform/extensionManagement/common/abstractExtensionManagementService', 'MarketPlaceDisabled', "Marketplace is not enabled"), ExtensionManagementErrorCode.Internal);
         }
         const results = [];
         const installableExtensions = [];
@@ -429,27 +429,27 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
         let compatibleExtension;
         const extensionsControlManifest = await this.getExtensionsControlManifest();
         if (( extensionsControlManifest.malicious.some(identifier => areSameExtensions(extension.identifier, identifier)))) {
-            throw new ExtensionManagementError(nls.localizeWithPath('vs/platform/extensionManagement/common/abstractExtensionManagementService', 'malicious extension', "Can't install '{0}' extension since it was reported to be problematic.", extension.identifier.id), ExtensionManagementErrorCode.Malicious);
+            throw new ExtensionManagementError(localizeWithPath('vs/platform/extensionManagement/common/abstractExtensionManagementService', 'malicious extension', "Can't install '{0}' extension since it was reported to be problematic.", extension.identifier.id), ExtensionManagementErrorCode.Malicious);
         }
         const deprecationInfo = extensionsControlManifest.deprecated[extension.identifier.id.toLowerCase()];
         if (deprecationInfo?.extension?.autoMigrate) {
             this.logService.info(`The '${extension.identifier.id}' extension is deprecated, fetching the compatible '${deprecationInfo.extension.id}' extension instead.`);
             compatibleExtension = (await this.galleryService.getExtensions([{ id: deprecationInfo.extension.id, preRelease: deprecationInfo.extension.preRelease }], { targetPlatform: await this.getTargetPlatform(), compatible: true }, CancellationToken.None))[0];
             if (!compatibleExtension) {
-                throw new ExtensionManagementError(nls.localizeWithPath('vs/platform/extensionManagement/common/abstractExtensionManagementService', 'notFoundDeprecatedReplacementExtension', "Can't install '{0}' extension since it was deprecated and the replacement extension '{1}' can't be found.", extension.identifier.id, deprecationInfo.extension.id), ExtensionManagementErrorCode.Deprecated);
+                throw new ExtensionManagementError(localizeWithPath('vs/platform/extensionManagement/common/abstractExtensionManagementService', 'notFoundDeprecatedReplacementExtension', "Can't install '{0}' extension since it was deprecated and the replacement extension '{1}' can't be found.", extension.identifier.id, deprecationInfo.extension.id), ExtensionManagementErrorCode.Deprecated);
             }
         }
         else {
             if (!(await this.canInstall(extension))) {
                 const targetPlatform = await this.getTargetPlatform();
-                throw new ExtensionManagementError(nls.localizeWithPath('vs/platform/extensionManagement/common/abstractExtensionManagementService', 'incompatible platform', "The '{0}' extension is not available in {1} for {2}.", extension.identifier.id, this.productService.nameLong, TargetPlatformToString(targetPlatform)), ExtensionManagementErrorCode.IncompatibleTargetPlatform);
+                throw new ExtensionManagementError(localizeWithPath('vs/platform/extensionManagement/common/abstractExtensionManagementService', 'incompatible platform', "The '{0}' extension is not available in {1} for {2}.", extension.identifier.id, this.productService.nameLong, TargetPlatformToString(targetPlatform)), ExtensionManagementErrorCode.IncompatibleTargetPlatform);
             }
             compatibleExtension = await this.getCompatibleVersion(extension, sameVersion, installPreRelease);
             if (!compatibleExtension) {
                 if (!installPreRelease && extension.properties.isPreReleaseVersion && (await this.galleryService.getExtensions([extension.identifier], CancellationToken.None))[0]) {
-                    throw new ExtensionManagementError(nls.localizeWithPath('vs/platform/extensionManagement/common/abstractExtensionManagementService', 'notFoundReleaseExtension', "Can't install release version of '{0}' extension because it has no release version.", extension.identifier.id), ExtensionManagementErrorCode.ReleaseVersionNotFound);
+                    throw new ExtensionManagementError(localizeWithPath('vs/platform/extensionManagement/common/abstractExtensionManagementService', 'notFoundReleaseExtension', "Can't install release version of '{0}' extension because it has no release version.", extension.identifier.id), ExtensionManagementErrorCode.ReleaseVersionNotFound);
                 }
-                throw new ExtensionManagementError(nls.localizeWithPath('vs/platform/extensionManagement/common/abstractExtensionManagementService', 'notFoundCompatibleDependency', "Can't install '{0}' extension because it is not compatible with the current version of {1} (version {2}).", extension.identifier.id, this.productService.nameLong, this.productService.version), ExtensionManagementErrorCode.Incompatible);
+                throw new ExtensionManagementError(localizeWithPath('vs/platform/extensionManagement/common/abstractExtensionManagementService', 'notFoundCompatibleDependency', "Can't install '{0}' extension because it is not compatible with the current version of {1} (version {2}).", extension.identifier.id, this.productService.nameLong, this.productService.version), ExtensionManagementErrorCode.Incompatible);
             }
         }
         this.logService.info('Getting Manifest...', compatibleExtension.identifier.id);
@@ -608,7 +608,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
     getDependentsErrorMessage(dependingExtension, dependents, extensionToUninstall) {
         if (extensionToUninstall === dependingExtension) {
             if (dependents.length === 1) {
-                return ( nls.localizeWithPath(
+                return ( localizeWithPath(
                     'vs/platform/extensionManagement/common/abstractExtensionManagementService',
                     'singleDependentError',
                     "Cannot uninstall '{0}' extension. '{1}' extension depends on this.",
@@ -617,7 +617,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
                 ));
             }
             if (dependents.length === 2) {
-                return ( nls.localizeWithPath(
+                return ( localizeWithPath(
                     'vs/platform/extensionManagement/common/abstractExtensionManagementService',
                     'twoDependentsError',
                     "Cannot uninstall '{0}' extension. '{1}' and '{2}' extensions depend on this.",
@@ -626,7 +626,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
                     dependents[1].manifest.displayName || dependents[1].manifest.name
                 ));
             }
-            return ( nls.localizeWithPath(
+            return ( localizeWithPath(
                 'vs/platform/extensionManagement/common/abstractExtensionManagementService',
                 'multipleDependentsError',
                 "Cannot uninstall '{0}' extension. '{1}', '{2}' and other extension depend on this.",
@@ -636,7 +636,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
             ));
         }
         if (dependents.length === 1) {
-            return ( nls.localizeWithPath(
+            return ( localizeWithPath(
                 'vs/platform/extensionManagement/common/abstractExtensionManagementService',
                 'singleIndirectDependentError',
                 "Cannot uninstall '{0}' extension . It includes uninstalling '{1}' extension and '{2}' extension depends on this.",
@@ -647,7 +647,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
             ));
         }
         if (dependents.length === 2) {
-            return ( nls.localizeWithPath(
+            return ( localizeWithPath(
                 'vs/platform/extensionManagement/common/abstractExtensionManagementService',
                 'twoIndirectDependentsError',
                 "Cannot uninstall '{0}' extension. It includes uninstalling '{1}' extension and '{2}' and '{3}' extensions depend on this.",
@@ -658,7 +658,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
                 dependents[1].manifest.displayName || dependents[1].manifest.name
             ));
         }
-        return ( nls.localizeWithPath(
+        return ( localizeWithPath(
             'vs/platform/extensionManagement/common/abstractExtensionManagementService',
             'multipleIndirectDependentsError',
             "Cannot uninstall '{0}' extension. It includes uninstalling '{1}' extension and '{2}', '{3}' and other extensions depend on this.",

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

@@ -1,24 +1,24 @@
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
-import { distinct } from 'monaco-editor/esm/vs/base/common/arrays.js';
-import { CancellationToken } from 'monaco-editor/esm/vs/base/common/cancellation.js';
-import { getErrorMessage, isCancellationError, CancellationError } from 'monaco-editor/esm/vs/base/common/errors.js';
-import { isWeb, platform } from 'monaco-editor/esm/vs/base/common/platform.js';
-import { arch } from 'monaco-editor/esm/vs/base/common/process.js';
-import { isBoolean } from 'monaco-editor/esm/vs/base/common/types.js';
-import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
-import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
-import { IEnvironmentService } from 'monaco-editor/esm/vs/platform/environment/common/environment.js';
+import { distinct } from 'vscode/vscode/vs/base/common/arrays';
+import { CancellationToken } from 'vscode/vscode/vs/base/common/cancellation';
+import { getErrorMessage, isCancellationError, CancellationError } from 'vscode/vscode/vs/base/common/errors';
+import { isWeb, platform } from 'vscode/vscode/vs/base/common/platform';
+import { arch } from 'vscode/vscode/vs/base/common/process';
+import { isBoolean } from 'vscode/vscode/vs/base/common/types';
+import { URI } from 'vscode/vscode/vs/base/common/uri';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
+import { IEnvironmentService } from 'vscode/vscode/vs/platform/environment/common/environment';
 import { getTargetPlatform, isNotWebExtensionInWebTargetPlatform, isTargetPlatformCompatible, toTargetPlatform, WEB_EXTENSION_TAG } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagement';
 import { getGalleryExtensionId, areSameExtensions, getGalleryExtensionTelemetryData, adoptToGalleryExtensionId } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagementUtil';
 import { isEngineValid } from 'vscode/vscode/vs/platform/extensions/common/extensionValidator';
-import { IFileService } from 'monaco-editor/esm/vs/platform/files/common/files.js';
-import { ILogService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
-import { IProductService } from 'monaco-editor/esm/vs/platform/product/common/productService.js';
+import { IFileService } from 'vscode/vscode/vs/platform/files/common/files';
+import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
+import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService';
 import { asJson, isSuccess, asTextOrError, IRequestService } from 'vscode/vscode/vs/platform/request/common/request';
 import { resolveMarketplaceHeaders } from '../../externalServices/common/marketplace.js';
-import { IStorageService } from 'monaco-editor/esm/vs/platform/storage/common/storage.js';
-import { ITelemetryService } from 'monaco-editor/esm/vs/platform/telemetry/common/telemetry.js';
-import { StopWatch } from 'monaco-editor/esm/vs/base/common/stopwatch.js';
+import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
+import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
+import { StopWatch } from 'vscode/vscode/vs/base/common/stopwatch';
 
 const CURRENT_TARGET_PLATFORM = isWeb ? "web"  : getTargetPlatform(platform, arch);
 const ACTIVITY_HEADER_NAME = 'X-Market-Search-Activity-Id';

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

@@ -1,6 +1,6 @@
-import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
-import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
+import { Emitter } from 'vscode/vscode/vs/base/common/event';
+import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { transformAndReviveIncomingURIs, DefaultURITransformer } from 'vscode/vscode/vs/base/common/uriIpc';
 import { isTargetPlatformCompatible } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagement';
 

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

@@ -1,8 +1,8 @@
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
-import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { joinPath } from 'monaco-editor/esm/vs/base/common/resources.js';
-import { IFileService } from 'monaco-editor/esm/vs/platform/files/common/files.js';
-import { IProductService } from 'monaco-editor/esm/vs/platform/product/common/productService.js';
+import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { joinPath } from 'vscode/vscode/vs/base/common/resources';
+import { IFileService } from 'vscode/vscode/vs/platform/files/common/files';
+import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService';
 
 let ExtensionTipsService = class ExtensionTipsService extends Disposable {
     constructor(fileService, productService) {

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

@@ -1,4 +1,4 @@
-import { CancellationToken } from 'monaco-editor/esm/vs/base/common/cancellation.js';
+import { CancellationToken } from 'vscode/vscode/vs/base/common/cancellation';
 import { areSameExtensions, getExtensionId } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagementUtil';
 
 async function migrateUnsupportedExtensions(extensionManagementService, galleryService, extensionStorageService, extensionEnablementService, logService) {

package/vscode/src/vs/workbench/contrib/extensions/browser/abstractRuntimeExtensionsEditor.js

@@ -1,29 +1,29 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { append, $, addDisposableListener, clearNode } from 'monaco-editor/esm/vs/base/browser/dom.js';
-import { ActionBar } from 'monaco-editor/esm/vs/base/browser/ui/actionbar/actionbar.js';
-import { renderLabelWithIcons } from 'monaco-editor/esm/vs/base/browser/ui/iconLabel/iconLabels.js';
-import { Action, Separator } from 'monaco-editor/esm/vs/base/common/actions.js';
-import { isNonEmptyArray } from 'monaco-editor/esm/vs/base/common/arrays.js';
-import { RunOnceScheduler } from 'monaco-editor/esm/vs/base/common/async.js';
-import { memoize } from 'monaco-editor/esm/vs/base/common/decorators.js';
-import { dispose } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { Schemas } from 'monaco-editor/esm/vs/base/common/network.js';
+import { append, $, addDisposableListener, clearNode } from 'vscode/vscode/vs/base/browser/dom';
+import { ActionBar } from 'vscode/vscode/vs/base/browser/ui/actionbar/actionbar';
+import { renderLabelWithIcons } from 'vscode/vscode/vs/base/browser/ui/iconLabel/iconLabels';
+import { Action, Separator } from 'vscode/vscode/vs/base/common/actions';
+import { isNonEmptyArray } from 'vscode/vscode/vs/base/common/arrays';
+import { RunOnceScheduler } from 'vscode/vscode/vs/base/common/async';
+import { memoize } from 'vscode/vscode/vs/base/common/decorators';
+import { dispose } from 'vscode/vscode/vs/base/common/lifecycle';
+import { Schemas } from 'vscode/vscode/vs/base/common/network';
 import './media/runtimeExtensionsEditor.css.js';
-import * as nls from 'monaco-editor/esm/vs/nls.js';
-import { Categories } from 'monaco-editor/esm/vs/platform/action/common/actionCommonCategories.js';
-import { Action2, MenuId } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
-import { IClipboardService } from 'monaco-editor/esm/vs/platform/clipboard/common/clipboardService.js';
-import { ContextKeyExpr, IContextKeyService } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
-import { IContextMenuService } from 'monaco-editor/esm/vs/platform/contextview/browser/contextView.js';
-import { ExtensionIdentifierMap } from 'monaco-editor/esm/vs/platform/extensions/common/extensions.js';
-import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
-import { ILabelService } from 'monaco-editor/esm/vs/platform/label/common/label.js';
-import { WorkbenchList } from 'monaco-editor/esm/vs/platform/list/browser/listService.js';
-import { INotificationService } from 'monaco-editor/esm/vs/platform/notification/common/notification.js';
-import { IStorageService } from 'monaco-editor/esm/vs/platform/storage/common/storage.js';
-import { ITelemetryService } from 'monaco-editor/esm/vs/platform/telemetry/common/telemetry.js';
-import { editorBackground } from 'monaco-editor/esm/vs/platform/theme/common/colorRegistry.js';
-import { IThemeService } from 'monaco-editor/esm/vs/platform/theme/common/themeService.js';
+import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { Categories } from 'vscode/vscode/vs/platform/action/common/actionCommonCategories';
+import { Action2, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
+import { IClipboardService } from 'vscode/vscode/vs/platform/clipboard/common/clipboardService';
+import { ContextKeyExpr, IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
+import { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView';
+import { ExtensionIdentifierMap } from 'vscode/vscode/vs/platform/extensions/common/extensions';
+import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
+import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label';
+import { WorkbenchList } from 'vscode/vscode/vs/platform/list/browser/listService';
+import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification';
+import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
+import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
+import { editorBackground } from 'vscode/vscode/vs/platform/theme/common/colorRegistry';
+import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService';
 import { EditorPane } from 'vscode/vscode/vs/workbench/browser/parts/editor/editorPane';
 import { IExtensionsWorkbenchService } from 'vscode/vscode/vs/workbench/contrib/extensions/common/extensions';
 import { RuntimeExtensionsInput } from '../common/runtimeExtensionsInput.js';
@@ -211,7 +211,7 @@ let AbstractRuntimeExtensionsEditor = class AbstractRuntimeExtensionsEditor exte
                     const activationId = activationTimes.activationReason.extensionId.value;
                     const activationEvent = activationTimes.activationReason.activationEvent;
                     if (activationEvent === '*') {
-                        title = ( nls.localizeWithPath(
+                        title = ( localizeWithPath(
                             'vs/workbench/contrib/extensions/browser/abstractRuntimeExtensionsEditor',
                             {
                                 key: 'starActivation',
@@ -226,7 +226,7 @@ let AbstractRuntimeExtensionsEditor = class AbstractRuntimeExtensionsEditor exte
                     else if (/^workspaceContains:/.test(activationEvent)) {
                         const fileNameOrGlob = activationEvent.substr('workspaceContains:'.length);
                         if (fileNameOrGlob.indexOf('*') >= 0 || fileNameOrGlob.indexOf('?') >= 0) {
-                            title = ( nls.localizeWithPath(
+                            title = ( localizeWithPath(
                                 'vs/workbench/contrib/extensions/browser/abstractRuntimeExtensionsEditor',
                                 {
                                     key: 'workspaceContainsGlobActivation',
@@ -241,7 +241,7 @@ let AbstractRuntimeExtensionsEditor = class AbstractRuntimeExtensionsEditor exte
                             ));
                         }
                         else {
-                            title = ( nls.localizeWithPath(
+                            title = ( localizeWithPath(
                                 'vs/workbench/contrib/extensions/browser/abstractRuntimeExtensionsEditor',
                                 {
                                     key: 'workspaceContainsFileActivation',
@@ -258,7 +258,7 @@ let AbstractRuntimeExtensionsEditor = class AbstractRuntimeExtensionsEditor exte
                     }
                     else if (/^workspaceContainsTimeout:/.test(activationEvent)) {
                         const glob = activationEvent.substr('workspaceContainsTimeout:'.length);
-                        title = ( nls.localizeWithPath(
+                        title = ( localizeWithPath(
                             'vs/workbench/contrib/extensions/browser/abstractRuntimeExtensionsEditor',
                             {
                                 key: 'workspaceContainsTimeout',
@@ -273,7 +273,7 @@ let AbstractRuntimeExtensionsEditor = class AbstractRuntimeExtensionsEditor exte
                         ));
                     }
                     else if (activationEvent === 'onStartupFinished') {
-                        title = ( nls.localizeWithPath(
+                        title = ( localizeWithPath(
                             'vs/workbench/contrib/extensions/browser/abstractRuntimeExtensionsEditor',
                             {
                                 key: 'startupFinishedActivation',
@@ -287,7 +287,7 @@ let AbstractRuntimeExtensionsEditor = class AbstractRuntimeExtensionsEditor exte
                     }
                     else if (/^onLanguage:/.test(activationEvent)) {
                         const language = activationEvent.substr('onLanguage:'.length);
-                        title = ( nls.localizeWithPath(
+                        title = ( localizeWithPath(
                             'vs/workbench/contrib/extensions/browser/abstractRuntimeExtensionsEditor',
                             'languageActivation',
                             "Activated by {1} because you opened a {0} file",
@@ -296,7 +296,7 @@ let AbstractRuntimeExtensionsEditor = class AbstractRuntimeExtensionsEditor exte
                         ));
                     }
                     else {
-                        title = ( nls.localizeWithPath(
+                        title = ( localizeWithPath(
                             'vs/workbench/contrib/extensions/browser/abstractRuntimeExtensionsEditor',
                             {
                                 key: 'workspaceGenericActivation',
@@ -312,7 +312,7 @@ let AbstractRuntimeExtensionsEditor = class AbstractRuntimeExtensionsEditor exte
                     }
                 }
                 else {
-                    title = ( nls.localizeWithPath(
+                    title = ( localizeWithPath(
                         'vs/workbench/contrib/extensions/browser/abstractRuntimeExtensionsEditor',
                         'extensionActivating',
                         "Extension is activating..."
@@ -322,7 +322,7 @@ let AbstractRuntimeExtensionsEditor = class AbstractRuntimeExtensionsEditor exte
                 clearNode(data.msgContainer);
                 if (this._getUnresponsiveProfile(element.description.identifier)) {
                     const el = $('span', undefined, ...renderLabelWithIcons(` $(alert) Unresponsive`));
-                    el.title = ( nls.localizeWithPath(
+                    el.title = ( localizeWithPath(
                         'vs/workbench/contrib/extensions/browser/abstractRuntimeExtensionsEditor',
                         'unresponsive.title',
                         "Extension has caused the extension host to freeze."
@@ -330,7 +330,7 @@ let AbstractRuntimeExtensionsEditor = class AbstractRuntimeExtensionsEditor exte
                     data.msgContainer.appendChild(el);
                 }
                 if (isNonEmptyArray(element.status.runtimeErrors)) {
-                    const el = $('span', undefined, ...renderLabelWithIcons(`$(bug) ${( nls.localizeWithPath(
+                    const el = $('span', undefined, ...renderLabelWithIcons(`$(bug) ${( localizeWithPath(
                         'vs/workbench/contrib/extensions/browser/abstractRuntimeExtensionsEditor',
                         'errors',
                         "{0} uncaught errors",
@@ -384,7 +384,7 @@ let AbstractRuntimeExtensionsEditor = class AbstractRuntimeExtensionsEditor exte
             },
             accessibilityProvider: new (class {
                 getWidgetAriaLabel() {
-                    return ( nls.localizeWithPath(
+                    return ( localizeWithPath(
                         'vs/workbench/contrib/extensions/browser/abstractRuntimeExtensionsEditor',
                         'runtimeExtensions',
                         "Runtime Extensions"
@@ -401,7 +401,7 @@ let AbstractRuntimeExtensionsEditor = class AbstractRuntimeExtensionsEditor exte
                 return;
             }
             const actions = [];
-            actions.push(( new Action('runtimeExtensionsEditor.action.copyId', ( nls.localizeWithPath(
+            actions.push(( new Action('runtimeExtensionsEditor.action.copyId', ( localizeWithPath(
                 'vs/workbench/contrib/extensions/browser/abstractRuntimeExtensionsEditor',
                 'copy id',
                 "Copy id ({0})",
@@ -415,12 +415,12 @@ let AbstractRuntimeExtensionsEditor = class AbstractRuntimeExtensionsEditor exte
             }
             actions.push(( new Separator()));
             if (e.element.marketplaceInfo) {
-                actions.push(( new Action('runtimeExtensionsEditor.action.disableWorkspace', ( nls.localizeWithPath(
+                actions.push(( new Action('runtimeExtensionsEditor.action.disableWorkspace', ( localizeWithPath(
                     'vs/workbench/contrib/extensions/browser/abstractRuntimeExtensionsEditor',
                     'disable workspace',
                     "Disable (Workspace)"
                 )), undefined, true, () => this._extensionsWorkbenchService.setEnablement(e.element.marketplaceInfo, 7 ))));
-                actions.push(( new Action('runtimeExtensionsEditor.action.disable', ( nls.localizeWithPath(
+                actions.push(( new Action('runtimeExtensionsEditor.action.disable', ( localizeWithPath(
                     'vs/workbench/contrib/extensions/browser/abstractRuntimeExtensionsEditor',
                     'disable',
                     "Disable"
@@ -469,7 +469,7 @@ class ShowRuntimeExtensionsAction extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.showRuntimeExtensions',
-            title: { value: ( nls.localizeWithPath(
+            title: { value: ( localizeWithPath(
                 'vs/workbench/contrib/extensions/browser/abstractRuntimeExtensionsEditor',
                 'showRuntimeExtensions',
                 "Show Running Extensions"

package/vscode/src/vs/workbench/contrib/extensions/browser/configBasedRecommendations.js

@@ -1,9 +1,9 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { IExtensionTipsService } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagement';
 import { ExtensionRecommendations } from './extensionRecommendations.js';
-import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
-import { IWorkspaceContextService } from 'monaco-editor/esm/vs/platform/workspace/common/workspace.js';
-import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
+import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace';
+import { Emitter } from 'vscode/vscode/vs/base/common/event';
 
 let ConfigBasedRecommendations = class ConfigBasedRecommendations extends ExtensionRecommendations {
     get otherRecommendations() { return this._otherRecommendations; }