@codingame/monaco-vscode-comments-service-override 24.3.0 → 25.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-comments-service-override",
-  "version": "24.3.0",
+  "version": "25.0.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - comments service-override",
   "keywords": [],
@@ -15,7 +15,7 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-api": "24.3.0"
+    "@codingame/monaco-vscode-api": "25.0.0"
   },
   "main": "index.js",
   "module": "index.js",

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

@@ -33,7 +33,7 @@ registerAction2(class Collapse extends ViewAction {
         super({
             viewId: COMMENTS_VIEW_ID,
             id: 'comments.collapse',
-            title: ( localize(6297, "Collapse All")),
+            title: ( localize(6319, "Collapse All")),
             f1: false,
             icon: Codicon.collapseAll,
             menu: {
@@ -53,7 +53,7 @@ registerAction2(class Expand extends ViewAction {
         super({
             viewId: COMMENTS_VIEW_ID,
             id: 'comments.expand',
-            title: ( localize(6298, "Expand All")),
+            title: ( localize(6320, "Expand All")),
             f1: false,
             icon: Codicon.expandAll,
             menu: {
@@ -72,7 +72,7 @@ registerAction2(class Reply extends Action2 {
     constructor() {
         super({
             id: 'comments.reply',
-            title: ( localize(6299, "Reply")),
+            title: ( localize(6321, "Reply")),
             icon: Codicon.reply,
             precondition: ( ContextKeyExpr.equals('canReply', true)),
             menu: [{
@@ -95,34 +95,34 @@ registerAction2(class Reply extends Action2 {
 ( Registry.as(Extensions.Configuration)).registerConfiguration({
     id: 'comments',
     order: 20,
-    title: ( localize(6300, "Comments")),
+    title: ( localize(6322, "Comments")),
     type: 'object',
     properties: {
         'comments.openPanel': {
             enum: ['neverOpen', 'openOnSessionStart', 'openOnSessionStartWithComments'],
             default: 'openOnSessionStartWithComments',
-            description: ( localize(6301, "Controls when the comments panel should open.")),
+            description: ( localize(6323, "Controls when the comments panel should open.")),
             restricted: false,
-            markdownDeprecationMessage: ( localize(6302, "This setting is deprecated in favor of `comments.openView`."))
+            markdownDeprecationMessage: ( localize(6324, "This setting is deprecated in favor of `comments.openView`."))
         },
         'comments.openView': {
             enum: ['never', 'file', 'firstFile', 'firstFileUnresolved'],
-            enumDescriptions: [( localize(6303, "The comments view will never be opened.")), ( localize(6304, "The comments view will open when a file with comments is active.")), ( localize(
-                6305,
+            enumDescriptions: [( localize(6325, "The comments view will never be opened.")), ( localize(6326, "The comments view will open when a file with comments is active.")), ( localize(
+                6327,
                 "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."
             )), ( localize(
-                6306,
+                6328,
                 "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: ( localize(6307, "Controls when the comments view should open.")),
+            description: ( localize(6329, "Controls when the comments view should open.")),
             restricted: false
         },
         'comments.useRelativeTime': {
             type: 'boolean',
             default: true,
             description: ( localize(
-                6308,
+                6330,
                 "Determines if relative time will be used in comment timestamps (ex. '1 day ago')."
             ))
         },
@@ -130,20 +130,20 @@ registerAction2(class Reply extends Action2 {
             type: 'boolean',
             default: true,
             description: ( localize(
-                6309,
+                6331,
                 "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: ( localize(6310, "Controls whether the comments widget scrolls or expands."))
+            description: ( localize(6332, "Controls whether the comments widget scrolls or expands."))
         },
         'comments.collapseOnResolve': {
             type: 'boolean',
             default: true,
             description: ( localize(
-                6311,
+                6333,
                 "Controls whether the comment thread should collapse when the thread is resolved."
             ))
         },
@@ -151,12 +151,12 @@ registerAction2(class Reply extends Action2 {
             type: 'string',
             enum: ['whenHasUnsubmittedComments', 'never'],
             enumDescriptions: [( localize(
-                6312,
+                6334,
                 "Show a confirmation dialog when collapsing a comment thread with unsubmitted comments."
-            )), ( localize(6313, "Never show a confirmation dialog when collapsing a comment thread."))],
+            )), ( localize(6335, "Never show a confirmation dialog when collapsing a comment thread."))],
             default: 'whenHasUnsubmittedComments',
             description: ( localize(
-                6314,
+                6336,
                 "Controls whether a confirmation dialog is shown when collapsing a comment thread."
             ))
         }
@@ -198,7 +198,7 @@ let UnresolvedCommentsBadge = class UnresolvedCommentsBadge extends Disposable {
             return;
         }
         this.totalUnresolved = unresolved;
-        const message = ( localize(6315, '{0} Unresolved Comments', this.totalUnresolved));
+        const message = ( localize(6337, '{0} Unresolved Comments', this.totalUnresolved));
         this.activity.value = this.activityService.showViewActivity(COMMENTS_VIEW_ID, { badge: ( new NumberBadge(this.totalUnresolved, () => message)) });
     }
 };

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

@@ -25,6 +25,7 @@ import { CommentsInputContentProvider } from './commentsInputContentProvider.js'
 import { AccessibleViewProviderId } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/browser/accessibleView';
 import { CommentWidgetFocus } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/comments/browser/commentThreadZoneWidget';
 import { IKeybindingService } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service';
+import { CommentThreadCollapsibleState, CommentThreadState } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages';
 
 registerCss(review);
 registerEditorContribution(ID, CommentController, EditorContributionInstantiation.AfterFirstRender);
@@ -66,11 +67,11 @@ registerAction2(class extends Action2 {
         super({
             id: CommentCommandId.NextCommentedRange,
             title: {
-                value: ( localize(6336, "Go to Next Commented Range")),
+                value: ( localize(6358, "Go to Next Commented Range")),
                 original: 'Go to Next Commented Range'
             },
             category: {
-                value: ( localize(6337, "Comments")),
+                value: ( localize(6359, "Comments")),
                 original: 'Comments'
             },
             menu: [{
@@ -101,11 +102,11 @@ registerAction2(class extends Action2 {
         super({
             id: CommentCommandId.PreviousCommentedRange,
             title: {
-                value: ( localize(6338, "Go to Previous Commented Range")),
+                value: ( localize(6360, "Go to Previous Commented Range")),
                 original: 'Go to Previous Commented Range'
             },
             category: {
-                value: ( localize(6337, "Comments")),
+                value: ( localize(6359, "Comments")),
                 original: 'Comments'
             },
             menu: [{
@@ -136,11 +137,11 @@ registerAction2(class extends Action2 {
         super({
             id: CommentCommandId.NextRange,
             title: {
-                value: ( localize(6339, "Go to Next Commenting Range")),
+                value: ( localize(6361, "Go to Next Commenting Range")),
                 original: 'Go to Next Commenting Range'
             },
             category: {
-                value: ( localize(6337, "Comments")),
+                value: ( localize(6359, "Comments")),
                 original: 'Comments'
             },
             menu: [{
@@ -171,11 +172,11 @@ registerAction2(class extends Action2 {
         super({
             id: CommentCommandId.PreviousRange,
             title: {
-                value: ( localize(6340, "Go to Previous Commenting Range")),
+                value: ( localize(6362, "Go to Previous Commenting Range")),
                 original: 'Go to Previous Commenting Range'
             },
             category: {
-                value: ( localize(6337, "Comments")),
+                value: ( localize(6359, "Comments")),
                 original: 'Comments'
             },
             menu: [{
@@ -206,11 +207,11 @@ registerAction2(class extends Action2 {
         super({
             id: CommentCommandId.ToggleCommenting,
             title: {
-                value: ( localize(6341, "Toggle Editor Commenting")),
+                value: ( localize(6363, "Toggle Editor Commenting")),
                 original: 'Toggle Editor Commenting'
             },
             category: {
-                value: ( localize(6337, "Comments")),
+                value: ( localize(6359, "Comments")),
                 original: 'Comments'
             },
             menu: [{
@@ -230,11 +231,11 @@ registerAction2(class extends Action2 {
         super({
             id: CommentCommandId.Add,
             title: {
-                value: ( localize(6342, "Add Comment on Current Selection")),
+                value: ( localize(6364, "Add Comment on Current Selection")),
                 original: 'Add Comment on Current Selection'
             },
             category: {
-                value: ( localize(6337, "Comments")),
+                value: ( localize(6359, "Comments")),
                 original: 'Comments'
             },
             menu: [{
@@ -272,11 +273,11 @@ registerAction2(class extends Action2 {
         super({
             id: CommentCommandId.FocusCommentOnCurrentLine,
             title: {
-                value: ( localize(6343, "Focus Comment on Current Line")),
+                value: ( localize(6365, "Focus Comment on Current Line")),
                 original: 'Focus Comment on Current Line'
             },
             category: {
-                value: ( localize(6337, "Comments")),
+                value: ( localize(6359, "Comments")),
                 original: 'Comments'
             },
             f1: true,
@@ -308,20 +309,27 @@ registerAction2(class extends Action2 {
             error = true;
         }
         if (error) {
-            notificationService.error(( localize(6344, "The cursor must be on a line with a comment to focus the comment")));
+            notificationService.error(( localize(6366, "The cursor must be on a line with a comment to focus the comment")));
         }
     }
 });
+function changeAllCollapseState(commentService, newState) {
+    for (const resource of commentService.commentsModel.resourceCommentThreads) {
+        for (const thread of resource.commentThreads) {
+            thread.thread.collapsibleState = newState(thread.thread);
+        }
+    }
+}
 registerAction2(class extends Action2 {
     constructor() {
         super({
             id: CommentCommandId.CollapseAll,
             title: {
-                value: ( localize(6345, "Collapse All Comments")),
+                value: ( localize(6367, "Collapse All Comments")),
                 original: 'Collapse All Comments'
             },
             category: {
-                value: ( localize(6337, "Comments")),
+                value: ( localize(6359, "Comments")),
                 original: 'Comments'
             },
             menu: [{
@@ -331,7 +339,8 @@ registerAction2(class extends Action2 {
         });
     }
     run(accessor, ...args) {
-        getActiveController(accessor)?.collapseAll();
+        const commentService = accessor.get(ICommentService);
+        changeAllCollapseState(commentService, () => CommentThreadCollapsibleState.Collapsed);
     }
 });
 registerAction2(class extends Action2 {
@@ -339,11 +348,11 @@ registerAction2(class extends Action2 {
         super({
             id: CommentCommandId.ExpandAll,
             title: {
-                value: ( localize(6346, "Expand All Comments")),
+                value: ( localize(6368, "Expand All Comments")),
                 original: 'Expand All Comments'
             },
             category: {
-                value: ( localize(6337, "Comments")),
+                value: ( localize(6359, "Comments")),
                 original: 'Comments'
             },
             menu: [{
@@ -353,7 +362,8 @@ registerAction2(class extends Action2 {
         });
     }
     run(accessor, ...args) {
-        getActiveController(accessor)?.expandAll();
+        const commentService = accessor.get(ICommentService);
+        changeAllCollapseState(commentService, () => CommentThreadCollapsibleState.Expanded);
     }
 });
 registerAction2(class extends Action2 {
@@ -361,11 +371,11 @@ registerAction2(class extends Action2 {
         super({
             id: CommentCommandId.ExpandUnresolved,
             title: {
-                value: ( localize(6347, "Expand Unresolved Comments")),
+                value: ( localize(6369, "Expand Unresolved Comments")),
                 original: 'Expand Unresolved Comments'
             },
             category: {
-                value: ( localize(6337, "Comments")),
+                value: ( localize(6359, "Comments")),
                 original: 'Comments'
             },
             menu: [{
@@ -375,7 +385,10 @@ registerAction2(class extends Action2 {
         });
     }
     run(accessor, ...args) {
-        getActiveController(accessor)?.expandUnresolved();
+        const commentService = accessor.get(ICommentService);
+        changeAllCollapseState(commentService, (commentThread) => {
+            return commentThread.state === CommentThreadState.Unresolved ? CommentThreadCollapsibleState.Expanded : CommentThreadCollapsibleState.Collapsed;
+        });
     }
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
@@ -424,7 +437,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
                 error = true;
             }
             if (error) {
-                notificationService.error(( localize(6344, "The cursor must be on a line with a comment to focus the comment")));
+                notificationService.error(( localize(6366, "The cursor must be on a line with a comment to focus the comment")));
             }
         }
     }
@@ -444,16 +457,5 @@ function getActiveEditor(accessor) {
     }
     return activeTextEditorControl;
 }
-function getActiveController(accessor) {
-    const activeEditor = getActiveEditor(accessor);
-    if (!activeEditor) {
-        return undefined;
-    }
-    const controller = CommentController.get(activeEditor);
-    if (!controller) {
-        return undefined;
-    }
-    return controller;
-}
 
 export { getActiveEditor };