@codingame/monaco-vscode-api 4.5.1 → 5.0.0

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

@@ -6,8 +6,6 @@ import { ActionBar } from '../../../../base/browser/ui/actionbar/actionbar.js';
 import { Separator, ActionRunner, Action } from '../../../../base/common/actions.js';
 import { Disposable, dispose } from '../../../../base/common/lifecycle.js';
 import { URI } from '../../../../base/common/uri.js';
-import { IModelService } from '../../../../editor/common/services/model.js';
-import { ILanguageService } from '../../../../editor/common/languages/language.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { ICommentService } from './commentService.service.js';
 import { MIN_EDITOR_HEIGHT, SimpleCommentEditor, calculateEditorHeight } from './simpleCommentEditor.js';
@@ -32,11 +30,14 @@ import { Scrollable } from '../../../../base/common/scrollable.js';
 import { SmoothScrollableElement } from '../../../../base/browser/ui/scrollbar/scrollableElement.js';
 import { DomEmitter } from '../../../../base/browser/event.js';
 import { CommentContextKeys } from '../common/commentContextKeys.js';
-import { FileAccess } from '../../../../base/common/network.js';
+import { FileAccess, Schemas } from '../../../../base/common/network.js';
 import { COMMENTS_SECTION } from '../common/commentsConfiguration.js';
 import { StandardMouseEvent } from '../../../../base/browser/mouseEvent.js';
 import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.service.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.service.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.service.js';
+import { ITextModelService } from '../../../../editor/common/services/resolverService.js';
+const _moduleId = "vs/workbench/contrib/comments/browser/commentNode";
 class CommentsActionRunner extends ActionRunner {
     async runAction(action, context) {
         await action.run(...context);
@@ -46,7 +47,7 @@ let CommentNode = class CommentNode extends Disposable {
     get domNode() {
         return this._domNode;
     }
-    constructor(parentEditor, commentThread, comment, pendingEdit, owner, resource, parentThread, markdownRenderer, instantiationService, commentService, modelService, languageService, notificationService, contextMenuService, contextKeyService, configurationService, accessibilityService, keybindingService) {
+    constructor(parentEditor, commentThread, comment, pendingEdit, owner, resource, parentThread, markdownRenderer, instantiationService, commentService, notificationService, contextMenuService, contextKeyService, configurationService, hoverService, accessibilityService, keybindingService, textModelService) {
         super();
         this.parentEditor = parentEditor;
         this.commentThread = commentThread;
@@ -58,13 +59,13 @@ let CommentNode = class CommentNode extends Disposable {
         this.markdownRenderer = markdownRenderer;
         this.instantiationService = instantiationService;
         this.commentService = commentService;
-        this.modelService = modelService;
-        this.languageService = languageService;
         this.notificationService = notificationService;
         this.contextMenuService = contextMenuService;
         this.configurationService = configurationService;
+        this.hoverService = hoverService;
         this.accessibilityService = accessibilityService;
         this.keybindingService = keybindingService;
+        this.textModelService = textModelService;
         this._editAction = null;
         this._commentEditContainer = null;
         this._commentEditor = null;
@@ -73,7 +74,7 @@ let CommentNode = class CommentNode extends Disposable {
         this._editorHeight = MIN_EDITOR_HEIGHT;
         this._commentFormActions = null;
         this._commentEditorActions = null;
-        this._onDidClick = ( new Emitter());
+        this._onDidClick = ( (new Emitter()));
         this.isEditing = false;
         this._domNode = $('div.review-comment');
         this._contextKeyService = contextKeyService.createScoped(this._domNode);
@@ -118,15 +119,15 @@ let CommentNode = class CommentNode extends Disposable {
         }, true));
     }
     createScroll(container, body) {
-        this._scrollable = ( new Scrollable({
+        this._scrollable = ( (new Scrollable({
             forceIntegerValues: true,
             smoothScrollDuration: 125,
             scheduleAtNextAnimationFrame: cb => scheduleAtNextAnimationFrame(getWindow(container), cb)
-        }));
-        this._scrollableElement = this._register(( new SmoothScrollableElement(body, {
+        })));
+        this._scrollableElement = this._register(( (new SmoothScrollableElement(body, {
             horizontal: 3 ,
             vertical: 3
-        }, this._scrollable)));
+        }, this._scrollable))));
         this._register(this._scrollableElement.onScroll(e => {
             if (e.scrollLeftChanged) {
                 body.scrollLeft = e.scrollLeft;
@@ -135,7 +136,7 @@ let CommentNode = class CommentNode extends Disposable {
                 body.scrollTop = e.scrollTop;
             }
         }));
-        const onDidScrollViewContainer = this._register(( new DomEmitter(body, 'scroll'))).event;
+        const onDidScrollViewContainer = this._register(( (new DomEmitter(body, 'scroll')))).event;
         this._register(onDidScrollViewContainer(_ => {
             const position = this._scrollableElement.getScrollPosition();
             const scrollLeft = Math.abs(body.scrollLeft - position.scrollLeft) <= 1 ? undefined : body.scrollLeft;
@@ -163,7 +164,7 @@ let CommentNode = class CommentNode extends Disposable {
         this._avatar.textContent = '';
         if (userIconPath) {
             const img = append(this._avatar, $('img.avatar'));
-            img.src = ( FileAccess.uriToBrowserUri(URI.revive(userIconPath)).toString(true));
+            img.src = ( (FileAccess.uriToBrowserUri(URI.revive(userIconPath)).toString(true)));
             img.onerror = _ => img.remove();
         }
     }
@@ -178,13 +179,13 @@ let CommentNode = class CommentNode extends Disposable {
         if (!this._timestamp) {
             return;
         }
-        const timestamp = raw !== undefined ? ( new Date(raw)) : undefined;
+        const timestamp = raw !== undefined ? ( (new Date(raw))) : undefined;
         if (!timestamp) {
             this._timestampWidget?.dispose();
         }
         else {
             if (!this._timestampWidget) {
-                this._timestampWidget = ( new TimestampWidget(this.configurationService, this._timestamp, timestamp));
+                this._timestampWidget = ( (new TimestampWidget(this.configurationService, this.hoverService, this._timestamp, timestamp)));
                 this._register(this._timestampWidget);
             }
             else {
@@ -238,23 +239,25 @@ let CommentNode = class CommentNode extends Disposable {
             }];
     }
     createToolbar() {
-        this.toolbar = ( new ToolBar(this._actionsToolbarContainer, this.contextMenuService, {
+        this.toolbar = ( (new ToolBar(this._actionsToolbarContainer, this.contextMenuService, {
             actionViewItemProvider: (action, options) => {
                 if (action.id === ToggleReactionsAction.ID) {
-                    return ( new DropdownMenuActionViewItem(action, action.menuActions, this.contextMenuService, {
-                        ...options,
-                        actionViewItemProvider: (action, options) => this.actionViewItemProvider(action, options),
-                        actionRunner: this.actionRunner,
-                        classNames: ['toolbar-toggle-pickReactions', ...ThemeIcon.asClassNameArray(Codicon.reactions)],
-                        anchorAlignmentProvider: () => 1
-                    }));
+                    return (
+                         (new DropdownMenuActionViewItem(action, action.menuActions, this.contextMenuService, {
+                            ...options,
+                            actionViewItemProvider: (action, options) => this.actionViewItemProvider(action, options),
+                            actionRunner: this.actionRunner,
+                            classNames: ['toolbar-toggle-pickReactions', ...ThemeIcon.asClassNameArray(Codicon.reactions)],
+                            anchorAlignmentProvider: () => 1
+                        }))
+                    );
                 }
                 return this.actionViewItemProvider(action, options);
             },
             orientation: 0
-        }));
+        })));
         this.toolbar.context = this.commentNodeContext;
-        this.toolbar.actionRunner = ( new CommentsActionRunner());
+        this.toolbar.actionRunner = ( (new CommentsActionRunner()));
         this.registerActionBarListeners(this._actionsToolbarContainer);
         this._register(this.toolbar);
     }
@@ -289,7 +292,7 @@ let CommentNode = class CommentNode extends Disposable {
             options = { label: false, icon: true };
         }
         if (action.id === ReactionAction.ID) {
-            const item = ( new ReactionActionViewItem(action));
+            const item = ( (new ReactionActionViewItem(action)));
             return item;
         }
         else if (action instanceof MenuItemAction) {
@@ -299,7 +302,7 @@ let CommentNode = class CommentNode extends Disposable {
             return this.instantiationService.createInstance(SubmenuEntryActionViewItem, action, options);
         }
         else {
-            const item = ( new ActionViewItem({}, action, options));
+            const item = ( (new ActionViewItem({}, action, options)));
             return item;
         }
     }
@@ -310,46 +313,35 @@ let CommentNode = class CommentNode extends Disposable {
         }
     }
     createReactionPicker(reactionGroup) {
-        const toggleReactionAction = this._register(( new ToggleReactionsAction(() => {
+        const toggleReactionAction = this._register(( (new ToggleReactionsAction(() => {
             toggleReactionActionViewItem?.show();
-        }, ( localizeWithPath(
-            'vs/workbench/contrib/comments/browser/commentNode',
-            'commentToggleReaction',
-            "Toggle Reaction"
-        )))));
+        }, ( localizeWithPath(_moduleId, 0, "Toggle Reaction"))))));
         let reactionMenuActions = [];
         if (reactionGroup && reactionGroup.length) {
-            reactionMenuActions = ( reactionGroup.map((reaction) => {
-                return ( new Action(
-                    `reaction.command.${reaction.label}`,
-                    `${reaction.label}`,
-                    '',
-                    true,
-                    async () => {
-                        try {
-                            await this.commentService.toggleReaction(this.owner, this.resource, this.commentThread, this.comment, reaction);
+            reactionMenuActions = ( (reactionGroup.map((reaction) => {
+                return (
+                     (new Action(
+                        `reaction.command.${reaction.label}`,
+                        `${reaction.label}`,
+                        '',
+                        true,
+                        async () => {
+                            try {
+                                await this.commentService.toggleReaction(this.owner, this.resource, this.commentThread, this.comment, reaction);
+                            }
+                            catch (e) {
+                                const error = e.message
+                                    ? ( localizeWithPath(_moduleId, 1, "Toggling the comment reaction failed: {0}.", e.message))
+                                    : ( localizeWithPath(_moduleId, 2, "Toggling the comment reaction failed"));
+                                this.notificationService.error(error);
+                            }
                         }
-                        catch (e) {
-                            const error = e.message
-                                ? ( localizeWithPath(
-                                'vs/workbench/contrib/comments/browser/commentNode',
-                                'commentToggleReactionError',
-                                "Toggling the comment reaction failed: {0}.",
-                                e.message
-                            ))
-                                : ( localizeWithPath(
-                                'vs/workbench/contrib/comments/browser/commentNode',
-                                'commentToggleReactionDefaultError',
-                                "Toggling the comment reaction failed"
-                            ));
-                            this.notificationService.error(error);
-                        }
-                    }
-                ));
-            }));
+                    ))
+                );
+            })));
         }
         toggleReactionAction.menuActions = reactionMenuActions;
-        const toggleReactionActionViewItem = ( new DropdownMenuActionViewItem(
+        const toggleReactionActionViewItem = ( (new DropdownMenuActionViewItem(
             toggleReactionAction,
             toggleReactionAction.menuActions,
             this.contextMenuService,
@@ -364,24 +356,26 @@ let CommentNode = class CommentNode extends Disposable {
                 classNames: 'toolbar-toggle-pickReactions',
                 anchorAlignmentProvider: () => 1
             }
-        ));
+        )));
         return toggleReactionAction;
     }
     createReactionsContainer(commentDetailsContainer) {
         this._reactionActionsContainer = append(commentDetailsContainer, $('div.comment-reactions'));
-        this._reactionsActionBar = ( new ActionBar(this._reactionActionsContainer, {
+        this._reactionsActionBar = ( (new ActionBar(this._reactionActionsContainer, {
             actionViewItemProvider: (action, options) => {
                 if (action.id === ToggleReactionsAction.ID) {
-                    return ( new DropdownMenuActionViewItem(action, action.menuActions, this.contextMenuService, {
-                        actionViewItemProvider: (action, options) => this.actionViewItemProvider(action, options),
-                        actionRunner: this.actionRunner,
-                        classNames: ['toolbar-toggle-pickReactions', ...ThemeIcon.asClassNameArray(Codicon.reactions)],
-                        anchorAlignmentProvider: () => 1
-                    }));
+                    return (
+                         (new DropdownMenuActionViewItem(action, action.menuActions, this.contextMenuService, {
+                            actionViewItemProvider: (action, options) => this.actionViewItemProvider(action, options),
+                            actionRunner: this.actionRunner,
+                            classNames: ['toolbar-toggle-pickReactions', ...ThemeIcon.asClassNameArray(Codicon.reactions)],
+                            anchorAlignmentProvider: () => 1
+                        }))
+                    );
                 }
                 return this.actionViewItemProvider(action, options);
             }
-        }));
+        })));
         this._register(this._reactionsActionBar);
         const hasReactionHandler = this.commentService.hasReactionHandler(this.owner);
         if (hasReactionHandler) {
@@ -392,12 +386,16 @@ let CommentNode = class CommentNode extends Disposable {
     get commentBodyValue() {
         return (typeof this.comment.body === 'string') ? this.comment.body : this.comment.body.value;
     }
-    createCommentEditor(editContainer) {
+    async createCommentEditor(editContainer) {
         const container = append(editContainer, $('.edit-textarea'));
         this._commentEditor = this.instantiationService.createInstance(SimpleCommentEditor, container, SimpleCommentEditor.getEditorOptions(this.configurationService), this._contextKeyService, this.parentThread);
-        const resource = ( URI.parse(`comment:commentinput-${this.comment.uniqueIdInThread}-${Date.now()}.md`));
-        this._commentEditorModel = this.modelService.createModel('', this.languageService.createByFilepathOrFirstLine(resource), resource, false);
-        this._commentEditor.setModel(this._commentEditorModel);
+        const resource = ( (URI.from({
+            scheme: Schemas.commentsInput,
+            path: `/commentinput-${this.comment.uniqueIdInThread}-${Date.now()}.md`
+        })));
+        const modelRef = await this.textModelService.createModelReference(resource);
+        this._commentEditorModel = modelRef;
+        this._commentEditor.setModel(this._commentEditorModel.object.textEditorModel);
         this._commentEditor.setValue(this.pendingEdit ?? this.commentBodyValue);
         this.pendingEdit = undefined;
         this._commentEditor.layout({ width: container.clientWidth - 14, height: this._editorHeight });
@@ -406,9 +404,9 @@ let CommentNode = class CommentNode extends Disposable {
             this._commentEditor.layout({ width: container.clientWidth - 14, height: this._editorHeight });
             this._commentEditor.focus();
         });
-        const lastLine = this._commentEditorModel.getLineCount();
-        const lastColumn = this._commentEditorModel.getLineLength(lastLine) + 1;
-        this._commentEditor.setSelection(( new Selection(lastLine, lastColumn, lastLine, lastColumn)));
+        const lastLine = this._commentEditorModel.object.textEditorModel.getLineCount();
+        const lastColumn = this._commentEditorModel.object.textEditorModel.getLineLength(lastLine) + 1;
+        this._commentEditor.setSelection(( (new Selection(lastLine, lastColumn, lastLine, lastColumn))));
         const commentThread = this.commentThread;
         commentThread.input = {
             uri: this._commentEditor.getModel().uri,
@@ -437,7 +435,7 @@ let CommentNode = class CommentNode extends Disposable {
             }
         }));
         this.calculateEditorHeight();
-        this._register((this._commentEditorModel.onDidChangeContent(() => {
+        this._register((this._commentEditorModel.object.textEditorModel.onDidChangeContent(() => {
             if (this._commentEditor && this.calculateEditorHeight()) {
                 this._commentEditor.layout({ height: this._editorHeight, width: this._commentEditor.getLayoutInfo().width });
                 this._commentEditor.render(true);
@@ -485,14 +483,14 @@ let CommentNode = class CommentNode extends Disposable {
         const height = getContentHeight(this._body) + 4;
         this._scrollableElement.setScrollDimensions({ width, scrollWidth, height, scrollHeight });
     }
-    switchToEditMode() {
+    async switchToEditMode() {
         if (this.isEditing) {
             return;
         }
         this.isEditing = true;
         this._body.classList.add('hidden');
         this._commentEditContainer = append(this._commentDetailsContainer, $('.edit-container'));
-        this.createCommentEditor(this._commentEditContainer);
+        await this.createCommentEditor(this._commentEditContainer);
         const formActions = append(this._commentEditContainer, $('.form-actions'));
         const otherActions = append(formActions, $('.other-actions'));
         this.createCommentWidgetFormActions(otherActions);
@@ -506,7 +504,7 @@ let CommentNode = class CommentNode extends Disposable {
         this._register(menu.onDidChange(() => {
             this._commentFormActions?.setActions(menu);
         }));
-        this._commentFormActions = ( new CommentFormActions(this.keybindingService, this._contextKeyService, container, (action) => {
+        this._commentFormActions = ( (new CommentFormActions(this.keybindingService, this._contextKeyService, container, (action) => {
             const text = this._commentEditor.getValue();
             action.run({
                 thread: this.commentThread,
@@ -515,7 +513,7 @@ let CommentNode = class CommentNode extends Disposable {
                 $mid: 11
             });
             this.removeCommentEditor();
-        }));
+        })));
         this._register(this._commentFormActions);
         this._commentFormActions.setActions(menu);
     }
@@ -526,7 +524,7 @@ let CommentNode = class CommentNode extends Disposable {
         this._register(menu.onDidChange(() => {
             this._commentEditorActions?.setActions(menu);
         }));
-        this._commentEditorActions = ( new CommentFormActions(this.keybindingService, this._contextKeyService, container, (action) => {
+        this._commentEditorActions = ( (new CommentFormActions(this.keybindingService, this._contextKeyService, container, (action) => {
             const text = this._commentEditor.getValue();
             action.run({
                 thread: this.commentThread,
@@ -535,7 +533,7 @@ let CommentNode = class CommentNode extends Disposable {
                 $mid: 11
             });
             this._commentEditor?.focus();
-        }));
+        })));
         this._register(this._commentEditorActions);
         this._commentEditorActions.setActions(menu, true);
     }
@@ -569,18 +567,18 @@ let CommentNode = class CommentNode extends Disposable {
             actionsContainer.classList.remove('mouseover');
         }));
     }
-    update(newComment) {
+    async update(newComment) {
         if (newComment.body !== this.comment.body) {
             this.updateCommentBody(newComment.body);
         }
-        if (this.comment.userIconPath && newComment.userIconPath && (( ( URI.from(this.comment.userIconPath)).toString()) !== ( ( URI.from(newComment.userIconPath)).toString()))) {
+        if (this.comment.userIconPath && newComment.userIconPath && (( (( (URI.from(this.comment.userIconPath))).toString())) !== ( (( (URI.from(newComment.userIconPath))).toString())))) {
             this.updateCommentUserIcon(newComment.userIconPath);
         }
         const isChangingMode = newComment.mode !== undefined && newComment.mode !== this.comment.mode;
         this.comment = newComment;
         if (isChangingMode) {
             if (newComment.mode === CommentMode.Editing) {
-                this.switchToEditMode();
+                await this.switchToEditMode();
             }
             else {
                 this.removeCommentEditor();
@@ -594,7 +592,7 @@ let CommentNode = class CommentNode extends Disposable {
         }
         this._reactionActionsContainer?.remove();
         this._reactionsActionBar?.clear();
-        if (this.comment.commentReactions && ( this.comment.commentReactions.some(reaction => !!reaction.count))) {
+        if (this.comment.commentReactions && ( (this.comment.commentReactions.some(reaction => !!reaction.count)))) {
             this.createReactionsContainer(this._commentDetailsContainer);
         }
         if (this.comment.contextValue) {
@@ -608,13 +606,13 @@ let CommentNode = class CommentNode extends Disposable {
         }
     }
     onContextMenu(e) {
-        const event = ( new StandardMouseEvent(getWindow(this._domNode), e));
+        const event = ( (new StandardMouseEvent(getWindow(this._domNode), e)));
         this.contextMenuService.showContextMenu({
             getAnchor: () => event,
             menuId: MenuId.CommentThreadCommentContext,
             menuActionOptions: { shouldForwardArgs: true },
             contextKeyService: this._contextKeyService,
-            actionRunner: ( new CommentsActionRunner()),
+            actionRunner: ( (new CommentsActionRunner())),
             getActionsContext: () => {
                 return this.commentNodeContext;
             },
@@ -634,23 +632,23 @@ let CommentNode = class CommentNode extends Disposable {
         dispose(this._commentEditorDisposables);
     }
 };
-CommentNode = ( __decorate([
-    ( __param(8, IInstantiationService)),
-    ( __param(9, ICommentService)),
-    ( __param(10, IModelService)),
-    ( __param(11, ILanguageService)),
-    ( __param(12, INotificationService)),
-    ( __param(13, IContextMenuService)),
-    ( __param(14, IContextKeyService)),
-    ( __param(15, IConfigurationService)),
-    ( __param(16, IAccessibilityService)),
-    ( __param(17, IKeybindingService))
-], CommentNode));
+CommentNode = ( (__decorate([
+    ( (__param(8, IInstantiationService))),
+    ( (__param(9, ICommentService))),
+    ( (__param(10, INotificationService))),
+    ( (__param(11, IContextMenuService))),
+    ( (__param(12, IContextKeyService))),
+    ( (__param(13, IConfigurationService))),
+    ( (__param(14, IHoverService))),
+    ( (__param(15, IAccessibilityService))),
+    ( (__param(16, IKeybindingService))),
+    ( (__param(17, ITextModelService)))
+], CommentNode)));
 function fillInActions(groups, target, useAlternativeActions, isPrimaryGroup = group => group === 'navigation') {
     for (const tuple of groups) {
         let [group, actions] = tuple;
         if (useAlternativeActions) {
-            actions = ( actions.map(a => (a instanceof MenuItemAction) && !!a.alt ? a.alt : a));
+            actions = ( (actions.map(a => (a instanceof MenuItemAction) && !!a.alt ? a.alt : a)));
         }
         if (isPrimaryGroup(group)) {
             const to = Array.isArray(target) ? target : target.primary;
@@ -659,7 +657,7 @@ function fillInActions(groups, target, useAlternativeActions, isPrimaryGroup = g
         else {
             const to = Array.isArray(target) ? target : target.secondary;
             if (to.length > 0) {
-                to.push(( new Separator()));
+                to.push(( (new Separator())));
             }
             to.push(...actions);
         }