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

package/vscode/src/vs/workbench/contrib/comments/browser/commentsTreeViewer.js

@@ -1,27 +1,27 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import * as dom from 'monaco-editor/esm/vs/base/browser/dom.js';
-import * as nls from 'monaco-editor/esm/vs/nls.js';
-import { renderMarkdown } from 'monaco-editor/esm/vs/base/browser/markdownRenderer.js';
-import { DisposableStore } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { IOpenerService } from 'monaco-editor/esm/vs/platform/opener/common/opener.js';
+import { append, $ } from 'vscode/vscode/vs/base/browser/dom';
+import { localize2WithPath, localizeWithPath } from 'vscode/vscode/vs/nls';
+import { renderMarkdown } from 'vscode/vscode/vs/base/browser/markdownRenderer';
+import { DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
+import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener';
 import { CommentNode, ResourceWithCommentThreads, CommentsModel } from '../common/commentModel.js';
-import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
-import { IContextKeyService } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
-import { IListService, WorkbenchObjectTree } from 'monaco-editor/esm/vs/platform/list/browser/listService.js';
-import { IThemeService } from 'monaco-editor/esm/vs/platform/theme/common/themeService.js';
-import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
+import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
+import { IListService, WorkbenchObjectTree } from 'vscode/vscode/vs/platform/list/browser/listService';
+import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService';
+import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { TimestampWidget } from 'vscode/vscode/vs/workbench/contrib/comments/browser/timestamp';
-import { Codicon } from 'monaco-editor/esm/vs/base/common/codicons.js';
-import { ThemeIcon } from 'monaco-editor/esm/vs/base/common/themables.js';
+import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
+import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
 import { commentViewThreadStateColorVar, getCommentThreadStateIconColor } from 'vscode/vscode/vs/workbench/contrib/comments/browser/commentColors';
-import { CommentThreadState } from 'monaco-editor/esm/vs/editor/common/languages.js';
+import { CommentThreadState } from 'vscode/vscode/vs/editor/common/languages';
 import { FilterOptions } from './commentsFilterOptions.js';
-import { basename } from 'monaco-editor/esm/vs/base/common/resources.js';
-import { openLinkFromMarkdown } from 'monaco-editor/esm/vs/editor/contrib/markdownRenderer/browser/markdownRenderer.js';
+import { basename } from 'vscode/vscode/vs/base/common/resources';
+import { openLinkFromMarkdown } from 'vscode/vscode/vs/editor/contrib/markdownRenderer/browser/markdownRenderer';
 
 const COMMENTS_VIEW_ID = 'workbench.panel.comments';
 const COMMENTS_VIEW_STORAGE_ID = 'Comments';
-const COMMENTS_VIEW_TITLE = ( nls.localize2WithPath(
+const COMMENTS_VIEW_TITLE = ( localize2WithPath(
     'vs/workbench/contrib/comments/browser/commentsTreeViewer',
     'comments.view.title',
     "Comments"
@@ -51,10 +51,10 @@ class ResourceWithCommentsRenderer {
         this.templateId = 'resource-with-comments';
     }
     renderTemplate(container) {
-        const labelContainer = dom.append(container, dom.$('.resource-container'));
+        const labelContainer = append(container, $('.resource-container'));
         const resourceLabel = this.labels.create(labelContainer);
-        const separator = dom.append(labelContainer, dom.$('.separator'));
-        const owner = labelContainer.appendChild(dom.$('.owner'));
+        const separator = append(labelContainer, $('.separator'));
+        const owner = labelContainer.appendChild($('.owner'));
         return { resourceLabel, owner, separator };
     }
     renderElement(node, index, templateData, height) {
@@ -81,30 +81,30 @@ let CommentNodeRenderer = class CommentNodeRenderer {
         this.templateId = 'comment-node';
     }
     renderTemplate(container) {
-        const threadContainer = dom.append(container, dom.$('.comment-thread-container'));
-        const metadataContainer = dom.append(threadContainer, dom.$('.comment-metadata-container'));
+        const threadContainer = append(container, $('.comment-thread-container'));
+        const metadataContainer = append(threadContainer, $('.comment-metadata-container'));
         const threadMetadata = {
-            icon: dom.append(metadataContainer, dom.$('.icon')),
-            userNames: dom.append(metadataContainer, dom.$('.user')),
+            icon: append(metadataContainer, $('.icon')),
+            userNames: append(metadataContainer, $('.user')),
             timestamp: ( new TimestampWidget(
                 this.configurationService,
-                dom.append(metadataContainer, dom.$('.timestamp-container'))
+                append(metadataContainer, $('.timestamp-container'))
             )),
-            separator: dom.append(metadataContainer, dom.$('.separator')),
-            commentPreview: dom.append(metadataContainer, dom.$('.text')),
-            range: dom.append(metadataContainer, dom.$('.range'))
+            separator: append(metadataContainer, $('.separator')),
+            commentPreview: append(metadataContainer, $('.text')),
+            range: append(metadataContainer, $('.range'))
         };
         threadMetadata.separator.innerText = '\u00b7';
-        const snippetContainer = dom.append(threadContainer, dom.$('.comment-snippet-container'));
+        const snippetContainer = append(threadContainer, $('.comment-snippet-container'));
         const repliesMetadata = {
             container: snippetContainer,
-            icon: dom.append(snippetContainer, dom.$('.icon')),
-            count: dom.append(snippetContainer, dom.$('.count')),
-            lastReplyDetail: dom.append(snippetContainer, dom.$('.reply-detail')),
-            separator: dom.append(snippetContainer, dom.$('.separator')),
+            icon: append(snippetContainer, $('.icon')),
+            count: append(snippetContainer, $('.count')),
+            lastReplyDetail: append(snippetContainer, $('.reply-detail')),
+            separator: append(snippetContainer, $('.separator')),
             timestamp: ( new TimestampWidget(
                 this.configurationService,
-                dom.append(snippetContainer, dom.$('.timestamp-container'))
+                append(snippetContainer, $('.timestamp-container'))
             )),
         };
         repliesMetadata.separator.innerText = '\u00b7';
@@ -114,7 +114,7 @@ let CommentNodeRenderer = class CommentNodeRenderer {
     }
     getCountString(commentCount) {
         if (commentCount > 1) {
-            return ( nls.localizeWithPath(
+            return ( localizeWithPath(
                 'vs/workbench/contrib/comments/browser/commentsTreeViewer',
                 'commentsCount',
                 "{0} comments",
@@ -122,7 +122,7 @@ let CommentNodeRenderer = class CommentNodeRenderer {
             ));
         }
         else {
-            return ( nls.localizeWithPath(
+            return ( localizeWithPath(
                 'vs/workbench/contrib/comments/browser/commentsTreeViewer',
                 'commentCount',
                 "1 comment"
@@ -140,13 +140,13 @@ let CommentNodeRenderer = class CommentNodeRenderer {
         const images = renderedComment.element.getElementsByTagName('img');
         for (let i = 0; i < images.length; i++) {
             const image = images[i];
-            const textDescription = dom.$('');
-            textDescription.textContent = image.alt ? ( nls.localizeWithPath(
+            const textDescription = $('');
+            textDescription.textContent = image.alt ? ( localizeWithPath(
                 'vs/workbench/contrib/comments/browser/commentsTreeViewer',
                 'imageWithLabel',
                 "Image: {0}",
                 image.alt
-            )) : ( nls.localizeWithPath(
+            )) : ( localizeWithPath(
                 'vs/workbench/contrib/comments/browser/commentsTreeViewer',
                 'image',
                 "Image"
@@ -191,7 +191,7 @@ let CommentNodeRenderer = class CommentNodeRenderer {
         }
         if (node.element.range) {
             if (node.element.range.startLineNumber === node.element.range.endLineNumber) {
-                templateData.threadMetadata.range.textContent = ( nls.localizeWithPath(
+                templateData.threadMetadata.range.textContent = ( localizeWithPath(
                     'vs/workbench/contrib/comments/browser/commentsTreeViewer',
                     'commentLine',
                     "[Ln {0}]",
@@ -199,7 +199,7 @@ let CommentNodeRenderer = class CommentNodeRenderer {
                 ));
             }
             else {
-                templateData.threadMetadata.range.textContent = ( nls.localizeWithPath(
+                templateData.threadMetadata.range.textContent = ( localizeWithPath(
                     'vs/workbench/contrib/comments/browser/commentsTreeViewer',
                     'commentRange',
                     "[Ln {0}-{1}]",
@@ -215,7 +215,7 @@ let CommentNodeRenderer = class CommentNodeRenderer {
         templateData.repliesMetadata.container.style.display = '';
         templateData.repliesMetadata.count.textContent = this.getCountString(commentCount);
         const lastComment = node.element.replies[node.element.replies.length - 1].comment;
-        templateData.repliesMetadata.lastReplyDetail.textContent = ( nls.localizeWithPath(
+        templateData.repliesMetadata.lastReplyDetail.textContent = ( localizeWithPath(
             'vs/workbench/contrib/comments/browser/commentsTreeViewer',
             'lastReplyFrom',
             "Last reply from {0}",

package/vscode/src/vs/workbench/contrib/comments/browser/commentsView.js

@@ -1,41 +1,41 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import './media/panel.css.js';
-import * as nls from 'monaco-editor/esm/vs/nls.js';
-import * as dom from 'monaco-editor/esm/vs/base/browser/dom.js';
-import { basename } from 'monaco-editor/esm/vs/base/common/resources.js';
-import { isDiffEditor, isCodeEditor } from 'monaco-editor/esm/vs/editor/browser/editorBrowser.js';
-import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
-import { IThemeService } from 'monaco-editor/esm/vs/platform/theme/common/themeService.js';
+import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { append, $, createStyleSheet, isActiveElement } from 'vscode/vscode/vs/base/browser/dom';
+import { basename } from 'vscode/vscode/vs/base/common/resources';
+import { isDiffEditor, isCodeEditor } from 'vscode/vscode/vs/editor/browser/editorBrowser';
+import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
+import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService';
 import { CommentsModel, ResourceWithCommentThreads, CommentNode } from '../common/commentModel.js';
 import { ICommentService } from 'vscode/vscode/vs/workbench/contrib/comments/browser/commentService';
 import { IEditorService, SIDE_GROUP, ACTIVE_GROUP } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
-import { CommandsRegistry } from 'monaco-editor/esm/vs/platform/commands/common/commands.js';
-import { textLinkForeground, textLinkActiveForeground, focusBorder, textPreformatForeground } from 'monaco-editor/esm/vs/platform/theme/common/colorRegistry.js';
+import { CommandsRegistry } from 'vscode/vscode/vs/platform/commands/common/commands';
+import { textLinkForeground, textLinkActiveForeground, focusBorder, textPreformatForeground } from 'vscode/vscode/vs/platform/theme/common/colorRegistry';
 import { ResourceLabels } from 'vscode/vscode/vs/workbench/browser/labels';
 import { COMMENTS_VIEW_ID, Filter, CommentsList, COMMENTS_VIEW_TITLE } from './commentsTreeViewer.js';
 import { ViewAction, FilterViewPane } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPane';
 import { IViewsService, IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views';
-import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
-import { RawContextKey, 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 { IKeybindingService } from 'monaco-editor/esm/vs/platform/keybinding/common/keybinding.js';
-import { IOpenerService } from 'monaco-editor/esm/vs/platform/opener/common/opener.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 { registerAction2, MenuId } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
-import { Codicon } from 'monaco-editor/esm/vs/base/common/codicons.js';
-import { TextModel } from 'monaco-editor/esm/vs/editor/common/model/textModel.js';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
+import { RawContextKey, ContextKeyExpr, IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
+import { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView';
+import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding';
+import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener';
+import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
+import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity';
+import { registerAction2, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
+import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
+import { TextModel } from 'vscode/vscode/vs/editor/common/model/textModel';
 import { CommentsViewFilterFocusContextKey } from './comments.js';
 import { CommentsFilters } from './commentsViewActions.js';
 import { Memento } from 'vscode/vscode/vs/workbench/common/memento';
-import { IStorageService } from 'monaco-editor/esm/vs/platform/storage/common/storage.js';
+import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { FilterOptions } from './commentsFilterOptions.js';
 import { IActivityService, NumberBadge } from 'vscode/vscode/vs/workbench/services/activity/common/activity';
-import { CommentThreadState } from 'monaco-editor/esm/vs/editor/common/languages.js';
-import { MutableDisposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { Iterable } from 'monaco-editor/esm/vs/base/common/iterator.js';
+import { CommentThreadState } from 'vscode/vscode/vs/editor/common/languages';
+import { MutableDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { Iterable } from 'vscode/vscode/vs/base/common/iterator';
 import { CommentController } from './commentsController.js';
-import { Range } from 'monaco-editor/esm/vs/editor/common/core/range.js';
+import { Range } from 'vscode/vscode/vs/editor/common/core/range';
 import { registerNavigableContainer } from 'vscode/vscode/vs/workbench/browser/actions/widgetNavigationCommands';
 
 const CONTEXT_KEY_HAS_COMMENTS = ( new RawContextKey('commentsView.hasComments', false));
@@ -55,12 +55,12 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
         super({
             ...options,
             filterOptions: {
-                placeholder: ( nls.localizeWithPath(
+                placeholder: ( localizeWithPath(
                     'vs/workbench/contrib/comments/browser/commentsView',
                     'comments.filter.placeholder',
                     "Filter (e.g. text, author)"
                 )),
-                ariaLabel: ( nls.localizeWithPath(
+                ariaLabel: ( localizeWithPath(
                     'vs/workbench/contrib/comments/browser/commentsView',
                     'comments.filter.ariaLabel',
                     "Filter comments"
@@ -106,7 +106,7 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
             return;
         }
         this.totalUnresolved = unresolved;
-        const message = ( nls.localizeWithPath(
+        const message = ( localizeWithPath(
             'vs/workbench/contrib/comments/browser/commentsView',
             'totalUnresolvedComments',
             '{0} Unresolved Comments',
@@ -162,7 +162,7 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
         this.tree?.filterComments();
         this.cachedFilterStats = undefined;
         const { total, filtered } = this.getFilterStats();
-        this.filterWidget.updateBadge(total === filtered || total === 0 ? undefined : ( nls.localizeWithPath(
+        this.filterWidget.updateBadge(total === filtered || total === 0 ? undefined : ( localizeWithPath(
             'vs/workbench/contrib/comments/browser/commentsView',
             'showing filtered results',
             "Showing {0} of {1}",
@@ -174,8 +174,8 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
     renderBody(container) {
         super.renderBody(container);
         container.classList.add('comments-panel');
-        const domContainer = dom.append(container, dom.$('.comments-panel-container'));
-        this.treeContainer = dom.append(domContainer, dom.$('.tree-container'));
+        const domContainer = append(container, $('.comments-panel-container'));
+        this.treeContainer = append(domContainer, $('.tree-container'));
         this.treeContainer.classList.add('file-icon-themable-tree', 'show-file-icons');
         this.commentsModel = ( new CommentsModel());
         this.cachedFilterStats = undefined;
@@ -184,7 +184,7 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
         this._register(this.commentService.onDidSetAllCommentThreads(this.onAllCommentsChanged, this));
         this._register(this.commentService.onDidUpdateCommentThreads(this.onCommentsUpdated, this));
         this._register(this.commentService.onDidDeleteDataProvider(this.onDataProviderDeleted, this));
-        const styleElement = dom.createStyleSheet(container);
+        const styleElement = createStyleSheet(container);
         this.applyStyles(styleElement);
         this._register(this.themeService.onDidColorThemeChange(_ => this.applyStyles(styleElement)));
         this._register(this.onDidChangeBodyVisibility(visible => {
@@ -197,7 +197,7 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
     focus() {
         super.focus();
         const element = this.tree?.getHTMLElement();
-        if (element && dom.isActiveElement(element)) {
+        if (element && isActiveElement(element)) {
             return;
         }
         if (!this.commentsModel.hasCommentThreads() && this.messageBoxContainer) {
@@ -263,7 +263,7 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
         this.currentWidth = width;
     }
     createMessageBox(parent) {
-        this.messageBoxContainer = dom.append(parent, dom.$('.message-box-container'));
+        this.messageBoxContainer = append(parent, $('.message-box-container'));
         this.messageBoxContainer.setAttribute('tabIndex', '0');
     }
     renderMessage() {
@@ -284,14 +284,14 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
             accessibilityProvider: {
                 getAriaLabel(element) {
                     if (element instanceof CommentsModel) {
-                        return ( nls.localizeWithPath(
+                        return ( localizeWithPath(
                             'vs/workbench/contrib/comments/browser/commentsView',
                             'rootCommentsLabel',
                             "Comments for current workspace"
                         ));
                     }
                     if (element instanceof ResourceWithCommentThreads) {
-                        return ( nls.localizeWithPath(
+                        return ( localizeWithPath(
                             'vs/workbench/contrib/comments/browser/commentsView',
                             'resourceWithCommentThreadsLabel',
                             "Comments in {0}, full path {1}",
@@ -301,7 +301,7 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
                     }
                     if (element instanceof CommentNode) {
                         if (element.range) {
-                            return ( nls.localizeWithPath(
+                            return ( localizeWithPath(
                                 'vs/workbench/contrib/comments/browser/commentsView',
                                 'resourceWithCommentLabel',
                                 "Comment from ${0} at line {1} column {2} in {3}, source: {4}",
@@ -313,7 +313,7 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
                             ));
                         }
                         else {
-                            return ( nls.localizeWithPath(
+                            return ( localizeWithPath(
                                 'vs/workbench/contrib/comments/browser/commentsView',
                                 'resourceWithCommentLabelFile',
                                 "Comment from ${0} in {1}, source: {2}",
@@ -498,7 +498,7 @@ registerAction2(class Collapse extends ViewAction {
         super({
             viewId: COMMENTS_VIEW_ID,
             id: 'comments.collapse',
-            title: ( nls.localizeWithPath(
+            title: ( localizeWithPath(
                 'vs/workbench/contrib/comments/browser/commentsView',
                 'collapseAll',
                 "Collapse All"
@@ -522,7 +522,7 @@ registerAction2(class Expand extends ViewAction {
         super({
             viewId: COMMENTS_VIEW_ID,
             id: 'comments.expand',
-            title: ( nls.localizeWithPath(
+            title: ( localizeWithPath(
                 'vs/workbench/contrib/comments/browser/commentsView',
                 'expandAll',
                 "Expand All"

package/vscode/src/vs/workbench/contrib/comments/browser/commentsViewActions.js

@@ -1,9 +1,9 @@
-import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
-import { RawContextKey, ContextKeyExpr } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
-import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
+import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { RawContextKey, ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
+import { Emitter } from 'vscode/vscode/vs/base/common/event';
 import { CommentsViewFilterFocusContextKey } from './comments.js';
-import { registerAction2 } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
+import { registerAction2 } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { ViewAction } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPane';
 import { COMMENTS_VIEW_ID } from './commentsTreeViewer.js';
 import { FocusedViewContext } from 'vscode/vscode/vs/workbench/common/contextkeys';

package/vscode/src/vs/workbench/contrib/comments/common/commentModel.js

@@ -1,6 +1,6 @@
-import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
-import { groupBy } from 'monaco-editor/esm/vs/base/common/arrays.js';
-import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
+import { URI } from 'vscode/vscode/vs/base/common/uri';
+import { groupBy } from 'vscode/vscode/vs/base/common/arrays';
+import { localizeWithPath } from 'vscode/vscode/vs/nls';
 
 class CommentNode {
     constructor(owner, threadId, resource, comment, range, threadState) {

package/vscode/src/vs/workbench/contrib/customEditor/common/customTextEditorModel.js

@@ -1,8 +1,8 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
-import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { isEqual } from 'monaco-editor/esm/vs/base/common/resources.js';
-import { ITextModelService } from 'monaco-editor/esm/vs/editor/common/services/resolverService.js';
+import { Emitter } from 'vscode/vscode/vs/base/common/event';
+import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { isEqual } from 'vscode/vscode/vs/base/common/resources';
+import { ITextModelService } from 'vscode/vscode/vs/editor/common/services/resolverService';
 import { ITextFileService } from 'vscode/vscode/vs/workbench/services/textfile/common/textfiles';
 
 var CustomTextEditorModel_1;

package/vscode/src/vs/workbench/contrib/externalUriOpener/common/contributedOpeners.js

@@ -1,6 +1,6 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { IStorageService } from 'monaco-editor/esm/vs/platform/storage/common/storage.js';
+import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { Memento } from 'vscode/vscode/vs/workbench/common/memento';
 import { updateContributedOpeners } from 'vscode/vscode/vs/workbench/contrib/externalUriOpener/common/configuration';
 import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';

package/vscode/src/vs/workbench/contrib/interactive/browser/interactiveEditorInput.js

@@ -1,11 +1,11 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { Event } from 'monaco-editor/esm/vs/base/common/event.js';
-import * as path from 'monaco-editor/esm/vs/base/common/path.js';
-import { joinPath, isEqual } from 'monaco-editor/esm/vs/base/common/resources.js';
-import { PLAINTEXT_LANGUAGE_ID } from 'monaco-editor/esm/vs/editor/common/languages/modesRegistry.js';
-import { ITextModelService } from 'monaco-editor/esm/vs/editor/common/services/resolverService.js';
+import { Event } from 'vscode/vscode/vs/base/common/event';
+import { basename, extname } from 'vscode/vscode/vs/base/common/path';
+import { joinPath, isEqual } from 'vscode/vscode/vs/base/common/resources';
+import { PLAINTEXT_LANGUAGE_ID } from 'vscode/vscode/vs/editor/common/languages/modesRegistry';
+import { ITextModelService } from 'vscode/vscode/vs/editor/common/services/resolverService';
 import '../../../../../../../override/vs/platform/dialogs/common/dialogs.js';
-import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
+import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { EditorInput } from 'vscode/vscode/vs/workbench/common/editor/editorInput';
 import { IInteractiveDocumentService } from 'vscode/vscode/vs/workbench/contrib/interactive/browser/interactiveDocumentService';
 import { IInteractiveHistoryService } from './interactiveHistoryService.js';
@@ -57,7 +57,7 @@ let InteractiveEditorInput = class InteractiveEditorInput extends EditorInput {
         this._fileDialogService = _fileDialogService;
         this._notebookEditorInput = input;
         this._register(this._notebookEditorInput);
-        this.name = title ?? InteractiveEditorInput_1.windowNames[resource.path] ?? path.basename(resource.path, path.extname(resource.path));
+        this.name = title ?? InteractiveEditorInput_1.windowNames[resource.path] ?? basename(resource.path, extname(resource.path));
         this._initLanguage = languageId;
         this._resource = resource;
         this._inputResource = inputResource;

package/vscode/src/vs/workbench/contrib/interactive/browser/interactiveHistoryService.js

@@ -1,4 +1,4 @@
-import { createDecorator } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
+import { createDecorator } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 
 const IInteractiveHistoryService = ( createDecorator('IInteractiveHistoryService'));
 

package/vscode/src/vs/workbench/services/extensions/browser/extensionService.js

@@ -1,19 +1,19 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { mainWindow } from 'monaco-editor/esm/vs/base/browser/window.js';
-import { Schemas } from 'monaco-editor/esm/vs/base/common/network.js';
-import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
+import { mainWindow } from 'vscode/vscode/vs/base/browser/window';
+import { Schemas } from 'vscode/vscode/vs/base/common/network';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
 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 { IFileService } from 'vscode/vscode/vs/platform/files/common/files';
+import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { getLogs } from '../../../../platform/log/browser/log.js';
-import { ILogService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
-import { INotificationService } from 'monaco-editor/esm/vs/platform/notification/common/notification.js';
-import { IProductService } from 'monaco-editor/esm/vs/platform/product/common/productService.js';
+import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
+import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification';
+import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService';
 import { IRemoteAuthorityResolverService, RemoteAuthorityResolverError } from 'vscode/vscode/vs/platform/remote/common/remoteAuthorityResolver';
 import { IRemoteExtensionsScannerService } from 'vscode/vscode/vs/platform/remote/common/remoteExtensionsScanner';
-import { ITelemetryService } from 'monaco-editor/esm/vs/platform/telemetry/common/telemetry.js';
-import { IWorkspaceContextService } from 'monaco-editor/esm/vs/platform/workspace/common/workspace.js';
-import { IWorkspaceTrustManagementService } from 'monaco-editor/esm/vs/platform/workspace/common/workspaceTrust.js';
+import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
+import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace';
+import { IWorkspaceTrustManagementService } from 'vscode/vscode/vs/platform/workspace/common/workspaceTrust';
 import { IBrowserWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/browser/environmentService';
 import { IWorkbenchExtensionEnablementService, IWorkbenchExtensionManagementService, IWebExtensionsScannerService } from 'vscode/vscode/vs/workbench/services/extensionManagement/common/extensionManagement';
 import { WebWorkerExtensionHost } from './webWorkerExtensionHost.js';

package/vscode/src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.js

@@ -1,26 +1,26 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import * as dom from 'monaco-editor/esm/vs/base/browser/dom.js';
-import { parentOriginHash } from 'monaco-editor/esm/vs/base/browser/iframe.js';
-import { mainWindow } from 'monaco-editor/esm/vs/base/browser/window.js';
-import { Barrier } from 'monaco-editor/esm/vs/base/common/async.js';
-import { VSBuffer } from 'monaco-editor/esm/vs/base/common/buffer.js';
-import { canceled, onUnexpectedError } 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 { COI, FileAccess } from 'monaco-editor/esm/vs/base/common/network.js';
-import * as platform from 'monaco-editor/esm/vs/base/common/platform.js';
-import { joinPath } 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 { ILabelService } from 'monaco-editor/esm/vs/platform/label/common/label.js';
-import { ILayoutService } from 'monaco-editor/esm/vs/platform/layout/browser/layoutService.js';
-import { ILogService, ILoggerService } from 'monaco-editor/esm/vs/platform/log/common/log.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 { ITelemetryService } from 'monaco-editor/esm/vs/platform/telemetry/common/telemetry.js';
+import { addDisposableListener } from 'vscode/vscode/vs/base/browser/dom';
+import { parentOriginHash } from 'vscode/vscode/vs/base/browser/iframe';
+import { mainWindow } from 'vscode/vscode/vs/base/browser/window';
+import { Barrier } from 'vscode/vscode/vs/base/common/async';
+import { VSBuffer } from 'vscode/vscode/vs/base/common/buffer';
+import { canceled, onUnexpectedError } 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 { COI, FileAccess } from 'vscode/vscode/vs/base/common/network';
+import { isWeb, Language, language } from 'vscode/vscode/vs/base/common/platform';
+import { joinPath } 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 { ILabelService } from 'vscode/vscode/vs/platform/label/common/label';
+import { ILayoutService } from 'vscode/vscode/vs/platform/layout/browser/layoutService';
+import { ILogService, ILoggerService } from 'vscode/vscode/vs/platform/log/common/log';
+import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService';
+import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
+import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
 import { isLoggingOnly } from 'vscode/vscode/vs/platform/telemetry/common/telemetryUtils';
-import { IUserDataProfilesService } from 'monaco-editor/esm/vs/platform/userDataProfile/common/userDataProfile.js';
-import { IWorkspaceContextService } from 'monaco-editor/esm/vs/platform/workspace/common/workspace.js';
+import { IUserDataProfilesService } from 'vscode/vscode/vs/platform/userDataProfile/common/userDataProfile';
+import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace';
 import { IBrowserWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/browser/environmentService';
 import { isMessageOfType, createMessageOfType, UIKind } from 'vscode/vscode/vs/workbench/services/extensions/common/extensionHostProtocol';
 
@@ -58,7 +58,7 @@ let WebWorkerExtensionHost = class WebWorkerExtensionHost extends Disposable {
         COI.addSearchParam(suffixSearchParams, true, true);
         const suffix = `?${( suffixSearchParams.toString())}`;
         const iframeModulePath = 'vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html';
-        if (platform.isWeb) {
+        if (isWeb) {
             const webEndpointUrlTemplate = this._productService.webEndpointUrlTemplate;
             const commit = this._productService.commit;
             const quality = this._productService.quality;
@@ -122,7 +122,7 @@ let WebWorkerExtensionHost = class WebWorkerExtensionHost extends Disposable {
         startTimeout = setTimeout(() => {
             console.warn(`The Web Worker Extension Host did not start in 60s, that might be a problem.`);
         }, 60000);
-        this._register(dom.addDisposableListener(mainWindow, 'message', (event) => {
+        this._register(addDisposableListener(mainWindow, 'message', (event) => {
             if (event.source !== iframe.contentWindow) {
                 return;
             }
@@ -206,8 +206,8 @@ let WebWorkerExtensionHost = class WebWorkerExtensionHost extends Disposable {
         const workspace = this._contextService.getWorkspace();
         const nlsBaseUrl = this._productService.extensionsGallery?.nlsBaseUrl;
         let nlsUrlWithDetails = undefined;
-        if (nlsBaseUrl && this._productService.commit && !platform.Language.isDefaultVariant()) {
-            nlsUrlWithDetails = URI.joinPath(( URI.parse(nlsBaseUrl)), this._productService.commit, this._productService.version, platform.Language.value());
+        if (nlsBaseUrl && this._productService.commit && !Language.isDefaultVariant()) {
+            nlsUrlWithDetails = URI.joinPath(( URI.parse(nlsBaseUrl)), this._productService.commit, this._productService.version, Language.value());
         }
         return {
             commit: this._productService.commit,
@@ -217,9 +217,9 @@ let WebWorkerExtensionHost = class WebWorkerExtensionHost extends Disposable {
             environment: {
                 isExtensionDevelopmentDebug: this._environmentService.debugRenderer,
                 appName: this._productService.nameLong,
-                appHost: this._productService.embedderIdentifier ?? (platform.isWeb ? 'web' : 'desktop'),
+                appHost: this._productService.embedderIdentifier ?? (isWeb ? 'web' : 'desktop'),
                 appUriScheme: this._productService.urlProtocol,
-                appLanguage: platform.language,
+                appLanguage: language,
                 extensionTelemetryLogResource: this._environmentService.extHostTelemetryLogFile,
                 isExtensionTelemetryLoggingOnly: isLoggingOnly(this._productService, this._environmentService),
                 extensionDevelopmentLocationURI: this._environmentService.extensionDevelopmentLocationURI,
@@ -256,7 +256,7 @@ let WebWorkerExtensionHost = class WebWorkerExtensionHost extends Disposable {
                 connectionData: null,
                 isRemote: false
             },
-            uiKind: platform.isWeb ? UIKind.Web : UIKind.Desktop
+            uiKind: isWeb ? UIKind.Web : UIKind.Desktop
         };
     }
 };

package/vscode/src/vs/workbench/services/extensions/browser/webWorkerFileSystemProvider.js

@@ -1,7 +1,7 @@
-import { createFileSystemProviderError, FileSystemProviderErrorCode, FileType } from 'monaco-editor/esm/vs/platform/files/common/files.js';
-import { Event } from 'monaco-editor/esm/vs/base/common/event.js';
-import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { NotSupportedError } from 'monaco-editor/esm/vs/base/common/errors.js';
+import { createFileSystemProviderError, FileSystemProviderErrorCode, FileType } from 'vscode/vscode/vs/platform/files/common/files';
+import { Event } from 'vscode/vscode/vs/base/common/event';
+import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { NotSupportedError } from 'vscode/vscode/vs/base/common/errors';
 
 class FetchFileSystemProvider {
     constructor() {