@codingame/monaco-vscode-api 4.5.1 → 5.0.0

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

@@ -1,13 +1,15 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { append, $, addDisposableListener } from '../../../../base/browser/dom.js';
+import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
 import { MOUSE_CURSOR_TEXT_CSS_CLASS_NAME } from '../../../../base/browser/ui/mouseCursor/mouseCursor.js';
 import { Disposable, dispose } from '../../../../base/common/lifecycle.js';
+import { Schemas } from '../../../../base/common/network.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 { ITextModelService } from '../../../../editor/common/services/resolverService.js';
 import { localizeWithPath } from '../../../../nls.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.service.js';
 import { resolveColorValue } from '../../../../platform/theme/common/colorUtils.js';
 import '../../../../platform/theme/common/colors/baseColors.js';
 import '../../../../platform/theme/common/colors/chartsColors.js';
@@ -24,14 +26,12 @@ import { CommentFormActions } from './commentFormActions.js';
 import { ICommentService } from './commentService.service.js';
 import { CommentContextKeys } from '../common/commentContextKeys.js';
 import { MIN_EDITOR_HEIGHT, SimpleCommentEditor, calculateEditorHeight } from './simpleCommentEditor.js';
-import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.service.js';
-import { setupCustomHover } from '../../../../base/browser/ui/hover/updatableHoverWidget.js';
-import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
-const COMMENT_SCHEME = 'comment';
+import { IHoverService } from '../../../../platform/hover/browser/hover.service.js';
+const _moduleId = "vs/workbench/contrib/comments/browser/commentReply";
 let INMEM_MODEL_ID = 0;
 const COMMENTEDITOR_DECORATION_KEY = 'commenteditordecoration';
 let CommentReply = class CommentReply extends Disposable {
-    constructor(owner, container, _parentEditor, _commentThread, _scopedInstatiationService, _contextKeyService, _commentMenus, _commentOptions, _pendingComment, _parentThread, _actionRunDelegate, commentService, languageService, modelService, themeService, configurationService, keybindingService) {
+    constructor(owner, container, _parentEditor, _commentThread, _scopedInstatiationService, _contextKeyService, _commentMenus, _commentOptions, _pendingComment, _parentThread, _actionRunDelegate, commentService, themeService, configurationService, keybindingService, hoverService, textModelService) {
         super();
         this.owner = owner;
         this._parentEditor = _parentEditor;
@@ -44,41 +44,46 @@ let CommentReply = class CommentReply extends Disposable {
         this._parentThread = _parentThread;
         this._actionRunDelegate = _actionRunDelegate;
         this.commentService = commentService;
-        this.languageService = languageService;
-        this.modelService = modelService;
         this.themeService = themeService;
         this.keybindingService = keybindingService;
+        this.hoverService = hoverService;
+        this.textModelService = textModelService;
         this._commentThreadDisposables = [];
         this._editorHeight = MIN_EDITOR_HEIGHT;
         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);
+        this.initialize();
+    }
+    async initialize() {
         const hasExistingComments = this._commentThread.comments && this._commentThread.comments.length > 0;
         const modeId = generateUuid() + '-' + (hasExistingComments ? this._commentThread.threadId : ++INMEM_MODEL_ID);
         const params = JSON.stringify({
             extensionId: this._commentThread.extensionId,
             commentThreadId: this._commentThread.threadId
         });
-        let resource = ( URI.parse(
-            `${COMMENT_SCHEME}://${this._commentThread.extensionId}/commentinput-${modeId}.md?${params}`
-        ));
-        const commentController = this.commentService.getCommentController(owner);
+        let resource = ( (URI.from({
+            scheme: Schemas.commentsInput,
+            path: `/${this._commentThread.extensionId}/commentinput-${modeId}.md?${params}`
+        })));
+        const commentController = this.commentService.getCommentController(this.owner);
         if (commentController) {
             resource = resource.with({ authority: commentController.id });
         }
-        const model = this.modelService.createModel(this._pendingComment || '', this.languageService.createByFilepathOrFirstLine(resource), resource, false);
+        const model = await this.textModelService.createModelReference(resource);
+        model.object.textEditorModel.setValue(this._pendingComment || '');
         this._register(model);
-        this.commentEditor.setModel(model);
+        this.commentEditor.setModel(model.object.textEditorModel);
         this.calculateEditorHeight();
-        this._register((model.onDidChangeContent(() => {
+        this._register(model.object.textEditorModel.onDidChangeContent(() => {
             this.setCommentEditorDecorations();
             this.commentEditorIsEmpty?.set(!this.commentEditor.getValue());
             if (this.calculateEditorHeight()) {
                 this.commentEditor.layout({ height: this._editorHeight, width: this.commentEditor.getLayoutInfo().width });
                 this.commentEditor.render(true);
             }
-        })));
+        }));
         this.createTextModelListener(this.commentEditor, this.form);
         this.setCommentEditorDecorations();
         if (hasExistingComments) {
@@ -90,9 +95,9 @@ let CommentReply = class CommentReply extends Disposable {
         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.createCommentWidgetFormActions(this._formActions, model.object.textEditorModel);
         this._editorActions = append(formActions, $('.editor-actions'));
-        this.createCommentWidgetEditorActions(this._editorActions, model);
+        this.createCommentWidgetEditorActions(this._editorActions, model.object.textEditorModel);
     }
     calculateEditorHeight() {
         const newEditorHeight = calculateEditorHeight(this._parentEditor, this.commentEditor, this._editorHeight);
@@ -133,7 +138,7 @@ let CommentReply = class CommentReply extends Disposable {
         if (!this._commentThread.comments || !this._commentThread.comments.length) {
             this.commentEditor.focus();
         }
-        else if (this.commentEditor.getModel().getValueLength() > 0) {
+        else if ((this.commentEditor.getModel()?.getValueLength() ?? 0) > 0) {
             this.expandReplyArea();
         }
     }
@@ -147,9 +152,6 @@ let CommentReply = class CommentReply extends Disposable {
     isCommentEditorFocused() {
         return this.commentEditor.hasWidgetFocus();
     }
-    getCommentModel() {
-        return this.commentEditor.getModel();
-    }
     updateCanReply() {
         if (!this._commentThread.canReply) {
             this.form.style.display = 'none';
@@ -170,12 +172,8 @@ let CommentReply = class CommentReply extends Disposable {
             const placeholder = valueLength > 0
                 ? ''
                 : hasExistingComments
-                    ? (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"
-            )));
+                    ? (this._commentOptions?.placeHolder || ( localizeWithPath(_moduleId, 0, "Reply...")))
+                    : (this._commentOptions?.placeHolder || ( localizeWithPath(_moduleId, 1, "Type a new comment")));
             const decorations = [{
                     range: {
                         startLineNumber: 0,
@@ -238,7 +236,7 @@ let CommentReply = class CommentReply extends Disposable {
         this._register(menu.onDidChange(() => {
             this._commentFormActions.setActions(menu);
         }));
-        this._commentFormActions = ( new CommentFormActions(
+        this._commentFormActions = ( (new CommentFormActions(
             this.keybindingService,
             this._contextKeyService,
             container,
@@ -251,7 +249,7 @@ let CommentReply = class CommentReply extends Disposable {
                 });
                 this.hideReplyArea();
             }
-        ));
+        )));
         this._register(this._commentFormActions);
         this._commentFormActions.setActions(menu);
     }
@@ -261,7 +259,7 @@ let CommentReply = class CommentReply extends Disposable {
         this._register(editorMenu.onDidChange(() => {
             this._commentEditorActions.setActions(editorMenu);
         }));
-        this._commentEditorActions = ( new CommentFormActions(
+        this._commentEditorActions = ( (new CommentFormActions(
             this.keybindingService,
             this._contextKeyService,
             container,
@@ -274,7 +272,7 @@ let CommentReply = class CommentReply extends Disposable {
                 });
                 this.focusCommentEditor();
             }
-        ));
+        )));
         this._register(this._commentEditorActions);
         this._commentEditorActions.setActions(editorMenu, true);
     }
@@ -304,8 +302,8 @@ let CommentReply = class CommentReply extends Disposable {
     }
     createReplyButton(commentEditor, commentForm) {
         this._reviewThreadReplyButton = append(commentForm, $(`button.review-thread-reply-button.${MOUSE_CURSOR_TEXT_CSS_CLASS_NAME}`));
-        this._register(setupCustomHover(getDefaultHoverDelegate('mouse'), this._reviewThreadReplyButton, 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(this.hoverService.setupUpdatableHover(getDefaultHoverDelegate('mouse'), this._reviewThreadReplyButton, this._commentOptions?.prompt || ( localizeWithPath(_moduleId, 0, "Reply..."))));
+        this._reviewThreadReplyButton.textContent = this._commentOptions?.prompt || ( localizeWithPath(_moduleId, 0, "Reply..."));
         this._register(addDisposableListener(this._reviewThreadReplyButton, 'click', _ => this.clearAndExpandReplyArea()));
         this._register(addDisposableListener(this._reviewThreadReplyButton, 'focus', _ => this.clearAndExpandReplyArea()));
         commentEditor.onDidBlurEditorWidget(() => {
@@ -319,12 +317,12 @@ let CommentReply = class CommentReply extends Disposable {
         dispose(this._commentThreadDisposables);
     }
 };
-CommentReply = ( __decorate([
-    ( __param(11, ICommentService)),
-    ( __param(12, ILanguageService)),
-    ( __param(13, IModelService)),
-    ( __param(14, IThemeService)),
-    ( __param(15, IConfigurationService)),
-    ( __param(16, IKeybindingService))
-], CommentReply));
+CommentReply = ( (__decorate([
+    ( (__param(11, ICommentService))),
+    ( (__param(12, IThemeService))),
+    ( (__param(13, IConfigurationService))),
+    ( (__param(14, IKeybindingService))),
+    ( (__param(15, IHoverService))),
+    ( (__param(16, ITextModelService)))
+], CommentReply)));
 export { COMMENTEDITOR_DECORATION_KEY, CommentReply };

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

@@ -10,6 +10,7 @@ import { CommentNode } from './commentNode.js';
 import { MarkdownRenderer } from '../../../../editor/browser/widget/markdownRenderer/browser/markdownRenderer.js';
 import { IOpenerService } from '../../../../platform/opener/common/opener.service.js';
 import { ILanguageService } from '../../../../editor/common/languages/language.js';
+const _moduleId = "vs/workbench/contrib/comments/browser/commentThreadBody";
 let CommentThreadBody = class CommentThreadBody extends Disposable {
     get length() {
         return this._commentThread.comments ? this._commentThread.comments.length : 0;
@@ -33,24 +34,24 @@ let CommentThreadBody = class CommentThreadBody extends Disposable {
         this.languageService = languageService;
         this._commentElements = [];
         this._focusedComment = undefined;
-        this._onDidResize = ( new Emitter());
+        this._onDidResize = ( (new Emitter()));
         this.onDidResize = this._onDidResize.event;
-        this._commentDisposable = ( new Map());
+        this._commentDisposable = ( (new Map()));
         this._register(addDisposableListener(container, EventType.FOCUS_IN, e => {
             this.commentService.setActiveEditingCommentThread(this._commentThread);
         }));
-        this._markdownRenderer = this._register(( new MarkdownRenderer(this._options, this.languageService, this.openerService)));
+        this._markdownRenderer = this._register(( (new MarkdownRenderer(this._options, this.languageService, this.openerService))));
     }
     focus() {
         this._commentsElement.focus();
     }
-    display() {
+    async display() {
         this._commentsElement = append(this.container, $('div.comments-container'));
         this._commentsElement.setAttribute('role', 'presentation');
         this._commentsElement.tabIndex = 0;
         this._updateAriaLabel();
         this._register(addDisposableListener(this._commentsElement, EventType.KEY_DOWN, (e) => {
-            const event = ( new StandardKeyboardEvent(e));
+            const event = ( (new StandardKeyboardEvent(e)));
             if ((event.equals(16 ) || event.equals(18 )) && (!this._focusedComment || !this._commentElements[this._focusedComment].isEditing)) {
                 const moveFocusWithinBounds = (change) => {
                     if (this._focusedComment === undefined && change >= 0) {
@@ -72,11 +73,11 @@ let CommentThreadBody = class CommentThreadBody extends Disposable {
                 this._commentElements.push(newCommentNode);
                 this._commentsElement.appendChild(newCommentNode.domNode);
                 if (comment.mode === CommentMode.Editing) {
-                    newCommentNode.switchToEditMode();
+                    await newCommentNode.switchToEditMode();
                 }
             }
         }
-        this._resizeObserver = ( new MutationObserver(this._refresh.bind(this)));
+        this._resizeObserver = ( (new MutationObserver(this._refresh.bind(this))));
         this._resizeObserver.observe(this.container, {
             attributes: true,
             childList: true,
@@ -120,7 +121,7 @@ let CommentThreadBody = class CommentThreadBody extends Disposable {
         }
         return;
     }
-    updateCommentThread(commentThread, preserveFocus) {
+    async updateCommentThread(commentThread, preserveFocus) {
         const oldCommentsLen = this._commentElements.length;
         const newCommentsLen = commentThread.comments ? commentThread.comments.length : 0;
         const commentElementsToDel = [];
@@ -165,7 +166,7 @@ let CommentThreadBody = class CommentThreadBody extends Disposable {
                     lastCommentElement = newElement.domNode;
                 }
                 if (currentComment.mode === CommentMode.Editing) {
-                    newElement.switchToEditMode();
+                    await newElement.switchToEditMode();
                     newCommentsInEditMode.push(newElement);
                 }
             }
@@ -185,8 +186,8 @@ let CommentThreadBody = class CommentThreadBody extends Disposable {
         if (this._commentThread.isDocumentCommentThread()) {
             if (this._commentThread.range) {
                 this._commentsElement.ariaLabel = ( localizeWithPath(
-                    'vs/workbench/contrib/comments/browser/commentThreadBody',
-                    'commentThreadAria.withRange',
+                    _moduleId,
+                    0,
                     "Comment thread with {0} comments on lines {1} through {2}. {3}.",
                     this._commentThread.comments?.length,
                     this._commentThread.range.startLineNumber,
@@ -196,8 +197,8 @@ let CommentThreadBody = class CommentThreadBody extends Disposable {
             }
             else {
                 this._commentsElement.ariaLabel = ( localizeWithPath(
-                    'vs/workbench/contrib/comments/browser/commentThreadBody',
-                    'commentThreadAria.document',
+                    _moduleId,
+                    1,
                     "Comment thread with {0} comments on the entire document. {1}.",
                     this._commentThread.comments?.length,
                     this._commentThread.label
@@ -206,8 +207,8 @@ let CommentThreadBody = class CommentThreadBody extends Disposable {
         }
         else {
             this._commentsElement.ariaLabel = ( localizeWithPath(
-                'vs/workbench/contrib/comments/browser/commentThreadBody',
-                'commentThreadAria',
+                _moduleId,
+                2,
                 "Comment thread with {0} comments. {1}.",
                 this._commentThread.comments?.length,
                 this._commentThread.label
@@ -241,9 +242,9 @@ let CommentThreadBody = class CommentThreadBody extends Disposable {
         this._commentDisposable.forEach(v => v.dispose());
     }
 };
-CommentThreadBody = ( __decorate([
-    ( __param(9, ICommentService)),
-    ( __param(10, IOpenerService)),
-    ( __param(11, ILanguageService))
-], CommentThreadBody));
+CommentThreadBody = ( (__decorate([
+    ( (__param(9, ICommentService))),
+    ( (__param(10, IOpenerService))),
+    ( (__param(11, ILanguageService)))
+], CommentThreadBody)));
 export { CommentThreadBody };

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

@@ -9,11 +9,8 @@ import { createActionViewItem } from '../../../../platform/actions/browser/menuE
 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.'
-)));
+const _moduleId = "vs/workbench/contrib/comments/browser/commentThreadHeader";
+const collapseIcon = registerIcon('review-comment-collapse', Codicon.chevronUp, ( localizeWithPath(_moduleId, 0, 'Icon to collapse a review comment.')));
 const COLLAPSE_ACTION_CLASS = 'expand-review-action ' + ThemeIcon.asClassName(collapseIcon);
 class CommentThreadHeader extends Disposable {
     constructor(container, _delegate, _commentMenus, _commentThread, _contextKeyService, instantiationService, _contextMenuService) {
@@ -33,15 +30,11 @@ class CommentThreadHeader extends Disposable {
         this._headingLabel = append(titleElement, $('span.filename'));
         this.createThreadLabel();
         const actionsContainer = append(this._headElement, $('.review-actions'));
-        this._actionbarWidget = ( new ActionBar(actionsContainer, {
+        this._actionbarWidget = ( (new ActionBar(actionsContainer, {
             actionViewItemProvider: createActionViewItem.bind(undefined, this.instantiationService)
-        }));
+        })));
         this._register(this._actionbarWidget);
-        this._collapseAction = ( new Action('review.expand', ( localizeWithPath(
-            'vs/workbench/contrib/comments/browser/commentThreadHeader',
-            'label.collapse',
-            "Collapse"
-        )), COLLAPSE_ACTION_CLASS, true, () => this._delegate.collapse()));
+        this._collapseAction = ( (new Action('review.expand', ( localizeWithPath(_moduleId, 1, "Collapse")), COLLAPSE_ACTION_CLASS, true, () => this._delegate.collapse())));
         const menu = this._commentMenus.getCommentThreadTitleActions(this._contextKeyService);
         this.setActionBarActions(menu);
         this._register(menu);
@@ -68,11 +61,7 @@ class CommentThreadHeader extends Disposable {
         label = this._commentThread.label;
         if (label === undefined) {
             if (!(this._commentThread.comments && this._commentThread.comments.length)) {
-                label = ( localizeWithPath(
-                    'vs/workbench/contrib/comments/browser/commentThreadHeader',
-                    'startThread',
-                    "Start discussion"
-                ));
+                label = ( localizeWithPath(_moduleId, 2, "Start discussion"));
             }
         }
         if (label) {
@@ -85,15 +74,15 @@ class CommentThreadHeader extends Disposable {
         this._headElement.style.lineHeight = this._headElement.style.height;
     }
     onContextMenu(e) {
-        const actions = ( this._commentMenus.getCommentThreadTitleContextActions(this._contextKeyService).getActions({ shouldForwardArgs: true }).map((value) => value[1])).flat();
+        const actions = ( (this._commentMenus.getCommentThreadTitleContextActions(this._contextKeyService).getActions({ shouldForwardArgs: true }).map((value) => value[1]))).flat();
         if (!actions.length) {
             return;
         }
-        const event = ( new StandardMouseEvent(getWindow(this._headElement), e));
+        const event = ( (new StandardMouseEvent(getWindow(this._headElement), e)));
         this._contextMenuService.showContextMenu({
             getAnchor: () => event,
             getActions: () => actions,
-            actionRunner: ( new ActionRunner()),
+            actionRunner: ( (new ActionRunner())),
             getActionsContext: () => {
                 return {
                     commentControlHandle: this._commentThread.controllerHandle,

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

@@ -29,6 +29,7 @@ import { IConfigurationService } from '../../../../platform/configuration/common
 import { COMMENTS_SECTION } from '../common/commentsConfiguration.js';
 import { localizeWithPath } from '../../../../nls.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.service.js';
+const _moduleId = "vs/workbench/contrib/comments/browser/commentThreadWidget";
 let CommentThreadWidget = class CommentThreadWidget extends Disposable {
     get commentThread() {
         return this._commentThread;
@@ -51,20 +52,21 @@ let CommentThreadWidget = class CommentThreadWidget extends Disposable {
         this.configurationService = configurationService;
         this._keybindingService = _keybindingService;
         this._commentThreadDisposables = [];
-        this._onDidResize = ( new Emitter());
+        this._onDidResize = ( (new Emitter()));
         this.onDidResize = this._onDidResize.event;
         this._threadIsEmpty = CommentContextKeys.commentThreadIsEmpty.bindTo(this._contextKeyService);
         this._threadIsEmpty.set(!_commentThread.comments || !_commentThread.comments.length);
         this._focusedContextKey = CommentContextKeys.commentFocused.bindTo(this._contextKeyService);
         this._commentMenus = this.commentService.getCommentMenus(this._owner);
-        this._header = ( new CommentThreadHeader(container, {
+        this._header = ( (new CommentThreadHeader(container, {
             collapse: this.collapse.bind(this)
-        }, this._commentMenus, this._commentThread, this._contextKeyService, this._scopedInstantiationService, contextMenuService));
+        }, this._commentMenus, this._commentThread, this._contextKeyService, this._scopedInstantiationService, contextMenuService)));
         this._header.updateCommentThread(this._commentThread);
         const bodyElement = $('.body');
         container.appendChild(bodyElement);
         const tracker = this._register(trackFocus(bodyElement));
         this._register(registerNavigableContainer({
+            name: 'commentThreadWidget',
             focusNotifiers: [tracker],
             focusNextWidget: () => {
                 if (!this._commentReply?.isCommentEditorFocused()) {
@@ -98,11 +100,7 @@ let CommentThreadWidget = class CommentThreadWidget extends Disposable {
         this.currentThreadListeners();
     }
     _setAriaLabel() {
-        let ariaLabel = ( localizeWithPath(
-            'vs/workbench/contrib/comments/browser/commentThreadWidget',
-            'commentLabel',
-            "Comment"
-        ));
+        let ariaLabel = ( localizeWithPath(_moduleId, 0, "Comment"));
         let keybinding;
         const verbose = this.configurationService.getValue("accessibility.verbosity.comments" );
         if (verbose) {
@@ -110,8 +108,8 @@ let CommentThreadWidget = class CommentThreadWidget extends Disposable {
         }
         if (keybinding) {
             ariaLabel = ( localizeWithPath(
-                'vs/workbench/contrib/comments/browser/commentThreadWidget',
-                'commentLabelWithKeybinding',
+                _moduleId,
+                1,
                 "{0}, use ({1}) for accessibility help",
                 ariaLabel,
                 keybinding
@@ -119,8 +117,8 @@ let CommentThreadWidget = class CommentThreadWidget extends Disposable {
         }
         else {
             ariaLabel = ( localizeWithPath(
-                'vs/workbench/contrib/comments/browser/commentThreadWidget',
-                'commentLabelWithKeybindingNoKeybinding',
+                _moduleId,
+                2,
                 "{0}, run the command Open Accessibility Help which is currently not triggerable via keybinding.",
                 ariaLabel
             ));
@@ -159,7 +157,7 @@ let CommentThreadWidget = class CommentThreadWidget extends Disposable {
             this.updateCurrentThread(hasMouse, hasFocus);
         }, true));
     }
-    updateCommentThread(commentThread) {
+    async updateCommentThread(commentThread) {
         const shouldCollapse = (this._commentThread.collapsibleState === CommentThreadCollapsibleState.Expanded) && (this._commentThreadState === CommentThreadState.Unresolved)
             && (commentThread.state === CommentThreadState.Resolved);
         this._commentThreadState = commentThread.state;
@@ -167,7 +165,7 @@ let CommentThreadWidget = class CommentThreadWidget extends Disposable {
         dispose(this._commentThreadDisposables);
         this._commentThreadDisposables = [];
         this._bindCommentThreadListeners();
-        this._body.updateCommentThread(commentThread, this._commentReply?.isCommentEditorFocused() ?? false);
+        await this._body.updateCommentThread(commentThread, this._commentReply?.isCommentEditorFocused() ?? false);
         this._threadIsEmpty.set(!this._body.length);
         this._header.updateCommentThread(commentThread);
         this._commentReply?.updateCommentThread(commentThread);
@@ -181,10 +179,10 @@ let CommentThreadWidget = class CommentThreadWidget extends Disposable {
             this.collapse();
         }
     }
-    display(lineHeight) {
+    async display(lineHeight) {
         const headHeight = Math.max(23, Math.ceil(lineHeight * 1.2));
         this._header.updateHeight(headHeight);
-        this._body.display();
+        await this._body.display();
         if (this._commentThread.canReply) {
             this._createCommentForm();
         }
@@ -335,10 +333,10 @@ let CommentThreadWidget = class CommentThreadWidget extends Disposable {
         this._commentReply?.setCommentEditorDecorations();
     }
 };
-CommentThreadWidget = ( __decorate([
-    ( __param(12, ICommentService)),
-    ( __param(13, IContextMenuService)),
-    ( __param(14, IConfigurationService)),
-    ( __param(15, IKeybindingService))
-], CommentThreadWidget));
+CommentThreadWidget = ( (__decorate([
+    ( (__param(12, ICommentService))),
+    ( (__param(13, IContextMenuService))),
+    ( (__param(14, IConfigurationService))),
+    ( (__param(15, IKeybindingService)))
+], CommentThreadWidget)));
 export { CommentThreadWidget };

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

@@ -241,7 +241,7 @@ let ReviewZoneWidget = class ReviewZoneWidget extends ZoneWidget {
             this._commentThreadDisposables = [];
             this.bindCommentThreadListeners();
         }
-        this._commentThreadWidget.updateCommentThread(commentThread);
+        await this._commentThreadWidget.updateCommentThread(commentThread);
         const lineNumber = this._commentThread.range?.endLineNumber ?? 1;
         let shouldMoveWidget = false;
         if (this._commentGlyph) {
@@ -264,12 +264,12 @@ let ReviewZoneWidget = class ReviewZoneWidget extends ZoneWidget {
     _doLayout(heightInPixel, widthInPixel) {
         this._commentThreadWidget.layout(widthInPixel);
     }
-    display(range) {
+    async display(range) {
         if (range) {
             this._commentGlyph = ( new CommentGlyphWidget(this.editor, range?.endLineNumber ?? -1));
             this._commentGlyph.setThreadState(this._commentThread.state);
         }
-        this._commentThreadWidget.display(this.editor.getOption(67 ));
+        await this._commentThreadWidget.display(this.editor.getOption(67 ));
         this._disposables.add(this._commentThreadWidget.onDidResize(dimension => {
             this._refresh(dimension);
         }));