@codingame/monaco-vscode-api 8.0.4 → 9.0.0

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

@@ -243,14 +243,6 @@ let ReviewZoneWidget = class ReviewZoneWidget extends ZoneWidget {
         }
         return 0;
     }
-    toggleExpand() {
-        if (this._isExpanded) {
-            this._commentThread.collapsibleState = CommentThreadCollapsibleState.Collapsed;
-        }
-        else {
-            this._commentThread.collapsibleState = CommentThreadCollapsibleState.Expanded;
-        }
-    }
     async update(commentThread) {
         if (this._commentThread !== commentThread) {
             this._commentThreadDisposables.forEach(disposable => disposable.dispose());

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

@@ -11,42 +11,42 @@ import { Disposable } from '../../../../base/common/lifecycle.js';
 var CommentAccessibilityHelpNLS;
 ( ((function(CommentAccessibilityHelpNLS) {
     CommentAccessibilityHelpNLS.intro = ( localize(
-        5352,
+        5296,
         "The editor contains commentable range(s). Some useful commands include:"
     ));
     CommentAccessibilityHelpNLS.tabFocus = ( localize(
-        5353,
+        5297,
         "This widget contains a text area, for composition of new comments, and actions, that can be tabbed to once tab moves focus mode has been enabled with the command Toggle Tab Key Moves Focus{0}.",
         `<keybinding:${ToggleTabFocusModeAction.ID}>`
     ));
-    CommentAccessibilityHelpNLS.commentCommands = ( localize(5354, "Some useful comment commands include:"));
-    CommentAccessibilityHelpNLS.escape = ( localize(5355, "- Dismiss Comment (Escape)"));
+    CommentAccessibilityHelpNLS.commentCommands = ( localize(5298, "Some useful comment commands include:"));
+    CommentAccessibilityHelpNLS.escape = ( localize(5299, "- Dismiss Comment (Escape)"));
     CommentAccessibilityHelpNLS.nextRange = ( localize(
-        5356,
+        5300,
         "- Go to Next Commenting Range{0}.",
         `<keybinding:${CommentCommandId.NextRange}>`
     ));
     CommentAccessibilityHelpNLS.previousRange = ( localize(
-        5357,
+        5301,
         "- Go to Previous Commenting Range{0}.",
         `<keybinding:${CommentCommandId.PreviousRange}>`
     ));
     CommentAccessibilityHelpNLS.nextCommentThread = ( localize(
-        5358,
+        5302,
         "- Go to Next Comment Thread{0}.",
         `<keybinding:${CommentCommandId.NextThread}>`
     ));
     CommentAccessibilityHelpNLS.previousCommentThread = ( localize(
-        5359,
+        5303,
         "- Go to Previous Comment Thread{0}.",
         `<keybinding:${CommentCommandId.PreviousThread}>`
     ));
     CommentAccessibilityHelpNLS.addComment = ( localize(
-        5360,
+        5304,
         "- Add Comment on Current Selection{0}.",
         `<keybinding:${CommentCommandId.Add}>`
     ));
-    CommentAccessibilityHelpNLS.submitComment = ( localize(5361, "- Submit Comment{0}.", `<keybinding:${CommentCommandId.Submit}>`));
+    CommentAccessibilityHelpNLS.submitComment = ( localize(5305, "- Submit Comment{0}.", `<keybinding:${CommentCommandId.Submit}>`));
 })(CommentAccessibilityHelpNLS || (CommentAccessibilityHelpNLS = {}))));
 class CommentsAccessibilityHelpProvider extends Disposable {
     constructor() {

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

@@ -38,6 +38,7 @@ import { AccessibilityCommandId } from '../../accessibility/common/accessibility
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.service.js';
 import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.service.js';
 import { URI } from '../../../../base/common/uri.js';
+import { threadHasMeaningfulComments } from './commentsModel.js';
 const ID = 'editor.contrib.review';
 class CommentingRangeDecoration {
     get id() {
@@ -771,7 +772,7 @@ let CommentController = class CommentController {
             const commentRangeEnd = range?.getEndPosition().lineNumber;
             if (commentRangeStart && commentRangeEnd) {
                 const oneLine = commentRangeStart === commentRangeEnd;
-                oneLine ? status(( localize(5346, "Line {0}", commentRangeStart))) : status(( localize(5347, "Lines {0} to {1}", commentRangeStart, commentRangeEnd)));
+                oneLine ? status(( localize(5290, "Line {0}", commentRangeStart))) : status(( localize(5291, "Lines {0} to {1}", commentRangeStart, commentRangeEnd)));
             }
         }
     }
@@ -943,27 +944,27 @@ let CommentController = class CommentController {
                         const keybinding = this.keybindingService.lookupKeybinding(AccessibilityCommandId.OpenAccessibilityHelp)?.getAriaLabel();
                         if (keybinding) {
                             status(( localize(
-                                5348,
+                                5292,
                                 "Editor has commenting ranges, run the command Open Accessibility Help ({0}), for more information.",
                                 keybinding
                             )));
                         }
                         else {
                             status(( localize(
-                                5349,
+                                5293,
                                 "Editor has commenting ranges, run the command Open Accessibility Help, which is currently not triggerable via keybinding, for more information."
                             )));
                         }
                     }
                     else {
-                        status(( localize(5350, "Editor has commenting ranges.")));
+                        status(( localize(5294, "Editor has commenting ranges.")));
                     }
                 }
             }
         });
     }
     async openCommentsView(thread) {
-        if (thread.comments && (thread.comments.length > 0)) {
+        if (thread.comments && (thread.comments.length > 0) && threadHasMeaningfulComments(thread)) {
             const openViewState = this.configurationService.getValue(COMMENTS_SECTION).openView;
             if (openViewState === 'file') {
                 return this.viewsService.openView(COMMENTS_VIEW_ID);
@@ -1106,7 +1107,7 @@ let CommentController = class CommentController {
             }
             else {
                 const picks = this.getCommentProvidersQuickPicks(newCommentInfos);
-                return this.quickInputService.pick(picks, { placeHolder: ( localize(5351, "Select Comment Provider")), matchOnDescription: true }).then(pick => {
+                return this.quickInputService.pick(picks, { placeHolder: ( localize(5295, "Select Comment Provider")), matchOnDescription: true }).then(pick => {
                     if (!pick) {
                         return;
                     }

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

@@ -3,6 +3,12 @@ import { URI } from '../../../../base/common/uri.js';
 import { localize } from '../../../../nls.js';
 import { ResourceWithCommentThreads } from '../common/commentModel.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
+import { isMarkdownString } from '../../../../base/common/htmlContent.js';
+function threadHasMeaningfulComments(thread) {
+    return !!thread.comments && !!thread.comments.length && ( (thread.comments.some(
+        comment => isMarkdownString(comment.body) ? comment.body.value.length > 0 : comment.body.length > 0
+    )));
+}
 class CommentsModel extends Disposable {
     get resourceCommentThreads() { return this._resourceCommentThreads; }
     constructor() {
@@ -18,9 +24,6 @@ class CommentsModel extends Disposable {
                 return resource;
             }))).flat();
         }))).flat();
-        this._resourceCommentThreads.sort((a, b) => {
-            return ( (a.resource.toString())) > ( (b.resource.toString())) ? 1 : -1;
-        });
     }
     setCommentThreads(uniqueOwner, owner, ownerLabel, commentThreads) {
         this.commentThreadsMap.set(uniqueOwner, { ownerLabel, resourceWithCommentThreads: this.groupByResource(uniqueOwner, owner, commentThreads) });
@@ -81,11 +84,15 @@ class CommentsModel extends Disposable {
         return removed.length > 0 || changed.length > 0 || added.length > 0;
     }
     hasCommentThreads() {
-        return !!this._resourceCommentThreads.length;
+        return !!this._resourceCommentThreads.length && ( (this._resourceCommentThreads.some(resource => {
+            return (resource.commentThreads.length > 0) && ( (resource.commentThreads.some(thread => {
+                return threadHasMeaningfulComments(thread.thread);
+            })));
+        })));
     }
     getMessage() {
         if (!this._resourceCommentThreads.length) {
-            return ( localize(5310, "There are no comments in this workspace yet."));
+            return ( localize(5254, "There are no comments in this workspace yet."));
         }
         else {
             return '';
@@ -116,4 +123,4 @@ class CommentsModel extends Disposable {
         }
     }
 }
-export { CommentsModel };
+export { CommentsModel, threadHasMeaningfulComments };

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

@@ -33,8 +33,8 @@ import { IKeybindingService } from '../../../../platform/keybinding/common/keybi
 import { IHoverService } from '../../../../platform/hover/browser/hover.service.js';
 const COMMENTS_VIEW_ID = 'workbench.panel.comments';
 const COMMENTS_VIEW_STORAGE_ID = 'Comments';
-const COMMENTS_VIEW_TITLE = ( localize2(5319, "Comments"));
-class CommentsModelVirualDelegate {
+const COMMENTS_VIEW_TITLE = ( localize2(5263, "Comments"));
+class CommentsModelVirtualDelegate {
     static { this.RESOURCE_ID = 'resource-with-comments'; }
     static { this.COMMENT_ID = 'comment-node'; }
     getHeight(element) {
@@ -45,10 +45,10 @@ class CommentsModelVirualDelegate {
     }
     getTemplateId(element) {
         if (element instanceof ResourceWithCommentThreads) {
-            return CommentsModelVirualDelegate.RESOURCE_ID;
+            return CommentsModelVirtualDelegate.RESOURCE_ID;
         }
         if (element instanceof CommentNode) {
-            return CommentsModelVirualDelegate.COMMENT_ID;
+            return CommentsModelVirtualDelegate.COMMENT_ID;
         }
         return '';
     }
@@ -172,13 +172,13 @@ let CommentNodeRenderer = class CommentNodeRenderer {
     }
     getCountString(commentCount) {
         if (commentCount > 2) {
-            return ( localize(5320, "{0} replies", commentCount - 1));
+            return ( localize(5264, "{0} replies", commentCount - 1));
         }
         else if (commentCount === 2) {
-            return ( localize(5321, "1 reply"));
+            return ( localize(5265, "1 reply"));
         }
         else {
-            return ( localize(5322, "1 comment"));
+            return ( localize(5266, "1 comment"));
         }
     }
     getRenderedComment(commentBody, disposables) {
@@ -193,9 +193,12 @@ let CommentNodeRenderer = class CommentNodeRenderer {
         for (let i = 0; i < images.length; i++) {
             const image = images[i];
             const textDescription = $('');
-            textDescription.textContent = image.alt ? ( localize(5323, "Image: {0}", image.alt)) : ( localize(5324, "Image"));
+            textDescription.textContent = image.alt ? ( localize(5267, "Image: {0}", image.alt)) : ( localize(5268, "Image"));
             image.parentNode.replaceChild(textDescription, image);
         }
+        while ((renderedComment.element.children.length > 1) && (renderedComment.element.firstElementChild?.tagName === 'HR')) {
+            renderedComment.element.removeChild(renderedComment.element.firstElementChild);
+        }
         return renderedComment;
     }
     getIcon(threadState) {
@@ -211,7 +214,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 = ( localize(5325, "Outdated"));
+            templateData.threadMetadata.relevance.innerText = ( localize(5269, "Outdated"));
             templateData.threadMetadata.separator.style.display = 'none';
         }
         else {
@@ -245,11 +248,11 @@ let CommentNodeRenderer = class CommentNodeRenderer {
         }
         if (node.element.range) {
             if (node.element.range.startLineNumber === node.element.range.endLineNumber) {
-                templateData.threadMetadata.range.textContent = ( localize(5326, "[Ln {0}]", node.element.range.startLineNumber));
+                templateData.threadMetadata.range.textContent = ( localize(5270, "[Ln {0}]", node.element.range.startLineNumber));
             }
             else {
                 templateData.threadMetadata.range.textContent = ( localize(
-                    5327,
+                    5271,
                     "[Ln {0}-{1}]",
                     node.element.range.startLineNumber,
                     node.element.range.endLineNumber
@@ -270,7 +273,7 @@ let CommentNodeRenderer = class CommentNodeRenderer {
         templateData.repliesMetadata.container.style.display = '';
         templateData.repliesMetadata.count.textContent = this.getCountString(commentCount);
         const lastComment = node.element.replies[node.element.replies.length - 1].comment;
-        templateData.repliesMetadata.lastReplyDetail.textContent = ( localize(5328, "Last reply from {0}", lastComment.userName));
+        templateData.repliesMetadata.lastReplyDetail.textContent = ( localize(5272, "Last reply from {0}", lastComment.userName));
         templateData.repliesMetadata.timestamp.setTimestamp(lastComment.timestamp ? ( (new Date(lastComment.timestamp))) : undefined);
     }
     getCommentThreadWidgetStateColor(state, theme) {
@@ -346,7 +349,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 CommentsModelVirtualDelegate()));
         const actionViewItemProvider = createActionViewItem.bind(undefined, instantiationService);
         const menus = instantiationService.createInstance(CommentsMenus);
         menus.setContextKeyService(contextKeyService);
@@ -374,6 +377,7 @@ let CommentsList = class CommentsList extends WorkbenchObjectTree {
             collapseByDefault: false,
             overrideStyles: options.overrideStyles,
             filter: options.filter,
+            sorter: options.sorter,
             findWidgetEnabled: false,
             multipleSelectionSupport: false,
         }, instantiationService, contextKeyService, listService, configurationService);

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

@@ -21,31 +21,37 @@ import { IOpenerService } from '../../../../platform/opener/common/opener.servic
 import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.service.js';
 import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.service.js';
 import { CommentsViewFilterFocusContextKey } from './comments.js';
-import { CommentsFilters } from './commentsViewActions.js';
+import { CommentsFilters, CommentsSortOrder } from './commentsViewActions.js';
 import { Memento } from '../../../common/memento.js';
 import { StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
 import { IStorageService } from '../../../../platform/storage/common/storage.service.js';
 import { FilterOptions } from './commentsFilterOptions.js';
 import { CommentThreadApplicability } from '../../../../editor/common/languages.js';
-import { Iterable } from '../../../../base/common/iterator.js';
 import { revealCommentThread } from './commentsController.js';
 import { registerNavigableContainer } from '../../../browser/actions/widgetNavigationCommands.js';
-import { CommentsModel } from './commentsModel.js';
+import { CommentsModel, threadHasMeaningfulComments } from './commentsModel.js';
 import { IHoverService } from '../../../../platform/hover/browser/hover.service.js';
 import { AccessibilityVerbositySettingId } from '../../accessibility/browser/accessibilityConfiguration.js';
 import { AccessibleViewAction } from '../../accessibility/browser/accessibleViewActions.js';
+import { IPathService } from '../../../services/path/common/pathService.service.js';
 const CONTEXT_KEY_HAS_COMMENTS = ( (new RawContextKey('commentsView.hasComments', false)));
 const CONTEXT_KEY_SOME_COMMENTS_EXPANDED = ( (new RawContextKey('commentsView.someCommentsExpanded', false)));
 const CONTEXT_KEY_COMMENT_FOCUSED = ( (new RawContextKey('commentsView.commentFocused', 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 };
-        }))
-    );
+    const result = [];
+    for (const m of model.resourceCommentThreads) {
+        const children = [];
+        for (const r of m.commentThreads) {
+            if (threadHasMeaningfulComments(r.thread)) {
+                children.push({ element: r });
+            }
+        }
+        if (children.length > 0) {
+            result.push({ element: m, children });
+        }
+    }
+    return result;
 }
 let CommentsPanel = class CommentsPanel extends FilterViewPane {
     get focusedCommentNode() {
@@ -95,14 +101,14 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
         }
         this.tree.setFocus([previous]);
     }
-    constructor(options, instantiationService, viewDescriptorService, editorService, configurationService, contextKeyService, contextMenuService, keybindingService, openerService, themeService, commentService, telemetryService, hoverService, uriIdentityService, storageService) {
+    constructor(options, instantiationService, viewDescriptorService, editorService, configurationService, contextKeyService, contextMenuService, keybindingService, openerService, themeService, commentService, telemetryService, hoverService, uriIdentityService, storageService, pathService) {
         const stateMemento = ( (new Memento(VIEW_STORAGE_ID, storageService)));
         const viewState = stateMemento.getMemento(StorageScope.WORKSPACE, StorageTarget.MACHINE);
         super({
             ...options,
             filterOptions: {
-                placeholder: ( localize(5329, "Filter (e.g. text, author)")),
-                ariaLabel: ( localize(5330, "Filter comments")),
+                placeholder: ( localize(5273, "Filter (e.g. text, author)")),
+                ariaLabel: ( localize(5274, "Filter comments")),
                 history: viewState['filterHistory'] || [],
                 text: viewState['filter'] || '',
                 focusContextKey: CommentsViewFilterFocusContextKey.key
@@ -111,6 +117,7 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
         this.editorService = editorService;
         this.commentService = commentService;
         this.uriIdentityService = uriIdentityService;
+        this.pathService = pathService;
         this.totalComments = 0;
         this.currentHeight = 0;
         this.currentWidth = 0;
@@ -124,6 +131,7 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
         this.filters = this._register(( (new CommentsFilters({
             showResolved: this.viewState['showResolved'] !== false,
             showUnresolved: this.viewState['showUnresolved'] !== false,
+            sortBy: this.viewState['sortBy'] ?? CommentsSortOrder.ResourceAscending,
         }, this.contextKeyService))));
         this.filter = ( (new Filter( (new FilterOptions(
             this.filterWidget.getFilterText(),
@@ -134,6 +142,9 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
             if (event.showResolved || event.showUnresolved) {
                 this.updateFilter();
             }
+            if (event.sortBy) {
+                this.refresh();
+            }
         }));
         this._register(this.filterWidget.onDidChangeFilterText(() => this.updateFilter()));
     }
@@ -142,6 +153,7 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
         this.viewState['filterHistory'] = this.filterWidget.getHistory();
         this.viewState['showResolved'] = this.filters.showResolved;
         this.viewState['showUnresolved'] = this.filters.showUnresolved;
+        this.viewState['sortBy'] = this.filters.sortBy;
         this.stateMemento.saveMemento();
         super.saveState();
     }
@@ -186,7 +198,7 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
         this.tree?.filterComments();
         this.cachedFilterStats = undefined;
         const { total, filtered } = this.getFilterStats();
-        this.filterWidget.updateBadge(total === filtered || total === 0 ? undefined : ( localize(5331, "Showing {0} of {1}", filtered, total)));
+        this.filterWidget.updateBadge(total === filtered || total === 0 ? undefined : ( localize(5275, "Showing {0} of {1}", filtered, total)));
         this.filterWidget.checkMoreFilters(!this.filters.showResolved || !this.filters.showUnresolved);
     }
     renderBody(container) {
@@ -221,10 +233,10 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
             this.tree.domFocus();
         }
     }
-    async renderComments() {
+    renderComments() {
         this.treeContainer.classList.toggle('hidden', !this.commentService.commentsModel.hasCommentThreads());
         this.renderMessage();
-        await this.tree?.setChildren(null, createResourceCommentsIterator(this.commentService.commentsModel));
+        this.tree?.setChildren(null, createResourceCommentsIterator(this.commentService.commentsModel));
     }
     collapseAll() {
         if (this.tree) {
@@ -267,8 +279,8 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
         let accessibleViewHint = '';
         if (forAriaLabel && this.configurationService.getValue(AccessibilityVerbositySettingId.Comments)) {
             const kbLabel = this.keybindingService.lookupKeybinding(AccessibleViewAction.id)?.getAriaLabel();
-            accessibleViewHint = kbLabel ? ( localize(5332, "Inspect this in the accessible view ({0}).\n", kbLabel)) : ( localize(
-                5333,
+            accessibleViewHint = kbLabel ? ( localize(5276, "Inspect this in the accessible view ({0}).\n", kbLabel)) : ( localize(
+                5277,
                 "Inspect this in the accessible view via the command Open Accessible View which is currently not triggerable via keybinding.\n"
             ));
         }
@@ -277,7 +289,7 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
         if (element.range) {
             if (element.threadRelevance === CommentThreadApplicability.Outdated) {
                 return accessibleViewHint + ( localize(
-                    5334,
+                    5278,
                     "Outdated from {0} at line {1} column {2} in {3},{4} comment: {5}",
                     element.comment.userName,
                     element.range.startLineNumber,
@@ -289,7 +301,7 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
             }
             else {
                 return accessibleViewHint + ( localize(
-                    5335,
+                    5279,
                     "{0} at line {1} column {2} in {3},{4} comment: {5}",
                     element.comment.userName,
                     element.range.startLineNumber,
@@ -303,7 +315,7 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
         else {
             if (element.threadRelevance === CommentThreadApplicability.Outdated) {
                 return accessibleViewHint + ( localize(
-                    5336,
+                    5280,
                     "Outdated from {0} in {1},{2} comment: {3}",
                     element.comment.userName,
                     basename(element.resource),
@@ -313,7 +325,7 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
             }
             else {
                 return accessibleViewHint + ( localize(
-                    5337,
+                    5281,
                     "{0} in {1},{2} comment: {3}",
                     element.comment.userName,
                     basename(element.resource),
@@ -328,14 +340,14 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
             return '';
         }
         return '\n' + ( (node.replies.map(reply => ( localize(
-            5338,
+            5282,
             "{0} {1}",
             reply.comment.userName,
             (typeof reply.comment.body === 'string') ? reply.comment.body : reply.comment.body.value
         ))))).join('\n');
     }
     getReplyCountAsString(node, forAriaLabel) {
-        return node.replies.length && !forAriaLabel ? ( localize(5339, " {0} replies,", node.replies.length)) : '';
+        return node.replies.length && !forAriaLabel ? ( localize(5283, " {0} replies,", node.replies.length)) : '';
     }
     createTree() {
         this.treeLabels = this._register(this.instantiationService.createInstance(ResourceLabels, this));
@@ -343,6 +355,29 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
             overrideStyles: this.getLocationBasedColors().listOverrideStyles,
             selectionNavigation: true,
             filter: this.filter,
+            sorter: {
+                compare: (a, b) => {
+                    if (a instanceof CommentsModel || b instanceof CommentsModel) {
+                        return 0;
+                    }
+                    if (this.filters.sortBy === CommentsSortOrder.UpdatedAtDescending) {
+                        return a.lastUpdatedAt > b.lastUpdatedAt ? -1 : 1;
+                    }
+                    else if (this.filters.sortBy === CommentsSortOrder.ResourceAscending) {
+                        if (a instanceof ResourceWithCommentThreads && b instanceof ResourceWithCommentThreads) {
+                            const workspaceScheme = this.pathService.defaultUriScheme;
+                            if ((a.resource.scheme !== b.resource.scheme) && (a.resource.scheme === workspaceScheme || b.resource.scheme === workspaceScheme)) {
+                                return b.resource.scheme === workspaceScheme ? 1 : -1;
+                            }
+                            return ( (a.resource.toString())) > ( (b.resource.toString())) ? 1 : -1;
+                        }
+                        else if (a instanceof CommentNode && b instanceof CommentNode && a.thread.range && b.thread.range) {
+                            return a.thread.range?.startLineNumber > b.thread.range?.startLineNumber ? 1 : -1;
+                        }
+                    }
+                    return 0;
+                },
+            },
             keyboardNavigationLabelProvider: {
                 getKeyboardNavigationLabel: (item) => {
                     return undefined;
@@ -351,11 +386,11 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
             accessibilityProvider: {
                 getAriaLabel: (element) => {
                     if (element instanceof CommentsModel) {
-                        return ( localize(5340, "Comments for current workspace"));
+                        return ( localize(5284, "Comments for current workspace"));
                     }
                     if (element instanceof ResourceWithCommentThreads) {
                         return ( localize(
-                            5341,
+                            5285,
                             "Comments in {0}, full path {1}",
                             basename(element.resource),
                             element.resource.fsPath
@@ -400,10 +435,8 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
         }
         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));
+            this.renderComments();
             if (this.tree.getSelection().length === 0 && this.commentService.commentsModel.hasCommentThreads()) {
                 const firstComment = this.commentService.commentsModel.resourceCommentThreads[0].commentThreads[0];
                 if (firstComment) {
@@ -477,6 +510,7 @@ CommentsPanel = ( (__decorate([
     ( (__param(11, ITelemetryService))),
     ( (__param(12, IHoverService))),
     ( (__param(13, IUriIdentityService))),
-    ( (__param(14, IStorageService)))
+    ( (__param(14, IStorageService))),
+    ( (__param(15, IPathService)))
 ], CommentsPanel)));
 export { CONTEXT_KEY_COMMENT_FOCUSED, CONTEXT_KEY_HAS_COMMENTS, CONTEXT_KEY_SOME_COMMENTS_EXPANDED, CommentsPanel };