@codingame/monaco-vscode-api 1.85.6 → 2.0.0-v2.1

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

@@ -1,41 +1,41 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import * as nls from 'monaco-editor/esm/vs/nls.js';
-import * as dom from 'monaco-editor/esm/vs/base/browser/dom.js';
-import * as languages from 'monaco-editor/esm/vs/editor/common/languages.js';
-import { ActionBar } from 'monaco-editor/esm/vs/base/browser/ui/actionbar/actionbar.js';
-import { Separator, ActionRunner, Action } from 'monaco-editor/esm/vs/base/common/actions.js';
-import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
-import { IModelService } from 'monaco-editor/esm/vs/editor/common/services/model.js';
-import { ILanguageService } from 'monaco-editor/esm/vs/editor/common/languages/language.js';
-import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
+import { localizeWithPath } from '../../../../nls.js';
+import { $, append, addDisposableListener, EventType, scheduleAtNextAnimationFrame, getWindow, getContentWidth, getContentHeight } from '../../../../base/browser/dom.js';
+import { CommentMode } from '../../../../editor/common/languages.js';
+import { ActionBar } from '../../../../base/browser/ui/actionbar/actionbar.js';
+import { Separator, ActionRunner, Action } from '../../../../base/common/actions.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IModelService } from '../../../../editor/common/services/model.js';
+import { ILanguageService } from '../../../../editor/common/languages/language.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { ICommentService } from './commentService.js';
 import { MIN_EDITOR_HEIGHT, SimpleCommentEditor, calculateEditorHeight } from './simpleCommentEditor.js';
-import { Selection } from 'monaco-editor/esm/vs/editor/common/core/selection.js';
-import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
-import { INotificationService } from 'monaco-editor/esm/vs/platform/notification/common/notification.js';
-import { ToolBar } from 'monaco-editor/esm/vs/base/browser/ui/toolbar/toolbar.js';
-import { IContextMenuService } from 'monaco-editor/esm/vs/platform/contextview/browser/contextView.js';
+import { Selection } from '../../../../editor/common/core/selection.js';
+import { Emitter } from '../../../../base/common/event.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.js';
+import { ToolBar } from '../../../../base/browser/ui/toolbar/toolbar.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
 import { ToggleReactionsAction, ReactionAction, ReactionActionViewItem } from './reactionsAction.js';
-import { MenuItemAction, SubmenuItemAction, MenuId } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
-import { MenuEntryActionViewItem, SubmenuEntryActionViewItem } from 'monaco-editor/esm/vs/platform/actions/browser/menuEntryActionViewItem.js';
-import { IContextKeyService } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
+import { MenuItemAction, SubmenuItemAction, MenuId } from '../../../../platform/actions/common/actions.js';
+import { MenuEntryActionViewItem, SubmenuEntryActionViewItem } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
 import { CommentFormActions } from './commentFormActions.js';
-import { MOUSE_CURSOR_TEXT_CSS_CLASS_NAME } from 'monaco-editor/esm/vs/base/browser/ui/mouseCursor/mouseCursor.js';
-import { ActionViewItem } from 'monaco-editor/esm/vs/base/browser/ui/actionbar/actionViewItems.js';
-import { DropdownMenuActionViewItem } from 'monaco-editor/esm/vs/base/browser/ui/dropdown/dropdownActionViewItem.js';
-import { Codicon } from 'monaco-editor/esm/vs/base/common/codicons.js';
-import { ThemeIcon } from 'monaco-editor/esm/vs/base/common/themables.js';
+import { MOUSE_CURSOR_TEXT_CSS_CLASS_NAME } from '../../../../base/browser/ui/mouseCursor/mouseCursor.js';
+import { ActionViewItem } from '../../../../base/browser/ui/actionbar/actionViewItems.js';
+import { DropdownMenuActionViewItem } from '../../../../base/browser/ui/dropdown/dropdownActionViewItem.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
 import { TimestampWidget } from './timestamp.js';
-import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
-import { Scrollable } from 'monaco-editor/esm/vs/base/common/scrollable.js';
-import { SmoothScrollableElement } from 'monaco-editor/esm/vs/base/browser/ui/scrollbar/scrollableElement.js';
-import { DomEmitter } from 'monaco-editor/esm/vs/base/browser/event.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { Scrollable } from '../../../../base/common/scrollable.js';
+import { SmoothScrollableElement } from '../../../../base/browser/ui/scrollbar/scrollableElement.js';
+import { DomEmitter } from '../../../../base/browser/event.js';
 import { CommentContextKeys } from '../common/commentContextKeys.js';
-import { FileAccess } from 'monaco-editor/esm/vs/base/common/network.js';
+import { FileAccess } from '../../../../base/common/network.js';
 import { COMMENTS_SECTION } from '../common/commentsConfiguration.js';
-import { StandardMouseEvent } from 'monaco-editor/esm/vs/base/browser/mouseEvent.js';
-import { IAccessibilityService } from 'monaco-editor/esm/vs/platform/accessibility/common/accessibility.js';
+import { StandardMouseEvent } from '../../../../base/browser/mouseEvent.js';
+import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.js';
 class CommentsActionRunner extends ActionRunner {
     async runAction(action, context) {
         await action.run(...context);
@@ -73,7 +73,7 @@ let CommentNode = class CommentNode extends Disposable {
         this._commentEditorActions = null;
         this._onDidClick = ( new Emitter());
         this.isEditing = false;
-        this._domNode = dom.$('div.review-comment');
+        this._domNode = $('div.review-comment');
         this._contextKeyService = contextKeyService.createScoped(this._domNode);
         this._commentContextValue = CommentContextKeys.commentContext.bindTo(this._contextKeyService);
         if (this.comment.contextValue) {
@@ -81,13 +81,13 @@ let CommentNode = class CommentNode extends Disposable {
         }
         this._commentMenus = this.commentService.getCommentMenus(this.owner);
         this._domNode.tabIndex = -1;
-        const avatar = dom.append(this._domNode, dom.$('div.avatar-container'));
+        const avatar = append(this._domNode, $('div.avatar-container'));
         if (comment.userIconPath) {
-            const img = dom.append(avatar, dom.$('img.avatar'));
+            const img = append(avatar, $('img.avatar'));
             img.src = ( FileAccess.uriToBrowserUri(URI.revive(comment.userIconPath)).toString(true));
             img.onerror = _ => img.remove();
         }
-        this._commentDetailsContainer = dom.append(this._domNode, dom.$('.review-comment-contents'));
+        this._commentDetailsContainer = append(this._domNode, $('.review-comment-contents'));
         this.createHeader(this._commentDetailsContainer);
         this._body = document.createElement(`div`);
         this._body.classList.add('comment-body', MOUSE_CURSOR_TEXT_CSS_CLASS_NAME);
@@ -102,8 +102,8 @@ let CommentNode = class CommentNode extends Disposable {
         this._domNode.setAttribute('aria-label', `${comment.userName}, ${this.commentBodyValue}`);
         this._domNode.setAttribute('role', 'treeitem');
         this._clearTimeout = null;
-        this._register(dom.addDisposableListener(this._domNode, dom.EventType.CLICK, () => this.isEditing || this._onDidClick.fire(this)));
-        this._register(dom.addDisposableListener(this._domNode, dom.EventType.CONTEXT_MENU, e => {
+        this._register(addDisposableListener(this._domNode, EventType.CLICK, () => this.isEditing || this._onDidClick.fire(this)));
+        this._register(addDisposableListener(this._domNode, EventType.CONTEXT_MENU, e => {
             return this.onContextMenu(e);
         }));
         if (pendingEdit) {
@@ -117,7 +117,7 @@ let CommentNode = class CommentNode extends Disposable {
         this._scrollable = ( new Scrollable({
             forceIntegerValues: true,
             smoothScrollDuration: 125,
-            scheduleAtNextAnimationFrame: cb => dom.scheduleAtNextAnimationFrame(dom.getWindow(container), cb)
+            scheduleAtNextAnimationFrame: cb => scheduleAtNextAnimationFrame(getWindow(container), cb)
         }));
         this._scrollableElement = this._register(( new SmoothScrollableElement(body, {
             horizontal: 3 ,
@@ -147,7 +147,7 @@ let CommentNode = class CommentNode extends Disposable {
         this._md = undefined;
         this._plainText = undefined;
         if (typeof body === 'string') {
-            this._plainText = dom.append(this._body, dom.$('.comment-body-plainstring'));
+            this._plainText = append(this._body, $('.comment-body-plainstring'));
             this._plainText.innerText = body;
         }
         else {
@@ -159,7 +159,7 @@ let CommentNode = class CommentNode extends Disposable {
         return this._onDidClick.event;
     }
     createTimestamp(container) {
-        this._timestamp = dom.append(container, dom.$('span.timestamp-container'));
+        this._timestamp = append(container, $('span.timestamp-container'));
         this.updateTimestamp(this.comment.timestamp);
     }
     updateTimestamp(raw) {
@@ -181,19 +181,19 @@ let CommentNode = class CommentNode extends Disposable {
         }
     }
     createHeader(commentDetailsContainer) {
-        const header = dom.append(commentDetailsContainer, dom.$(`div.comment-title.${MOUSE_CURSOR_TEXT_CSS_CLASS_NAME}`));
-        const infoContainer = dom.append(header, dom.$('comment-header-info'));
-        const author = dom.append(infoContainer, dom.$('strong.author'));
+        const header = append(commentDetailsContainer, $(`div.comment-title.${MOUSE_CURSOR_TEXT_CSS_CLASS_NAME}`));
+        const infoContainer = append(header, $('comment-header-info'));
+        const author = append(infoContainer, $('strong.author'));
         author.innerText = this.comment.userName;
         this.createTimestamp(infoContainer);
-        this._isPendingLabel = dom.append(infoContainer, dom.$('span.isPending'));
+        this._isPendingLabel = append(infoContainer, $('span.isPending'));
         if (this.comment.label) {
             this._isPendingLabel.innerText = this.comment.label;
         }
         else {
             this._isPendingLabel.innerText = '';
         }
-        this._actionsToolbarContainer = dom.append(header, dom.$('.comment-actions'));
+        this._actionsToolbarContainer = append(header, $('.comment-actions'));
         this.toggleToolbarHidden(true);
         this.createActionsToolbar();
     }
@@ -300,7 +300,7 @@ let CommentNode = class CommentNode extends Disposable {
     createReactionPicker(reactionGroup) {
         const toggleReactionAction = this._register(( new ToggleReactionsAction(() => {
             toggleReactionActionViewItem?.show();
-        }, ( nls.localizeWithPath(
+        }, ( localizeWithPath(
             'vs/workbench/contrib/comments/browser/commentNode',
             'commentToggleReaction',
             "Toggle Reaction"
@@ -319,13 +319,13 @@ let CommentNode = class CommentNode extends Disposable {
                         }
                         catch (e) {
                             const error = e.message
-                                ? ( nls.localizeWithPath(
+                                ? ( localizeWithPath(
                                 'vs/workbench/contrib/comments/browser/commentNode',
                                 'commentToggleReactionError',
                                 "Toggling the comment reaction failed: {0}.",
                                 e.message
                             ))
-                                : ( nls.localizeWithPath(
+                                : ( localizeWithPath(
                                 'vs/workbench/contrib/comments/browser/commentNode',
                                 'commentToggleReactionDefaultError',
                                 "Toggling the comment reaction failed"
@@ -356,7 +356,7 @@ let CommentNode = class CommentNode extends Disposable {
         return toggleReactionAction;
     }
     createReactionsContainer(commentDetailsContainer) {
-        this._reactionActionsContainer = dom.append(commentDetailsContainer, dom.$('div.comment-reactions'));
+        this._reactionActionsContainer = append(commentDetailsContainer, $('div.comment-reactions'));
         this._reactionsActionBar = ( new ActionBar(this._reactionActionsContainer, {
             actionViewItemProvider: action => {
                 if (action.id === ToggleReactionsAction.ID) {
@@ -381,7 +381,7 @@ let CommentNode = class CommentNode extends Disposable {
         return (typeof this.comment.body === 'string') ? this.comment.body : this.comment.body.value;
     }
     createCommentEditor(editContainer) {
-        const container = dom.append(editContainer, dom.$('.edit-textarea'));
+        const container = append(editContainer, $('.edit-textarea'));
         this._commentEditor = this.instantiationService.createInstance(SimpleCommentEditor, container, SimpleCommentEditor.getEditorOptions(this.configurationService), this._contextKeyService, this.parentThread);
         const resource = ( URI.parse(`comment:commentinput-${this.comment.uniqueIdInThread}-${Date.now()}.md`));
         this._commentEditorModel = this.modelService.createModel('', this.languageService.createByFilepathOrFirstLine(resource), resource, false);
@@ -390,7 +390,7 @@ let CommentNode = class CommentNode extends Disposable {
         this.pendingEdit = undefined;
         this._commentEditor.layout({ width: container.clientWidth - 14, height: this._editorHeight });
         this._commentEditor.focus();
-        dom.scheduleAtNextAnimationFrame(dom.getWindow(editContainer), () => {
+        scheduleAtNextAnimationFrame(getWindow(editContainer), () => {
             this._commentEditor.layout({ width: container.clientWidth - 14, height: this._editorHeight });
             this._commentEditor.focus();
         });
@@ -467,9 +467,9 @@ let CommentNode = class CommentNode extends Disposable {
         const editorWidth = widthInPixel !== undefined ? widthInPixel - 72  : (this._commentEditor?.getLayoutInfo().width ?? 0);
         this._commentEditor?.layout({ width: editorWidth, height: this._editorHeight });
         const scrollWidth = this._body.scrollWidth;
-        const width = dom.getContentWidth(this._body);
+        const width = getContentWidth(this._body);
         const scrollHeight = this._body.scrollHeight;
-        const height = dom.getContentHeight(this._body) + 4;
+        const height = getContentHeight(this._body) + 4;
         this._scrollableElement.setScrollDimensions({ width, scrollWidth, height, scrollHeight });
     }
     switchToEditMode() {
@@ -478,12 +478,12 @@ let CommentNode = class CommentNode extends Disposable {
         }
         this.isEditing = true;
         this._body.classList.add('hidden');
-        this._commentEditContainer = dom.append(this._commentDetailsContainer, dom.$('.edit-container'));
+        this._commentEditContainer = append(this._commentDetailsContainer, $('.edit-container'));
         this.createCommentEditor(this._commentEditContainer);
-        const formActions = dom.append(this._commentEditContainer, dom.$('.form-actions'));
-        const otherActions = dom.append(formActions, dom.$('.other-actions'));
+        const formActions = append(this._commentEditContainer, $('.form-actions'));
+        const otherActions = append(formActions, $('.other-actions'));
         this.createCommentWidgetFormActions(otherActions);
-        const editorActions = dom.append(formActions, dom.$('.editor-actions'));
+        const editorActions = append(formActions, $('.editor-actions'));
         this.createCommentWidgetEditorActions(editorActions);
     }
     createCommentWidgetFormActions(container) {
@@ -532,7 +532,7 @@ let CommentNode = class CommentNode extends Disposable {
             this.toggleToolbarHidden(false);
             this._actionsToolbarContainer.classList.add('tabfocused');
             this._domNode.tabIndex = 0;
-            if (this.comment.mode === languages.CommentMode.Editing) {
+            if (this.comment.mode === CommentMode.Editing) {
                 this._commentEditor?.focus();
             }
         }
@@ -545,11 +545,11 @@ let CommentNode = class CommentNode extends Disposable {
         }
     }
     registerActionBarListeners(actionsContainer) {
-        this._register(dom.addDisposableListener(this._domNode, 'mouseenter', () => {
+        this._register(addDisposableListener(this._domNode, 'mouseenter', () => {
             this.toggleToolbarHidden(false);
             actionsContainer.classList.add('mouseover');
         }));
-        this._register(dom.addDisposableListener(this._domNode, 'mouseleave', () => {
+        this._register(addDisposableListener(this._domNode, 'mouseleave', () => {
             if (actionsContainer.classList.contains('mouseover') && !actionsContainer.classList.contains('tabfocused')) {
                 this.toggleToolbarHidden(true);
             }
@@ -563,7 +563,7 @@ let CommentNode = class CommentNode extends Disposable {
         const isChangingMode = newComment.mode !== undefined && newComment.mode !== this.comment.mode;
         this.comment = newComment;
         if (isChangingMode) {
-            if (newComment.mode === languages.CommentMode.Editing) {
+            if (newComment.mode === CommentMode.Editing) {
                 this.switchToEditMode();
             }
             else {
@@ -592,7 +592,7 @@ let CommentNode = class CommentNode extends Disposable {
         }
     }
     onContextMenu(e) {
-        const event = ( new StandardMouseEvent(dom.getWindow(this._domNode), e));
+        const event = ( new StandardMouseEvent(getWindow(this._domNode), e));
         this.contextMenuService.showContextMenu({
             getAnchor: () => event,
             menuId: MenuId.CommentThreadCommentContext,

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

@@ -1,15 +1,15 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import * as dom from 'monaco-editor/esm/vs/base/browser/dom.js';
-import { MOUSE_CURSOR_TEXT_CSS_CLASS_NAME } from 'monaco-editor/esm/vs/base/browser/ui/mouseCursor/mouseCursor.js';
-import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
-import { generateUuid } from 'monaco-editor/esm/vs/base/common/uuid.js';
-import { ILanguageService } from 'monaco-editor/esm/vs/editor/common/languages/language.js';
-import { IModelService } from 'monaco-editor/esm/vs/editor/common/services/model.js';
-import * as nls from 'monaco-editor/esm/vs/nls.js';
-import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
-import { resolveColorValue, editorForeground } from 'monaco-editor/esm/vs/platform/theme/common/colorRegistry.js';
-import { IThemeService } from 'monaco-editor/esm/vs/platform/theme/common/themeService.js';
+import { append, $, addDisposableListener } from '../../../../base/browser/dom.js';
+import { MOUSE_CURSOR_TEXT_CSS_CLASS_NAME } from '../../../../base/browser/ui/mouseCursor/mouseCursor.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { URI } from '../../../../base/common/uri.js';
+import { generateUuid } from '../../../../base/common/uuid.js';
+import { ILanguageService } from '../../../../editor/common/languages/language.js';
+import { IModelService } from '../../../../editor/common/services/model.js';
+import { localizeWithPath } from '../../../../nls.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { resolveColorValue, editorForeground } from '../../../../platform/theme/common/colorRegistry.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
 import { CommentFormActions } from './commentFormActions.js';
 import { ICommentService } from './commentService.js';
 import { CommentContextKeys } from '../common/commentContextKeys.js';
@@ -36,7 +36,7 @@ let CommentReply = class CommentReply extends Disposable {
         this.themeService = themeService;
         this._commentThreadDisposables = [];
         this._editorHeight = MIN_EDITOR_HEIGHT;
-        this.form = dom.append(container, dom.$('.comment-form'));
+        this.form = append(container, $('.comment-form'));
         this.commentEditor = this._register(this._scopedInstatiationService.createInstance(SimpleCommentEditor, this.form, SimpleCommentEditor.getEditorOptions(configurationService), _contextKeyService, this._parentThread));
         this.commentEditorIsEmpty = CommentContextKeys.commentIsEmpty.bindTo(this._contextKeyService);
         this.commentEditorIsEmpty.set(!this._pendingComment);
@@ -73,11 +73,11 @@ let CommentReply = class CommentReply extends Disposable {
         else if ((this._commentThread.comments && this._commentThread.comments.length === 0) || this._pendingComment) {
             this.expandReplyArea();
         }
-        this._error = dom.append(this.form, dom.$('.validation-error.hidden'));
-        const formActions = dom.append(this.form, dom.$('.form-actions'));
-        this._formActions = dom.append(formActions, dom.$('.other-actions'));
+        this._error = append(this.form, $('.validation-error.hidden'));
+        const formActions = append(this.form, $('.form-actions'));
+        this._formActions = append(formActions, $('.other-actions'));
         this.createCommentWidgetFormActions(this._formActions, model);
-        this._editorActions = dom.append(formActions, dom.$('.editor-actions'));
+        this._editorActions = append(formActions, $('.editor-actions'));
         this.createCommentWidgetEditorActions(this._editorActions, model);
     }
     calculateEditorHeight() {
@@ -156,8 +156,8 @@ let CommentReply = class CommentReply extends Disposable {
             const placeholder = valueLength > 0
                 ? ''
                 : hasExistingComments
-                    ? (this._commentOptions?.placeHolder || ( nls.localizeWithPath('vs/workbench/contrib/comments/browser/commentReply', 'reply', "Reply...")))
-                    : (this._commentOptions?.placeHolder || ( nls.localizeWithPath(
+                    ? (this._commentOptions?.placeHolder || ( localizeWithPath('vs/workbench/contrib/comments/browser/commentReply', 'reply', "Reply...")))
+                    : (this._commentOptions?.placeHolder || ( localizeWithPath(
                 'vs/workbench/contrib/comments/browser/commentReply',
                 'newComment',
                 "Type a new comment"
@@ -278,11 +278,11 @@ let CommentReply = class CommentReply extends Disposable {
         this._error.classList.add('hidden');
     }
     createReplyButton(commentEditor, commentForm) {
-        this._reviewThreadReplyButton = dom.append(commentForm, dom.$(`button.review-thread-reply-button.${MOUSE_CURSOR_TEXT_CSS_CLASS_NAME}`));
-        this._reviewThreadReplyButton.title = this._commentOptions?.prompt || ( nls.localizeWithPath('vs/workbench/contrib/comments/browser/commentReply', 'reply', "Reply..."));
-        this._reviewThreadReplyButton.textContent = this._commentOptions?.prompt || ( nls.localizeWithPath('vs/workbench/contrib/comments/browser/commentReply', 'reply', "Reply..."));
-        this._register(dom.addDisposableListener(this._reviewThreadReplyButton, 'click', _ => this.clearAndExpandReplyArea()));
-        this._register(dom.addDisposableListener(this._reviewThreadReplyButton, 'focus', _ => this.clearAndExpandReplyArea()));
+        this._reviewThreadReplyButton = append(commentForm, $(`button.review-thread-reply-button.${MOUSE_CURSOR_TEXT_CSS_CLASS_NAME}`));
+        this._reviewThreadReplyButton.title = this._commentOptions?.prompt || ( localizeWithPath('vs/workbench/contrib/comments/browser/commentReply', 'reply', "Reply..."));
+        this._reviewThreadReplyButton.textContent = this._commentOptions?.prompt || ( localizeWithPath('vs/workbench/contrib/comments/browser/commentReply', 'reply', "Reply..."));
+        this._register(addDisposableListener(this._reviewThreadReplyButton, 'click', _ => this.clearAndExpandReplyArea()));
+        this._register(addDisposableListener(this._reviewThreadReplyButton, 'focus', _ => this.clearAndExpandReplyArea()));
         commentEditor.onDidBlurEditorWidget(() => {
             if (commentEditor.getModel().getValueLength() === 0 && commentForm.classList.contains('expand')) {
                 commentForm.classList.remove('expand');

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

@@ -1,3 +1,3 @@
-import { createDecorator } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
 const ICommentService = ( createDecorator('commentService'));
 export { ICommentService };

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

@@ -1,5 +1,5 @@
-import * as dom from 'monaco-editor/esm/vs/base/browser/dom.js';
-import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
+import { append, $ } from '../../../../base/browser/dom.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
 import { CommentFormActions } from './commentFormActions.js';
 class CommentThreadAdditionalActions extends Disposable {
     constructor(container, _commentThread, _contextKeyService, _commentMenus, _actionRunDelegate) {
@@ -8,9 +8,9 @@ class CommentThreadAdditionalActions extends Disposable {
         this._contextKeyService = _contextKeyService;
         this._commentMenus = _commentMenus;
         this._actionRunDelegate = _actionRunDelegate;
-        this._container = dom.append(container, dom.$('.comment-additional-actions'));
-        dom.append(this._container, dom.$('.section-separator'));
-        this._buttonBar = dom.append(this._container, dom.$('.button-bar'));
+        this._container = append(container, $('.comment-additional-actions'));
+        append(this._container, $('.section-separator'));
+        this._buttonBar = append(this._container, $('.button-bar'));
         this._createAdditionalActions(this._buttonBar);
     }
     _showMenu() {

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

@@ -1,15 +1,15 @@
 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 { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import * as languages from 'monaco-editor/esm/vs/editor/common/languages.js';
-import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
+import { addDisposableListener, EventType, append, $, getClientArea, getDomNodePagePosition } from '../../../../base/browser/dom.js';
+import { localizeWithPath } from '../../../../nls.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { CommentMode } from '../../../../editor/common/languages.js';
+import { Emitter } from '../../../../base/common/event.js';
 import { ICommentService } from './commentService.js';
-import { StandardKeyboardEvent } from 'monaco-editor/esm/vs/base/browser/keyboardEvent.js';
+import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
 import { CommentNode } from './commentNode.js';
-import { MarkdownRenderer } from 'monaco-editor/esm/vs/editor/contrib/markdownRenderer/browser/markdownRenderer.js';
-import { IOpenerService } from 'monaco-editor/esm/vs/platform/opener/common/opener.js';
-import { ILanguageService } from 'monaco-editor/esm/vs/editor/common/languages/language.js';
+import { MarkdownRenderer } from '../../../../editor/contrib/markdownRenderer/browser/markdownRenderer.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { ILanguageService } from '../../../../editor/common/languages/language.js';
 let CommentThreadBody = class CommentThreadBody extends Disposable {
     get length() {
         return this._commentThread.comments ? this._commentThread.comments.length : 0;
@@ -36,7 +36,7 @@ let CommentThreadBody = class CommentThreadBody extends Disposable {
         this._onDidResize = ( new Emitter());
         this.onDidResize = this._onDidResize.event;
         this._commentDisposable = ( new Map());
-        this._register(dom.addDisposableListener(container, dom.EventType.FOCUS_IN, e => {
+        this._register(addDisposableListener(container, EventType.FOCUS_IN, e => {
             this.commentService.setActiveCommentThread(this._commentThread);
         }));
         this._markdownRenderer = this._register(( new MarkdownRenderer(this._options, this.languageService, this.openerService)));
@@ -45,11 +45,11 @@ let CommentThreadBody = class CommentThreadBody extends Disposable {
         this._commentsElement.focus();
     }
     display() {
-        this._commentsElement = dom.append(this.container, dom.$('div.comments-container'));
+        this._commentsElement = append(this.container, $('div.comments-container'));
         this._commentsElement.setAttribute('role', 'presentation');
         this._commentsElement.tabIndex = 0;
         this._updateAriaLabel();
-        this._register(dom.addDisposableListener(this._commentsElement, dom.EventType.KEY_DOWN, (e) => {
+        this._register(addDisposableListener(this._commentsElement, EventType.KEY_DOWN, (e) => {
             const event = ( new StandardKeyboardEvent(e));
             if ((event.equals(16 ) || event.equals(18 )) && (!this._focusedComment || !this._commentElements[this._focusedComment].isEditing)) {
                 const moveFocusWithinBounds = (change) => {
@@ -71,7 +71,7 @@ let CommentThreadBody = class CommentThreadBody extends Disposable {
                 const newCommentNode = this.createNewCommentNode(comment);
                 this._commentElements.push(newCommentNode);
                 this._commentsElement.appendChild(newCommentNode.domNode);
-                if (comment.mode === languages.CommentMode.Editing) {
+                if (comment.mode === CommentMode.Editing) {
                     newCommentNode.switchToEditMode();
                 }
             }
@@ -85,11 +85,11 @@ let CommentThreadBody = class CommentThreadBody extends Disposable {
         });
     }
     _refresh() {
-        const dimensions = dom.getClientArea(this.container);
+        const dimensions = getClientArea(this.container);
         this._onDidResize.fire(dimensions);
     }
     getDimensions() {
-        return dom.getClientArea(this.container);
+        return getClientArea(this.container);
     }
     layout(widthInPixel) {
         this._commentElements.forEach(element => {
@@ -111,8 +111,8 @@ let CommentThreadBody = class CommentThreadBody extends Disposable {
     getCommentCoords(commentUniqueId) {
         const matchedNode = this._commentElements.filter(commentNode => commentNode.comment.uniqueIdInThread === commentUniqueId);
         if (matchedNode && matchedNode.length) {
-            const commentThreadCoords = dom.getDomNodePagePosition(this._commentElements[0].domNode);
-            const commentCoords = dom.getDomNodePagePosition(matchedNode[0].domNode);
+            const commentThreadCoords = getDomNodePagePosition(this._commentElements[0].domNode);
+            const commentCoords = getDomNodePagePosition(matchedNode[0].domNode);
             return {
                 thread: commentThreadCoords,
                 comment: commentCoords
@@ -164,7 +164,7 @@ let CommentThreadBody = class CommentThreadBody extends Disposable {
                     this._commentsElement.appendChild(newElement.domNode);
                     lastCommentElement = newElement.domNode;
                 }
-                if (currentComment.mode === languages.CommentMode.Editing) {
+                if (currentComment.mode === CommentMode.Editing) {
                     newElement.switchToEditMode();
                     newCommentsInEditMode.push(newElement);
                 }
@@ -184,7 +184,7 @@ let CommentThreadBody = class CommentThreadBody extends Disposable {
     _updateAriaLabel() {
         if (this._commentThread.isDocumentCommentThread()) {
             if (this._commentThread.range) {
-                this._commentsElement.ariaLabel = ( nls.localizeWithPath(
+                this._commentsElement.ariaLabel = ( localizeWithPath(
                     'vs/workbench/contrib/comments/browser/commentThreadBody',
                     'commentThreadAria.withRange',
                     "Comment thread with {0} comments on lines {1} through {2}. {3}.",
@@ -195,7 +195,7 @@ let CommentThreadBody = class CommentThreadBody extends Disposable {
                 ));
             }
             else {
-                this._commentsElement.ariaLabel = ( nls.localizeWithPath(
+                this._commentsElement.ariaLabel = ( localizeWithPath(
                     'vs/workbench/contrib/comments/browser/commentThreadBody',
                     'commentThreadAria.document',
                     "Comment thread with {0} comments on the entire document. {1}.",
@@ -205,7 +205,7 @@ let CommentThreadBody = class CommentThreadBody extends Disposable {
             }
         }
         else {
-            this._commentsElement.ariaLabel = ( nls.localizeWithPath(
+            this._commentsElement.ariaLabel = ( localizeWithPath(
                 'vs/workbench/contrib/comments/browser/commentThreadBody',
                 'commentThreadAria',
                 "Comment thread with {0} comments. {1}.",

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

@@ -1,15 +1,15 @@
-import * as dom from 'monaco-editor/esm/vs/base/browser/dom.js';
-import { ActionBar } from 'monaco-editor/esm/vs/base/browser/ui/actionbar/actionbar.js';
-import { Action, ActionRunner } from 'monaco-editor/esm/vs/base/common/actions.js';
-import { Codicon } from 'monaco-editor/esm/vs/base/common/codicons.js';
-import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import * as strings from 'monaco-editor/esm/vs/base/common/strings.js';
-import * as nls from 'monaco-editor/esm/vs/nls.js';
-import { createActionViewItem } from 'monaco-editor/esm/vs/platform/actions/browser/menuEntryActionViewItem.js';
-import { registerIcon } from 'monaco-editor/esm/vs/platform/theme/common/iconRegistry.js';
-import { ThemeIcon } from 'monaco-editor/esm/vs/base/common/themables.js';
-import { StandardMouseEvent } from 'monaco-editor/esm/vs/base/browser/mouseEvent.js';
-const collapseIcon = registerIcon('review-comment-collapse', Codicon.chevronUp, ( nls.localizeWithPath(
+import { $, append, addDisposableListener, EventType, getWindow } from '../../../../base/browser/dom.js';
+import { ActionBar } from '../../../../base/browser/ui/actionbar/actionbar.js';
+import { Action, ActionRunner } from '../../../../base/common/actions.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { escape } from '../../../../base/common/strings.js';
+import { localizeWithPath } from '../../../../nls.js';
+import { createActionViewItem } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
+import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { StandardMouseEvent } from '../../../../base/browser/mouseEvent.js';
+const collapseIcon = registerIcon('review-comment-collapse', Codicon.chevronUp, ( localizeWithPath(
     'vs/workbench/contrib/comments/browser/commentThreadHeader',
     'collapseIcon',
     'Icon to collapse a review comment.'
@@ -24,20 +24,20 @@ class CommentThreadHeader extends Disposable {
         this._contextKeyService = _contextKeyService;
         this.instantiationService = instantiationService;
         this._contextMenuService = _contextMenuService;
-        this._headElement = dom.$('.head');
+        this._headElement = $('.head');
         container.appendChild(this._headElement);
         this._fillHead();
     }
     _fillHead() {
-        const titleElement = dom.append(this._headElement, dom.$('.review-title'));
-        this._headingLabel = dom.append(titleElement, dom.$('span.filename'));
+        const titleElement = append(this._headElement, $('.review-title'));
+        this._headingLabel = append(titleElement, $('span.filename'));
         this.createThreadLabel();
-        const actionsContainer = dom.append(this._headElement, dom.$('.review-actions'));
+        const actionsContainer = append(this._headElement, $('.review-actions'));
         this._actionbarWidget = ( new ActionBar(actionsContainer, {
             actionViewItemProvider: createActionViewItem.bind(undefined, this.instantiationService)
         }));
         this._register(this._actionbarWidget);
-        this._collapseAction = ( new Action('review.expand', ( nls.localizeWithPath(
+        this._collapseAction = ( new Action('review.expand', ( localizeWithPath(
             'vs/workbench/contrib/comments/browser/commentThreadHeader',
             'label.collapse',
             "Collapse"
@@ -48,7 +48,7 @@ class CommentThreadHeader extends Disposable {
         this._register(menu.onDidChange(e => {
             this.setActionBarActions(menu);
         }));
-        this._register(dom.addDisposableListener(this._headElement, dom.EventType.CONTEXT_MENU, e => {
+        this._register(addDisposableListener(this._headElement, EventType.CONTEXT_MENU, e => {
             return this.onContextMenu(e);
         }));
         this._actionbarWidget.context = this._commentThread;
@@ -68,7 +68,7 @@ class CommentThreadHeader extends Disposable {
         label = this._commentThread.label;
         if (label === undefined) {
             if (!(this._commentThread.comments && this._commentThread.comments.length)) {
-                label = ( nls.localizeWithPath(
+                label = ( localizeWithPath(
                     'vs/workbench/contrib/comments/browser/commentThreadHeader',
                     'startThread',
                     "Start discussion"
@@ -76,7 +76,7 @@ class CommentThreadHeader extends Disposable {
             }
         }
         if (label) {
-            this._headingLabel.textContent = strings.escape(label);
+            this._headingLabel.textContent = escape(label);
             this._headingLabel.setAttribute('aria-label', label);
         }
     }
@@ -89,7 +89,7 @@ class CommentThreadHeader extends Disposable {
         if (!actions.length) {
             return;
         }
-        const event = ( new StandardMouseEvent(dom.getWindow(this._headElement), e));
+        const event = ( new StandardMouseEvent(getWindow(this._headElement), e));
         this._contextMenuService.showContextMenu({
             getAnchor: () => event,
             getActions: () => actions,