@codingame/monaco-vscode-extensions-service-override 2.0.3 → 2.1.0

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

@@ -4,7 +4,7 @@ import { localize2WithPath, localizeWithPath } from 'vscode/vscode/vs/nls';
 import { renderMarkdown } from 'vscode/vscode/vs/base/browser/markdownRenderer';
 import { DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
 import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener';
-import { CommentNode, ResourceWithCommentThreads, CommentsModel } from '../common/commentModel.js';
+import { CommentNode, ResourceWithCommentThreads } from '../common/commentModel.js';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { IListService, WorkbenchObjectTree } from 'vscode/vscode/vs/platform/list/browser/listService';
@@ -17,7 +17,8 @@ import { commentViewThreadStateColorVar, getCommentThreadStateIconColor } from '
 import { CommentThreadState } from 'vscode/vscode/vs/editor/common/languages';
 import { FilterOptions } from './commentsFilterOptions.js';
 import { basename } from 'vscode/vscode/vs/base/common/resources';
-import { openLinkFromMarkdown } from 'vscode/vscode/vs/editor/contrib/markdownRenderer/browser/markdownRenderer';
+import { openLinkFromMarkdown } from 'vscode/vscode/vs/editor/browser/widget/markdownRenderer/browser/markdownRenderer';
+import { CommentsModel } from './commentsModel.js';
 
 const COMMENTS_VIEW_ID = 'workbench.panel.comments';
 const COMMENTS_VIEW_STORAGE_ID = 'Comments';

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

@@ -6,37 +6,33 @@ import { basename } from 'vscode/vscode/vs/base/common/resources';
 import { isDiffEditor, isCodeEditor } from 'vscode/vscode/vs/editor/browser/editorBrowser';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService';
-import { CommentsModel, ResourceWithCommentThreads, CommentNode } from '../common/commentModel.js';
+import { ResourceWithCommentThreads, CommentNode } from '../common/commentModel.js';
 import { ICommentService } from 'vscode/vscode/vs/workbench/contrib/comments/browser/commentService';
 import { IEditorService, SIDE_GROUP, ACTIVE_GROUP } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
-import { CommandsRegistry } from 'vscode/vscode/vs/platform/commands/common/commands';
 import { textLinkForeground, textLinkActiveForeground, focusBorder, textPreformatForeground } from 'vscode/vscode/vs/platform/theme/common/colorRegistry';
 import { ResourceLabels } from 'vscode/vscode/vs/workbench/browser/labels';
-import { COMMENTS_VIEW_ID, Filter, CommentsList, COMMENTS_VIEW_TITLE } from './commentsTreeViewer.js';
-import { ViewAction, FilterViewPane } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPane';
-import { IViewsService, IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views';
+import { Filter, CommentsList, COMMENTS_VIEW_TITLE } from './commentsTreeViewer.js';
+import { FilterViewPane } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPane';
+import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
-import { RawContextKey, ContextKeyExpr, IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
+import { RawContextKey, IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView';
 import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding';
 import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
 import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity';
-import { registerAction2, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
-import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { TextModel } from 'vscode/vscode/vs/editor/common/model/textModel';
 import { CommentsViewFilterFocusContextKey } from './comments.js';
 import { CommentsFilters } from './commentsViewActions.js';
 import { Memento } from 'vscode/vscode/vs/workbench/common/memento';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { FilterOptions } from './commentsFilterOptions.js';
-import { IActivityService, NumberBadge } from 'vscode/vscode/vs/workbench/services/activity/common/activity';
-import { CommentThreadState } from 'vscode/vscode/vs/editor/common/languages';
-import { MutableDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import 'vscode/vscode/vs/editor/common/languages';
 import { Iterable } from 'vscode/vscode/vs/base/common/iterator';
 import { CommentController } from './commentsController.js';
 import { Range } from 'vscode/vscode/vs/editor/common/core/range';
 import { registerNavigableContainer } from 'vscode/vscode/vs/workbench/browser/actions/widgetNavigationCommands';
+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));
@@ -49,7 +45,7 @@ function createResourceCommentsIterator(model) {
     }));
 }
 let CommentsPanel = class CommentsPanel extends FilterViewPane {
-    constructor(options, instantiationService, viewDescriptorService, editorService, configurationService, contextKeyService, contextMenuService, keybindingService, openerService, themeService, commentService, telemetryService, uriIdentityService, activityService, storageService) {
+    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({
@@ -73,10 +69,7 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
         this.editorService = editorService;
         this.commentService = commentService;
         this.uriIdentityService = uriIdentityService;
-        this.activityService = activityService;
         this.totalComments = 0;
-        this.totalUnresolved = 0;
-        this.activity = this._register(( new MutableDisposable()));
         this.currentHeight = 0;
         this.currentWidth = 0;
         this.cachedFilterStats = undefined;
@@ -101,19 +94,6 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
         }));
         this._register(this.filterWidget.onDidChangeFilterText(() => this.updateFilter()));
     }
-    updateBadge(unresolved) {
-        if (unresolved === this.totalUnresolved) {
-            return;
-        }
-        this.totalUnresolved = unresolved;
-        const message = ( localizeWithPath(
-            'vs/workbench/contrib/comments/browser/commentsView',
-            'totalUnresolvedComments',
-            '{0} Unresolved Comments',
-            this.totalUnresolved
-        ));
-        this.activity.value = this.activityService.showViewActivity(this.id, { badge: ( new NumberBadge(this.totalUnresolved, () => message)) });
-    }
     saveState() {
         this.viewState['filter'] = this.filterWidget.getFilterText();
         this.viewState['filterHistory'] = this.filterWidget.getHistory();
@@ -177,7 +157,6 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
         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.commentsModel = ( new CommentsModel());
         this.cachedFilterStats = undefined;
         this.createTree();
         this.createMessageBox(domContainer);
@@ -200,7 +179,7 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
         if (element && isActiveElement(element)) {
             return;
         }
-        if (!this.commentsModel.hasCommentThreads() && this.messageBoxContainer) {
+        if (!this.commentService.commentsModel.hasCommentThreads() && this.messageBoxContainer) {
             this.messageBoxContainer.focus();
         }
         else if (this.tree) {
@@ -229,9 +208,9 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
         styleElement.textContent = content.join('\n');
     }
     async renderComments() {
-        this.treeContainer.classList.toggle('hidden', !this.commentsModel.hasCommentThreads());
+        this.treeContainer.classList.toggle('hidden', !this.commentService.commentsModel.hasCommentThreads());
         this.renderMessage();
-        await this.tree?.setChildren(null, createResourceCommentsIterator(this.commentsModel));
+        await this.tree?.setChildren(null, createResourceCommentsIterator(this.commentService.commentsModel));
     }
     collapseAll() {
         if (this.tree) {
@@ -267,8 +246,8 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
         this.messageBoxContainer.setAttribute('tabIndex', '0');
     }
     renderMessage() {
-        this.messageBoxContainer.textContent = this.commentsModel.getMessage();
-        this.messageBoxContainer.classList.toggle('hidden', this.commentsModel.hasCommentThreads());
+        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));
@@ -391,13 +370,13 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
             return;
         }
         if (this.isVisible()) {
-            this.hasCommentsContextKey.set(this.commentsModel.hasCommentThreads());
-            this.treeContainer.classList.toggle('hidden', !this.commentsModel.hasCommentThreads());
+            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.commentsModel));
-            if (this.tree.getSelection().length === 0 && this.commentsModel.hasCommentThreads()) {
-                const firstComment = this.commentsModel.resourceCommentThreads[0].commentThreads[0];
+            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]);
@@ -407,38 +386,23 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
     }
     onAllCommentsChanged(e) {
         this.cachedFilterStats = undefined;
-        this.commentsModel.setCommentThreads(e.ownerId, e.ownerLabel, e.commentThreads);
         this.totalComments += e.commentThreads.length;
-        let unresolved = 0;
         for (const thread of e.commentThreads) {
-            if (thread.state === CommentThreadState.Unresolved) {
-                unresolved++;
-            }
         }
-        this.updateBadge(unresolved);
         this.refresh();
     }
     onCommentsUpdated(e) {
         this.cachedFilterStats = undefined;
-        const didUpdate = this.commentsModel.updateCommentThreads(e);
         this.totalComments += e.added.length;
         this.totalComments -= e.removed.length;
-        let unresolved = 0;
-        for (const resource of this.commentsModel.resourceCommentThreads) {
+        for (const resource of this.commentService.commentsModel.resourceCommentThreads) {
             for (const thread of resource.commentThreads) {
-                if (thread.threadState === CommentThreadState.Unresolved) {
-                    unresolved++;
-                }
             }
         }
-        this.updateBadge(unresolved);
-        if (didUpdate) {
-            this.refresh();
-        }
+        this.refresh();
     }
     onDataProviderDeleted(owner) {
         this.cachedFilterStats = undefined;
-        this.commentsModel.deleteCommentsByOwner(owner);
         this.totalComments = 0;
         this.refresh();
     }
@@ -483,63 +447,7 @@ CommentsPanel = ( __decorate([
     ( __param(10, ICommentService)),
     ( __param(11, ITelemetryService)),
     ( __param(12, IUriIdentityService)),
-    ( __param(13, IActivityService)),
-    ( __param(14, IStorageService))
+    ( __param(13, IStorageService))
 ], CommentsPanel));
-CommandsRegistry.registerCommand({
-    id: 'workbench.action.focusCommentsPanel',
-    handler: async (accessor) => {
-        const viewsService = accessor.get(IViewsService);
-        viewsService.openView(COMMENTS_VIEW_ID, true);
-    }
-});
-registerAction2(class Collapse extends ViewAction {
-    constructor() {
-        super({
-            viewId: COMMENTS_VIEW_ID,
-            id: 'comments.collapse',
-            title: ( localizeWithPath(
-                'vs/workbench/contrib/comments/browser/commentsView',
-                'collapseAll',
-                "Collapse All"
-            )),
-            f1: false,
-            icon: Codicon.collapseAll,
-            menu: {
-                id: MenuId.ViewTitle,
-                group: 'navigation',
-                when: ( ContextKeyExpr.and(( ContextKeyExpr.and(( ContextKeyExpr.equals('view', COMMENTS_VIEW_ID)), CONTEXT_KEY_HAS_COMMENTS)), CONTEXT_KEY_SOME_COMMENTS_EXPANDED)),
-                order: 100
-            }
-        });
-    }
-    runInView(_accessor, view) {
-        view.collapseAll();
-    }
-});
-registerAction2(class Expand extends ViewAction {
-    constructor() {
-        super({
-            viewId: COMMENTS_VIEW_ID,
-            id: 'comments.expand',
-            title: ( localizeWithPath(
-                'vs/workbench/contrib/comments/browser/commentsView',
-                'expandAll',
-                "Expand All"
-            )),
-            f1: false,
-            icon: Codicon.expandAll,
-            menu: {
-                id: MenuId.ViewTitle,
-                group: 'navigation',
-                when: ( ContextKeyExpr.and(( ContextKeyExpr.and(( ContextKeyExpr.equals('view', COMMENTS_VIEW_ID)), CONTEXT_KEY_HAS_COMMENTS)), ContextKeyExpr.not(CONTEXT_KEY_SOME_COMMENTS_EXPANDED.key))),
-                order: 100
-            }
-        });
-    }
-    runInView(_accessor, view) {
-        view.expandAll();
-    }
-});
 
-export { CommentsPanel };
+export { CONTEXT_KEY_HAS_COMMENTS, CONTEXT_KEY_SOME_COMMENTS_EXPANDED, CommentsPanel };

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

@@ -1,7 +1,3 @@
-import { URI } from 'vscode/vscode/vs/base/common/uri';
-import { groupBy } from 'vscode/vscode/vs/base/common/arrays';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
-
 class CommentNode {
     constructor(owner, threadId, resource, comment, range, threadState) {
         this.replies = [];
@@ -36,120 +32,5 @@ class ResourceWithCommentThreads {
         return commentNodes[0];
     }
 }
-class CommentsModel {
-    constructor() {
-        this.resourceCommentThreads = [];
-        this.commentThreadsMap = ( new Map());
-    }
-    updateResourceCommentThreads() {
-        const includeLabel = this.commentThreadsMap.size > 1;
-        this.resourceCommentThreads = ( [...( this.commentThreadsMap.values())].map(value => {
-            return ( value.resourceWithCommentThreads.map(resource => {
-                resource.ownerLabel = includeLabel ? value.ownerLabel : undefined;
-                return resource;
-            })).flat();
-        })).flat();
-        this.resourceCommentThreads.sort((a, b) => {
-            return ( a.resource.toString()) > ( b.resource.toString()) ? 1 : -1;
-        });
-    }
-    setCommentThreads(owner, ownerLabel, commentThreads) {
-        this.commentThreadsMap.set(owner, { ownerLabel, resourceWithCommentThreads: this.groupByResource(owner, commentThreads) });
-        this.updateResourceCommentThreads();
-    }
-    deleteCommentsByOwner(owner) {
-        if (owner) {
-            const existingOwner = this.commentThreadsMap.get(owner);
-            this.commentThreadsMap.set(owner, { ownerLabel: existingOwner?.ownerLabel, resourceWithCommentThreads: [] });
-        }
-        else {
-            this.commentThreadsMap.clear();
-        }
-        this.updateResourceCommentThreads();
-    }
-    updateCommentThreads(event) {
-        const { owner, ownerLabel, removed, changed, added } = event;
-        const threadsForOwner = this.commentThreadsMap.get(owner)?.resourceWithCommentThreads || [];
-        removed.forEach(thread => {
-            const matchingResourceIndex = threadsForOwner.findIndex((resourceData) => resourceData.id === thread.resource);
-            const matchingResourceData = matchingResourceIndex >= 0 ? threadsForOwner[matchingResourceIndex] : undefined;
-            const index = matchingResourceData?.commentThreads.findIndex((commentThread) => commentThread.threadId === thread.threadId) ?? 0;
-            if (index >= 0) {
-                matchingResourceData?.commentThreads.splice(index, 1);
-            }
-            if (matchingResourceData?.commentThreads.length === 0) {
-                threadsForOwner.splice(matchingResourceIndex, 1);
-            }
-        });
-        changed.forEach(thread => {
-            const matchingResourceIndex = threadsForOwner.findIndex((resourceData) => resourceData.id === thread.resource);
-            const matchingResourceData = matchingResourceIndex >= 0 ? threadsForOwner[matchingResourceIndex] : undefined;
-            if (!matchingResourceData) {
-                return;
-            }
-            const index = matchingResourceData.commentThreads.findIndex((commentThread) => commentThread.threadId === thread.threadId);
-            if (index >= 0) {
-                matchingResourceData.commentThreads[index] = ResourceWithCommentThreads.createCommentNode(owner, ( URI.parse(matchingResourceData.id)), thread);
-            }
-            else if (thread.comments && thread.comments.length) {
-                matchingResourceData.commentThreads.push(ResourceWithCommentThreads.createCommentNode(owner, ( URI.parse(matchingResourceData.id)), thread));
-            }
-        });
-        added.forEach(thread => {
-            const existingResource = threadsForOwner.filter(resourceWithThreads => ( resourceWithThreads.resource.toString()) === thread.resource);
-            if (existingResource.length) {
-                const resource = existingResource[0];
-                if (thread.comments && thread.comments.length) {
-                    resource.commentThreads.push(ResourceWithCommentThreads.createCommentNode(owner, resource.resource, thread));
-                }
-            }
-            else {
-                threadsForOwner.push(( new ResourceWithCommentThreads(owner, ( URI.parse(thread.resource)), [thread])));
-            }
-        });
-        this.commentThreadsMap.set(owner, { ownerLabel, resourceWithCommentThreads: threadsForOwner });
-        this.updateResourceCommentThreads();
-        return removed.length > 0 || changed.length > 0 || added.length > 0;
-    }
-    hasCommentThreads() {
-        return !!this.resourceCommentThreads.length;
-    }
-    getMessage() {
-        if (!this.resourceCommentThreads.length) {
-            return ( localizeWithPath(
-                'vs/workbench/contrib/comments/common/commentModel',
-                'noComments',
-                "There are no comments in this workspace yet."
-            ));
-        }
-        else {
-            return '';
-        }
-    }
-    groupByResource(owner, commentThreads) {
-        const resourceCommentThreads = [];
-        const commentThreadsByResource = ( new Map());
-        for (const group of groupBy(commentThreads, CommentsModel._compareURIs)) {
-            commentThreadsByResource.set(group[0].resource, ( new ResourceWithCommentThreads(owner, ( URI.parse(group[0].resource)), group)));
-        }
-        commentThreadsByResource.forEach((v, i, m) => {
-            resourceCommentThreads.push(v);
-        });
-        return resourceCommentThreads;
-    }
-    static _compareURIs(a, b) {
-        const resourceA = ( a.resource.toString());
-        const resourceB = ( b.resource.toString());
-        if (resourceA < resourceB) {
-            return -1;
-        }
-        else if (resourceA > resourceB) {
-            return 1;
-        }
-        else {
-            return 0;
-        }
-    }
-}
 
-export { CommentNode, CommentsModel, ResourceWithCommentThreads };
+export { CommentNode, ResourceWithCommentThreads };