@codingame/monaco-vscode-extensions-service-override 1.85.4 → 2.0.0-rework-ci.1

package/extensions.js

@@ -1,34 +1,34 @@
 import { __decorate, __param } from './external/tslib/tslib.es6.js';
-import { IFileService } from 'monaco-editor/esm/vs/platform/files/common/files.js';
+import { IFileService } from 'vscode/vscode/vs/platform/files/common/files';
 import { ILifecycleService } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 import { toExtensionDescription, IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
-import { ILogService, ILoggerService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
-import { IWorkspaceContextService } from 'monaco-editor/esm/vs/platform/workspace/common/workspace.js';
-import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
-import { INotificationService } from 'monaco-editor/esm/vs/platform/notification/common/notification.js';
+import { ILogService, ILoggerService } from 'vscode/vscode/vs/platform/log/common/log';
+import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace';
+import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
+import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification';
 import { DeltaExtensionsQueueItem } from './vscode/src/vs/workbench/services/extensions/common/abstractExtensionService.js';
-import { ITelemetryService } from 'monaco-editor/esm/vs/platform/telemetry/common/telemetry.js';
+import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
 import './override/vs/platform/dialogs/common/dialogs.js';
 import { IRemoteAuthorityResolverService } from 'vscode/vscode/vs/platform/remote/common/remoteAuthorityResolver';
 import { IRemoteExtensionsScannerService } from 'vscode/vscode/vs/platform/remote/common/remoteExtensionsScanner';
 import { IRemoteAgentService } from 'vscode/vscode/vs/workbench/services/remote/common/remoteAgentService';
 import { IWorkbenchExtensionEnablementService, IWorkbenchExtensionManagementService, IWebExtensionsScannerService } from 'vscode/vscode/vs/workbench/services/extensionManagement/common/extensionManagement';
 import { IExtensionManifestPropertiesService, ExtensionManifestPropertiesService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensionManifestPropertiesService';
-import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
-import { IProductService } from 'monaco-editor/esm/vs/platform/product/common/productService.js';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
+import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService';
 import { IBrowserWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/browser/environmentService';
-import { SyncDescriptor } from 'monaco-editor/esm/vs/platform/instantiation/common/descriptors.js';
+import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
 import { IUserDataInitializationService } from 'vscode/vscode/vs/workbench/services/userData/browser/userDataInit';
 import { ExtensionsProposedApi } from './vscode/src/vs/workbench/services/extensions/common/extensionsProposedApi.js';
 import { ExtensionService, BrowserExtensionHostFactory, BrowserExtensionHostKindPicker } from './vscode/src/vs/workbench/services/extensions/browser/extensionService.js';
 export { ExtensionHostKind } from 'vscode/vscode/vs/workbench/services/extensions/common/extensionHostKind';
 import { WebWorkerExtensionHost } from './vscode/src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.js';
-import { IUserDataProfilesService } from 'monaco-editor/esm/vs/platform/userDataProfile/common/userDataProfile.js';
-import { ILayoutService } from 'monaco-editor/esm/vs/platform/layout/browser/layoutService.js';
-import { IStorageService } from 'monaco-editor/esm/vs/platform/storage/common/storage.js';
-import { ILabelService } from 'monaco-editor/esm/vs/platform/label/common/label.js';
+import { IUserDataProfilesService } from 'vscode/vscode/vs/platform/userDataProfile/common/userDataProfile';
+import { ILayoutService } from 'vscode/vscode/vs/platform/layout/browser/layoutService';
+import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
+import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label';
 import { IUserDataProfileService } from 'vscode/vscode/vs/workbench/services/userDataProfile/common/userDataProfile';
-import { IWorkspaceTrustManagementService } from 'monaco-editor/esm/vs/platform/workspace/common/workspaceTrust.js';
+import { IWorkspaceTrustManagementService } from 'vscode/vscode/vs/platform/workspace/common/workspaceTrust';
 import { IRemoteExplorerService } from 'vscode/vscode/vs/workbench/services/remote/common/remoteExplorerService';
 import { ExtensionResourceLoaderService } from './vscode/src/vs/platform/extensionResourceLoader/browser/extensionResourceLoaderService.js';
 import { IExtensionResourceLoaderService } from 'vscode/vscode/vs/platform/extensionResourceLoader/common/extensionResourceLoader';
@@ -57,6 +57,10 @@ import './vscode/src/vs/workbench/api/browser/mainThreadDialogs.js';
 import './vscode/src/vs/workbench/api/browser/mainThreadDocumentContentProviders.js';
 import './vscode/src/vs/workbench/api/browser/mainThreadDocuments.js';
 import './vscode/src/vs/workbench/api/browser/mainThreadDocumentsAndEditors.js';
+import 'vscode/vscode/vs/editor/common/config/editorOptions';
+import 'vscode/vscode/vs/editor/contrib/snippet/browser/snippetController2';
+import 'vscode/vscode/vs/editor/contrib/editorState/browser/keybindingCancellation';
+import 'vscode/vscode/vs/editor/contrib/snippet/browser/snippetParser';
 import './vscode/src/vs/workbench/api/browser/mainThreadEditors.js';
 import './vscode/src/vs/workbench/api/browser/mainThreadEditorTabs.js';
 import './vscode/src/vs/workbench/api/browser/mainThreadErrors.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-extensions-service-override",
-  "version": "1.85.4",
+  "version": "2.0.0-rework-ci.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,9 +18,9 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@1.85.4",
-    "monaco-editor": "0.45.0",
+    "vscode": "npm:@codingame/monaco-vscode-api@2.0.0-rework-ci.1",
+    "vscode-marked": "npm:marked@=3.0.2",
     "vscode-semver": "npm:semver@=5.5.0",
-    "@codingame/monaco-vscode-files-service-override": "1.85.4"
+    "@codingame/monaco-vscode-files-service-override": "2.0.0-rework-ci.1"
   }
 }

package/vscode/src/vs/platform/extensionResourceLoader/browser/extensionResourceLoaderService.js

@@ -1,11 +1,11 @@
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
-import { IFileService } from 'monaco-editor/esm/vs/platform/files/common/files.js';
-import { FileAccess, Schemas } from 'monaco-editor/esm/vs/base/common/network.js';
-import { IProductService } from 'monaco-editor/esm/vs/platform/product/common/productService.js';
-import { IStorageService } from 'monaco-editor/esm/vs/platform/storage/common/storage.js';
-import { IEnvironmentService } from 'monaco-editor/esm/vs/platform/environment/common/environment.js';
-import { ILogService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
-import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
+import { IFileService } from 'vscode/vscode/vs/platform/files/common/files';
+import { FileAccess, Schemas } from 'vscode/vscode/vs/base/common/network';
+import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService';
+import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
+import { IEnvironmentService } from 'vscode/vscode/vs/platform/environment/common/environment';
+import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
 import { AbstractExtensionResourceLoaderService } from 'vscode/vscode/vs/platform/extensionResourceLoader/common/extensionResourceLoader';
 
 let ExtensionResourceLoaderService = class ExtensionResourceLoaderService extends AbstractExtensionResourceLoaderService {

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

@@ -1,4 +1,4 @@
-import { isThenable, Promises } from 'monaco-editor/esm/vs/base/common/async.js';
+import { isThenable, Promises } from 'vscode/vscode/vs/base/common/async';
 
 function handleVetos(vetos, onError) {
     if (vetos.length === 0) {

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

@@ -1,4 +1,4 @@
-import { relativePath } from 'monaco-editor/esm/vs/base/common/resources.js';
+import { relativePath } from 'vscode/vscode/vs/base/common/resources';
 
 async function getLogs(fileService, environmentService) {
     const result = [];

package/vscode/src/vs/platform/remote/common/managedSocket.js

@@ -1,6 +1,6 @@
-import { VSBuffer, encodeBase64 } from 'monaco-editor/esm/vs/base/common/buffer.js';
-import { PauseableEmitter, Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
-import { DisposableStore, Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
+import { VSBuffer, encodeBase64 } from 'vscode/vscode/vs/base/common/buffer';
+import { PauseableEmitter, Emitter } from 'vscode/vscode/vs/base/common/event';
+import { DisposableStore, Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { SocketDiagnostics } from 'vscode/vscode/vs/base/parts/ipc/common/ipc.net';
 
 const makeRawSocketHeaders = (path, query, deubgLabel) => {

package/vscode/src/vs/workbench/api/browser/mainThreadAiEmbeddingVector.js

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
-import { Disposable, DisposableMap } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
+import { Disposable, DisposableMap } from 'vscode/vscode/vs/base/common/lifecycle';
 import { MainContext, ExtHostContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
 import { IAiEmbeddingVectorService } from 'vscode/vscode/vs/workbench/services/aiEmbeddingVector/common/aiEmbeddingVectorService';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';

package/vscode/src/vs/workbench/api/browser/mainThreadAiRelatedInformation.js

@@ -1,6 +1,6 @@
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
-import { CancellationToken } from 'monaco-editor/esm/vs/base/common/cancellation.js';
-import { Disposable, DisposableMap } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
+import { CancellationToken } from 'vscode/vscode/vs/base/common/cancellation';
+import { Disposable, DisposableMap } from 'vscode/vscode/vs/base/common/lifecycle';
 import { MainContext, ExtHostContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
 import { IAiRelatedInformationService } from 'vscode/vscode/vs/workbench/services/aiRelatedInformation/common/aiRelatedInformation';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';

package/vscode/src/vs/workbench/api/browser/mainThreadAuthentication.js

@@ -1,18 +1,18 @@
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
-import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import * as nls from 'monaco-editor/esm/vs/nls.js';
+import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 import { getAuthenticationProviderActivationEvent, addAccountUsage, readAllowedExtensions, readAccountUsages, removeAccountUsage } from 'vscode/vscode/vs/workbench/services/authentication/browser/authenticationService';
 import { IAuthenticationService } from 'vscode/vscode/vs/workbench/services/authentication/common/authentication';
 import { MainContext, ExtHostContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
 import '../../../../../../override/vs/platform/dialogs/common/dialogs.js';
-import { IStorageService } from 'monaco-editor/esm/vs/platform/storage/common/storage.js';
-import Severity from 'monaco-editor/esm/vs/base/common/severity.js';
-import { IQuickInputService } from 'monaco-editor/esm/vs/platform/quickinput/common/quickInput.js';
-import { INotificationService } from 'monaco-editor/esm/vs/platform/notification/common/notification.js';
+import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
+import Severity from 'vscode/vscode/vs/base/common/severity';
+import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput';
+import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification';
 import { fromNow } from 'vscode/vscode/vs/base/common/date';
 import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
-import { ITelemetryService } from 'monaco-editor/esm/vs/platform/telemetry/common/telemetry.js';
+import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
 import { IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs';
 
 class MainThreadAuthenticationProvider extends Disposable {
@@ -30,7 +30,7 @@ class MainThreadAuthenticationProvider extends Disposable {
     manageTrustedExtensions(accountName) {
         const allowedExtensions = readAllowedExtensions(this.storageService, this.id, accountName);
         if (!allowedExtensions.length) {
-            this.dialogService.info(( nls.localizeWithPath(
+            this.dialogService.info(( localizeWithPath(
                 'vs/workbench/api/browser/mainThreadAuthentication',
                 'noTrustedExtensions',
                 "This account has not been used by any extensions."
@@ -40,7 +40,7 @@ class MainThreadAuthenticationProvider extends Disposable {
         const quickPick = this.quickInputService.createQuickPick();
         quickPick.canSelectMany = true;
         quickPick.customButton = true;
-        quickPick.customLabel = ( nls.localizeWithPath(
+        quickPick.customLabel = ( localizeWithPath(
             'vs/workbench/api/browser/mainThreadAuthentication',
             'manageTrustedExtensions.cancel',
             'Cancel'
@@ -51,13 +51,13 @@ class MainThreadAuthenticationProvider extends Disposable {
             return {
                 label: extension.name,
                 description: usage
-                    ? ( nls.localizeWithPath(
+                    ? ( localizeWithPath(
                     'vs/workbench/api/browser/mainThreadAuthentication',
                     { key: 'accountLastUsedDate', comment: ['The placeholder {0} is a string with time information, such as "3 days ago"'] },
                     "Last used this account {0}",
                     fromNow(usage.lastUsed, true)
                 ))
-                    : ( nls.localizeWithPath(
+                    : ( localizeWithPath(
                     'vs/workbench/api/browser/mainThreadAuthentication',
                     'notUsed',
                     "Has not used this account"
@@ -67,12 +67,12 @@ class MainThreadAuthenticationProvider extends Disposable {
         }));
         quickPick.items = items;
         quickPick.selectedItems = items.filter(item => item.extension.allowed === undefined || item.extension.allowed);
-        quickPick.title = ( nls.localizeWithPath(
+        quickPick.title = ( localizeWithPath(
             'vs/workbench/api/browser/mainThreadAuthentication',
             'manageTrustedExtensions',
             "Manage Trusted Extensions"
         ));
-        quickPick.placeholder = ( nls.localizeWithPath(
+        quickPick.placeholder = ( localizeWithPath(
             'vs/workbench/api/browser/mainThreadAuthentication',
             'manageExtensions',
             "Choose which extensions can access this account"
@@ -104,20 +104,20 @@ class MainThreadAuthenticationProvider extends Disposable {
         const { confirmed } = await this.dialogService.confirm({
             type: Severity.Info,
             message: accountUsages.length
-                ? ( nls.localizeWithPath(
+                ? ( localizeWithPath(
                 'vs/workbench/api/browser/mainThreadAuthentication',
                 'signOutMessage',
                 "The account '{0}' has been used by: \n\n{1}\n\n Sign out from these extensions?",
                 accountName,
                 ( accountUsages.map(usage => usage.extensionName)).join('\n')
             ))
-                : ( nls.localizeWithPath(
+                : ( localizeWithPath(
                 'vs/workbench/api/browser/mainThreadAuthentication',
                 'signOutMessageSimple',
                 "Sign out of '{0}'?",
                 accountName
             )),
-            primaryButton: ( nls.localizeWithPath(
+            primaryButton: ( localizeWithPath(
                 'vs/workbench/api/browser/mainThreadAuthentication',
                 { key: 'signOut', comment: ['&& denotes a mnemonic'] },
                 "&&Sign Out"
@@ -138,7 +138,7 @@ class MainThreadAuthenticationProvider extends Disposable {
     }
     async removeSession(sessionId) {
         await this._proxy.$removeSession(this.id, sessionId);
-        this.notificationService.info(( nls.localizeWithPath(
+        this.notificationService.info(( localizeWithPath(
             'vs/workbench/api/browser/mainThreadAuthentication',
             'signedOut',
             "Successfully signed out."
@@ -191,14 +191,14 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
     }
     async loginPrompt(providerName, extensionName, recreatingSession, detail) {
         const message = recreatingSession
-            ? ( nls.localizeWithPath(
+            ? ( localizeWithPath(
             'vs/workbench/api/browser/mainThreadAuthentication',
             'confirmRelogin',
             "The extension '{0}' wants you to sign in again using {1}.",
             extensionName,
             providerName
         ))
-            : ( nls.localizeWithPath(
+            : ( localizeWithPath(
             'vs/workbench/api/browser/mainThreadAuthentication',
             'confirmLogin',
             "The extension '{0}' wants to sign in using {1}.",
@@ -209,7 +209,7 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
             type: Severity.Info,
             message,
             detail,
-            primaryButton: ( nls.localizeWithPath(
+            primaryButton: ( localizeWithPath(
                 'vs/workbench/api/browser/mainThreadAuthentication',
                 { key: 'allow', comment: ['&& denotes a mnemonic'] },
                 "&&Allow"

package/vscode/src/vs/workbench/api/browser/mainThreadBulkEdits.js

@@ -1,9 +1,9 @@
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
-import { decodeBase64 } from 'monaco-editor/esm/vs/base/common/buffer.js';
-import { revive } from 'monaco-editor/esm/vs/base/common/marshalling.js';
-import { IBulkEditService, ResourceTextEdit, ResourceFileEdit } from 'monaco-editor/esm/vs/editor/browser/services/bulkEditService.js';
-import { ILogService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
-import { IUriIdentityService } from 'monaco-editor/esm/vs/platform/uriIdentity/common/uriIdentity.js';
+import { decodeBase64 } from 'vscode/vscode/vs/base/common/buffer';
+import { revive } from 'vscode/vscode/vs/base/common/marshalling';
+import { IBulkEditService, ResourceTextEdit, ResourceFileEdit } from 'vscode/vscode/vs/editor/browser/services/bulkEditService';
+import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
+import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity';
 import { MainContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
 import { ResourceNotebookCellEdit } from 'vscode/vscode/vs/workbench/contrib/bulkEdit/browser/bulkCellEdits';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';

package/vscode/src/vs/workbench/api/browser/mainThreadChat.js

@@ -1,7 +1,7 @@
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
-import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
-import { Disposable, DisposableMap } 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, DisposableMap } from 'vscode/vscode/vs/base/common/lifecycle';
+import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { MainContext, ExtHostContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
 import { IChatWidgetService } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat';
 import { IChatContributionService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContributionService';

package/vscode/src/vs/workbench/api/browser/mainThreadChatAgents2.js

@@ -1,12 +1,12 @@
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
-import { DeferredPromise } from 'monaco-editor/esm/vs/base/common/async.js';
-import { Disposable, DisposableMap } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { revive } from 'monaco-editor/esm/vs/base/common/marshalling.js';
-import { escapeRegExpCharacters } from 'monaco-editor/esm/vs/base/common/strings.js';
-import { Range } from 'monaco-editor/esm/vs/editor/common/core/range.js';
-import { getWordAtText } from 'monaco-editor/esm/vs/editor/common/core/wordHelper.js';
-import { ILanguageFeaturesService } from 'monaco-editor/esm/vs/editor/common/services/languageFeatures.js';
-import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
+import { DeferredPromise } from 'vscode/vscode/vs/base/common/async';
+import { Disposable, DisposableMap } from 'vscode/vscode/vs/base/common/lifecycle';
+import { revive } from 'vscode/vscode/vs/base/common/marshalling';
+import { escapeRegExpCharacters } from 'vscode/vscode/vs/base/common/strings';
+import { Range } from 'vscode/vscode/vs/editor/common/core/range';
+import { getWordAtText } from 'vscode/vscode/vs/editor/common/core/wordHelper';
+import { ILanguageFeaturesService } from 'vscode/vscode/vs/editor/common/services/languageFeatures';
+import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { MainContext, ExtHostContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
 import { IChatWidgetService } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat';
 import { ChatInputPart } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chatInputPart';

package/vscode/src/vs/workbench/api/browser/mainThreadChatProvider.js

@@ -1,7 +1,7 @@
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
-import { DisposableMap } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { ILogService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
-import { Progress } from 'monaco-editor/esm/vs/platform/progress/common/progress.js';
+import { DisposableMap } from 'vscode/vscode/vs/base/common/lifecycle';
+import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
+import { Progress } from 'vscode/vscode/vs/platform/progress/common/progress';
 import { MainContext, ExtHostContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
 import { IChatProviderService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatProvider';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';

package/vscode/src/vs/workbench/api/browser/mainThreadChatVariables.js

@@ -1,6 +1,6 @@
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
-import { DisposableMap } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { revive } from 'monaco-editor/esm/vs/base/common/marshalling.js';
+import { DisposableMap } from 'vscode/vscode/vs/base/common/lifecycle';
+import { revive } from 'vscode/vscode/vs/base/common/marshalling';
 import { MainContext, ExtHostContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
 import { IChatVariablesService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatVariables';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';

package/vscode/src/vs/workbench/api/browser/mainThreadClipboard.js

@@ -1,7 +1,7 @@
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 import { MainContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
-import { IClipboardService } from 'monaco-editor/esm/vs/platform/clipboard/common/clipboardService.js';
+import { IClipboardService } from 'vscode/vscode/vs/platform/clipboard/common/clipboardService';
 
 let MainThreadClipboard = class MainThreadClipboard {
     constructor(_context, _clipboardService) {

package/vscode/src/vs/workbench/api/browser/mainThreadCodeInsets.js

@@ -1,8 +1,8 @@
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
-import { DisposableStore } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { isEqual } from 'monaco-editor/esm/vs/base/common/resources.js';
-import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
-import { ICodeEditorService } from 'monaco-editor/esm/vs/editor/browser/services/codeEditorService.js';
+import { DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
+import { isEqual } from 'vscode/vscode/vs/base/common/resources';
+import { URI } from 'vscode/vscode/vs/base/common/uri';
+import { ICodeEditorService } from 'vscode/vscode/vs/editor/browser/services/codeEditorService';
 import { reviveWebviewContentOptions } from './mainThreadWebviews.js';
 import { MainContext, ExtHostContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
 import { IWebviewService } from 'vscode/vscode/vs/workbench/contrib/webview/browser/webview';

package/vscode/src/vs/workbench/api/browser/mainThreadCommands.js

@@ -1,12 +1,12 @@
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
-import { DisposableMap } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { revive } from 'monaco-editor/esm/vs/base/common/marshalling.js';
-import { ICommandService, CommandsRegistry } from 'monaco-editor/esm/vs/platform/commands/common/commands.js';
+import { DisposableMap } from 'vscode/vscode/vs/base/common/lifecycle';
+import { revive } from 'vscode/vscode/vs/base/common/marshalling';
+import { ICommandService, CommandsRegistry } from 'vscode/vscode/vs/platform/commands/common/commands';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
 import { SerializableObjectWithBuffers } from 'vscode/vscode/vs/workbench/services/extensions/common/proxyIdentifier';
 import { MainContext, ExtHostContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
-import { isString } from 'monaco-editor/esm/vs/base/common/types.js';
+import { isString } from 'vscode/vscode/vs/base/common/types';
 
 let MainThreadCommands = class MainThreadCommands {
     constructor(extHostContext, _commandService, _extensionService) {

package/vscode/src/vs/workbench/api/browser/mainThreadComments.js

@@ -1,21 +1,21 @@
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
-import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
-import { Disposable, DisposableStore } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
-import { Range } from 'monaco-editor/esm/vs/editor/common/core/range.js';
-import { Registry } from 'monaco-editor/esm/vs/platform/registry/common/platform.js';
+import { Emitter } from 'vscode/vscode/vs/base/common/event';
+import { Disposable, DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
+import { URI } from 'vscode/vscode/vs/base/common/uri';
+import { Range } from 'vscode/vscode/vs/editor/common/core/range';
+import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 import { ICommentService } from 'vscode/vscode/vs/workbench/contrib/comments/browser/commentService';
 import { CommentsPanel } from '../../contrib/comments/browser/commentsView.js';
 import { MainContext, ExtHostContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
 import { COMMENTS_VIEW_ID, COMMENTS_VIEW_TITLE, COMMENTS_VIEW_STORAGE_ID } from '../../contrib/comments/browser/commentsTreeViewer.js';
 import { IViewsService, IViewDescriptorService, Extensions } from 'vscode/vscode/vs/workbench/common/views';
-import { SyncDescriptor } from 'monaco-editor/esm/vs/platform/instantiation/common/descriptors.js';
+import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
 import { ViewPaneContainer } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
-import { Codicon } from 'monaco-editor/esm/vs/base/common/codicons.js';
-import { registerIcon } from 'monaco-editor/esm/vs/platform/theme/common/iconRegistry.js';
-import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
-import { Schemas } from 'monaco-editor/esm/vs/base/common/network.js';
+import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
+import { registerIcon } from 'vscode/vscode/vs/platform/theme/common/iconRegistry';
+import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { Schemas } from 'vscode/vscode/vs/base/common/network';
 
 class MainThreadCommentThread {
     get input() {

package/vscode/src/vs/workbench/api/browser/mainThreadConfiguration.js

@@ -1,12 +1,12 @@
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
-import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
-import { Registry } from 'monaco-editor/esm/vs/platform/registry/common/platform.js';
-import { getScopes, Extensions } from 'monaco-editor/esm/vs/platform/configuration/common/configurationRegistry.js';
-import { IWorkspaceContextService } from 'monaco-editor/esm/vs/platform/workspace/common/workspace.js';
+import { URI } from 'vscode/vscode/vs/base/common/uri';
+import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
+import { getScopes, Extensions } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
+import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace';
 import { MainContext, ExtHostContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.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 { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
+import { IEnvironmentService } from 'vscode/vscode/vs/platform/environment/common/environment';
 
 let MainThreadConfiguration = class MainThreadConfiguration {
     constructor(extHostContext, _workspaceContextService, configurationService, _environmentService) {

package/vscode/src/vs/workbench/api/browser/mainThreadConsole.js

@@ -1,11 +1,11 @@
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 import { MainContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
-import { IEnvironmentService } from 'monaco-editor/esm/vs/platform/environment/common/environment.js';
+import { IEnvironmentService } from 'vscode/vscode/vs/platform/environment/common/environment';
 import { log } from '../../../base/common/console.js';
 import { logRemoteEntry, logRemoteEntryIfError } from '../../services/extensions/common/remoteConsoleUtil.js';
 import { parseExtensionDevOptions } from '../../services/extensions/common/extensionDevOptions.js';
-import { ILogService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
+import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
 
 let MainThreadConsole = class MainThreadConsole {
     constructor(_extHostContext, _environmentService, _logService) {

package/vscode/src/vs/workbench/api/browser/mainThreadCustomEditors.js

@@ -1,22 +1,22 @@
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
-import { multibyteAwareBtoa } from 'monaco-editor/esm/vs/base/browser/dom.js';
-import { createCancelablePromise } from 'monaco-editor/esm/vs/base/common/async.js';
-import { CancellationToken } from 'monaco-editor/esm/vs/base/common/cancellation.js';
-import { onUnexpectedError, isCancellationError } from 'monaco-editor/esm/vs/base/common/errors.js';
-import { Emitter, Event } from 'monaco-editor/esm/vs/base/common/event.js';
-import { Disposable, DisposableMap, DisposableStore } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { Schemas } from 'monaco-editor/esm/vs/base/common/network.js';
-import { basename } from 'monaco-editor/esm/vs/base/common/path.js';
-import { isEqualOrParent, isEqual, toLocalResource } from 'monaco-editor/esm/vs/base/common/resources.js';
-import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
-import { generateUuid } from 'monaco-editor/esm/vs/base/common/uuid.js';
-import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
+import { multibyteAwareBtoa } from 'vscode/vscode/vs/base/browser/dom';
+import { createCancelablePromise } from 'vscode/vscode/vs/base/common/async';
+import { CancellationToken } from 'vscode/vscode/vs/base/common/cancellation';
+import { onUnexpectedError, isCancellationError } from 'vscode/vscode/vs/base/common/errors';
+import { Emitter, Event } from 'vscode/vscode/vs/base/common/event';
+import { Disposable, DisposableMap, DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
+import { Schemas } from 'vscode/vscode/vs/base/common/network';
+import { basename } from 'vscode/vscode/vs/base/common/path';
+import { isEqualOrParent, isEqual, toLocalResource } from 'vscode/vscode/vs/base/common/resources';
+import { URI } from 'vscode/vscode/vs/base/common/uri';
+import { generateUuid } from 'vscode/vscode/vs/base/common/uuid';
+import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import '../../../../../../override/vs/platform/dialogs/common/dialogs.js';
-import { IFileService } from 'monaco-editor/esm/vs/platform/files/common/files.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 { IStorageService } from 'monaco-editor/esm/vs/platform/storage/common/storage.js';
-import { IUndoRedoService } from 'monaco-editor/esm/vs/platform/undoRedo/common/undoRedo.js';
+import { IFileService } from 'vscode/vscode/vs/platform/files/common/files';
+import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
+import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label';
+import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
+import { IUndoRedoService } from 'vscode/vscode/vs/platform/undoRedo/common/undoRedo';
 import { reviveWebviewExtension } from './mainThreadWebviews.js';
 import { ExtHostContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
 import { CustomEditorInput } from 'vscode/vscode/vs/workbench/contrib/customEditor/browser/customEditorInput';

package/vscode/src/vs/workbench/api/browser/mainThreadDebugService.js

@@ -1,13 +1,13 @@
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
-import { DisposableStore, DisposableMap, toDisposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
+import { DisposableStore, DisposableMap, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
 import { MainContext, ExtHostContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
-import Severity from 'monaco-editor/esm/vs/base/common/severity.js';
+import Severity from 'vscode/vscode/vs/base/common/severity';
 import { AbstractDebugAdapter } from 'vscode/vscode/vs/workbench/contrib/debug/common/abstractDebugAdapter';
 import { isSessionAttach, convertToVSCPaths, convertToDAPaths } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugUtils';
-import { ErrorNoTelemetry } from 'monaco-editor/esm/vs/base/common/errors.js';
+import { ErrorNoTelemetry } from 'vscode/vscode/vs/base/common/errors';
 
 let MainThreadDebugService = class MainThreadDebugService {
     constructor(extHostContext, debugService) {

package/vscode/src/vs/workbench/api/browser/mainThreadDecorations.js

@@ -1,11 +1,11 @@
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
-import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
-import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
-import { dispose } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
+import { URI } from 'vscode/vscode/vs/base/common/uri';
+import { Emitter } from 'vscode/vscode/vs/base/common/event';
+import { dispose } from 'vscode/vscode/vs/base/common/lifecycle';
 import { MainContext, ExtHostContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 import { IDecorationsService } from 'vscode/vscode/vs/workbench/services/decorations/common/decorations';
-import { CancellationToken } from 'monaco-editor/esm/vs/base/common/cancellation.js';
+import { CancellationToken } from 'vscode/vscode/vs/base/common/cancellation';
 
 class DecorationRequestsQueue {
     constructor(_proxy, _handle) {

package/vscode/src/vs/workbench/api/browser/mainThreadDiagnostics.js

@@ -1,9 +1,9 @@
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
-import { IMarkerService } from 'monaco-editor/esm/vs/platform/markers/common/markers.js';
-import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
+import { IMarkerService } from 'vscode/vscode/vs/platform/markers/common/markers';
+import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { MainContext, ExtHostContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
-import { IUriIdentityService } from 'monaco-editor/esm/vs/platform/uriIdentity/common/uriIdentity.js';
+import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity';
 
 let MainThreadDiagnostics = class MainThreadDiagnostics {
     constructor(extHostContext, _markerService, _uriIdentService) {