@codingame/monaco-vscode-extensions-service-override 2.1.3 → 2.2.0-next.1

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

@@ -1,19 +0,0 @@
-import { matchesFuzzy2, matchesFuzzy } from 'vscode/vscode/vs/base/common/filters';
-import { ltrim } from 'vscode/vscode/vs/base/common/strings';
-
-class FilterOptions {
-    static { this._filter = matchesFuzzy2; }
-    static { this._messageFilter = matchesFuzzy; }
-    constructor(filter, showResolved, showUnresolved) {
-        this.filter = filter;
-        this.showResolved = true;
-        this.showUnresolved = true;
-        filter = filter.trim();
-        this.showResolved = showResolved;
-        this.showUnresolved = showUnresolved;
-        const negate = filter.startsWith('!');
-        this.textFilter = { text: (negate ? ltrim(filter, '!') : filter).trim(), negate };
-    }
-}
-
-export { FilterOptions };

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

@@ -1,125 +0,0 @@
-import { groupBy } from 'vscode/vscode/vs/base/common/arrays';
-import { URI } from 'vscode/vscode/vs/base/common/uri';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
-import { ResourceWithCommentThreads } from '../common/commentModel.js';
-import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
-
-class CommentsModel extends Disposable {
-    get resourceCommentThreads() { return this._resourceCommentThreads; }
-    constructor() {
-        super();
-        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/browser/commentsModel',
-                '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 { CommentsModel };

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

@@ -1,344 +0,0 @@
-import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { append, $ } from 'vscode/vscode/vs/base/browser/dom';
-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 } 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';
-import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService';
-import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
-import { TimestampWidget } from 'vscode/vscode/vs/workbench/contrib/comments/browser/timestamp';
-import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
-import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
-import { commentViewThreadStateColorVar, getCommentThreadStateIconColor } from 'vscode/vscode/vs/workbench/contrib/comments/browser/commentColors';
-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/browser/widget/markdownRenderer/browser/markdownRenderer';
-import { CommentsModel } from './commentsModel.js';
-
-const COMMENTS_VIEW_ID = 'workbench.panel.comments';
-const COMMENTS_VIEW_STORAGE_ID = 'Comments';
-const COMMENTS_VIEW_TITLE = ( localize2WithPath(
-    'vs/workbench/contrib/comments/browser/commentsTreeViewer',
-    'comments.view.title',
-    "Comments"
-));
-class CommentsModelVirualDelegate {
-    static { this.RESOURCE_ID = 'resource-with-comments'; }
-    static { this.COMMENT_ID = 'comment-node'; }
-    getHeight(element) {
-        if ((element instanceof CommentNode) && element.hasReply()) {
-            return 44;
-        }
-        return 22;
-    }
-    getTemplateId(element) {
-        if (element instanceof ResourceWithCommentThreads) {
-            return CommentsModelVirualDelegate.RESOURCE_ID;
-        }
-        if (element instanceof CommentNode) {
-            return CommentsModelVirualDelegate.COMMENT_ID;
-        }
-        return '';
-    }
-}
-class ResourceWithCommentsRenderer {
-    constructor(labels) {
-        this.labels = labels;
-        this.templateId = 'resource-with-comments';
-    }
-    renderTemplate(container) {
-        const labelContainer = append(container, $('.resource-container'));
-        const resourceLabel = this.labels.create(labelContainer);
-        const separator = append(labelContainer, $('.separator'));
-        const owner = labelContainer.appendChild($('.owner'));
-        return { resourceLabel, owner, separator };
-    }
-    renderElement(node, index, templateData, height) {
-        templateData.resourceLabel.setFile(node.element.resource);
-        templateData.separator.innerText = '\u00b7';
-        if (node.element.ownerLabel) {
-            templateData.owner.innerText = node.element.ownerLabel;
-            templateData.separator.style.display = 'inline';
-        }
-        else {
-            templateData.owner.innerText = '';
-            templateData.separator.style.display = 'none';
-        }
-    }
-    disposeTemplate(templateData) {
-        templateData.resourceLabel.dispose();
-    }
-}
-let CommentNodeRenderer = class CommentNodeRenderer {
-    constructor(openerService, configurationService, themeService) {
-        this.openerService = openerService;
-        this.configurationService = configurationService;
-        this.themeService = themeService;
-        this.templateId = 'comment-node';
-    }
-    renderTemplate(container) {
-        const threadContainer = append(container, $('.comment-thread-container'));
-        const metadataContainer = append(threadContainer, $('.comment-metadata-container'));
-        const threadMetadata = {
-            icon: append(metadataContainer, $('.icon')),
-            userNames: append(metadataContainer, $('.user')),
-            timestamp: ( new TimestampWidget(
-                this.configurationService,
-                append(metadataContainer, $('.timestamp-container'))
-            )),
-            separator: append(metadataContainer, $('.separator')),
-            commentPreview: append(metadataContainer, $('.text')),
-            range: append(metadataContainer, $('.range'))
-        };
-        threadMetadata.separator.innerText = '\u00b7';
-        const snippetContainer = append(threadContainer, $('.comment-snippet-container'));
-        const repliesMetadata = {
-            container: snippetContainer,
-            icon: append(snippetContainer, $('.icon')),
-            count: append(snippetContainer, $('.count')),
-            lastReplyDetail: append(snippetContainer, $('.reply-detail')),
-            separator: append(snippetContainer, $('.separator')),
-            timestamp: ( new TimestampWidget(
-                this.configurationService,
-                append(snippetContainer, $('.timestamp-container'))
-            )),
-        };
-        repliesMetadata.separator.innerText = '\u00b7';
-        repliesMetadata.icon.classList.add(...ThemeIcon.asClassNameArray(Codicon.indent));
-        const disposables = [threadMetadata.timestamp, repliesMetadata.timestamp];
-        return { threadMetadata, repliesMetadata, disposables };
-    }
-    getCountString(commentCount) {
-        if (commentCount > 1) {
-            return ( localizeWithPath(
-                'vs/workbench/contrib/comments/browser/commentsTreeViewer',
-                'commentsCount',
-                "{0} comments",
-                commentCount
-            ));
-        }
-        else {
-            return ( localizeWithPath(
-                'vs/workbench/contrib/comments/browser/commentsTreeViewer',
-                'commentCount',
-                "1 comment"
-            ));
-        }
-    }
-    getRenderedComment(commentBody, disposables) {
-        const renderedComment = renderMarkdown(commentBody, {
-            inline: true,
-            actionHandler: {
-                callback: (link) => openLinkFromMarkdown(this.openerService, link, commentBody.isTrusted),
-                disposables: disposables
-            }
-        });
-        const images = renderedComment.element.getElementsByTagName('img');
-        for (let i = 0; i < images.length; i++) {
-            const image = images[i];
-            const textDescription = $('');
-            textDescription.textContent = image.alt ? ( localizeWithPath(
-                'vs/workbench/contrib/comments/browser/commentsTreeViewer',
-                'imageWithLabel',
-                "Image: {0}",
-                image.alt
-            )) : ( localizeWithPath(
-                'vs/workbench/contrib/comments/browser/commentsTreeViewer',
-                'image',
-                "Image"
-            ));
-            image.parentNode.replaceChild(textDescription, image);
-        }
-        return renderedComment;
-    }
-    getIcon(threadState) {
-        if (threadState === CommentThreadState.Unresolved) {
-            return Codicon.commentUnresolved;
-        }
-        else {
-            return Codicon.comment;
-        }
-    }
-    renderElement(node, index, templateData, height) {
-        const commentCount = node.element.replies.length + 1;
-        templateData.threadMetadata.icon.classList.remove(...Array.from(( templateData.threadMetadata.icon.classList.values()))
-            .filter(value => value.startsWith('codicon')));
-        templateData.threadMetadata.icon.classList.add(...ThemeIcon.asClassNameArray(this.getIcon(node.element.threadState)));
-        if (node.element.threadState !== undefined) {
-            const color = this.getCommentThreadWidgetStateColor(node.element.threadState, this.themeService.getColorTheme());
-            templateData.threadMetadata.icon.style.setProperty(commentViewThreadStateColorVar, `${color}`);
-            templateData.threadMetadata.icon.style.color = `var(${commentViewThreadStateColorVar})`;
-        }
-        templateData.threadMetadata.userNames.textContent = node.element.comment.userName;
-        templateData.threadMetadata.timestamp.setTimestamp(node.element.comment.timestamp ? ( new Date(node.element.comment.timestamp)) : undefined);
-        const originalComment = node.element;
-        templateData.threadMetadata.commentPreview.innerText = '';
-        templateData.threadMetadata.commentPreview.style.height = '22px';
-        if (typeof originalComment.comment.body === 'string') {
-            templateData.threadMetadata.commentPreview.innerText = originalComment.comment.body;
-        }
-        else {
-            const disposables = ( new DisposableStore());
-            templateData.disposables.push(disposables);
-            const renderedComment = this.getRenderedComment(originalComment.comment.body, disposables);
-            templateData.disposables.push(renderedComment);
-            templateData.threadMetadata.commentPreview.appendChild(renderedComment.element.firstElementChild ?? renderedComment.element);
-            templateData.threadMetadata.commentPreview.title = renderedComment.element.textContent ?? '';
-        }
-        if (node.element.range) {
-            if (node.element.range.startLineNumber === node.element.range.endLineNumber) {
-                templateData.threadMetadata.range.textContent = ( localizeWithPath(
-                    'vs/workbench/contrib/comments/browser/commentsTreeViewer',
-                    'commentLine',
-                    "[Ln {0}]",
-                    node.element.range.startLineNumber
-                ));
-            }
-            else {
-                templateData.threadMetadata.range.textContent = ( localizeWithPath(
-                    'vs/workbench/contrib/comments/browser/commentsTreeViewer',
-                    'commentRange',
-                    "[Ln {0}-{1}]",
-                    node.element.range.startLineNumber,
-                    node.element.range.endLineNumber
-                ));
-            }
-        }
-        if (!node.element.hasReply()) {
-            templateData.repliesMetadata.container.style.display = 'none';
-            return;
-        }
-        templateData.repliesMetadata.container.style.display = '';
-        templateData.repliesMetadata.count.textContent = this.getCountString(commentCount);
-        const lastComment = node.element.replies[node.element.replies.length - 1].comment;
-        templateData.repliesMetadata.lastReplyDetail.textContent = ( localizeWithPath(
-            'vs/workbench/contrib/comments/browser/commentsTreeViewer',
-            'lastReplyFrom',
-            "Last reply from {0}",
-            lastComment.userName
-        ));
-        templateData.repliesMetadata.timestamp.setTimestamp(lastComment.timestamp ? ( new Date(lastComment.timestamp)) : undefined);
-    }
-    getCommentThreadWidgetStateColor(state, theme) {
-        return (state !== undefined) ? getCommentThreadStateIconColor(state, theme) : undefined;
-    }
-    disposeTemplate(templateData) {
-        templateData.disposables.forEach(disposeable => disposeable.dispose());
-    }
-};
-CommentNodeRenderer = ( __decorate([
-    ( __param(0, IOpenerService)),
-    ( __param(1, IConfigurationService)),
-    ( __param(2, IThemeService))
-], CommentNodeRenderer));
-class Filter {
-    constructor(options) {
-        this.options = options;
-    }
-    filter(element, parentVisibility) {
-        if (this.options.filter === '' && this.options.showResolved && this.options.showUnresolved) {
-            return 1 ;
-        }
-        if (element instanceof ResourceWithCommentThreads) {
-            return this.filterResourceMarkers(element);
-        }
-        else {
-            return this.filterCommentNode(element, parentVisibility);
-        }
-    }
-    filterResourceMarkers(resourceMarkers) {
-        if (this.options.textFilter.text && !this.options.textFilter.negate) {
-            const uriMatches = FilterOptions._filter(this.options.textFilter.text, basename(resourceMarkers.resource));
-            if (uriMatches) {
-                return { visibility: true, data: { type: 0 , uriMatches: uriMatches || [] } };
-            }
-        }
-        return 2 ;
-    }
-    filterCommentNode(comment, parentVisibility) {
-        const matchesResolvedState = (comment.threadState === undefined) || (this.options.showResolved && CommentThreadState.Resolved === comment.threadState) ||
-            (this.options.showUnresolved && CommentThreadState.Unresolved === comment.threadState);
-        if (!matchesResolvedState) {
-            return false;
-        }
-        if (!this.options.textFilter.text) {
-            return true;
-        }
-        const textMatches =
-        FilterOptions._messageFilter(this.options.textFilter.text, typeof comment.comment.body === 'string' ? comment.comment.body : comment.comment.body.value)
-            || FilterOptions._messageFilter(this.options.textFilter.text, comment.comment.userName)
-            || ( comment.replies.map(reply => {
-                return FilterOptions._messageFilter(this.options.textFilter.text, reply.comment.userName)
-                    || FilterOptions._messageFilter(this.options.textFilter.text, typeof reply.comment.body === 'string' ? reply.comment.body : reply.comment.body.value);
-            })).filter(value => !!value).flat();
-        if (textMatches.length && !this.options.textFilter.negate) {
-            return { visibility: true, data: { type: 1 , textMatches } };
-        }
-        if (textMatches.length && this.options.textFilter.negate && parentVisibility === 2 ) {
-            return false;
-        }
-        if ((textMatches.length === 0) && this.options.textFilter.negate && parentVisibility === 2 ) {
-            return true;
-        }
-        return parentVisibility;
-    }
-}
-let CommentsList = class CommentsList extends WorkbenchObjectTree {
-    constructor(labels, container, options, contextKeyService, listService, instantiationService, configurationService) {
-        const delegate = ( new CommentsModelVirualDelegate());
-        const renderers = [
-            instantiationService.createInstance(ResourceWithCommentsRenderer, labels),
-            instantiationService.createInstance(CommentNodeRenderer)
-        ];
-        super('CommentsTree', container, delegate, renderers, {
-            accessibilityProvider: options.accessibilityProvider,
-            identityProvider: {
-                getId: (element) => {
-                    if (element instanceof CommentsModel) {
-                        return 'root';
-                    }
-                    if (element instanceof ResourceWithCommentThreads) {
-                        return `${element.owner}-${element.id}`;
-                    }
-                    if (element instanceof CommentNode) {
-                        return `${element.owner}-${( element.resource.toString())}-${element.threadId}-${element.comment.uniqueIdInThread}` + (element.isRoot ? '-root' : '');
-                    }
-                    return '';
-                }
-            },
-            expandOnlyOnTwistieClick: true,
-            collapseByDefault: false,
-            overrideStyles: options.overrideStyles,
-            filter: options.filter,
-            findWidgetEnabled: false
-        }, instantiationService, contextKeyService, listService, configurationService);
-    }
-    filterComments() {
-        this.refilter();
-    }
-    getVisibleItemCount() {
-        let filtered = 0;
-        const root = this.getNode();
-        for (const resourceNode of root.children) {
-            for (const commentNode of resourceNode.children) {
-                if (commentNode.visible && resourceNode.visible) {
-                    filtered++;
-                }
-            }
-        }
-        return filtered;
-    }
-};
-CommentsList = ( __decorate([
-    ( __param(3, IContextKeyService)),
-    ( __param(4, IListService)),
-    ( __param(5, IInstantiationService)),
-    ( __param(6, IConfigurationService))
-], CommentsList));
-
-export { COMMENTS_VIEW_ID, COMMENTS_VIEW_STORAGE_ID, COMMENTS_VIEW_TITLE, CommentNodeRenderer, CommentsList, Filter, ResourceWithCommentsRenderer };