@codingame/monaco-vscode-api 2.0.3-improve-modularity.1 → 2.1.0-update-vscode-1.86.1

package/vscode/src/vs/workbench/contrib/chat/common/chatModel.js

@@ -24,9 +24,10 @@ class ChatRequestModel {
     get avatarIconUri() {
         return this.session.requesterAvatarIconUri;
     }
-    constructor(session, message) {
+    constructor(session, message, variableData) {
         this.session = session;
         this.message = message;
+        this.variableData = variableData;
         this._id = 'request_' + ChatRequestModel.nextId++;
     }
 }
@@ -84,23 +85,7 @@ class Response {
             }
             this._updateRepr(quiet);
         }
-        else if (progress.kind === 'asyncContent') {
-            const responsePosition = this._responseParts.push(progress) - 1;
-            this._updateRepr(quiet);
-            progress.resolvedContent?.then((content) => {
-                if (typeof content === 'string') {
-                    this._responseParts[responsePosition] = { content: ( new MarkdownString(content)), kind: 'markdownContent' };
-                }
-                else if (isMarkdownString(content)) {
-                    this._responseParts[responsePosition] = { content, kind: 'markdownContent' };
-                }
-                else {
-                    this._responseParts[responsePosition] = content;
-                }
-                this._updateRepr(quiet);
-            });
-        }
-        else if (progress.kind === 'treeData' || progress.kind === 'inlineReference' || progress.kind === 'markdownVuln') {
+        else if (progress.kind === 'treeData' || progress.kind === 'inlineReference' || progress.kind === 'markdownVuln' || progress.kind === 'progressMessage') {
             this._responseParts.push(progress);
             this._updateRepr(quiet);
         }
@@ -113,9 +98,6 @@ class Response {
             else if (part.kind === 'inlineReference') {
                 return basename('uri' in part.inlineReference ? part.inlineReference.uri : part.inlineReference);
             }
-            else if (part.kind === 'asyncContent') {
-                return part.content;
-            }
             else {
                 return part.content.value;
             }
@@ -172,9 +154,11 @@ class ChatResponseModel extends Disposable {
     get progressMessages() {
         return this._progressMessages;
     }
-    constructor(_response, session, agent, requestId, _isComplete = false, _isCanceled = false, _vote, _errorDetails, followups) {
+    constructor(_response, session, _agent, _slashCommand, requestId, _isComplete = false, _isCanceled = false, _vote, _errorDetails, followups) {
         super();
         this.session = session;
+        this._agent = _agent;
+        this._slashCommand = _slashCommand;
         this.requestId = requestId;
         this._isComplete = _isComplete;
         this._isCanceled = _isCanceled;
@@ -184,7 +168,6 @@ class ChatResponseModel extends Disposable {
         this.onDidChange = this._onDidChange.event;
         this._contentReferences = [];
         this._progressMessages = [];
-        this._agent = agent;
         this._followups = followups ? [...followups] : undefined;
         this._response = ( new Response(_response));
         this._register(this._response.onDidChangeValue(() => this._onDidChange.fire()));
@@ -193,7 +176,7 @@ class ChatResponseModel extends Disposable {
     updateContent(responsePart, quiet) {
         this._response.updateContent(responsePart, quiet);
     }
-    applyProgress(progress) {
+    applyReference(progress) {
         if (progress.kind === 'usedContext') {
             this._usedContext = progress;
         }
@@ -201,10 +184,6 @@ class ChatResponseModel extends Disposable {
             this._contentReferences.push(progress);
             this._onDidChange.fire();
         }
-        else if (progress.kind === 'progressMessage') {
-            this._progressMessages.push(progress);
-            this._onDidChange.fire();
-        }
     }
     setAgent(agent, slashCommand) {
         this._agent = agent;
@@ -334,16 +313,17 @@ let ChatModel = class ChatModel extends Disposable {
                 const parsedRequest = typeof raw.message === 'string'
                     ? this.getParsedRequestFromString(raw.message)
                     : reviveParsedChatRequest(raw.message);
-                const request = ( new ChatRequestModel(this, parsedRequest));
+                const variableData = raw.variableData ?? { message: parsedRequest.text, variables: {} };
+                const request = ( new ChatRequestModel(this, parsedRequest, variableData));
                 if (raw.response || raw.responseErrorDetails) {
                     const agent = (raw.agent && 'metadata' in raw.agent) ?
                         revive(raw.agent) : undefined;
-                    request.response = ( new ChatResponseModel(raw.response ?? [( new MarkdownString(raw.response))], this, agent, request.id, true, raw.isCanceled, raw.vote, raw.responseErrorDetails, raw.followups));
+                    request.response = ( new ChatResponseModel(raw.response ?? [( new MarkdownString(raw.response))], this, agent, raw.slashCommand, request.id, true, raw.isCanceled, raw.vote, raw.responseErrorDetails, raw.followups));
                     if (raw.usedContext) {
-                        request.response.applyProgress(raw.usedContext);
+                        request.response.applyReference(revive(raw.usedContext));
                     }
                     if (raw.contentReferences) {
-                        raw.contentReferences.forEach(r => request.response.applyProgress(r));
+                        raw.contentReferences.forEach(r => request.response.applyReference(revive(r)));
                     }
                 }
                 return request;
@@ -398,12 +378,12 @@ let ChatModel = class ChatModel extends Disposable {
     getRequests() {
         return this._requests;
     }
-    addRequest(message, chatAgent) {
+    addRequest(message, variableData, chatAgent, slashCommand) {
         if (!this._session) {
             throw new Error('addRequest: No session');
         }
-        const request = ( new ChatRequestModel(this, message));
-        request.response = ( new ChatResponseModel([], this, chatAgent, request.id));
+        const request = ( new ChatRequestModel(this, message, variableData));
+        request.response = ( new ChatResponseModel([], this, chatAgent, slashCommand, request.id));
         this._requests.push(request);
         this._onDidChange.fire({ kind: 'addRequest', request });
         return request;
@@ -413,7 +393,7 @@ let ChatModel = class ChatModel extends Disposable {
             throw new Error('acceptResponseProgress: No session');
         }
         if (!request.response) {
-            request.response = ( new ChatResponseModel([], this, undefined, request.id));
+            request.response = ( new ChatResponseModel([], this, undefined, undefined, request.id));
         }
         if (request.response.isComplete) {
             throw new Error('acceptResponseProgress: Adding progress to a completed response');
@@ -421,11 +401,11 @@ let ChatModel = class ChatModel extends Disposable {
         if (progress.kind === 'vulnerability') {
             request.response.updateContent({ kind: 'markdownVuln', content: { value: progress.content }, vulnerabilities: progress.vulnerabilities }, quiet);
         }
-        else if (progress.kind === 'content' || progress.kind === 'markdownContent' || progress.kind === 'asyncContent' || progress.kind === 'treeData' || progress.kind === 'inlineReference' || progress.kind === 'markdownVuln') {
+        else if (progress.kind === 'content' || progress.kind === 'markdownContent' || progress.kind === 'treeData' || progress.kind === 'inlineReference' || progress.kind === 'markdownVuln' || progress.kind === 'progressMessage') {
             request.response.updateContent(progress, quiet);
         }
-        else if (progress.kind === 'usedContext' || progress.kind === 'reference' || progress.kind === 'progressMessage') {
-            request.response.applyProgress(progress);
+        else if (progress.kind === 'usedContext' || progress.kind === 'reference') {
+            request.response.applyReference(progress);
         }
         else if (progress.kind === 'agentDetection') {
             const agent = this.chatAgentService.getAgent(progress.agentName);
@@ -456,7 +436,7 @@ let ChatModel = class ChatModel extends Disposable {
             throw new Error('completeResponse: No session');
         }
         if (!request.response) {
-            request.response = ( new ChatResponseModel([], this, undefined, request.id));
+            request.response = ( new ChatResponseModel([], this, undefined, undefined, request.id));
         }
         request.response.setErrorDetails(rawResponse.errorDetails);
     }
@@ -493,6 +473,7 @@ let ChatModel = class ChatModel extends Disposable {
             requests: ( this._requests.map((r) => {
                 return {
                     message: r.message,
+                    variableData: r.variableData,
                     response: r.response ?
                         ( r.response.response.value.map(item => {
                             if (item.kind === 'treeData') {
@@ -501,9 +482,6 @@ let ChatModel = class ChatModel extends Disposable {
                             else if (item.kind === 'markdownContent') {
                                 return item.content;
                             }
-                            else if (item.kind === 'asyncContent') {
-                                return ( new MarkdownString(item.content));
-                            }
                             else {
                                 return item;
                             }

package/vscode/src/vs/workbench/contrib/chat/common/chatService.js

@@ -20,10 +20,10 @@ var InteractiveSessionVoteDirection;
     InteractiveSessionVoteDirection[InteractiveSessionVoteDirection["Down"] = 0] = "Down";
     InteractiveSessionVoteDirection[InteractiveSessionVoteDirection["Up"] = 1] = "Up";
 })(InteractiveSessionVoteDirection || (InteractiveSessionVoteDirection = {})));
-var InteractiveSessionCopyKind;
-( (function(InteractiveSessionCopyKind) {
-    InteractiveSessionCopyKind[InteractiveSessionCopyKind["Action"] = 1] = "Action";
-    InteractiveSessionCopyKind[InteractiveSessionCopyKind["Toolbar"] = 2] = "Toolbar";
-})(InteractiveSessionCopyKind || (InteractiveSessionCopyKind = {})));
+var ChatAgentCopyKind;
+( (function(ChatAgentCopyKind) {
+    ChatAgentCopyKind[ChatAgentCopyKind["Action"] = 1] = "Action";
+    ChatAgentCopyKind[ChatAgentCopyKind["Toolbar"] = 2] = "Toolbar";
+})(ChatAgentCopyKind || (ChatAgentCopyKind = {})));
 const IChatService = ( createDecorator('IChatService'));
-export { IChatService, InteractiveSessionCopyKind, InteractiveSessionVoteDirection, isIDocumentContext, isIUsedContext };
+export { ChatAgentCopyKind, IChatService, InteractiveSessionVoteDirection, isIDocumentContext, isIUsedContext };

package/vscode/src/vs/workbench/contrib/codeActions/browser/codeActionsContribution.js

@@ -10,7 +10,7 @@ import { IKeybindingService } from '../../../../platform/keybinding/common/keybi
 import { Registry } from '../../../../platform/registry/common/platform.js';
 const createCodeActionsAutoSave = (description) => {
     return {
-        type: ['string', 'boolean'],
+        type: 'string',
         enum: ['always', 'explicit', 'never', true, false],
         enumDescriptions: [
             ( localizeWithPath(
@@ -39,7 +39,7 @@ const createCodeActionsAutoSave = (description) => {
                 'Never triggers Code Actions on save. This value will be deprecated in favor of "never".'
             ))
         ],
-        default: true,
+        default: 'explicit',
         description: description
     };
 };
@@ -56,7 +56,7 @@ const codeActionsOnSaveSchema = {
             type: 'object',
             properties: codeActionsOnSaveDefaultProperties,
             additionalProperties: {
-                type: ['string', 'boolean']
+                type: 'string'
             },
         },
         {
@@ -71,7 +71,7 @@ const codeActionsOnSaveSchema = {
     )),
     type: ['object', 'array'],
     additionalProperties: {
-        type: ['string', 'boolean'],
+        type: 'string',
         enum: ['always', 'explicit', 'never', true, false],
     },
     default: {},

package/vscode/src/vs/workbench/contrib/codeEditor/browser/suggestEnabledInput/suggestEnabledInput.css.js

@@ -1,4 +1,4 @@
 import n from '../../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
-var css = ".suggest-input-container{border-radius:2px;padding:2px 6px}.suggest-input-container .monaco-editor,.suggest-input-container .monaco-editor-background,.suggest-input-container .mtk1{color:inherit}.suggest-input-container .suggest-input-placeholder{margin-top:1px;overflow:hidden;pointer-events:none;position:absolute;text-overflow:ellipsis;white-space:nowrap;z-index:1}.suggest-input-container .monaco-editor,.suggest-input-container .monaco-editor .lines-content{background:none}";
+var css = ".suggest-input-container{border-radius:2px;padding:2px 6px}.suggest-input-container .monaco-editor,.suggest-input-container .monaco-editor-background,.suggest-input-container .mtk1{color:inherit}.suggest-input-container .suggest-input-placeholder{margin-top:1px;overflow:hidden;pointer-events:none;position:absolute;text-overflow:ellipsis;white-space:nowrap;z-index:1}.suggest-input-container .monaco-editor,.suggest-input-container .monaco-editor .lines-content{background:none!important}";
 n(css,{});
 export { css, css as default };

package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleMultiCursorModifier.js

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize2WithPath, localizeWithPath } from '../../../../nls.js';
 import { isMacintosh } from '../../../../base/common/platform.js';
 import { Action2, registerAction2, MenuRegistry, MenuId } from '../../../../platform/actions/common/actions.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
@@ -12,11 +12,11 @@ class ToggleMultiCursorModifierAction extends Action2 {
     constructor() {
         super({
             id: ToggleMultiCursorModifierAction.ID,
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/codeEditor/browser/toggleMultiCursorModifier',
                 'toggleLocation',
-                "Toggle Multi-Cursor Modifier"
-            )), original: 'Toggle Multi-Cursor Modifier' },
+                'Toggle Multi-Cursor Modifier'
+            )),
             f1: true
         });
     }

package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleWordWrap.js

@@ -186,9 +186,6 @@ function canToggleWordWrap(codeEditorService, editor) {
     if (!model) {
         return false;
     }
-    if (model.uri.scheme === 'output') {
-        return false;
-    }
     if (editor.getOption(61 )) {
         for (const diffEditor of codeEditorService.listDiffEditors()) {
             if (diffEditor.getOriginalEditor() === editor && !diffEditor.renderSideBySide) {

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

@@ -7,7 +7,7 @@ import { Emitter } from '../../../../base/common/event.js';
 import { ICommentService } from './commentService.js';
 import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
 import { CommentNode } from './commentNode.js';
-import { MarkdownRenderer } from '../../../../editor/contrib/markdownRenderer/browser/markdownRenderer.js';
+import { MarkdownRenderer } from '../../../../editor/browser/widget/markdownRenderer/browser/markdownRenderer.js';
 import { IOpenerService } from '../../../../platform/opener/common/opener.js';
 import { ILanguageService } from '../../../../editor/common/languages/language.js';
 let CommentThreadBody = class CommentThreadBody extends Disposable {

package/vscode/src/vs/workbench/contrib/comments/browser/{comments.contribution.js → commentsAccessibility.js}

@@ -1,207 +1,104 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { localizeWithPath } from '../../../../nls.js';
-import { Registry } from '../../../../platform/registry/common/platform.js';
-import { Extensions } from '../../../../platform/configuration/common/configurationRegistry.js';
-import { ctxCommentEditorFocused } from './simpleCommentEditor.js';
-import { format } from '../../../../base/common/strings.js';
-import { IAccessibleViewService } from '../../accessibility/browser/accessibleView.js';
-import { AccessibilityHelpAction } from '../../accessibility/browser/accessibleViewActions.js';
-import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
-import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IAccessibleViewService } from '../../accessibility/browser/accessibleView.js';
+import { AccessibilityHelpAction } from '../../accessibility/browser/accessibleViewActions.js';
+import { ctxCommentEditorFocused } from './simpleCommentEditor.js';
 import { CommentContextKeys } from '../common/commentContextKeys.js';
-import { ToggleTabFocusModeAction } from '../../../../editor/contrib/toggleTabFocusMode/browser/toggleTabFocusMode.js';
+import { localizeWithPath } from '../../../../nls.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { format } from '../../../../base/common/strings.js';
 import { getActiveElement } from '../../../../base/browser/dom.js';
-( Registry.as(Extensions.Configuration)).registerConfiguration({
-    id: 'comments',
-    order: 20,
-    title: ( localizeWithPath(
-        'vs/workbench/contrib/comments/browser/comments.contribution',
-        'commentsConfigurationTitle',
-        "Comments"
-    )),
-    type: 'object',
-    properties: {
-        'comments.openPanel': {
-            enum: ['neverOpen', 'openOnSessionStart', 'openOnSessionStartWithComments'],
-            default: 'openOnSessionStartWithComments',
-            description: ( localizeWithPath(
-                'vs/workbench/contrib/comments/browser/comments.contribution',
-                'openComments',
-                "Controls when the comments panel should open."
-            )),
-            restricted: false,
-            markdownDeprecationMessage: ( localizeWithPath(
-                'vs/workbench/contrib/comments/browser/comments.contribution',
-                'comments.openPanel.deprecated',
-                "This setting is deprecated in favor of `comments.openView`."
-            ))
-        },
-        'comments.openView': {
-            enum: ['never', 'file', 'firstFile', 'firstFileUnresolved'],
-            enumDescriptions: [( localizeWithPath(
-                'vs/workbench/contrib/comments/browser/comments.contribution',
-                'comments.openView.never',
-                "The comments view will never be opened."
-            )), ( localizeWithPath(
-                'vs/workbench/contrib/comments/browser/comments.contribution',
-                'comments.openView.file',
-                "The comments view will open when a file with comments is active."
-            )), ( localizeWithPath(
-                'vs/workbench/contrib/comments/browser/comments.contribution',
-                'comments.openView.firstFile',
-                "If the comments view has not been opened yet during this session it will open the first time during a session that a file with comments is active."
-            )), ( localizeWithPath(
-                'vs/workbench/contrib/comments/browser/comments.contribution',
-                'comments.openView.firstFileUnresolved',
-                "If the comments view has not been opened yet during this session and the comment is not resolved, it will open the first time during a session that a file with comments is active."
-            ))],
-            default: 'firstFile',
-            description: ( localizeWithPath(
-                'vs/workbench/contrib/comments/browser/comments.contribution',
-                'comments.openView',
-                "Controls when the comments view should open."
-            )),
-            restricted: false
-        },
-        'comments.useRelativeTime': {
-            type: 'boolean',
-            default: true,
-            description: ( localizeWithPath(
-                'vs/workbench/contrib/comments/browser/comments.contribution',
-                'useRelativeTime',
-                "Determines if relative time will be used in comment timestamps (ex. '1 day ago')."
-            ))
-        },
-        'comments.visible': {
-            type: 'boolean',
-            default: true,
-            description: ( localizeWithPath(
-                'vs/workbench/contrib/comments/browser/comments.contribution',
-                'comments.visible',
-                "Controls the visibility of the comments bar and comment threads in editors that have commenting ranges and comments. Comments are still accessible via the Comments view and will cause commenting to be toggled on in the same way running the command \"Comments: Toggle Editor Commenting\" toggles comments."
-            ))
-        },
-        'comments.maxHeight': {
-            type: 'boolean',
-            default: true,
-            description: ( localizeWithPath(
-                'vs/workbench/contrib/comments/browser/comments.contribution',
-                'comments.maxHeight',
-                "Controls whether the comments widget scrolls or expands."
-            ))
-        },
-        'comments.collapseOnResolve': {
-            type: 'boolean',
-            default: true,
-            description: ( localizeWithPath(
-                'vs/workbench/contrib/comments/browser/comments.contribution',
-                'collapseOnResolve',
-                "Controls whether the comment thread should collapse when the thread is resolved."
-            ))
-        }
-    }
-});
+import { ToggleTabFocusModeAction } from '../../../../editor/contrib/toggleTabFocusMode/browser/toggleTabFocusMode.js';
 var CommentAccessibilityHelpNLS;
 ( (function(CommentAccessibilityHelpNLS) {
     CommentAccessibilityHelpNLS.intro = ( localizeWithPath(
-        'vs/workbench/contrib/comments/browser/comments.contribution',
+        'vs/workbench/contrib/comments/browser/commentsAccessibility',
         'intro',
         "The editor contains commentable range(s). Some useful commands include:"
     ));
     CommentAccessibilityHelpNLS.introWidget = ( localizeWithPath(
-        'vs/workbench/contrib/comments/browser/comments.contribution',
+        'vs/workbench/contrib/comments/browser/commentsAccessibility',
         'introWidget',
         "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 ({0})."
     ));
     CommentAccessibilityHelpNLS.introWidgetNoKb = ( localizeWithPath(
-        'vs/workbench/contrib/comments/browser/comments.contribution',
+        'vs/workbench/contrib/comments/browser/commentsAccessibility',
         'introWidgetNoKb',
         "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, which is currently not triggerable via keybinding."
     ));
     CommentAccessibilityHelpNLS.commentCommands = ( localizeWithPath(
-        'vs/workbench/contrib/comments/browser/comments.contribution',
+        'vs/workbench/contrib/comments/browser/commentsAccessibility',
         'commentCommands',
         "Some useful comment commands include:"
     ));
     CommentAccessibilityHelpNLS.escape = ( localizeWithPath(
-        'vs/workbench/contrib/comments/browser/comments.contribution',
+        'vs/workbench/contrib/comments/browser/commentsAccessibility',
         'escape',
         "- Dismiss Comment (Escape)"
     ));
     CommentAccessibilityHelpNLS.nextRange = ( localizeWithPath(
-        'vs/workbench/contrib/comments/browser/comments.contribution',
+        'vs/workbench/contrib/comments/browser/commentsAccessibility',
         'next',
         "- Go to Next Commenting Range ({0})"
     ));
     CommentAccessibilityHelpNLS.nextRangeNoKb = ( localizeWithPath(
-        'vs/workbench/contrib/comments/browser/comments.contribution',
+        'vs/workbench/contrib/comments/browser/commentsAccessibility',
         'nextNoKb',
         "- Go to Next Commenting Range, which is currently not triggerable via keybinding."
     ));
     CommentAccessibilityHelpNLS.previousRange = ( localizeWithPath(
-        'vs/workbench/contrib/comments/browser/comments.contribution',
+        'vs/workbench/contrib/comments/browser/commentsAccessibility',
         'previous',
         "- Go to Previous Commenting Range ({0})"
     ));
     CommentAccessibilityHelpNLS.previousRangeNoKb = ( localizeWithPath(
-        'vs/workbench/contrib/comments/browser/comments.contribution',
+        'vs/workbench/contrib/comments/browser/commentsAccessibility',
         'previousNoKb',
         "- Go to Previous Commenting Range, which is currently not triggerable via keybinding."
     ));
     CommentAccessibilityHelpNLS.nextCommentThreadKb = ( localizeWithPath(
-        'vs/workbench/contrib/comments/browser/comments.contribution',
+        'vs/workbench/contrib/comments/browser/commentsAccessibility',
         'nextCommentThreadKb',
         "- Go to Next Comment Thread ({0})"
     ));
     CommentAccessibilityHelpNLS.nextCommentThreadNoKb = ( localizeWithPath(
-        'vs/workbench/contrib/comments/browser/comments.contribution',
+        'vs/workbench/contrib/comments/browser/commentsAccessibility',
         'nextCommentThreadNoKb',
         "- Go to Next Comment Thread, which is currently not triggerable via keybinding."
     ));
     CommentAccessibilityHelpNLS.previousCommentThreadKb = ( localizeWithPath(
-        'vs/workbench/contrib/comments/browser/comments.contribution',
+        'vs/workbench/contrib/comments/browser/commentsAccessibility',
         'previousCommentThreadKb',
         "- Go to Previous Comment Thread ({0})"
     ));
     CommentAccessibilityHelpNLS.previousCommentThreadNoKb = ( localizeWithPath(
-        'vs/workbench/contrib/comments/browser/comments.contribution',
+        'vs/workbench/contrib/comments/browser/commentsAccessibility',
         'previousCommentThreadNoKb',
         "- Go to Previous Comment Thread, which is currently not triggerable via keybinding."
     ));
     CommentAccessibilityHelpNLS.addComment = ( localizeWithPath(
-        'vs/workbench/contrib/comments/browser/comments.contribution',
+        'vs/workbench/contrib/comments/browser/commentsAccessibility',
         'addComment',
         "- Add Comment ({0})"
     ));
     CommentAccessibilityHelpNLS.addCommentNoKb = ( localizeWithPath(
-        'vs/workbench/contrib/comments/browser/comments.contribution',
+        'vs/workbench/contrib/comments/browser/commentsAccessibility',
         'addCommentNoKb',
         "- Add Comment on Current Selection, which is currently not triggerable via keybinding."
     ));
     CommentAccessibilityHelpNLS.submitComment = ( localizeWithPath(
-        'vs/workbench/contrib/comments/browser/comments.contribution',
+        'vs/workbench/contrib/comments/browser/commentsAccessibility',
         'submitComment',
         "- Submit Comment ({0})"
     ));
     CommentAccessibilityHelpNLS.submitCommentNoKb = ( localizeWithPath(
-        'vs/workbench/contrib/comments/browser/comments.contribution',
+        'vs/workbench/contrib/comments/browser/commentsAccessibility',
         'submitCommentNoKb',
         "- Submit Comment, accessible via tabbing, as it's currently not triggerable with a keybinding."
     ));
 })(CommentAccessibilityHelpNLS || (CommentAccessibilityHelpNLS = {})));
-class CommentsAccessibilityHelpContribution extends Disposable {
-    constructor() {
-        super();
-        this._register(AccessibilityHelpAction.addImplementation(110, 'comments', accessor => {
-            const instantiationService = accessor.get(IInstantiationService);
-            const accessibleViewService = accessor.get(IAccessibleViewService);
-            accessibleViewService.show(instantiationService.createInstance(CommentsAccessibilityHelpProvider));
-            return true;
-        }, ( ContextKeyExpr.or(ctxCommentEditorFocused, CommentContextKeys.commentFocused))));
-    }
-}
 let CommentsAccessibilityHelpProvider = class CommentsAccessibilityHelpProvider {
     constructor(_keybindingService) {
         this._keybindingService = _keybindingService;
@@ -235,4 +132,15 @@ let CommentsAccessibilityHelpProvider = class CommentsAccessibilityHelpProvider
 CommentsAccessibilityHelpProvider = ( __decorate([
     ( __param(0, IKeybindingService))
 ], CommentsAccessibilityHelpProvider));
+class CommentsAccessibilityHelpContribution extends Disposable {
+    constructor() {
+        super();
+        this._register(AccessibilityHelpAction.addImplementation(110, 'comments', accessor => {
+            const instantiationService = accessor.get(IInstantiationService);
+            const accessibleViewService = accessor.get(IAccessibleViewService);
+            accessibleViewService.show(instantiationService.createInstance(CommentsAccessibilityHelpProvider));
+            return true;
+        }, ( ContextKeyExpr.or(ctxCommentEditorFocused, CommentContextKeys.commentFocused))));
+    }
+}
 export { CommentAccessibilityHelpNLS, CommentsAccessibilityHelpContribution, CommentsAccessibilityHelpProvider };

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

@@ -45,7 +45,6 @@ class ReactionActionViewItem extends ActionViewItem {
             const reactionIcon = append(this.label, $('.reaction-icon'));
             const uri = URI.revive(action.icon);
             reactionIcon.style.backgroundImage = asCSSUrl(uri);
-            reactionIcon.title = action.label;
         }
         if (action.count) {
             const reactionCount = append(this.label, $('span.reaction-count'));
@@ -67,31 +66,55 @@ class ReactionActionViewItem extends ActionViewItem {
                 ]
             }, "{0}{1} reaction", toggleMessage, action.label));
         }
-        else if (action.count === 1) {
-            return ( localizeWithPath('vs/workbench/contrib/comments/browser/reactionsAction', {
-                key: 'comment.reactionLabelOne', comment: [
-                    'This is a tooltip for an emoji that is a "reaction" to a comment where the count of the reactions is 1.',
-                    'The emoji is also a button so that the current user can also toggle their own emoji reaction.',
-                    'The first arg is localized message "Toggle reaction" or empty if the user doesn\'t have permission to toggle the reaction, the second is the name of the reaction.'
-                ]
-            }, "{0}1 reaction with {1}", toggleMessage, action.label));
+        else if (action.reactors === undefined || action.reactors.length === 0) {
+            if (action.count === 1) {
+                return ( localizeWithPath('vs/workbench/contrib/comments/browser/reactionsAction', {
+                    key: 'comment.reactionLabelOne', comment: [
+                        'This is a tooltip for an emoji that is a "reaction" to a comment where the count of the reactions is 1.',
+                        'The emoji is also a button so that the current user can also toggle their own emoji reaction.',
+                        'The first arg is localized message "Toggle reaction" or empty if the user doesn\'t have permission to toggle the reaction, the second is the name of the reaction.'
+                    ]
+                }, "{0}1 reaction with {1}", toggleMessage, action.label));
+            }
+            else if (action.count > 1) {
+                return ( localizeWithPath('vs/workbench/contrib/comments/browser/reactionsAction', {
+                    key: 'comment.reactionLabelMany', comment: [
+                        'This is a tooltip for an emoji that is a "reaction" to a comment where the count of the reactions is greater than 1.',
+                        'The emoji is also a button so that the current user can also toggle their own emoji reaction.',
+                        'The first arg is localized message "Toggle reaction" or empty if the user doesn\'t have permission to toggle the reaction, the second is number of users who have reacted with that reaction, and the third is the name of the reaction.'
+                    ]
+                }, "{0}{1} reactions with {2}", toggleMessage, action.count, action.label));
+            }
         }
-        else if (action.count > 1) {
-            return ( localizeWithPath('vs/workbench/contrib/comments/browser/reactionsAction', {
-                key: 'comment.reactionLabelMany', comment: [
-                    'This is a tooltip for an emoji that is a "reaction" to a comment where the count of the reactions is greater than 1.',
-                    'The emoji is also a button so that the current user can also toggle their own emoji reaction.',
-                    'The first arg is localized message "Toggle reaction" or empty if the user doesn\'t have permission to toggle the reaction, the second is number of users who have reacted with that reaction, and the third is the name of the reaction.'
-                ]
-            }, "{0}{1} reactions with {2}", toggleMessage, action.count, action.label));
+        else {
+            if (action.reactors.length <= 10 && action.reactors.length === action.count) {
+                return ( localizeWithPath('vs/workbench/contrib/comments/browser/reactionsAction', {
+                    key: 'comment.reactionLessThanTen', comment: [
+                        'This is a tooltip for an emoji that is a "reaction" to a comment where the count of the reactions is less than or equal to 10.',
+                        'The emoji is also a button so that the current user can also toggle their own emoji reaction.',
+                        'The first arg is localized message "Toggle reaction" or empty if the user doesn\'t have permission to toggle the reaction, the second iis a list of the reactors, and the third is the name of the reaction.'
+                    ]
+                }, "{0}{1} reacted with {2}", toggleMessage, action.reactors.join(', '), action.label));
+            }
+            else if (action.count > 1) {
+                const displayedReactors = action.reactors.slice(0, 10);
+                return ( localizeWithPath('vs/workbench/contrib/comments/browser/reactionsAction', {
+                    key: 'comment.reactionMoreThanTen', comment: [
+                        'This is a tooltip for an emoji that is a "reaction" to a comment where the count of the reactions is less than or equal to 10.',
+                        'The emoji is also a button so that the current user can also toggle their own emoji reaction.',
+                        'The first arg is localized message "Toggle reaction" or empty if the user doesn\'t have permission to toggle the reaction, the second iis a list of the reactors, and the third is the name of the reaction.'
+                    ]
+                }, "{0}{1} and {2} more reacted with {3}", toggleMessage, displayedReactors.join(', '), action.count - displayedReactors.length, action.label));
+            }
         }
         return undefined;
     }
 }
 class ReactionAction extends Action {
     static { this.ID = 'toolbar.toggle.reaction'; }
-    constructor(id, label = '', cssClass = '', enabled = true, actionCallback, icon, count) {
+    constructor(id, label = '', cssClass = '', enabled = true, actionCallback, reactors, icon, count) {
         super(ReactionAction.ID, label, cssClass, enabled, actionCallback);
+        this.reactors = reactors;
         this.icon = icon;
         this.count = count;
     }