@codingame/monaco-vscode-api 2.1.3 → 2.2.0-next.1

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

@@ -0,0 +1,451 @@
+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 { 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 { ResourceLabels } from '../../../browser/labels.js';
+import { Filter, CommentsList, COMMENTS_VIEW_TITLE } from './commentsTreeViewer.js';
+import { FilterViewPane } from '../../../browser/parts/views/viewPane.js';
+import { IViewDescriptorService } from '../../../common/views.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { RawContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+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 { Iterable } from '../../../../base/common/iterator.js';
+import { CommentController } from './commentsController.js';
+import { Range } from '../../../../editor/common/core/range.js';
+import { registerNavigableContainer } from '../../../browser/actions/widgetNavigationCommands.js';
+import { CommentsModel } from './commentsModel.js';
+const CONTEXT_KEY_HAS_COMMENTS = ( new RawContextKey('commentsView.hasComments', false));
+const CONTEXT_KEY_SOME_COMMENTS_EXPANDED = ( new RawContextKey('commentsView.someCommentsExpanded', false));
+const VIEW_STORAGE_ID = 'commentsViewState';
+function createResourceCommentsIterator(model) {
+    return ( Iterable.map(model.resourceCommentThreads, m => {
+        const CommentNodeIt = Iterable.from(m.commentThreads);
+        const children = ( Iterable.map(CommentNodeIt, r => ({ element: r })));
+        return { element: m, children };
+    }));
+}
+let CommentsPanel = class CommentsPanel extends FilterViewPane {
+    constructor(options, instantiationService, viewDescriptorService, editorService, configurationService, contextKeyService, contextMenuService, keybindingService, openerService, themeService, commentService, telemetryService, uriIdentityService, storageService) {
+        const stateMemento = ( new Memento(VIEW_STORAGE_ID, storageService));
+        const viewState = stateMemento.getMemento(1 , 1 );
+        super({
+            ...options,
+            filterOptions: {
+                placeholder: ( localizeWithPath(
+                    'vs/workbench/contrib/comments/browser/commentsView',
+                    'comments.filter.placeholder',
+                    "Filter (e.g. text, author)"
+                )),
+                ariaLabel: ( localizeWithPath(
+                    'vs/workbench/contrib/comments/browser/commentsView',
+                    'comments.filter.ariaLabel',
+                    "Filter comments"
+                )),
+                history: viewState['filterHistory'] || [],
+                text: viewState['filter'] || '',
+                focusContextKey: CommentsViewFilterFocusContextKey.key
+            }
+        }, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService);
+        this.editorService = editorService;
+        this.commentService = commentService;
+        this.uriIdentityService = uriIdentityService;
+        this.totalComments = 0;
+        this.currentHeight = 0;
+        this.currentWidth = 0;
+        this.cachedFilterStats = undefined;
+        this.onDidChangeVisibility = this.onDidChangeBodyVisibility;
+        this.hasCommentsContextKey = CONTEXT_KEY_HAS_COMMENTS.bindTo(contextKeyService);
+        this.someCommentsExpandedContextKey = CONTEXT_KEY_SOME_COMMENTS_EXPANDED.bindTo(contextKeyService);
+        this.stateMemento = stateMemento;
+        this.viewState = viewState;
+        this.filters = this._register(( new CommentsFilters({
+            showResolved: this.viewState['showResolved'] !== false,
+            showUnresolved: this.viewState['showUnresolved'] !== false,
+        }, this.contextKeyService)));
+        this.filter = ( new Filter(( new FilterOptions(
+            this.filterWidget.getFilterText(),
+            this.filters.showResolved,
+            this.filters.showUnresolved
+        ))));
+        this._register(this.filters.onDidChange((event) => {
+            if (event.showResolved || event.showUnresolved) {
+                this.updateFilter();
+            }
+        }));
+        this._register(this.filterWidget.onDidChangeFilterText(() => this.updateFilter()));
+    }
+    saveState() {
+        this.viewState['filter'] = this.filterWidget.getFilterText();
+        this.viewState['filterHistory'] = this.filterWidget.getHistory();
+        this.viewState['showResolved'] = this.filters.showResolved;
+        this.viewState['showUnresolved'] = this.filters.showUnresolved;
+        this.stateMemento.saveMemento();
+        super.saveState();
+    }
+    render() {
+        super.render();
+        this._register(registerNavigableContainer({
+            focusNotifiers: [this, this.filterWidget],
+            focusNextWidget: () => {
+                if (this.filterWidget.hasFocus()) {
+                    this.focus();
+                }
+            },
+            focusPreviousWidget: () => {
+                if (!this.filterWidget.hasFocus()) {
+                    this.focusFilter();
+                }
+            }
+        }));
+    }
+    focusFilter() {
+        this.filterWidget.focus();
+    }
+    clearFilterText() {
+        this.filterWidget.setFilterText('');
+    }
+    getFilterStats() {
+        if (!this.cachedFilterStats) {
+            this.cachedFilterStats = {
+                total: this.totalComments,
+                filtered: this.tree?.getVisibleItemCount() ?? 0
+            };
+        }
+        return this.cachedFilterStats;
+    }
+    updateFilter() {
+        this.filter.options = ( new FilterOptions(
+            this.filterWidget.getFilterText(),
+            this.filters.showResolved,
+            this.filters.showUnresolved
+        ));
+        this.tree?.filterComments();
+        this.cachedFilterStats = undefined;
+        const { total, filtered } = this.getFilterStats();
+        this.filterWidget.updateBadge(total === filtered || total === 0 ? undefined : ( localizeWithPath(
+            'vs/workbench/contrib/comments/browser/commentsView',
+            'showing filtered results',
+            "Showing {0} of {1}",
+            filtered,
+            total
+        )));
+        this.filterWidget.checkMoreFilters(!this.filters.showResolved || !this.filters.showUnresolved);
+    }
+    renderBody(container) {
+        super.renderBody(container);
+        container.classList.add('comments-panel');
+        const domContainer = append(container, $('.comments-panel-container'));
+        this.treeContainer = append(domContainer, $('.tree-container'));
+        this.treeContainer.classList.add('file-icon-themable-tree', 'show-file-icons');
+        this.cachedFilterStats = undefined;
+        this.createTree();
+        this.createMessageBox(domContainer);
+        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();
+            }
+        }));
+        this.renderComments();
+    }
+    focus() {
+        super.focus();
+        const element = this.tree?.getHTMLElement();
+        if (element && isActiveElement(element)) {
+            return;
+        }
+        if (!this.commentService.commentsModel.hasCommentThreads() && this.messageBoxContainer) {
+            this.messageBoxContainer.focus();
+        }
+        else if (this.tree) {
+            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();
+        await this.tree?.setChildren(null, createResourceCommentsIterator(this.commentService.commentsModel));
+    }
+    collapseAll() {
+        if (this.tree) {
+            this.tree.collapseAll();
+            this.tree.setSelection([]);
+            this.tree.setFocus([]);
+            this.tree.domFocus();
+            this.tree.focusFirst();
+        }
+    }
+    expandAll() {
+        if (this.tree) {
+            this.tree.expandAll();
+            this.tree.setSelection([]);
+            this.tree.setFocus([]);
+            this.tree.domFocus();
+            this.tree.focusFirst();
+        }
+    }
+    get hasRendered() {
+        return !!this.tree;
+    }
+    layoutBodyContent(height = this.currentHeight, width = this.currentWidth) {
+        if (this.messageBoxContainer) {
+            this.messageBoxContainer.style.height = `${height}px`;
+        }
+        this.tree?.layout(height, width);
+        this.currentHeight = height;
+        this.currentWidth = width;
+    }
+    createMessageBox(parent) {
+        this.messageBoxContainer = append(parent, $('.message-box-container'));
+        this.messageBoxContainer.setAttribute('tabIndex', '0');
+    }
+    renderMessage() {
+        this.messageBoxContainer.textContent = this.commentService.commentsModel.getMessage();
+        this.messageBoxContainer.classList.toggle('hidden', this.commentService.commentsModel.hasCommentThreads());
+    }
+    createTree() {
+        this.treeLabels = this._register(this.instantiationService.createInstance(ResourceLabels, this));
+        this.tree = this._register(this.instantiationService.createInstance(CommentsList, this.treeLabels, this.treeContainer, {
+            overrideStyles: { listBackground: this.getBackgroundColor() },
+            selectionNavigation: true,
+            filter: this.filter,
+            keyboardNavigationLabelProvider: {
+                getKeyboardNavigationLabel: (item) => {
+                    return undefined;
+                }
+            },
+            accessibilityProvider: {
+                getAriaLabel(element) {
+                    if (element instanceof CommentsModel) {
+                        return ( localizeWithPath(
+                            'vs/workbench/contrib/comments/browser/commentsView',
+                            'rootCommentsLabel',
+                            "Comments for current workspace"
+                        ));
+                    }
+                    if (element instanceof ResourceWithCommentThreads) {
+                        return ( localizeWithPath(
+                            'vs/workbench/contrib/comments/browser/commentsView',
+                            'resourceWithCommentThreadsLabel',
+                            "Comments in {0}, full path {1}",
+                            basename(element.resource),
+                            element.resource.fsPath
+                        ));
+                    }
+                    if (element instanceof CommentNode) {
+                        if (element.range) {
+                            return ( localizeWithPath(
+                                'vs/workbench/contrib/comments/browser/commentsView',
+                                'resourceWithCommentLabel',
+                                "Comment 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',
+                                'resourceWithCommentLabelFile',
+                                "Comment from ${0} in {1}, source: {2}",
+                                element.comment.userName,
+                                basename(element.resource),
+                                (typeof element.comment.body === 'string') ? element.comment.body : element.comment.body.value
+                            ));
+                        }
+                    }
+                    return '';
+                },
+                getWidgetAriaLabel() {
+                    return COMMENTS_VIEW_TITLE.value;
+                }
+            }
+        }));
+        this._register(this.tree.onDidOpen(e => {
+            this.openFile(e.element, e.editorOptions.pinned, e.editorOptions.preserveFocus, e.sideBySide);
+        }));
+        this._register(this.tree.onDidChangeModel(() => {
+            this.updateSomeCommentsExpanded();
+        }));
+        this._register(this.tree.onDidChangeCollapseState(() => {
+            this.updateSomeCommentsExpanded();
+        }));
+    }
+    openFile(element, pinned, preserveFocus, sideBySide) {
+        if (!element) {
+            return false;
+        }
+        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;
+            }
+        }
+        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;
+    }
+    async refresh() {
+        if (!this.tree) {
+            return;
+        }
+        if (this.isVisible()) {
+            this.hasCommentsContextKey.set(this.commentService.commentsModel.hasCommentThreads());
+            this.treeContainer.classList.toggle('hidden', !this.commentService.commentsModel.hasCommentThreads());
+            this.cachedFilterStats = undefined;
+            this.renderMessage();
+            this.tree?.setChildren(null, createResourceCommentsIterator(this.commentService.commentsModel));
+            if (this.tree.getSelection().length === 0 && this.commentService.commentsModel.hasCommentThreads()) {
+                const firstComment = this.commentService.commentsModel.resourceCommentThreads[0].commentThreads[0];
+                if (firstComment) {
+                    this.tree.setFocus([firstComment]);
+                    this.tree.setSelection([firstComment]);
+                }
+            }
+        }
+    }
+    onAllCommentsChanged(e) {
+        this.cachedFilterStats = undefined;
+        this.totalComments += e.commentThreads.length;
+        for (const thread of e.commentThreads) {
+        }
+        this.refresh();
+    }
+    onCommentsUpdated(e) {
+        this.cachedFilterStats = undefined;
+        this.totalComments += e.added.length;
+        this.totalComments -= e.removed.length;
+        for (const resource of this.commentService.commentsModel.resourceCommentThreads) {
+            for (const thread of resource.commentThreads) {
+            }
+        }
+        this.refresh();
+    }
+    onDataProviderDeleted(owner) {
+        this.cachedFilterStats = undefined;
+        this.totalComments = 0;
+        this.refresh();
+    }
+    updateSomeCommentsExpanded() {
+        this.someCommentsExpandedContextKey.set(this.isSomeCommentsExpanded());
+    }
+    areAllCommentsExpanded() {
+        if (!this.tree) {
+            return false;
+        }
+        const navigator = this.tree.navigate();
+        while (navigator.next()) {
+            if (this.tree.isCollapsed(navigator.current())) {
+                return false;
+            }
+        }
+        return true;
+    }
+    isSomeCommentsExpanded() {
+        if (!this.tree) {
+            return false;
+        }
+        const navigator = this.tree.navigate();
+        while (navigator.next()) {
+            if (!this.tree.isCollapsed(navigator.current())) {
+                return true;
+            }
+        }
+        return false;
+    }
+};
+CommentsPanel = ( __decorate([
+    ( __param(1, IInstantiationService)),
+    ( __param(2, IViewDescriptorService)),
+    ( __param(3, IEditorService)),
+    ( __param(4, IConfigurationService)),
+    ( __param(5, IContextKeyService)),
+    ( __param(6, IContextMenuService)),
+    ( __param(7, IKeybindingService)),
+    ( __param(8, IOpenerService)),
+    ( __param(9, IThemeService)),
+    ( __param(10, ICommentService)),
+    ( __param(11, ITelemetryService)),
+    ( __param(12, IUriIdentityService)),
+    ( __param(13, IStorageService))
+], CommentsPanel));
+export { CONTEXT_KEY_HAS_COMMENTS, CONTEXT_KEY_SOME_COMMENTS_EXPANDED, CommentsPanel };

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

@@ -0,0 +1,176 @@
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { localizeWithPath } from '../../../../nls.js';
+import { ContextKeyExpr, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { Emitter } from '../../../../base/common/event.js';
+import { CommentsViewFilterFocusContextKey } from './comments.js';
+import { registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { ViewAction } from '../../../browser/parts/views/viewPane.js';
+import { COMMENTS_VIEW_ID } from './commentsTreeViewer.js';
+import { FocusedViewContext } from '../../../common/contextkeys.js';
+import { viewFilterSubmenu } from '../../../browser/parts/views/viewFilter.js';
+const CONTEXT_KEY_SHOW_RESOLVED = ( new RawContextKey('commentsView.showResolvedFilter', true));
+const CONTEXT_KEY_SHOW_UNRESOLVED = ( new RawContextKey('commentsView.showUnResolvedFilter', true));
+class CommentsFilters extends Disposable {
+    constructor(options, contextKeyService) {
+        super();
+        this.contextKeyService = contextKeyService;
+        this._onDidChange = this._register(( new Emitter()));
+        this.onDidChange = this._onDidChange.event;
+        this._showUnresolved = CONTEXT_KEY_SHOW_UNRESOLVED.bindTo(this.contextKeyService);
+        this._showResolved = CONTEXT_KEY_SHOW_RESOLVED.bindTo(this.contextKeyService);
+        this._showResolved.set(options.showResolved);
+        this._showUnresolved.set(options.showUnresolved);
+    }
+    get showUnresolved() {
+        return !!this._showUnresolved.get();
+    }
+    set showUnresolved(showUnresolved) {
+        if (this._showUnresolved.get() !== showUnresolved) {
+            this._showUnresolved.set(showUnresolved);
+            this._onDidChange.fire({ showUnresolved: true });
+        }
+    }
+    get showResolved() {
+        return !!this._showResolved.get();
+    }
+    set showResolved(showResolved) {
+        if (this._showResolved.get() !== showResolved) {
+            this._showResolved.set(showResolved);
+            this._onDidChange.fire({ showResolved: true });
+        }
+    }
+}
+registerAction2(class extends ViewAction {
+    constructor() {
+        super({
+            id: 'commentsFocusViewFromFilter',
+            title: ( localizeWithPath(
+                'vs/workbench/contrib/comments/browser/commentsViewActions',
+                'focusCommentsList',
+                "Focus Comments view"
+            )),
+            keybinding: {
+                when: CommentsViewFilterFocusContextKey,
+                weight: 200 ,
+                primary: 2048  | 18
+            },
+            viewId: COMMENTS_VIEW_ID
+        });
+    }
+    async runInView(serviceAccessor, commentsView) {
+        commentsView.focus();
+    }
+});
+registerAction2(class extends ViewAction {
+    constructor() {
+        super({
+            id: 'commentsClearFilterText',
+            title: ( localizeWithPath(
+                'vs/workbench/contrib/comments/browser/commentsViewActions',
+                'commentsClearFilterText',
+                "Clear filter text"
+            )),
+            keybinding: {
+                when: CommentsViewFilterFocusContextKey,
+                weight: 200 ,
+                primary: 9
+            },
+            viewId: COMMENTS_VIEW_ID
+        });
+    }
+    async runInView(serviceAccessor, commentsView) {
+        commentsView.clearFilterText();
+    }
+});
+registerAction2(class extends ViewAction {
+    constructor() {
+        super({
+            id: 'commentsFocusFilter',
+            title: ( localizeWithPath(
+                'vs/workbench/contrib/comments/browser/commentsViewActions',
+                'focusCommentsFilter',
+                "Focus comments filter"
+            )),
+            keybinding: {
+                when: ( FocusedViewContext.isEqualTo(COMMENTS_VIEW_ID)),
+                weight: 200 ,
+                primary: 2048  | 36
+            },
+            viewId: COMMENTS_VIEW_ID
+        });
+    }
+    async runInView(serviceAccessor, commentsView) {
+        commentsView.focusFilter();
+    }
+});
+registerAction2(class extends ViewAction {
+    constructor() {
+        super({
+            id: `workbench.actions.${COMMENTS_VIEW_ID}.toggleUnResolvedComments`,
+            title: ( localizeWithPath(
+                'vs/workbench/contrib/comments/browser/commentsViewActions',
+                'toggle unresolved',
+                "Toggle Unresolved Comments"
+            )),
+            category: ( localizeWithPath(
+                'vs/workbench/contrib/comments/browser/commentsViewActions',
+                'comments',
+                "Comments"
+            )),
+            toggled: {
+                condition: CONTEXT_KEY_SHOW_UNRESOLVED,
+                title: ( localizeWithPath(
+                    'vs/workbench/contrib/comments/browser/commentsViewActions',
+                    'unresolved',
+                    "Show Unresolved"
+                )),
+            },
+            menu: {
+                id: viewFilterSubmenu,
+                group: '1_filter',
+                when: ( ContextKeyExpr.equals('view', COMMENTS_VIEW_ID)),
+                order: 1
+            },
+            viewId: COMMENTS_VIEW_ID
+        });
+    }
+    async runInView(serviceAccessor, view) {
+        view.filters.showUnresolved = !view.filters.showUnresolved;
+    }
+});
+registerAction2(class extends ViewAction {
+    constructor() {
+        super({
+            id: `workbench.actions.${COMMENTS_VIEW_ID}.toggleResolvedComments`,
+            title: ( localizeWithPath(
+                'vs/workbench/contrib/comments/browser/commentsViewActions',
+                'toggle resolved',
+                "Toggle Resolved Comments"
+            )),
+            category: ( localizeWithPath(
+                'vs/workbench/contrib/comments/browser/commentsViewActions',
+                'comments',
+                "Comments"
+            )),
+            toggled: {
+                condition: CONTEXT_KEY_SHOW_RESOLVED,
+                title: ( localizeWithPath(
+                    'vs/workbench/contrib/comments/browser/commentsViewActions',
+                    'resolved',
+                    "Show Resolved"
+                )),
+            },
+            menu: {
+                id: viewFilterSubmenu,
+                group: '1_filter',
+                when: ( ContextKeyExpr.equals('view', COMMENTS_VIEW_ID)),
+                order: 1
+            },
+            viewId: COMMENTS_VIEW_ID
+        });
+    }
+    async runInView(serviceAccessor, view) {
+        view.filters.showResolved = !view.filters.showResolved;
+    }
+});
+export { CommentsFilters };

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

@@ -0,0 +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}";
+n(css,{});
+export { css, css as default };

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

@@ -0,0 +1,35 @@
+class CommentNode {
+    constructor(owner, threadId, resource, comment, range, threadState) {
+        this.replies = [];
+        this.owner = owner;
+        this.threadId = threadId;
+        this.comment = comment;
+        this.resource = resource;
+        this.range = range;
+        this.isRoot = false;
+        this.threadState = threadState;
+    }
+    hasReply() {
+        return this.replies && this.replies.length !== 0;
+    }
+}
+class ResourceWithCommentThreads {
+    constructor(owner, resource, commentThreads) {
+        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)
+        ));
+    }
+    static createCommentNode(owner, resource, commentThread) {
+        const { threadId, comments, range } = commentThread;
+        const commentNodes = ( comments.map(comment => ( new CommentNode(owner, threadId, resource, comment, range, commentThread.state))));
+        if (commentNodes.length > 1) {
+            commentNodes[0].replies = commentNodes.slice(1, commentNodes.length);
+        }
+        commentNodes[0].isRoot = true;
+        return commentNodes[0];
+    }
+}
+export { CommentNode, ResourceWithCommentThreads };