@codingame/monaco-vscode-api 3.2.2 → 4.0.0

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.js';
-import { ResourceWithCommentThreads, CommentNode } from '../common/commentModel.js';
+import { CommentNode, ResourceWithCommentThreads } from '../common/commentModel.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
 import { WorkbenchObjectTree, IListService } from '../../../../platform/list/browser/listService.js';
@@ -14,11 +14,19 @@ import { TimestampWidget } from './timestamp.js';
 import { Codicon } from '../../../../base/common/codicons.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
 import { commentViewThreadStateColorVar, getCommentThreadStateIconColor } from './commentColors.js';
-import { CommentThreadState } from '../../../../editor/common/languages.js';
+import { CommentThreadState, CommentThreadApplicability } from '../../../../editor/common/languages.js';
 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 { MenuId, IMenuService } from '../../../../platform/actions/common/actions.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { ActionViewItem } from '../../../../base/browser/ui/actionbar/actionViewItems.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
 const COMMENTS_VIEW_ID = 'workbench.panel.comments';
 const COMMENTS_VIEW_STORAGE_ID = 'Comments';
 const COMMENTS_VIEW_TITLE = ( localize2WithPath(
@@ -73,8 +81,50 @@ class ResourceWithCommentsRenderer {
         templateData.resourceLabel.dispose();
     }
 }
+let CommentsMenus = class CommentsMenus {
+    constructor(menuService) {
+        this.menuService = menuService;
+    }
+    getResourceActions(element) {
+        const actions = this.getActions(MenuId.CommentsViewThreadActions, element);
+        return { menu: actions.menu, actions: actions.primary };
+    }
+    getResourceContextActions(element) {
+        return this.getActions(MenuId.CommentsViewThreadActions, element).secondary;
+    }
+    setContextKeyService(service) {
+        this.contextKeyService = service;
+    }
+    getActions(menuId, element) {
+        if (!this.contextKeyService) {
+            return { primary: [], secondary: [] };
+        }
+        const overlay = [
+            ['commentController', element.owner],
+            ['resourceScheme', element.resource.scheme],
+            ['commentThread', element.contextValue],
+            ['canReply', element.thread.canReply]
+        ];
+        const contextKeyService = this.contextKeyService.createOverlay(overlay);
+        const menu = this.menuService.createMenu(menuId, contextKeyService);
+        const primary = [];
+        const secondary = [];
+        const result = { primary, secondary, menu };
+        createAndFillInContextMenuActions(menu, { shouldForwardArgs: true }, result, 'inline');
+        menu.dispose();
+        return result;
+    }
+    dispose() {
+        this.contextKeyService = undefined;
+    }
+};
+CommentsMenus = ( __decorate([
+    ( __param(0, IMenuService))
+], CommentsMenus));
 let CommentNodeRenderer = class CommentNodeRenderer {
-    constructor(openerService, configurationService, themeService) {
+    constructor(actionViewItemProvider, menus, openerService, configurationService, themeService) {
+        this.actionViewItemProvider = actionViewItemProvider;
+        this.menus = menus;
         this.openerService = openerService;
         this.configurationService = configurationService;
         this.themeService = themeService;
@@ -83,18 +133,24 @@ let CommentNodeRenderer = class CommentNodeRenderer {
     renderTemplate(container) {
         const threadContainer = append(container, $('.comment-thread-container'));
         const metadataContainer = append(threadContainer, $('.comment-metadata-container'));
+        const metadata = append(metadataContainer, $('.comment-metadata'));
         const threadMetadata = {
-            icon: append(metadataContainer, $('.icon')),
-            userNames: append(metadataContainer, $('.user')),
+            icon: append(metadata, $('.icon')),
+            userNames: append(metadata, $('.user')),
             timestamp: ( new TimestampWidget(
                 this.configurationService,
-                append(metadataContainer, $('.timestamp-container'))
+                append(metadata, $('.timestamp-container'))
             )),
-            separator: append(metadataContainer, $('.separator')),
-            commentPreview: append(metadataContainer, $('.text')),
-            range: append(metadataContainer, $('.range'))
+            relevance: append(metadata, $('.relevance')),
+            separator: append(metadata, $('.separator')),
+            commentPreview: append(metadata, $('.text')),
+            range: append(metadata, $('.range'))
         };
         threadMetadata.separator.innerText = '\u00b7';
+        const actionsContainer = append(metadataContainer, $('.actions'));
+        const actionBar = ( new ActionBar(actionsContainer, {
+            actionViewItemProvider: this.actionViewItemProvider
+        }));
         const snippetContainer = append(threadContainer, $('.comment-snippet-container'));
         const repliesMetadata = {
             container: snippetContainer,
@@ -110,7 +166,7 @@ let CommentNodeRenderer = class CommentNodeRenderer {
         repliesMetadata.separator.innerText = '\u00b7';
         repliesMetadata.icon.classList.add(...ThemeIcon.asClassNameArray(Codicon.indent));
         const disposables = [threadMetadata.timestamp, repliesMetadata.timestamp];
-        return { threadMetadata, repliesMetadata, disposables };
+        return { threadMetadata, repliesMetadata, actionBar, disposables };
     }
     getCountString(commentCount) {
         if (commentCount > 1) {
@@ -164,7 +220,22 @@ let CommentNodeRenderer = class CommentNodeRenderer {
         }
     }
     renderElement(node, index, templateData, height) {
+        templateData.actionBar.clear();
         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.separator.style.display = 'none';
+        }
+        else {
+            templateData.threadMetadata.relevance.innerText = '';
+            templateData.threadMetadata.relevance.style.display = 'none';
+            templateData.threadMetadata.separator.style.display = '';
+        }
         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)));
@@ -187,7 +258,7 @@ 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.threadMetadata.commentPreview.title = renderedComment.element.textContent ?? '';
+            templateData.disposables.push(setupCustomHover(getDefaultHoverDelegate('mouse'), templateData.threadMetadata.commentPreview, renderedComment.element.textContent ?? ''));
         }
         if (node.element.range) {
             if (node.element.range.startLineNumber === node.element.range.endLineNumber) {
@@ -208,6 +279,13 @@ let CommentNodeRenderer = class CommentNodeRenderer {
                 ));
             }
         }
+        const menuActions = this.menus.getResourceActions(node.element);
+        templateData.actionBar.push(menuActions.actions, { icon: true, label: false });
+        templateData.actionBar.context = {
+            commentControlHandle: node.element.controllerHandle,
+            commentThreadHandle: node.element.threadHandle,
+            $mid: 7
+        };
         if (!node.element.hasReply()) {
             templateData.repliesMetadata.container.style.display = 'none';
             return;
@@ -228,12 +306,13 @@ let CommentNodeRenderer = class CommentNodeRenderer {
     }
     disposeTemplate(templateData) {
         templateData.disposables.forEach(disposeable => disposeable.dispose());
+        templateData.actionBar.dispose();
     }
 };
 CommentNodeRenderer = ( __decorate([
-    ( __param(0, IOpenerService)),
-    ( __param(1, IConfigurationService)),
-    ( __param(2, IThemeService))
+    ( __param(2, IOpenerService)),
+    ( __param(3, IConfigurationService)),
+    ( __param(4, IThemeService))
 ], CommentNodeRenderer));
 class Filter {
     constructor(options) {
@@ -288,11 +367,14 @@ class Filter {
     }
 }
 let CommentsList = class CommentsList extends WorkbenchObjectTree {
-    constructor(labels, container, options, contextKeyService, listService, instantiationService, configurationService) {
+    constructor(labels, container, options, contextKeyService, listService, instantiationService, configurationService, contextMenuService, keybindingService) {
         const delegate = ( new CommentsModelVirualDelegate());
+        const actionViewItemProvider = createActionViewItem.bind(undefined, instantiationService);
+        const menus = instantiationService.createInstance(CommentsMenus);
+        menus.setContextKeyService(contextKeyService);
         const renderers = [
             instantiationService.createInstance(ResourceWithCommentsRenderer, labels),
-            instantiationService.createInstance(CommentNodeRenderer)
+            instantiationService.createInstance(CommentNodeRenderer, actionViewItemProvider, menus)
         ];
         super('CommentsTree', container, delegate, renderers, {
             accessibilityProvider: options.accessibilityProvider,
@@ -302,10 +384,10 @@ let CommentsList = class CommentsList extends WorkbenchObjectTree {
                         return 'root';
                     }
                     if (element instanceof ResourceWithCommentThreads) {
-                        return `${element.owner}-${element.id}`;
+                        return `${element.uniqueOwner}-${element.id}`;
                     }
                     if (element instanceof CommentNode) {
-                        return `${element.owner}-${( 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 '';
                 }
@@ -314,8 +396,49 @@ let CommentsList = class CommentsList extends WorkbenchObjectTree {
             collapseByDefault: false,
             overrideStyles: options.overrideStyles,
             filter: options.filter,
-            findWidgetEnabled: false
+            findWidgetEnabled: false,
+            multipleSelectionSupport: false,
         }, instantiationService, contextKeyService, listService, configurationService);
+        this.contextMenuService = contextMenuService;
+        this.keybindingService = keybindingService;
+        this.menus = menus;
+        this.disposables.add(this.onContextMenu(e => this.commentsOnContextMenu(e)));
+    }
+    commentsOnContextMenu(treeEvent) {
+        const node = treeEvent.element;
+        if (!(node instanceof CommentNode)) {
+            return;
+        }
+        const event = treeEvent.browserEvent;
+        event.preventDefault();
+        event.stopPropagation();
+        this.setFocus([node]);
+        const actions = this.menus.getResourceContextActions(node);
+        if (!actions.length) {
+            return;
+        }
+        this.contextMenuService.showContextMenu({
+            getAnchor: () => treeEvent.anchor,
+            getActions: () => actions,
+            getActionViewItem: (action) => {
+                const keybinding = this.keybindingService.lookupKeybinding(action.id);
+                if (keybinding) {
+                    return ( new ActionViewItem(action, action, { label: true, keybinding: keybinding.getLabel() }));
+                }
+                return undefined;
+            },
+            onHide: (wasCancelled) => {
+                if (wasCancelled) {
+                    this.domFocus();
+                }
+            },
+            getActionsContext: () => ({
+                commentControlHandle: node.controllerHandle,
+                commentThreadHandle: node.threadHandle,
+                $mid: 7 ,
+                thread: node.thread
+            })
+        });
     }
     filterComments() {
         this.refilter();
@@ -337,6 +460,8 @@ CommentsList = ( __decorate([
     ( __param(3, IContextKeyService)),
     ( __param(4, IListService)),
     ( __param(5, IInstantiationService)),
-    ( __param(6, IConfigurationService))
+    ( __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 };

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

@@ -1,15 +1,13 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import './media/panel.css.js';
 import { localizeWithPath } from '../../../../nls.js';
-import { append, $, createStyleSheet, isActiveElement } from '../../../../base/browser/dom.js';
+import { append, $, isActiveElement } from '../../../../base/browser/dom.js';
 import { basename } from '../../../../base/common/resources.js';
-import { isDiffEditor, isCodeEditor } from '../../../../editor/browser/editorBrowser.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { IThemeService } from '../../../../platform/theme/common/themeService.js';
 import { ResourceWithCommentThreads, CommentNode } from '../common/commentModel.js';
 import { ICommentService } from './commentService.js';
-import { SIDE_GROUP, ACTIVE_GROUP, IEditorService } from '../../../services/editor/common/editorService.js';
-import { textLinkForeground, textLinkActiveForeground, focusBorder, textPreformatForeground } from '../../../../platform/theme/common/colorRegistry.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
 import { ResourceLabels } from '../../../browser/labels.js';
 import { Filter, CommentsList, COMMENTS_VIEW_TITLE } from './commentsTreeViewer.js';
 import { FilterViewPane } from '../../../browser/parts/views/viewPane.js';
@@ -21,16 +19,14 @@ import { IKeybindingService } from '../../../../platform/keybinding/common/keybi
 import { IOpenerService } from '../../../../platform/opener/common/opener.js';
 import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
 import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
-import { TextModel } from '../../../../editor/common/model/textModel.js';
 import { CommentsViewFilterFocusContextKey } from './comments.js';
 import { CommentsFilters } from './commentsViewActions.js';
 import { Memento } from '../../../common/memento.js';
 import { IStorageService } from '../../../../platform/storage/common/storage.js';
 import { FilterOptions } from './commentsFilterOptions.js';
-import '../../../../editor/common/languages.js';
+import { CommentThreadApplicability } from '../../../../editor/common/languages.js';
 import { Iterable } from '../../../../base/common/iterator.js';
-import { CommentController } from './commentsController.js';
-import { Range } from '../../../../editor/common/core/range.js';
+import { revealCommentThread } from './commentsController.js';
 import { registerNavigableContainer } from '../../../browser/actions/widgetNavigationCommands.js';
 import { CommentsModel } from './commentsModel.js';
 const CONTEXT_KEY_HAS_COMMENTS = ( new RawContextKey('commentsView.hasComments', false));
@@ -162,9 +158,6 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
         this._register(this.commentService.onDidSetAllCommentThreads(this.onAllCommentsChanged, this));
         this._register(this.commentService.onDidUpdateCommentThreads(this.onCommentsUpdated, this));
         this._register(this.commentService.onDidDeleteDataProvider(this.onDataProviderDeleted, this));
-        const styleElement = createStyleSheet(container);
-        this.applyStyles(styleElement);
-        this._register(this.themeService.onDidColorThemeChange(_ => this.applyStyles(styleElement)));
         this._register(this.onDidChangeBodyVisibility(visible => {
             if (visible) {
                 this.refresh();
@@ -185,27 +178,6 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
             this.tree.domFocus();
         }
     }
-    applyStyles(styleElement) {
-        const content = [];
-        const theme = this.themeService.getColorTheme();
-        const linkColor = theme.getColor(textLinkForeground);
-        if (linkColor) {
-            content.push(`.comments-panel .comments-panel-container a { color: ${linkColor}; }`);
-        }
-        const linkActiveColor = theme.getColor(textLinkActiveForeground);
-        if (linkActiveColor) {
-            content.push(`.comments-panel .comments-panel-container a:hover, a:active { color: ${linkActiveColor}; }`);
-        }
-        const focusColor = theme.getColor(focusBorder);
-        if (focusColor) {
-            content.push(`.comments-panel .comments-panel-container a:focus { outline-color: ${focusColor}; }`);
-        }
-        const codeTextForegroundColor = theme.getColor(textPreformatForeground);
-        if (codeTextForegroundColor) {
-            content.push(`.comments-panel .comments-panel-container .text code { color: ${codeTextForegroundColor}; }`);
-        }
-        styleElement.textContent = content.join('\n');
-    }
     async renderComments() {
         this.treeContainer.classList.toggle('hidden', !this.commentService.commentsModel.hasCommentThreads());
         this.renderMessage();
@@ -248,6 +220,56 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
         this.messageBoxContainer.textContent = this.commentService.commentsModel.getMessage();
         this.messageBoxContainer.classList.toggle('hidden', this.commentService.commentsModel.hasCommentThreads());
     }
+    getAriaForNode(element) {
+        if (element.range) {
+            if (element.threadRelevance === CommentThreadApplicability.Outdated) {
+                return ( localizeWithPath(
+                    'vs/workbench/contrib/comments/browser/commentsView',
+                    'resourceWithCommentLabelOutdated',
+                    "Outdated from ${0} at line {1} column {2} in {3}, source: {4}",
+                    element.comment.userName,
+                    element.range.startLineNumber,
+                    element.range.startColumn,
+                    basename(element.resource),
+                    (typeof element.comment.body === 'string') ? element.comment.body : element.comment.body.value
+                ));
+            }
+            else {
+                return ( localizeWithPath(
+                    'vs/workbench/contrib/comments/browser/commentsView',
+                    'resourceWithCommentLabel',
+                    "${0} at line {1} column {2} in {3}, source: {4}",
+                    element.comment.userName,
+                    element.range.startLineNumber,
+                    element.range.startColumn,
+                    basename(element.resource),
+                    (typeof element.comment.body === 'string') ? element.comment.body : element.comment.body.value
+                ));
+            }
+        }
+        else {
+            if (element.threadRelevance === CommentThreadApplicability.Outdated) {
+                return ( localizeWithPath(
+                    'vs/workbench/contrib/comments/browser/commentsView',
+                    'resourceWithCommentLabelFileOutdated',
+                    "Outdated from {0} in {1}, source: {2}",
+                    element.comment.userName,
+                    basename(element.resource),
+                    (typeof element.comment.body === 'string') ? element.comment.body : element.comment.body.value
+                ));
+            }
+            else {
+                return ( localizeWithPath(
+                    'vs/workbench/contrib/comments/browser/commentsView',
+                    'resourceWithCommentLabelFile',
+                    "{0} in {1}, source: {2}",
+                    element.comment.userName,
+                    basename(element.resource),
+                    (typeof element.comment.body === 'string') ? element.comment.body : element.comment.body.value
+                ));
+            }
+        }
+    }
     createTree() {
         this.treeLabels = this._register(this.instantiationService.createInstance(ResourceLabels, this));
         this.tree = this._register(this.instantiationService.createInstance(CommentsList, this.treeLabels, this.treeContainer, {
@@ -260,7 +282,7 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
                 }
             },
             accessibilityProvider: {
-                getAriaLabel(element) {
+                getAriaLabel: (element) => {
                     if (element instanceof CommentsModel) {
                         return ( localizeWithPath(
                             'vs/workbench/contrib/comments/browser/commentsView',
@@ -278,28 +300,7 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
                         ));
                     }
                     if (element instanceof CommentNode) {
-                        if (element.range) {
-                            return ( localizeWithPath(
-                                'vs/workbench/contrib/comments/browser/commentsView',
-                                'resourceWithCommentLabel',
-                                "${0} at line {1} column {2} in {3}, source: {4}",
-                                element.comment.userName,
-                                element.range.startLineNumber,
-                                element.range.startColumn,
-                                basename(element.resource),
-                                (typeof element.comment.body === 'string') ? element.comment.body : element.comment.body.value
-                            ));
-                        }
-                        else {
-                            return ( localizeWithPath(
-                                'vs/workbench/contrib/comments/browser/commentsView',
-                                'resourceWithCommentLabelFile',
-                                "${0} in {1}, source: {2}",
-                                element.comment.userName,
-                                basename(element.resource),
-                                (typeof element.comment.body === 'string') ? element.comment.body : element.comment.body.value
-                            ));
-                        }
+                        return this.getAriaForNode(element);
                     }
                     return '';
                 },
@@ -320,49 +321,14 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
     }
     openFile(element, pinned, preserveFocus, sideBySide) {
         if (!element) {
-            return false;
+            return;
         }
         if (!(element instanceof ResourceWithCommentThreads || element instanceof CommentNode)) {
-            return false;
-        }
-        if (!this.commentService.isCommentingEnabled) {
-            this.commentService.enableCommenting(true);
-        }
-        const range = element instanceof ResourceWithCommentThreads ? element.commentThreads[0].range : element.range;
-        const activeEditor = this.editorService.activeTextEditorControl;
-        const currentActiveResources = isDiffEditor(activeEditor) ? [activeEditor.getOriginalEditor(), activeEditor.getModifiedEditor()]
-            : (activeEditor ? [activeEditor] : []);
-        for (const editor of currentActiveResources) {
-            const model = editor.getModel();
-            if ((model instanceof TextModel) && this.uriIdentityService.extUri.isEqual(element.resource, model.uri)) {
-                const threadToReveal = element instanceof ResourceWithCommentThreads ? element.commentThreads[0].threadId : element.threadId;
-                const commentToReveal = element instanceof ResourceWithCommentThreads ? element.commentThreads[0].comment.uniqueIdInThread : element.comment.uniqueIdInThread;
-                if (threadToReveal && isCodeEditor(editor)) {
-                    const controller = CommentController.get(editor);
-                    controller?.revealCommentThread(threadToReveal, commentToReveal, true, !preserveFocus);
-                }
-                return true;
-            }
+            return;
         }
-        const threadToReveal = element instanceof ResourceWithCommentThreads ? element.commentThreads[0].threadId : element.threadId;
-        const commentToReveal = element instanceof ResourceWithCommentThreads ? element.commentThreads[0].comment : element.comment;
-        this.editorService.openEditor({
-            resource: element.resource,
-            options: {
-                pinned: pinned,
-                preserveFocus: preserveFocus,
-                selection: range ?? ( new Range(1, 1, 1, 1))
-            }
-        }, sideBySide ? SIDE_GROUP : ACTIVE_GROUP).then(editor => {
-            if (editor) {
-                const control = editor.getControl();
-                if (threadToReveal && isCodeEditor(control)) {
-                    const controller = CommentController.get(control);
-                    controller?.revealCommentThread(threadToReveal, commentToReveal.uniqueIdInThread, true, !preserveFocus);
-                }
-            }
-        });
-        return true;
+        const threadToReveal = element instanceof ResourceWithCommentThreads ? element.commentThreads[0].thread : element.thread;
+        const commentToReveal = element instanceof ResourceWithCommentThreads ? element.commentThreads[0].comment : undefined;
+        return revealCommentThread(this.commentService, this.editorService, this.uriIdentityService, threadToReveal, commentToReveal, false, pinned, preserveFocus, sideBySide);
     }
     async refresh() {
         if (!this.tree) {

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

@@ -110,7 +110,7 @@ registerAction2(class extends ViewAction {
             title: ( localizeWithPath(
                 'vs/workbench/contrib/comments/browser/commentsViewActions',
                 'toggle unresolved',
-                "Toggle Unresolved Comments"
+                "Show Unresolved"
             )),
             category: ( localizeWithPath(
                 'vs/workbench/contrib/comments/browser/commentsViewActions',
@@ -145,7 +145,7 @@ registerAction2(class extends ViewAction {
             title: ( localizeWithPath(
                 'vs/workbench/contrib/comments/browser/commentsViewActions',
                 'toggle resolved',
-                "Toggle Resolved Comments"
+                "Show Resolved"
             )),
             category: ( localizeWithPath(
                 'vs/workbench/contrib/comments/browser/commentsViewActions',

package/vscode/src/vs/workbench/contrib/comments/browser/media/panel.css.js

@@ -1,4 +1,4 @@
 import n from '../../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
-var css = ".comments-panel .comments-panel-container{height:100%}.comments-panel .comments-panel-container .hidden{display:none}.comments-panel .comments-panel-container .tree-container{height:100%}.comments-panel .comments-panel-container .tree-container.hidden{display:none;visibility:hidden}.comments-panel .comments-panel-container .tree-container .comment-thread-container{display:block}.comments-panel .comments-panel-container .tree-container .comment-thread-container div{overflow:hidden}.comments-panel .comments-panel-container .tree-container .comment-thread-container .comment-metadata-container,.comments-panel .comments-panel-container .tree-container .comment-thread-container .comment-snippet-container,.comments-panel .comments-panel-container .tree-container .resource-container{display:flex;overflow:hidden;text-overflow:ellipsis}.comments-panel .count,.comments-panel .user{padding-right:5px}.comments-panel .comments-panel-container .tree-container .comment-thread-container .icon{min-width:fit-content;padding-right:5px;padding-top:4px}.comments-panel .comments-panel-container .tree-container .comment-thread-container .comment-metadata-container .user,.comments-panel .comments-panel-container .tree-container .comment-thread-container .comment-snippet-container .count{min-width:fit-content}.comments-panel .comments-panel-container .tree-container .comment-thread-container .comment-snippet-container .text{display:flex;flex:1;min-width:0}.comments-panel .comments-panel-container .tree-container .comment-thread-container .reply-detail,.comments-panel .comments-panel-container .tree-container .comment-thread-container .timestamp,.comments-panel .comments-panel-container .tree-container .resource-container .owner{display:block;font-size:.9em;opacity:.8;overflow:hidden;padding-right:5px;text-overflow:ellipsis}.comments-panel .comments-panel-container .tree-container .comment-thread-container .text *{margin:0;max-width:500px;overflow:hidden;padding-right:5px;text-overflow:ellipsis}.comments-panel .comments-panel-container .tree-container .comment-thread-container .range{opacity:.8}.comments-panel .comments-panel-container .tree-container .comment-thread-container .comment-snippet-container .text code{font-family:var(--monaco-monospace-font)}.comments-panel .comments-panel-container .tree-container .monaco-icon-label{padding-right:5px}.comments-panel .comments-panel-container .tree-container .separator{opacity:.8;padding-right:5px}.comments-panel .comments-panel-container .message-box-container{height:inherit;line-height:22px;padding-left:20px}.comments-panel .comments-panel-container .tree-container .count-badge-wrapper{margin-left:10px}.comments-panel .comments-panel-container .tree-container .comment-thread-container .comment-metadata-container,.comments-panel .comments-panel-container .tree-container .comment-thread-container .comment-snippet-container{line-height:22px;margin-right:5px}.comments-panel .comments-panel-container .tree-container .comment-thread-container .comment-snippet-container{padding-left:16px}.comments-panel .hide{display:none}";
+var css = ".comments-panel .comments-panel-container{height:100%}.comments-panel .comments-panel-container .hidden{display:none}.comments-panel .comments-panel-container .tree-container{height:100%}.comments-panel .comments-panel-container .tree-container.hidden{display:none;visibility:hidden}.comments-panel .comments-panel-container .tree-container .comment-thread-container{display:block}.comments-panel .comments-panel-container .tree-container .comment-thread-container div{overflow:hidden}.comments-panel .comments-panel-container .tree-container .comment-thread-container .comment-metadata-container,.comments-panel .comments-panel-container .tree-container .comment-thread-container .comment-snippet-container,.comments-panel .comments-panel-container .tree-container .resource-container{display:flex;overflow:hidden;text-overflow:ellipsis}.comments-panel .comments-panel-container .tree-container .comment-thread-container .comment-metadata{display:flex;flex:1}.comments-panel .count,.comments-panel .user{padding-right:5px}.comments-panel .comments-panel-container .tree-container .comment-thread-container .icon{min-width:fit-content;padding-right:5px;padding-top:4px}.comments-panel .comments-panel-container .tree-container .comment-thread-container .comment-metadata-container .relevance,.comments-panel .comments-panel-container .tree-container .comment-thread-container .comment-metadata-container .user,.comments-panel .comments-panel-container .tree-container .comment-thread-container .comment-snippet-container .count{min-width:fit-content}.comments-panel .comments-panel-container .tree-container .comment-thread-container .comment-metadata-container .relevance{background-color:var(--vscode-badge-background);border-radius:2px;color:var(--vscode-badge-foreground);font-size:.9em;line-height:14px;margin-bottom:3px;margin-right:4px;margin-top:4px;padding:0 4px 1px}.comments-panel .comments-panel-container .tree-container .comment-thread-container .comment-snippet-container .text{display:flex;flex:1;min-width:0}.comments-panel .comments-panel-container .tree-container .comment-thread-container .reply-detail,.comments-panel .comments-panel-container .tree-container .comment-thread-container .timestamp,.comments-panel .comments-panel-container .tree-container .resource-container .owner{display:block;font-size:.9em;opacity:.8;overflow:hidden;padding-right:5px;text-overflow:ellipsis}.comments-panel .comments-panel-container .tree-container .comment-thread-container .text *{margin:0;max-width:500px;overflow:hidden;padding-right:5px;text-overflow:ellipsis}.comments-panel .comments-panel-container .tree-container .comment-thread-container .range{opacity:.8}.comments-panel .comments-panel-container .tree-container .comment-thread-container .comment-snippet-container .text code{font-family:var(--monaco-monospace-font)}.comments-panel .comments-panel-container .tree-container .monaco-icon-label{padding-right:5px}.comments-panel .comments-panel-container .tree-container .separator{opacity:.8;padding-right:5px}.comments-panel .comments-panel-container .message-box-container{height:inherit;line-height:22px;padding-left:20px}.comments-panel .comments-panel-container .tree-container .count-badge-wrapper{margin-left:10px}.comments-panel .comments-panel-container .tree-container .comment-thread-container .comment-metadata-container,.comments-panel .comments-panel-container .tree-container .comment-thread-container .comment-snippet-container{line-height:22px;margin-right:5px}.comments-panel .comments-panel-container .tree-container .comment-thread-container .comment-snippet-container{padding-left:16px}.comments-panel .hide{display:none}.comments-panel .comments-panel-container .text a{color:var(--vscode-textLink-foreground)}.comments-panel .comments-panel-container .text a:hover,.comments-panel .comments-panel-container a:active{color:var(--vscode-textLink-activeForeground)}.comments-panel .comments-panel-container .text a:focus{outline-color:var(--vscode-focusBorder)}.comments-panel .comments-panel-container .text code{color:var(--vscode-textPreformat-foreground)}.comments-panel .comments-panel-container .actions{display:none}.comments-panel .comments-panel-container .actions .action-label{padding:2px}.comments-panel .monaco-list .monaco-list-row.focused .comment-metadata-container .actions,.comments-panel .monaco-list .monaco-list-row.selected .comment-metadata-container .actions,.comments-panel .monaco-list .monaco-list-row:hover .comment-metadata-container .actions{display:block}";
 n(css,{});
 export { css, css as default };

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

@@ -1,7 +1,7 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { EditorExtensionsRegistry } from '../../../../editor/browser/editorExtensions.js';
 import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
-import { CodeEditorWidget } from '../../../../editor/browser/widget/codeEditorWidget.js';
+import { CodeEditorWidget } from '../../../../editor/browser/widget/codeEditor/codeEditorWidget.js';
 import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { ICommandService } from '../../../../platform/commands/common/commands.js';
@@ -92,7 +92,7 @@ SimpleCommentEditor = ( __decorate([
 function calculateEditorHeight(parentEditor, editor, currentHeight) {
     const layoutInfo = editor.getLayoutInfo();
     const lineHeight = editor.getOption(67 );
-    const contentHeight = (editor.getModel()?.getLineCount() * lineHeight) ?? editor.getContentHeight();
+    const contentHeight = (editor._getViewModel()?.getLineCount() * lineHeight) ?? editor.getContentHeight();
     if ((contentHeight > layoutInfo.height) ||
         (contentHeight < layoutInfo.height && currentHeight > MIN_EDITOR_HEIGHT)) {
         const linesToAdd = Math.ceil((contentHeight - layoutInfo.height) / lineHeight);

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

@@ -1,4 +1,6 @@
 import { append, $ } from '../../../../base/browser/dom.js';
+import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
+import { setupCustomHover } from '../../../../base/browser/ui/hover/updatableHoverWidget.js';
 import { fromNow } from '../../../../base/common/date.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { language } from '../../../../base/common/platform.js';
@@ -10,6 +12,7 @@ class TimestampWidget extends Disposable {
         this._date = append(container, $('span.timestamp'));
         this._date.style.display = 'none';
         this._useRelativeTime = this.useRelativeTimeSetting;
+        this.hover = this._register(setupCustomHover(getDefaultHoverDelegate('mouse'), this._date, ''));
         this.setTimestamp(timeStamp);
     }
     get useRelativeTimeSetting() {
@@ -40,9 +43,7 @@ class TimestampWidget extends Disposable {
                 textContent = this.getDateString(timestamp);
             }
             this._date.textContent = textContent;
-            if (tooltip) {
-                this._date.title = tooltip;
-            }
+            this.hover.update(tooltip ?? '');
         }
     }
     getRelative(date) {

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

@@ -1,30 +1,37 @@
 class CommentNode {
-    constructor(owner, threadId, resource, comment, range, threadState) {
-        this.replies = [];
+    constructor(uniqueOwner, owner, resource, comment, thread) {
+        this.uniqueOwner = uniqueOwner;
         this.owner = owner;
-        this.threadId = threadId;
-        this.comment = comment;
         this.resource = resource;
-        this.range = range;
+        this.comment = comment;
+        this.thread = thread;
         this.isRoot = false;
-        this.threadState = threadState;
+        this.replies = [];
+        this.threadId = thread.threadId;
+        this.range = thread.range;
+        this.threadState = thread.state;
+        this.threadRelevance = thread.applicability;
+        this.contextValue = thread.contextValue;
+        this.controllerHandle = thread.controllerHandle;
+        this.threadHandle = thread.commentThreadHandle;
     }
     hasReply() {
         return this.replies && this.replies.length !== 0;
     }
 }
 class ResourceWithCommentThreads {
-    constructor(owner, resource, commentThreads) {
+    constructor(uniqueOwner, owner, resource, commentThreads) {
+        this.uniqueOwner = uniqueOwner;
         this.owner = owner;
         this.id = ( resource.toString());
         this.resource = resource;
         this.commentThreads = ( commentThreads.filter(thread => thread.comments && thread.comments.length).map(
-            thread => ResourceWithCommentThreads.createCommentNode(owner, resource, thread)
+            thread => ResourceWithCommentThreads.createCommentNode(uniqueOwner, owner, resource, thread)
         ));
     }
-    static createCommentNode(owner, resource, commentThread) {
-        const { threadId, comments, range } = commentThread;
-        const commentNodes = ( comments.map(comment => ( new CommentNode(owner, threadId, resource, comment, range, commentThread.state))));
+    static createCommentNode(uniqueOwner, owner, resource, commentThread) {
+        const { comments } = commentThread;
+        const commentNodes = ( comments.map(comment => ( new CommentNode(uniqueOwner, owner, resource, comment, commentThread))));
         if (commentNodes.length > 1) {
             commentNodes[0].replies = commentNodes.slice(1, commentNodes.length);
         }

package/vscode/src/vs/workbench/contrib/customEditor/browser/customEditor.contribution.js

@@ -4,8 +4,14 @@ import { EditorPaneDescriptor } from '../../../browser/editor.js';
 import { registerWorkbenchContribution2 } from '../../../common/contributions.js';
 import { EditorExtensions } from '../../../common/editor.js';
 import { CustomEditorInputSerializer, ComplexCustomWorkingCopyEditorHandler } from './customEditorInputFactory.js';
+import '../../../../base/common/arrays.js';
+import '../../../../nls.js';
+import '../../../../platform/contextkey/common/contextkey.js';
+import '../../../../platform/instantiation/common/instantiation.js';
+import '../../../services/editor/common/editorResolverService.js';
 import { WebviewEditor } from '../../webviewPanel/browser/webviewEditor.js';
 import { CustomEditorInput } from './customEditorInput.js';
+import './customEditors.js';
 ( Registry.as(EditorExtensions.EditorPane))
     .registerEditorPane(EditorPaneDescriptor.create(WebviewEditor, WebviewEditor.ID, 'Webview Editor'), [
     ( new SyncDescriptor(CustomEditorInput))