@codingame/monaco-vscode-api 4.5.1 → 5.0.0

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

@@ -3,23 +3,24 @@ import { URI } from '../../../../base/common/uri.js';
 import { localizeWithPath } from '../../../../nls.js';
 import { ResourceWithCommentThreads } from '../common/commentModel.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
+const _moduleId = "vs/workbench/contrib/comments/browser/commentsModel";
 class CommentsModel extends Disposable {
     get resourceCommentThreads() { return this._resourceCommentThreads; }
     constructor() {
         super();
         this._resourceCommentThreads = [];
-        this.commentThreadsMap = ( new Map());
+        this.commentThreadsMap = ( (new Map()));
     }
     updateResourceCommentThreads() {
         const includeLabel = this.commentThreadsMap.size > 1;
-        this._resourceCommentThreads = ( [...( this.commentThreadsMap.values())].map(value => {
-            return ( value.resourceWithCommentThreads.map(resource => {
+        this._resourceCommentThreads = ( ([...( (this.commentThreadsMap.values()))].map(value => {
+            return ( (value.resourceWithCommentThreads.map(resource => {
                 resource.ownerLabel = includeLabel ? value.ownerLabel : undefined;
                 return resource;
-            })).flat();
-        })).flat();
+            }))).flat();
+        }))).flat();
         this._resourceCommentThreads.sort((a, b) => {
-            return ( a.resource.toString()) > ( b.resource.toString()) ? 1 : -1;
+            return ( (a.resource.toString())) > ( (b.resource.toString())) ? 1 : -1;
         });
     }
     setCommentThreads(uniqueOwner, owner, ownerLabel, commentThreads) {
@@ -58,14 +59,14 @@ class CommentsModel extends Disposable {
             }
             const index = matchingResourceData.commentThreads.findIndex((commentThread) => commentThread.threadId === thread.threadId);
             if (index >= 0) {
-                matchingResourceData.commentThreads[index] = ResourceWithCommentThreads.createCommentNode(uniqueOwner, owner, ( URI.parse(matchingResourceData.id)), thread);
+                matchingResourceData.commentThreads[index] = ResourceWithCommentThreads.createCommentNode(uniqueOwner, owner, ( (URI.parse(matchingResourceData.id))), thread);
             }
             else if (thread.comments && thread.comments.length) {
-                matchingResourceData.commentThreads.push(ResourceWithCommentThreads.createCommentNode(uniqueOwner, owner, ( URI.parse(matchingResourceData.id)), thread));
+                matchingResourceData.commentThreads.push(ResourceWithCommentThreads.createCommentNode(uniqueOwner, owner, ( (URI.parse(matchingResourceData.id))), thread));
             }
         });
         added.forEach(thread => {
-            const existingResource = threadsForOwner.filter(resourceWithThreads => ( resourceWithThreads.resource.toString()) === thread.resource);
+            const existingResource = threadsForOwner.filter(resourceWithThreads => ( (resourceWithThreads.resource.toString())) === thread.resource);
             if (existingResource.length) {
                 const resource = existingResource[0];
                 if (thread.comments && thread.comments.length) {
@@ -73,7 +74,7 @@ class CommentsModel extends Disposable {
                 }
             }
             else {
-                threadsForOwner.push(( new ResourceWithCommentThreads(uniqueOwner, owner, ( URI.parse(thread.resource)), [thread])));
+                threadsForOwner.push(( (new ResourceWithCommentThreads(uniqueOwner, owner,  (URI.parse(thread.resource)), [thread]))));
             }
         });
         this.commentThreadsMap.set(uniqueOwner, { ownerLabel, resourceWithCommentThreads: threadsForOwner });
@@ -85,11 +86,7 @@ class CommentsModel extends Disposable {
     }
     getMessage() {
         if (!this._resourceCommentThreads.length) {
-            return ( localizeWithPath(
-                'vs/workbench/contrib/comments/browser/commentsModel',
-                'noComments',
-                "There are no comments in this workspace yet."
-            ));
+            return ( localizeWithPath(_moduleId, 0, "There are no comments in this workspace yet."));
         }
         else {
             return '';
@@ -97,9 +94,9 @@ class CommentsModel extends Disposable {
     }
     groupByResource(uniqueOwner, owner, commentThreads) {
         const resourceCommentThreads = [];
-        const commentThreadsByResource = ( new Map());
+        const commentThreadsByResource = ( (new Map()));
         for (const group of groupBy(commentThreads, CommentsModel._compareURIs)) {
-            commentThreadsByResource.set(group[0].resource, ( new ResourceWithCommentThreads(uniqueOwner, owner, ( URI.parse(group[0].resource)), group)));
+            commentThreadsByResource.set(group[0].resource, ( (new ResourceWithCommentThreads(uniqueOwner, owner,  (URI.parse(group[0].resource)), group))));
         }
         commentThreadsByResource.forEach((v, i, m) => {
             resourceCommentThreads.push(v);
@@ -107,8 +104,8 @@ class CommentsModel extends Disposable {
         return resourceCommentThreads;
     }
     static _compareURIs(a, b) {
-        const resourceA = ( a.resource.toString());
-        const resourceB = ( b.resource.toString());
+        const resourceA = ( (a.resource.toString()));
+        const resourceB = ( (b.resource.toString()));
         if (resourceA < resourceB) {
             return -1;
         }

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

@@ -20,22 +20,19 @@ 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';
-const COMMENTS_VIEW_TITLE = ( localize2WithPath(
-    'vs/workbench/contrib/comments/browser/commentsTreeViewer',
-    'comments.view.title',
-    "Comments"
-));
+const COMMENTS_VIEW_TITLE = ( localize2WithPath(_moduleId, 0, "Comments"));
 class CommentsModelVirualDelegate {
     static { this.RESOURCE_ID = 'resource-with-comments'; }
     static { this.COMMENT_ID = 'comment-node'; }
@@ -120,15 +117,16 @@ let CommentsMenus = class CommentsMenus {
         this.contextKeyService = undefined;
     }
 };
-CommentsMenus = ( __decorate([
-    ( __param(0, IMenuService))
-], CommentsMenus));
+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';
     }
@@ -139,10 +137,11 @@ let CommentNodeRenderer = class CommentNodeRenderer {
         const threadMetadata = {
             icon: append(metadata, $('.icon')),
             userNames: append(metadata, $('.user')),
-            timestamp: ( new TimestampWidget(
+            timestamp: ( (new TimestampWidget(
                 this.configurationService,
+                this.hoverService,
                 append(metadata, $('.timestamp-container'))
-            )),
+            ))),
             relevance: append(metadata, $('.relevance')),
             separator: append(metadata, $('.separator')),
             commentPreview: append(metadata, $('.text')),
@@ -150,9 +149,9 @@ let CommentNodeRenderer = class CommentNodeRenderer {
         };
         threadMetadata.separator.innerText = '\u00b7';
         const actionsContainer = append(metadataContainer, $('.actions'));
-        const actionBar = ( new ActionBar(actionsContainer, {
+        const actionBar = ( (new ActionBar(actionsContainer, {
             actionViewItemProvider: this.actionViewItemProvider
-        }));
+        })));
         const snippetContainer = append(threadContainer, $('.comment-snippet-container'));
         const repliesMetadata = {
             container: snippetContainer,
@@ -160,10 +159,11 @@ let CommentNodeRenderer = class CommentNodeRenderer {
             count: append(snippetContainer, $('.count')),
             lastReplyDetail: append(snippetContainer, $('.reply-detail')),
             separator: append(snippetContainer, $('.separator')),
-            timestamp: ( new TimestampWidget(
+            timestamp: ( (new TimestampWidget(
                 this.configurationService,
+                this.hoverService,
                 append(snippetContainer, $('.timestamp-container'))
-            )),
+            ))),
         };
         repliesMetadata.separator.innerText = '\u00b7';
         repliesMetadata.icon.classList.add(...ThemeIcon.asClassNameArray(Codicon.indent));
@@ -171,20 +171,14 @@ let CommentNodeRenderer = class CommentNodeRenderer {
         return { threadMetadata, repliesMetadata, actionBar, disposables };
     }
     getCountString(commentCount) {
-        if (commentCount > 1) {
-            return ( localizeWithPath(
-                'vs/workbench/contrib/comments/browser/commentsTreeViewer',
-                'commentsCount',
-                "{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(
-                'vs/workbench/contrib/comments/browser/commentsTreeViewer',
-                'commentCount',
-                "1 comment"
-            ));
+            return ( localizeWithPath(_moduleId, 3, "1 comment"));
         }
     }
     getRenderedComment(commentBody, disposables) {
@@ -199,16 +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(
-                'vs/workbench/contrib/comments/browser/commentsTreeViewer',
-                'imageWithLabel',
-                "Image: {0}",
-                image.alt
-            )) : ( localizeWithPath(
-                'vs/workbench/contrib/comments/browser/commentsTreeViewer',
-                'image',
-                "Image"
-            ));
+            textDescription.textContent = image.alt ? ( localizeWithPath(_moduleId, 4, "Image: {0}", image.alt)) : ( localizeWithPath(_moduleId, 5, "Image"));
             image.parentNode.replaceChild(textDescription, image);
         }
         return renderedComment;
@@ -226,11 +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(
-                'vs/workbench/contrib/comments/browser/commentsTreeViewer',
-                'outdated',
-                "Outdated"
-            ));
+            templateData.threadMetadata.relevance.innerText = ( localizeWithPath(_moduleId, 6, "Outdated"));
             templateData.threadMetadata.separator.style.display = 'none';
         }
         else {
@@ -238,7 +219,7 @@ let CommentNodeRenderer = class CommentNodeRenderer {
             templateData.threadMetadata.relevance.style.display = 'none';
             templateData.threadMetadata.separator.style.display = '';
         }
-        templateData.threadMetadata.icon.classList.remove(...Array.from(( templateData.threadMetadata.icon.classList.values()))
+        templateData.threadMetadata.icon.classList.remove(...Array.from(( (templateData.threadMetadata.icon.classList.values())))
             .filter(value => value.startsWith('codicon')));
         templateData.threadMetadata.icon.classList.add(...ThemeIcon.asClassNameArray(this.getIcon(node.element.threadState)));
         if (node.element.threadState !== undefined) {
@@ -247,7 +228,7 @@ let CommentNodeRenderer = class CommentNodeRenderer {
             templateData.threadMetadata.icon.style.color = `var(${commentViewThreadStateColorVar})`;
         }
         templateData.threadMetadata.userNames.textContent = node.element.comment.userName;
-        templateData.threadMetadata.timestamp.setTimestamp(node.element.comment.timestamp ? ( new Date(node.element.comment.timestamp)) : undefined);
+        templateData.threadMetadata.timestamp.setTimestamp(node.element.comment.timestamp ? ( (new Date(node.element.comment.timestamp))) : undefined);
         const originalComment = node.element;
         templateData.threadMetadata.commentPreview.innerText = '';
         templateData.threadMetadata.commentPreview.style.height = '22px';
@@ -255,26 +236,21 @@ let CommentNodeRenderer = class CommentNodeRenderer {
             templateData.threadMetadata.commentPreview.innerText = originalComment.comment.body;
         }
         else {
-            const disposables = ( new DisposableStore());
+            const disposables = ( (new DisposableStore()));
             templateData.disposables.push(disposables);
             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(
-                    'vs/workbench/contrib/comments/browser/commentsTreeViewer',
-                    'commentLine',
-                    "[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(
-                    'vs/workbench/contrib/comments/browser/commentsTreeViewer',
-                    'commentRange',
+                    _moduleId,
+                    8,
                     "[Ln {0}-{1}]",
                     node.element.range.startLineNumber,
                     node.element.range.endLineNumber
@@ -295,13 +271,8 @@ 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(
-            'vs/workbench/contrib/comments/browser/commentsTreeViewer',
-            'lastReplyFrom',
-            "Last reply from {0}",
-            lastComment.userName
-        ));
-        templateData.repliesMetadata.timestamp.setTimestamp(lastComment.timestamp ? ( new Date(lastComment.timestamp)) : undefined);
+        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) {
         return (state !== undefined) ? getCommentThreadStateIconColor(state, theme) : undefined;
@@ -311,11 +282,12 @@ let CommentNodeRenderer = class CommentNodeRenderer {
         templateData.actionBar.dispose();
     }
 };
-CommentNodeRenderer = ( __decorate([
-    ( __param(2, IOpenerService)),
-    ( __param(3, IConfigurationService)),
-    ( __param(4, IThemeService))
-], CommentNodeRenderer));
+CommentNodeRenderer = ( (__decorate([
+    ( (__param(2, IOpenerService))),
+    ( (__param(3, IConfigurationService))),
+    ( (__param(4, IHoverService))),
+    ( (__param(5, IThemeService)))
+], CommentNodeRenderer)));
 class Filter {
     constructor(options) {
         this.options = options;
@@ -352,10 +324,10 @@ class Filter {
         const textMatches =
         FilterOptions._messageFilter(this.options.textFilter.text, typeof comment.comment.body === 'string' ? comment.comment.body : comment.comment.body.value)
             || FilterOptions._messageFilter(this.options.textFilter.text, comment.comment.userName)
-            || ( comment.replies.map(reply => {
+            || ( (comment.replies.map(reply => {
                 return FilterOptions._messageFilter(this.options.textFilter.text, reply.comment.userName)
                     || FilterOptions._messageFilter(this.options.textFilter.text, typeof reply.comment.body === 'string' ? reply.comment.body : reply.comment.body.value);
-            })).filter(value => !!value).flat();
+            }))).filter(value => !!value).flat();
         if (textMatches.length && !this.options.textFilter.negate) {
             return { visibility: true, data: { type: 1 , textMatches } };
         }
@@ -370,7 +342,7 @@ class Filter {
 }
 let CommentsList = class CommentsList extends WorkbenchObjectTree {
     constructor(labels, container, options, contextKeyService, listService, instantiationService, configurationService, contextMenuService, keybindingService) {
-        const delegate = ( new CommentsModelVirualDelegate());
+        const delegate = ( (new CommentsModelVirualDelegate()));
         const actionViewItemProvider = createActionViewItem.bind(undefined, instantiationService);
         const menus = instantiationService.createInstance(CommentsMenus);
         menus.setContextKeyService(contextKeyService);
@@ -389,7 +361,7 @@ let CommentsList = class CommentsList extends WorkbenchObjectTree {
                         return `${element.uniqueOwner}-${element.id}`;
                     }
                     if (element instanceof CommentNode) {
-                        return `${element.uniqueOwner}-${( element.resource.toString())}-${element.threadId}-${element.comment.uniqueIdInThread}` + (element.isRoot ? '-root' : '');
+                        return `${element.uniqueOwner}-${( (element.resource.toString()))}-${element.threadId}-${element.comment.uniqueIdInThread}` + (element.isRoot ? '-root' : '');
                     }
                     return '';
                 }
@@ -425,7 +397,9 @@ let CommentsList = class CommentsList extends WorkbenchObjectTree {
             getActionViewItem: (action) => {
                 const keybinding = this.keybindingService.lookupKeybinding(action.id);
                 if (keybinding) {
-                    return ( new ActionViewItem(action, action, { label: true, keybinding: keybinding.getLabel() }));
+                    return (
+                         (new ActionViewItem(action, action, { label: true, keybinding: keybinding.getLabel() }))
+                    );
                 }
                 return undefined;
             },
@@ -458,12 +432,12 @@ let CommentsList = class CommentsList extends WorkbenchObjectTree {
         return filtered;
     }
 };
-CommentsList = ( __decorate([
-    ( __param(3, IContextKeyService)),
-    ( __param(4, IListService)),
-    ( __param(5, IInstantiationService)),
-    ( __param(6, IConfigurationService)),
-    ( __param(7, IContextMenuService)),
-    ( __param(8, IKeybindingService))
-], CommentsList));
-export { COMMENTS_VIEW_ID, COMMENTS_VIEW_STORAGE_ID, COMMENTS_VIEW_TITLE, CommentNodeRenderer, CommentsList, Filter, ResourceWithCommentsRenderer };
+CommentsList = ( (__decorate([
+    ( (__param(3, IContextKeyService))),
+    ( (__param(4, IListService))),
+    ( (__param(5, IInstantiationService))),
+    ( (__param(6, IConfigurationService))),
+    ( (__param(7, IContextMenuService))),
+    ( (__param(8, IKeybindingService)))
+], CommentsList)));
+export { COMMENTS_VIEW_ID, COMMENTS_VIEW_STORAGE_ID, COMMENTS_VIEW_TITLE, CommentNodeRenderer, CommentsList, CommentsMenus, Filter, ResourceWithCommentsRenderer };