@codingame/monaco-vscode-comments-service-override 4.5.2 → 5.0.1

package/package.json

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

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

@@ -19,6 +19,7 @@ import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 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';
 
 const _moduleId = "vs/workbench/contrib/comments/browser/comments.contribution";
 registerAction2(class Collapse extends ViewAction {
@@ -73,11 +74,18 @@ registerAction2(class Reply extends Action2 {
             id: 'comments.reply',
             title: ( localizeWithPath(_moduleId, 2, "Reply")),
             icon: Codicon.reply,
-            menu: {
-                id: MenuId.CommentsViewThreadActions,
-                order: 100,
-                when: ( (ContextKeyExpr.equals('canReply', true)))
-            },
+            precondition: ( (ContextKeyExpr.equals('canReply', true))),
+            menu: [{
+                    id: MenuId.CommentsViewThreadActions,
+                    order: 100
+                },
+                {
+                    id: MenuId.AccessibleView,
+                    when: ( (ContextKeyExpr.and(accessibleViewIsShown,  (ContextKeyExpr.equals(
+                        accessibleViewCurrentProviderId.key,
+                        "comments"
+                    ))))),
+                }]
         });
     }
     run(accessor, marshalledCommentThread) {

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

@@ -18,9 +18,12 @@ 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 { CommentsInputContentProvider } from './commentsInputContentProvider.js';
 
 const _moduleId = "vs/workbench/contrib/comments/browser/commentsEditorContribution";
 registerEditorContribution(ID, CommentController, 1 );
+registerWorkbenchContribution2(CommentsInputContentProvider.ID, CommentsInputContentProvider, 2 );
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: "editor.action.nextCommentThreadAction" ,
     handler: async (accessor, args) => {

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

@@ -0,0 +1,43 @@
+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 { 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';
+import { applyTextEditorOptions } from 'vscode/vscode/vs/workbench/common/editor/editorOptions';
+import { SimpleCommentEditor } from 'vscode/vscode/vs/workbench/contrib/comments/browser/simpleCommentEditor';
+
+let CommentsInputContentProvider = class CommentsInputContentProvider extends Disposable {
+    static { this.ID = 'comments.input.contentProvider'; }
+    constructor(textModelService, codeEditorService, _modelService, _languageService) {
+        super();
+        this._modelService = _modelService;
+        this._languageService = _languageService;
+        this._register(textModelService.registerTextModelContentProvider(Schemas.commentsInput, this));
+        this._register(codeEditorService.registerCodeEditorOpenHandler(async (input, editor, _sideBySide) => {
+            if (!(editor instanceof SimpleCommentEditor)) {
+                return null;
+            }
+            if (editor.getModel()?.uri.toString() !== ( input.resource.toString())) {
+                return null;
+            }
+            if (input.options) {
+                applyTextEditorOptions(input.options, editor, 1 );
+            }
+            return editor;
+        }));
+    }
+    async provideTextContent(resource) {
+        const existing = this._modelService.getModel(resource);
+        return existing ?? this._modelService.createModel('', this._languageService.createById('markdown'), resource);
+    }
+};
+CommentsInputContentProvider = ( __decorate([
+    ( __param(0, ITextModelService)),
+    ( __param(1, ICodeEditorService)),
+    ( __param(2, IModelService)),
+    ( __param(3, ILanguageService))
+], CommentsInputContentProvider));
+
+export { CommentsInputContentProvider };