@codingame/monaco-vscode-comments-service-override 5.3.0 → 6.0.1

package/package.json

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

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

@@ -9,6 +9,7 @@ import { IWorkbenchLayoutService } from 'vscode/vscode/vs/workbench/services/lay
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { COMMENTS_SECTION } from 'vscode/vscode/vs/workbench/contrib/comments/common/commentsConfiguration';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
+import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { CommentContextKeys } from 'vscode/vscode/vs/workbench/contrib/comments/common/commentContextKeys';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
@@ -60,12 +61,12 @@ let CommentService = class CommentService extends Disposable {
         this._handleZenMode();
         this._workspaceHasCommenting = CommentContextKeys.WorkspaceHasCommenting.bindTo(contextKeyService);
         const storageListener = this._register(( new DisposableStore()));
-        const storageEvent = Event.debounce(this.storageService.onDidChangeValue(1 , CONTINUE_ON_COMMENTS, storageListener), (last, event) => last?.external ? last : event, 500);
+        const storageEvent = Event.debounce(this.storageService.onDidChangeValue(StorageScope.WORKSPACE, CONTINUE_ON_COMMENTS, storageListener), (last, event) => last?.external ? last : event, 500);
         storageListener.add(storageEvent(v => {
             if (!v.external) {
                 return;
             }
-            const commentsToRestore = this.storageService.getObject(CONTINUE_ON_COMMENTS, 1 );
+            const commentsToRestore = this.storageService.getObject(CONTINUE_ON_COMMENTS, StorageScope.WORKSPACE);
             if (!commentsToRestore) {
                 return;
             }
@@ -201,12 +202,12 @@ let CommentService = class CommentService extends Disposable {
     getCommentController(uniqueOwner) {
         return this._commentControls.get(uniqueOwner);
     }
-    async createCommentThreadTemplate(uniqueOwner, resource, range) {
+    async createCommentThreadTemplate(uniqueOwner, resource, range, editorId) {
         const commentController = this._commentControls.get(uniqueOwner);
         if (!commentController) {
             return;
         }
-        return commentController.createCommentThreadTemplate(resource, range);
+        return commentController.createCommentThreadTemplate(resource, range, editorId);
     }
     async updateCommentThreadTemplate(uniqueOwner, threadHandle, range) {
         const commentController = this._commentControls.get(uniqueOwner);
@@ -309,7 +310,7 @@ let CommentService = class CommentService extends Disposable {
             commentsToSave.push(...pendingComments);
         }
         this.logService.debug(`Comments: URIs of continue on comments to add to storage ${( commentsToSave.map(thread => ( thread.uri.toString()))).join(', ')}.`);
-        this.storageService.store(CONTINUE_ON_COMMENTS, commentsToSave, 1 , 0 );
+        this.storageService.store(CONTINUE_ON_COMMENTS, commentsToSave, StorageScope.WORKSPACE, StorageTarget.USER);
     }
     removeContinueOnComment(pendingComment) {
         const pendingComments = this._continueOnComments.get(pendingComment.uniqueOwner);

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

@@ -1,5 +1,6 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { localizeWithPath } 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';
 import './commentService.js';
@@ -12,6 +13,7 @@ import { NumberBadge } from 'vscode/vscode/vs/workbench/services/activity/common
 import { IActivityService } from 'vscode/vscode/vs/workbench/services/activity/common/activity.service';
 import { COMMENTS_VIEW_ID } from 'vscode/vscode/vs/workbench/contrib/comments/browser/commentsTreeViewer';
 import { CommentThreadState } from 'vscode/vscode/vs/editor/common/languages';
+import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 import { registerAction2, MenuId, Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { CONTEXT_KEY_HAS_COMMENTS, CONTEXT_KEY_SOME_COMMENTS_EXPANDED } from 'vscode/vscode/vs/workbench/contrib/comments/browser/commentsView';
 import { ViewAction } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPane';
@@ -20,6 +22,10 @@ import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/commo
 import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
 import { revealCommentThread } from 'vscode/vscode/vs/workbench/contrib/comments/browser/commentsController';
 import { accessibleViewIsShown, accessibleViewCurrentProviderId } from 'vscode/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
+import { AccessibleViewProviderId } from 'vscode/vscode/vs/platform/accessibility/browser/accessibleView';
+import { AccessibleViewRegistry } from 'vscode/vscode/vs/platform/accessibility/browser/accessibleViewRegistry';
+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 {
@@ -81,10 +87,10 @@ registerAction2(class Reply extends Action2 {
                 },
                 {
                     id: MenuId.AccessibleView,
-                    when: ( (ContextKeyExpr.and(accessibleViewIsShown,  (ContextKeyExpr.equals(
-                        accessibleViewCurrentProviderId.key,
-                        "comments"
-                    ))))),
+                    when: ( (ContextKeyExpr.and(
+                        accessibleViewIsShown,
+                         (ContextKeyExpr.equals(accessibleViewCurrentProviderId.key, AccessibleViewProviderId.Comments))
+                    ))),
                 }]
         });
     }
@@ -208,6 +214,8 @@ UnresolvedCommentsBadge = ( (__decorate([
     ( (__param(0, ICommentService))),
     ( (__param(1, IActivityService)))
 ], UnresolvedCommentsBadge)));
-( (Registry.as(Extensions$1.Workbench))).registerWorkbenchContribution(UnresolvedCommentsBadge, 4 );
+( (Registry.as(Extensions$1.Workbench))).registerWorkbenchContribution(UnresolvedCommentsBadge, LifecyclePhase.Eventually);
+AccessibleViewRegistry.register(( (new CommentsAccessibleView())));
+AccessibleViewRegistry.register(( (new CommentsAccessibilityHelp())));
 
 export { UnresolvedCommentsBadge };

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

@@ -0,0 +1,80 @@
+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 { 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 { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';
+
+class CommentsAccessibleView extends Disposable {
+    getProvider(accessor) {
+        const contextKeyService = accessor.get(IContextKeyService);
+        const viewsService = accessor.get(IViewsService);
+        const menuService = accessor.get(IMenuService);
+        const commentsView = viewsService.getActiveViewWithId(COMMENTS_VIEW_ID);
+        if (!commentsView) {
+            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();
+    }
+    constructor() {
+        super();
+        this.priority = 90;
+        this.name = 'comment';
+        this.when = CONTEXT_KEY_HAS_COMMENTS;
+        this.type = AccessibleViewType.View;
+    }
+}
+
+export { CommentsAccessibleView };

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

@@ -1,11 +1,11 @@
-import { KeyChord } from 'vscode/vscode/vs/base/common/keyCodes';
+import { KeyMod, KeyCode, KeyChord } from 'vscode/vscode/vs/base/common/keyCodes';
 import 'vscode/vscode/vs/workbench/contrib/comments/browser/media/review.css';
 import { isDiffEditor, isCodeEditor } from 'vscode/vscode/vs/editor/browser/editorBrowser';
-import { registerEditorContribution } from 'vscode/vscode/vs/editor/browser/editorExtensions';
+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 { CommandsRegistry } from 'vscode/vscode/vs/platform/commands/common/commands';
-import { KeybindingsRegistry } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
+import { KeybindingsRegistry, KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { ICommentService } from 'vscode/vscode/vs/workbench/contrib/comments/browser/commentService.service';
 import { ctxCommentEditorFocused, SimpleCommentEditor } from 'vscode/vscode/vs/workbench/contrib/comments/browser/simpleCommentEditor';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
@@ -18,14 +18,16 @@ import { CommentContextKeys } from 'vscode/vscode/vs/workbench/contrib/comments/
 import { CONTEXT_ACCESSIBILITY_MODE_ENABLED } from 'vscode/vscode/vs/platform/accessibility/common/accessibility';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { accessibilityHelpIsShown, accessibleViewCurrentProviderId } from 'vscode/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
-import { registerWorkbenchContribution2 } from 'vscode/vscode/vs/workbench/common/contributions';
+import { CommentCommandId } from 'vscode/vscode/vs/workbench/contrib/comments/common/commentCommandIds';
+import { registerWorkbenchContribution2, WorkbenchPhase } from 'vscode/vscode/vs/workbench/common/contributions';
 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, 1 );
-registerWorkbenchContribution2(CommentsInputContentProvider.ID, CommentsInputContentProvider, 2 );
+registerEditorContribution(ID, CommentController, EditorContributionInstantiation.AfterFirstRender);
+registerWorkbenchContribution2(CommentsInputContentProvider.ID, CommentsInputContentProvider, WorkbenchPhase.BlockRestore);
 KeybindingsRegistry.registerCommandAndKeybindingRule({
-    id: "editor.action.nextCommentThreadAction" ,
+    id: CommentCommandId.NextThread,
     handler: async (accessor, args) => {
         const activeEditor = getActiveEditor(accessor);
         if (!activeEditor) {
@@ -37,11 +39,11 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
         }
         controller.nextCommentThread();
     },
-    weight: 100 ,
-    primary: 512  | 67 ,
+    weight: KeybindingWeight.EditorContrib,
+    primary: KeyMod.Alt | KeyCode.F9,
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
-    id: "editor.action.previousCommentThreadAction" ,
+    id: CommentCommandId.PreviousThread,
     handler: async (accessor, args) => {
         const activeEditor = getActiveEditor(accessor);
         if (!activeEditor) {
@@ -53,11 +55,11 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
         }
         controller.previousCommentThread();
     },
-    weight: 100 ,
-    primary: 1024  | 512  | 67
+    weight: KeybindingWeight.EditorContrib,
+    primary: KeyMod.Shift | KeyMod.Alt | KeyCode.F9
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
-    id: "editor.action.nextCommentingRange" ,
+    id: CommentCommandId.NextRange,
     handler: async (accessor, args) => {
         const activeEditor = getActiveEditor(accessor);
         if (!activeEditor) {
@@ -74,22 +76,22 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
         CommentContextKeys.commentFocused,
          (ContextKeyExpr.and(
             accessibilityHelpIsShown,
-             (accessibleViewCurrentProviderId.isEqualTo("comments" ))
+             (accessibleViewCurrentProviderId.isEqualTo(AccessibleViewProviderId.Comments))
         ))
     ))))),
-    primary: KeyChord(2048  | 41 , 2048  | 512  | 18 ),
-    weight: 100
+    primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KeyK, KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.DownArrow),
+    weight: KeybindingWeight.EditorContrib
 });
 MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
     command: {
-        id: "editor.action.nextCommentingRange" ,
+        id: CommentCommandId.NextRange,
         title: ( localizeWithPath(_moduleId, 0, "Go to Next Commenting Range")),
         category: 'Comments',
     },
     when: CommentContextKeys.activeEditorHasCommentingRange
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
-    id: "editor.action.previousCommentingRange" ,
+    id: CommentCommandId.PreviousRange,
     handler: async (accessor, args) => {
         const activeEditor = getActiveEditor(accessor);
         if (!activeEditor) {
@@ -106,22 +108,22 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
         CommentContextKeys.commentFocused,
          (ContextKeyExpr.and(
             accessibilityHelpIsShown,
-             (accessibleViewCurrentProviderId.isEqualTo("comments" ))
+             (accessibleViewCurrentProviderId.isEqualTo(AccessibleViewProviderId.Comments))
         ))
     ))))),
-    primary: KeyChord(2048  | 41 , 2048  | 512  | 16 ),
-    weight: 100
+    primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KeyK, KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.UpArrow),
+    weight: KeybindingWeight.EditorContrib
 });
 MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
     command: {
-        id: "editor.action.previousCommentingRange" ,
+        id: CommentCommandId.PreviousRange,
         title: ( localizeWithPath(_moduleId, 1, "Go to Previous Commenting Range")),
         category: 'Comments',
     },
     when: CommentContextKeys.activeEditorHasCommentingRange
 });
 CommandsRegistry.registerCommand({
-    id: "workbench.action.toggleCommenting" ,
+    id: CommentCommandId.ToggleCommenting,
     handler: (accessor) => {
         const commentService = accessor.get(ICommentService);
         const enable = commentService.isCommentingEnabled;
@@ -130,14 +132,14 @@ CommandsRegistry.registerCommand({
 });
 MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
     command: {
-        id: "workbench.action.toggleCommenting" ,
+        id: CommentCommandId.ToggleCommenting,
         title: ( localizeWithPath(_moduleId, 2, "Toggle Editor Commenting")),
         category: 'Comments',
     },
     when: CommentContextKeys.WorkspaceHasCommenting
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
-    id: "workbench.action.addComment" ,
+    id: CommentCommandId.Add,
     handler: async (accessor, args) => {
         const activeEditor = getActiveEditor(accessor);
         if (!activeEditor) {
@@ -166,63 +168,63 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
             )));
         }
     },
-    weight: 100 ,
-    primary: KeyChord(2048  | 41 , 2048  | 512  | 33 ),
+    weight: KeybindingWeight.EditorContrib,
+    primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KeyK, KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.KeyC),
 });
 MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
     command: {
-        id: "workbench.action.addComment" ,
+        id: CommentCommandId.Add,
         title: ( localizeWithPath(_moduleId, 4, "Add Comment on Current Selection")),
         category: 'Comments'
     },
     when: CommentContextKeys.activeCursorHasCommentingRange
 });
 CommandsRegistry.registerCommand({
-    id: "workbench.action.collapseAllComments" ,
+    id: CommentCommandId.CollapseAll,
     handler: (accessor) => {
         return getActiveController(accessor)?.collapseAll();
     }
 });
 MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
     command: {
-        id: "workbench.action.collapseAllComments" ,
+        id: CommentCommandId.CollapseAll,
         title: ( localizeWithPath(_moduleId, 5, "Collapse All Comments")),
         category: 'Comments'
     },
     when: CommentContextKeys.WorkspaceHasCommenting
 });
 CommandsRegistry.registerCommand({
-    id: "workbench.action.expandAllComments" ,
+    id: CommentCommandId.ExpandAll,
     handler: (accessor) => {
         return getActiveController(accessor)?.expandAll();
     }
 });
 MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
     command: {
-        id: "workbench.action.expandAllComments" ,
+        id: CommentCommandId.ExpandAll,
         title: ( localizeWithPath(_moduleId, 6, "Expand All Comments")),
         category: 'Comments'
     },
     when: CommentContextKeys.WorkspaceHasCommenting
 });
 CommandsRegistry.registerCommand({
-    id: "workbench.action.expandUnresolvedComments" ,
+    id: CommentCommandId.ExpandUnresolved,
     handler: (accessor) => {
         return getActiveController(accessor)?.expandUnresolved();
     }
 });
 MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
     command: {
-        id: "workbench.action.expandUnresolvedComments" ,
+        id: CommentCommandId.ExpandUnresolved,
         title: ( localizeWithPath(_moduleId, 7, "Expand Unresolved Comments")),
         category: 'Comments'
     },
     when: CommentContextKeys.WorkspaceHasCommenting
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
-    id: "editor.action.submitComment" ,
-    weight: 100 ,
-    primary: 2048  | 3 ,
+    id: CommentCommandId.Submit,
+    weight: KeybindingWeight.EditorContrib,
+    primary: KeyMod.CtrlCmd | KeyCode.Enter,
     when: ctxCommentEditorFocused,
     handler: (accessor, args) => {
         const activeCodeEditor = accessor.get(ICodeEditorService).getFocusedCodeEditor();
@@ -232,10 +234,10 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
     }
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
-    id: "workbench.action.hideComment" ,
-    weight: 100 ,
-    primary: 9 ,
-    secondary: [1024  | 9 ],
+    id: CommentCommandId.Hide,
+    weight: KeybindingWeight.EditorContrib,
+    primary: KeyCode.Escape,
+    secondary: [KeyMod.Shift | KeyCode.Escape],
     when: ctxCommentEditorFocused,
     handler: (accessor, args) => {
         const activeCodeEditor = accessor.get(ICodeEditorService).getFocusedCodeEditor();

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

@@ -2,6 +2,7 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
 import { ICodeEditorService } from 'vscode/vscode/vs/editor/browser/services/codeEditorService';
+import { ScrollType } from 'vscode/vscode/vs/editor/common/editorCommon';
 import { ILanguageService } from 'vscode/vscode/vs/editor/common/languages/language';
 import { IModelService } from 'vscode/vscode/vs/editor/common/services/model';
 import { ITextModelService } from 'vscode/vscode/vs/editor/common/services/resolverService';
@@ -23,7 +24,7 @@ let CommentsInputContentProvider = class CommentsInputContentProvider extends Di
                 return null;
             }
             if (input.options) {
-                applyTextEditorOptions(input.options, editor, 1 );
+                applyTextEditorOptions(input.options, editor, ScrollType.Immediate);
             }
             return editor;
         }));