npm - @codingame/monaco-vscode-comments-service-override - Versions diffs - 7.1.0 → 8.0.0 - Mend

@codingame/monaco-vscode-comments-service-override 7.1.0 → 8.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (4) hide show

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-comments-service-override",
-  "version": "7.1.0",
+  "version": "8.0.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -26,6 +26,6 @@
     }
   },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@7.1.0"
+    "vscode": "npm:@codingame/monaco-vscode-api@8.0.0"
   }
 }

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

@@ -1,5 +1,5 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import './commentsEditorContribution.js';
@@ -27,13 +27,12 @@ import { AccessibleViewRegistry } from 'vscode/vscode/vs/platform/accessibility/
 import { CommentsAccessibleView } from './commentsAccessibleView.js';
 import { CommentsAccessibilityHelp } from 'vscode/vscode/vs/workbench/contrib/comments/browser/commentsAccessibility';
-const _moduleId = "vs/workbench/contrib/comments/browser/comments.contribution";
 registerAction2(class Collapse extends ViewAction {
     constructor() {
         super({
             viewId: COMMENTS_VIEW_ID,
             id: 'comments.collapse',
-            title: ( localizeWithPath(_moduleId, 0, "Collapse All")),
+            title: ( localize(1611, "Collapse All")),
             f1: false,
             icon: Codicon.collapseAll,
             menu: {
@@ -56,7 +55,7 @@ registerAction2(class Expand extends ViewAction {
         super({
             viewId: COMMENTS_VIEW_ID,
             id: 'comments.expand',
-            title: ( localizeWithPath(_moduleId, 1, "Expand All")),
+            title: ( localize(1612, "Expand All")),
             f1: false,
             icon: Codicon.expandAll,
             menu: {
@@ -78,7 +77,7 @@ registerAction2(class Reply extends Action2 {
     constructor() {
         super({
             id: 'comments.reply',
-            title: ( localizeWithPath(_moduleId, 2, "Reply")),
+            title: ( localize(1613, "Reply")),
             icon: Codicon.reply,
             precondition: ( (ContextKeyExpr.equals('canReply', true))),
             menu: [{
@@ -104,68 +103,55 @@ registerAction2(class Reply extends Action2 {
 ( (Registry.as(Extensions.Configuration))).registerConfiguration({
     id: 'comments',
     order: 20,
-    title: ( localizeWithPath(_moduleId, 3, "Comments")),
+    title: ( localize(1614, "Comments")),
     type: 'object',
     properties: {
         'comments.openPanel': {
             enum: ['neverOpen', 'openOnSessionStart', 'openOnSessionStartWithComments'],
             default: 'openOnSessionStartWithComments',
-            description: ( localizeWithPath(_moduleId, 4, "Controls when the comments panel should open.")),
+            description: ( localize(1615, "Controls when the comments panel should open.")),
             restricted: false,
-            markdownDeprecationMessage: ( localizeWithPath(
-                _moduleId,
-                5,
-                "This setting is deprecated in favor of `comments.openView`."
-            ))
+            markdownDeprecationMessage: ( localize(1616, "This setting is deprecated in favor of `comments.openView`."))
         },
         'comments.openView': {
             enum: ['never', 'file', 'firstFile', 'firstFileUnresolved'],
-            enumDescriptions: [( localizeWithPath(_moduleId, 6, "The comments view will never be opened.")), ( localizeWithPath(
-                _moduleId,
-                7,
-                "The comments view will open when a file with comments is active."
-            )), ( localizeWithPath(
-                _moduleId,
-                8,
+            enumDescriptions: [( localize(1617, "The comments view will never be opened.")), ( localize(1618, "The comments view will open when a file with comments is active.")), ( localize(
+                1619,
                 "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(
-                _moduleId,
-                9,
+            )), ( localize(
+                1620,
                 "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(_moduleId, 10, "Controls when the comments view should open.")),
+            description: ( localize(1621, "Controls when the comments view should open.")),
             restricted: false
         },
         'comments.useRelativeTime': {
             type: 'boolean',
             default: true,
-            description: ( localizeWithPath(
-                _moduleId,
-                11,
+            description: ( localize(
+                1622,
                 "Determines if relative time will be used in comment timestamps (ex. '1 day ago')."
             ))
         },
         'comments.visible': {
             type: 'boolean',
             default: true,
-            description: ( localizeWithPath(
-                _moduleId,
-                12,
+            description: ( localize(
+                1623,
                 "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(_moduleId, 13, "Controls whether the comments widget scrolls or expands."))
+            description: ( localize(1624, "Controls whether the comments widget scrolls or expands."))
         },
         'comments.collapseOnResolve': {
             type: 'boolean',
             default: true,
-            description: ( localizeWithPath(
-                _moduleId,
-                14,
+            description: ( localize(
+                1625,
                 "Controls whether the comment thread should collapse when the thread is resolved."
             ))
         }
@@ -206,7 +192,7 @@ let UnresolvedCommentsBadge = class UnresolvedCommentsBadge extends Disposable {
             return;
         }
         this.totalUnresolved = unresolved;
-        const message = ( localizeWithPath(_moduleId, 15, '{0} Unresolved Comments', this.totalUnresolved));
+        const message = ( localize(1626, '{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/commentsAccessibleView.js CHANGED Viewed

@@ -1,11 +1,11 @@
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { MarshalledId } from 'vscode/vscode/vs/base/common/marshallingIds';
-import { AccessibleViewProviderId, AccessibleViewType } from 'vscode/vscode/vs/platform/accessibility/browser/accessibleView';
+import { AccessibleViewType, AccessibleViewProviderId } from 'vscode/vscode/vs/platform/accessibility/browser/accessibleView';
 import { IMenuService } from 'vscode/vscode/vs/platform/actions/common/actions.service';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
 import { AccessibilityVerbositySettingId } from 'vscode/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
 import { COMMENTS_VIEW_ID, CommentsMenus } from 'vscode/vscode/vs/workbench/contrib/comments/browser/commentsTreeViewer';
-import { CONTEXT_KEY_HAS_COMMENTS } from 'vscode/vscode/vs/workbench/contrib/comments/browser/commentsView';
+import { CONTEXT_KEY_COMMENT_FOCUSED } from 'vscode/vscode/vs/workbench/contrib/comments/browser/commentsView';
 import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';
 class CommentsAccessibleView extends Disposable {
@@ -14,67 +14,65 @@ class CommentsAccessibleView extends Disposable {
         const viewsService = accessor.get(IViewsService);
         const menuService = accessor.get(IMenuService);
         const commentsView = viewsService.getActiveViewWithId(COMMENTS_VIEW_ID);
-        if (!commentsView) {
+        const focusedCommentNode = commentsView?.focusedCommentNode;
+        if (!commentsView || !focusedCommentNode) {
             return;
         }
         const menus = this._register(( new CommentsMenus(menuService)));
         menus.setContextKeyService(contextKeyService);
-        function resolveProvider() {
-            if (!commentsView) {
-                return;
-            }
-            const commentNode = commentsView.focusedCommentNode;
-            const content = commentsView.focusedCommentInfo?.toString();
-            if (!commentNode || !content) {
-                return;
-            }
-            const menuActions = [...menus.getResourceContextActions(commentNode)].filter(i => i.enabled);
-            const actions = ( menuActions.map(action => {
-                return {
-                    ...action,
-                    run: () => {
-                        commentsView.focus();
-                        action.run({
-                            thread: commentNode.thread,
-                            $mid: MarshalledId.CommentThread,
-                            commentControlHandle: commentNode.controllerHandle,
-                            commentThreadHandle: commentNode.threadHandle,
-                        });
-                    }
-                };
-            }));
-            return {
-                id: AccessibleViewProviderId.Notification,
-                provideContent: () => {
-                    return content;
-                },
-                onClose() {
-                    commentsView.focus();
-                },
-                next() {
-                    commentsView.focus();
-                    commentsView.focusNextNode();
-                    resolveProvider();
-                },
-                previous() {
-                    commentsView.focus();
-                    commentsView.focusPreviousNode();
-                    resolveProvider();
-                },
-                verbositySettingKey: AccessibilityVerbositySettingId.Comments,
-                options: { type: AccessibleViewType.View },
-                actions
-            };
-        }
-        return resolveProvider();
+        return ( new CommentsAccessibleContentProvider(commentsView, focusedCommentNode, menus));
     }
     constructor() {
         super();
         this.priority = 90;
         this.name = 'comment';
-        this.when = CONTEXT_KEY_HAS_COMMENTS;
+        this.when = CONTEXT_KEY_COMMENT_FOCUSED;
         this.type = AccessibleViewType.View;
     }
 }
+class CommentsAccessibleContentProvider extends Disposable {
+    constructor(_commentsView, _focusedCommentNode, _menus) {
+        super();
+        this._commentsView = _commentsView;
+        this._focusedCommentNode = _focusedCommentNode;
+        this._menus = _menus;
+        this.id = AccessibleViewProviderId.Comments;
+        this.verbositySettingKey = AccessibilityVerbositySettingId.Comments;
+        this.options = { type: AccessibleViewType.View };
+        this.actions = ( [...this._menus.getResourceContextActions(this._focusedCommentNode)].filter(i => i.enabled).map(action => {
+            return {
+                ...action,
+                run: () => {
+                    this._commentsView.focus();
+                    action.run({
+                        thread: this._focusedCommentNode.thread,
+                        $mid: MarshalledId.CommentThread,
+                        commentControlHandle: this._focusedCommentNode.controllerHandle,
+                        commentThreadHandle: this._focusedCommentNode.threadHandle,
+                    });
+                }
+            };
+        }));
+    }
+    provideContent() {
+        const commentNode = this._commentsView.focusedCommentNode;
+        const content = this._commentsView.focusedCommentInfo?.toString();
+        if (!commentNode || !content) {
+            throw ( new Error('Comment tree is focused but no comment is selected'));
+        }
+        return content;
+    }
+    onClose() {
+        this._commentsView.focus();
+    }
+    provideNextContent() {
+        this._commentsView.focusNextNode();
+        return this.provideContent();
+    }
+    providePreviousContent() {
+        this._commentsView.focusPreviousNode();
+        return this.provideContent();
+    }
+}
 export { CommentsAccessibleView };

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

@@ -3,7 +3,7 @@ import 'vscode/vscode/vs/workbench/contrib/comments/browser/media/review.css';
 import { isDiffEditor, isCodeEditor } from 'vscode/vscode/vs/editor/browser/editorBrowser';
 import { registerEditorContribution, EditorContributionInstantiation } from 'vscode/vscode/vs/editor/browser/editorExtensions';
 import { ICodeEditorService } from 'vscode/vscode/vs/editor/browser/services/codeEditorService';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { CommandsRegistry } from 'vscode/vscode/vs/platform/commands/common/commands';
 import { KeybindingsRegistry, KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { ICommentService } from 'vscode/vscode/vs/workbench/contrib/comments/browser/commentService.service';
@@ -23,7 +23,6 @@ import { registerWorkbenchContribution2, WorkbenchPhase } from 'vscode/vscode/vs
 import { CommentsInputContentProvider } from './commentsInputContentProvider.js';
 import { AccessibleViewProviderId } from 'vscode/vscode/vs/platform/accessibility/browser/accessibleView';
-const _moduleId = "vs/workbench/contrib/comments/browser/commentsEditorContribution";
 registerEditorContribution(ID, CommentController, EditorContributionInstantiation.AfterFirstRender);
 registerWorkbenchContribution2(CommentsInputContentProvider.ID, CommentsInputContentProvider, WorkbenchPhase.BlockRestore);
 KeybindingsRegistry.registerCommandAndKeybindingRule({
@@ -85,7 +84,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
     command: {
         id: CommentCommandId.NextRange,
-        title: ( localizeWithPath(_moduleId, 0, "Go to Next Commenting Range")),
+        title: ( localize(5250, "Go to Next Commenting Range")),
         category: 'Comments',
     },
     when: CommentContextKeys.activeEditorHasCommentingRange
@@ -117,7 +116,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
     command: {
         id: CommentCommandId.PreviousRange,
-        title: ( localizeWithPath(_moduleId, 1, "Go to Previous Commenting Range")),
+        title: ( localize(5251, "Go to Previous Commenting Range")),
         category: 'Comments',
     },
     when: CommentContextKeys.activeEditorHasCommentingRange
@@ -133,7 +132,7 @@ CommandsRegistry.registerCommand({
 MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
     command: {
         id: CommentCommandId.ToggleCommenting,
-        title: ( localizeWithPath(_moduleId, 2, "Toggle Editor Commenting")),
+        title: ( localize(5252, "Toggle Editor Commenting")),
         category: 'Comments',
     },
     when: CommentContextKeys.WorkspaceHasCommenting
@@ -161,11 +160,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
             await controller.addOrToggleCommentAtLine(position, undefined);
         }
         catch (e) {
-            notificationService.error(( localizeWithPath(
-                _moduleId,
-                3,
-                "The cursor must be within a commenting range to add a comment"
-            )));
+            notificationService.error(( localize(5253, "The cursor must be within a commenting range to add a comment")));
         }
     },
     weight: KeybindingWeight.EditorContrib,
@@ -174,7 +169,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
     command: {
         id: CommentCommandId.Add,
-        title: ( localizeWithPath(_moduleId, 4, "Add Comment on Current Selection")),
+        title: ( localize(5254, "Add Comment on Current Selection")),
         category: 'Comments'
     },
     when: CommentContextKeys.activeCursorHasCommentingRange
@@ -188,7 +183,7 @@ CommandsRegistry.registerCommand({
 MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
     command: {
         id: CommentCommandId.CollapseAll,
-        title: ( localizeWithPath(_moduleId, 5, "Collapse All Comments")),
+        title: ( localize(5255, "Collapse All Comments")),
         category: 'Comments'
     },
     when: CommentContextKeys.WorkspaceHasCommenting
@@ -202,7 +197,7 @@ CommandsRegistry.registerCommand({
 MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
     command: {
         id: CommentCommandId.ExpandAll,
-        title: ( localizeWithPath(_moduleId, 6, "Expand All Comments")),
+        title: ( localize(5256, "Expand All Comments")),
         category: 'Comments'
     },
     when: CommentContextKeys.WorkspaceHasCommenting
@@ -216,7 +211,7 @@ CommandsRegistry.registerCommand({
 MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
     command: {
         id: CommentCommandId.ExpandUnresolved,
-        title: ( localizeWithPath(_moduleId, 7, "Expand Unresolved Comments")),
+        title: ( localize(5257, "Expand Unresolved Comments")),
         category: 'Comments'
     },
     when: CommentContextKeys.WorkspaceHasCommenting