@codingame/monaco-vscode-api 4.5.2 → 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,15 +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';
+import { IHoverService } from '../../../../platform/hover/browser/hover.service.js';
 const _moduleId = "vs/workbench/contrib/comments/browser/commentReply";
-const COMMENT_SCHEME = 'comment';
 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;
@@ -45,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) {
@@ -91,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);
@@ -134,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();
         }
     }
@@ -148,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';
@@ -301,7 +302,7 @@ 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(_moduleId, 0, "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()));
@@ -318,10 +319,10 @@ let CommentReply = class CommentReply extends Disposable {
 };
 CommentReply = ( (__decorate([
     ( (__param(11, ICommentService))),
-    ( (__param(12, ILanguageService))),
-    ( (__param(13, IModelService))),
-    ( (__param(14, IThemeService))),
-    ( (__param(15, IConfigurationService))),
-    ( (__param(16, IKeybindingService)))
+    ( (__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

@@ -45,7 +45,7 @@ let CommentThreadBody = class CommentThreadBody extends Disposable {
     focus() {
         this._commentsElement.focus();
     }
-    display() {
+    async display() {
         this._commentsElement = append(this.container, $('div.comments-container'));
         this._commentsElement.setAttribute('role', 'presentation');
         this._commentsElement.tabIndex = 0;
@@ -73,7 +73,7 @@ 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();
                 }
             }
         }
@@ -121,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 = [];
@@ -166,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);
                 }
             }

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

@@ -66,6 +66,7 @@ let CommentThreadWidget = class CommentThreadWidget extends Disposable {
         container.appendChild(bodyElement);
         const tracker = this._register(trackFocus(bodyElement));
         this._register(registerNavigableContainer({
+            name: 'commentThreadWidget',
             focusNotifiers: [tracker],
             focusNextWidget: () => {
                 if (!this._commentReply?.isCommentEditorFocused()) {
@@ -156,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;
@@ -164,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);
@@ -178,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();
         }

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);
         }));

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

@@ -487,10 +487,10 @@ let CommentController = class CommentController {
         }));
         this.globalToDispose.add(this.commentService.onDidSetDataProvider(_ => this.beginComputeAndHandleEditorChange()));
         this.globalToDispose.add(this.commentService.onDidUpdateCommentingRanges(_ => this.beginComputeAndHandleEditorChange()));
-        this.globalToDispose.add(this.commentService.onDidSetResourceCommentInfos(e => {
+        this.globalToDispose.add(this.commentService.onDidSetResourceCommentInfos(async (e) => {
             const editorURI = this.editor && this.editor.hasModel() && this.editor.getModel().uri;
             if (editorURI && ( (editorURI.toString())) === ( (e.resource.toString()))) {
-                this.setComments(e.commentInfos.filter(commentInfo => commentInfo !== null));
+                await this.setComments(e.commentInfos.filter(commentInfo => commentInfo !== null));
             }
         }));
         this.globalToDispose.add(this.commentService.onDidChangeCommentingEnabled(e => {
@@ -622,8 +622,8 @@ let CommentController = class CommentController {
             }
             return Promise.resolve([]);
         });
-        return this._computePromise.then(commentInfos => {
-            this.setComments(coalesce(commentInfos));
+        return this._computePromise.then(async (commentInfos) => {
+            await this.setComments(coalesce(commentInfos));
             this._computePromise = null;
         }, error => console.log(error));
     }
@@ -878,7 +878,7 @@ let CommentController = class CommentController {
                 const pendingCommentText = (this._pendingNewCommentCache[e.uniqueOwner] && this._pendingNewCommentCache[e.uniqueOwner][thread.threadId])
                     ?? continueOnCommentText;
                 const pendingEdits = this._pendingEditsCache[e.uniqueOwner] && this._pendingEditsCache[e.uniqueOwner][thread.threadId];
-                this.displayCommentThread(e.uniqueOwner, thread, pendingCommentText, pendingEdits);
+                await this.displayCommentThread(e.uniqueOwner, thread, pendingCommentText, pendingEdits);
                 this._commentInfos.filter(info => info.uniqueOwner === e.uniqueOwner)[0].threads.push(thread);
                 this.tryUpdateReservedSpace();
             }
@@ -970,7 +970,7 @@ let CommentController = class CommentController {
         }
         return undefined;
     }
-    displayCommentThread(uniqueOwner, thread, pendingComment, pendingEdits) {
+    async displayCommentThread(uniqueOwner, thread, pendingComment, pendingEdits) {
         const editor = this.editor?.getModel();
         if (!editor) {
             return;
@@ -983,7 +983,7 @@ let CommentController = class CommentController {
             continueOnCommentReply = this.commentService.removeContinueOnComment({ uniqueOwner, uri: editor.uri, range: thread.range, isReply: true });
         }
         const zoneWidget = this.instantiationService.createInstance(ReviewZoneWidget, this.editor, uniqueOwner, thread, pendingComment ?? continueOnCommentReply?.body, pendingEdits);
-        zoneWidget.display(thread.range);
+        await zoneWidget.display(thread.range);
         this._commentWidgets.push(zoneWidget);
         this.openCommentsView(thread);
     }
@@ -1228,7 +1228,7 @@ let CommentController = class CommentController {
             this.updateEditorLayoutOptions(this.editor, newOptions.extraEditorClassName, newOptions.lineDecorationsWidth);
         }
     }
-    setComments(commentInfos) {
+    async setComments(commentInfos) {
         if (!this.editor || !this.commentService.isCommentingEnabled) {
             return;
         }
@@ -1236,14 +1236,14 @@ let CommentController = class CommentController {
         this.tryUpdateReservedSpace();
         this.removeCommentWidgetsAndStoreCache();
         let hasCommentingRanges = false;
-        this._commentInfos.forEach(info => {
+        for (const info of this._commentInfos) {
             if (!hasCommentingRanges && (info.commentingRanges.ranges.length > 0 || info.commentingRanges.fileComments)) {
                 hasCommentingRanges = true;
             }
             const providerCacheStore = this._pendingNewCommentCache[info.uniqueOwner];
             const providerEditsCacheStore = this._pendingEditsCache[info.uniqueOwner];
             info.threads = info.threads.filter(thread => !thread.isDisposed);
-            info.threads.forEach(thread => {
+            for (const thread of info.threads) {
                 let pendingComment = undefined;
                 if (providerCacheStore) {
                     pendingComment = providerCacheStore[thread.threadId];
@@ -1252,12 +1252,12 @@ let CommentController = class CommentController {
                 if (providerEditsCacheStore) {
                     pendingEdits = providerEditsCacheStore[thread.threadId];
                 }
-                this.displayCommentThread(info.uniqueOwner, thread, pendingComment, pendingEdits);
-            });
+                await this.displayCommentThread(info.uniqueOwner, thread, pendingComment, pendingEdits);
+            }
             for (const thread of info.pendingCommentThreads ?? []) {
                 this.resumePendingComment(this.editor.getModel().uri, thread);
             }
-        });
+        }
         this._commentingRangeDecorator.update(this.editor, this._commentInfos);
         this._commentThreadRangeDecorator.update(this.editor, this._commentInfos);
         if (hasCommentingRanges) {

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

@@ -4,7 +4,7 @@ import { localize2WithPath, localizeWithPath } from '../../../../nls.js';
 import { renderMarkdown } from '../../../../base/browser/markdownRenderer.js';
 import { DisposableStore } from '../../../../base/common/lifecycle.js';
 import { IOpenerService } from '../../../../platform/opener/common/opener.service.js';
-import { CommentNode, ResourceWithCommentThreads } from '../common/commentModel.js';
+import { ResourceWithCommentThreads, CommentNode } from '../common/commentModel.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
 import { WorkbenchObjectTree } from '../../../../platform/list/browser/listService.js';
@@ -20,15 +20,15 @@ import { FilterOptions } from './commentsFilterOptions.js';
 import { basename } from '../../../../base/common/resources.js';
 import { openLinkFromMarkdown } from '../../../../editor/browser/widget/markdownRenderer/browser/markdownRenderer.js';
 import { CommentsModel } from './commentsModel.js';
-import { setupCustomHover } from '../../../../base/browser/ui/hover/updatableHoverWidget.js';
 import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
 import { ActionBar } from '../../../../base/browser/ui/actionbar/actionbar.js';
-import { createActionViewItem, createAndFillInContextMenuActions } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
+import { createAndFillInContextMenuActions, createActionViewItem } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
 import { MenuId } from '../../../../platform/actions/common/actions.js';
 import { IMenuService } from '../../../../platform/actions/common/actions.service.js';
 import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.service.js';
 import { ActionViewItem } from '../../../../base/browser/ui/actionbar/actionViewItems.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.service.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.service.js';
 const _moduleId = "vs/workbench/contrib/comments/browser/commentsTreeViewer";
 const COMMENTS_VIEW_ID = 'workbench.panel.comments';
 const COMMENTS_VIEW_STORAGE_ID = 'Comments';
@@ -121,11 +121,12 @@ CommentsMenus = ( (__decorate([
     ( (__param(0, IMenuService)))
 ], CommentsMenus)));
 let CommentNodeRenderer = class CommentNodeRenderer {
-    constructor(actionViewItemProvider, menus, openerService, configurationService, themeService) {
+    constructor(actionViewItemProvider, menus, openerService, configurationService, hoverService, themeService) {
         this.actionViewItemProvider = actionViewItemProvider;
         this.menus = menus;
         this.openerService = openerService;
         this.configurationService = configurationService;
+        this.hoverService = hoverService;
         this.themeService = themeService;
         this.templateId = 'comment-node';
     }
@@ -136,7 +137,11 @@ let CommentNodeRenderer = class CommentNodeRenderer {
         const threadMetadata = {
             icon: append(metadata, $('.icon')),
             userNames: append(metadata, $('.user')),
-            timestamp: ( (new TimestampWidget(this.configurationService, append(metadata, $('.timestamp-container'))))),
+            timestamp: ( (new TimestampWidget(
+                this.configurationService,
+                this.hoverService,
+                append(metadata, $('.timestamp-container'))
+            ))),
             relevance: append(metadata, $('.relevance')),
             separator: append(metadata, $('.separator')),
             commentPreview: append(metadata, $('.text')),
@@ -156,6 +161,7 @@ let CommentNodeRenderer = class CommentNodeRenderer {
             separator: append(snippetContainer, $('.separator')),
             timestamp: ( (new TimestampWidget(
                 this.configurationService,
+                this.hoverService,
                 append(snippetContainer, $('.timestamp-container'))
             ))),
         };
@@ -165,11 +171,14 @@ let CommentNodeRenderer = class CommentNodeRenderer {
         return { threadMetadata, repliesMetadata, actionBar, disposables };
     }
     getCountString(commentCount) {
-        if (commentCount > 1) {
-            return ( localizeWithPath(_moduleId, 1, "{0} comments", commentCount));
+        if (commentCount > 2) {
+            return ( localizeWithPath(_moduleId, 1, "{0} replies", commentCount - 1));
+        }
+        else if (commentCount === 2) {
+            return ( localizeWithPath(_moduleId, 2, "1 reply"));
         }
         else {
-            return ( localizeWithPath(_moduleId, 2, "1 comment"));
+            return ( localizeWithPath(_moduleId, 3, "1 comment"));
         }
     }
     getRenderedComment(commentBody, disposables) {
@@ -184,7 +193,7 @@ let CommentNodeRenderer = class CommentNodeRenderer {
         for (let i = 0; i < images.length; i++) {
             const image = images[i];
             const textDescription = $('');
-            textDescription.textContent = image.alt ? ( localizeWithPath(_moduleId, 3, "Image: {0}", image.alt)) : ( localizeWithPath(_moduleId, 4, "Image"));
+            textDescription.textContent = image.alt ? ( localizeWithPath(_moduleId, 4, "Image: {0}", image.alt)) : ( localizeWithPath(_moduleId, 5, "Image"));
             image.parentNode.replaceChild(textDescription, image);
         }
         return renderedComment;
@@ -202,7 +211,7 @@ let CommentNodeRenderer = class CommentNodeRenderer {
         const commentCount = node.element.replies.length + 1;
         if (node.element.threadRelevance === CommentThreadApplicability.Outdated) {
             templateData.threadMetadata.relevance.style.display = '';
-            templateData.threadMetadata.relevance.innerText = ( localizeWithPath(_moduleId, 5, "Outdated"));
+            templateData.threadMetadata.relevance.innerText = ( localizeWithPath(_moduleId, 6, "Outdated"));
             templateData.threadMetadata.separator.style.display = 'none';
         }
         else {
@@ -232,16 +241,16 @@ let CommentNodeRenderer = class CommentNodeRenderer {
             const renderedComment = this.getRenderedComment(originalComment.comment.body, disposables);
             templateData.disposables.push(renderedComment);
             templateData.threadMetadata.commentPreview.appendChild(renderedComment.element.firstElementChild ?? renderedComment.element);
-            templateData.disposables.push(setupCustomHover(getDefaultHoverDelegate('mouse'), templateData.threadMetadata.commentPreview, renderedComment.element.textContent ?? ''));
+            templateData.disposables.push(this.hoverService.setupUpdatableHover(getDefaultHoverDelegate('mouse'), templateData.threadMetadata.commentPreview, renderedComment.element.textContent ?? ''));
         }
         if (node.element.range) {
             if (node.element.range.startLineNumber === node.element.range.endLineNumber) {
-                templateData.threadMetadata.range.textContent = ( localizeWithPath(_moduleId, 6, "[Ln {0}]", node.element.range.startLineNumber));
+                templateData.threadMetadata.range.textContent = ( localizeWithPath(_moduleId, 7, "[Ln {0}]", node.element.range.startLineNumber));
             }
             else {
                 templateData.threadMetadata.range.textContent = ( localizeWithPath(
                     _moduleId,
-                    7,
+                    8,
                     "[Ln {0}-{1}]",
                     node.element.range.startLineNumber,
                     node.element.range.endLineNumber
@@ -262,7 +271,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 = ( localizeWithPath(_moduleId, 8, "Last reply from {0}", lastComment.userName));
+        templateData.repliesMetadata.lastReplyDetail.textContent = ( localizeWithPath(_moduleId, 9, "Last reply from {0}", lastComment.userName));
         templateData.repliesMetadata.timestamp.setTimestamp(lastComment.timestamp ? ( (new Date(lastComment.timestamp))) : undefined);
     }
     getCommentThreadWidgetStateColor(state, theme) {
@@ -276,7 +285,8 @@ let CommentNodeRenderer = class CommentNodeRenderer {
 CommentNodeRenderer = ( (__decorate([
     ( (__param(2, IOpenerService))),
     ( (__param(3, IConfigurationService))),
-    ( (__param(4, IThemeService)))
+    ( (__param(4, IHoverService))),
+    ( (__param(5, IThemeService)))
 ], CommentNodeRenderer)));
 class Filter {
     constructor(options) {
@@ -430,4 +440,4 @@ CommentsList = ( (__decorate([
     ( (__param(7, IContextMenuService))),
     ( (__param(8, IKeybindingService)))
 ], CommentsList)));
-export { COMMENTS_VIEW_ID, COMMENTS_VIEW_STORAGE_ID, COMMENTS_VIEW_TITLE, CommentNodeRenderer, CommentsList, Filter, ResourceWithCommentsRenderer };
+export { COMMENTS_VIEW_ID, COMMENTS_VIEW_STORAGE_ID, COMMENTS_VIEW_TITLE, CommentNodeRenderer, CommentsList, CommentsMenus, Filter, ResourceWithCommentsRenderer };