@codingame/monaco-vscode-api 4.5.2 → 5.0.1

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

@@ -5,7 +5,7 @@ import { append, $, isActiveElement } from '../../../../base/browser/dom.js';
 import { basename } from '../../../../base/common/resources.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { IThemeService } from '../../../../platform/theme/common/themeService.service.js';
-import { ResourceWithCommentThreads, CommentNode } from '../common/commentModel.js';
+import { CommentNode, ResourceWithCommentThreads } from '../common/commentModel.js';
 import { ICommentService } from './commentService.service.js';
 import { IEditorService } from '../../../services/editor/common/editorService.service.js';
 import { ResourceLabels } from '../../../browser/labels.js';
@@ -30,6 +30,8 @@ import { Iterable } from '../../../../base/common/iterator.js';
 import { revealCommentThread } from './commentsController.js';
 import { registerNavigableContainer } from '../../../browser/actions/widgetNavigationCommands.js';
 import { CommentsModel } from './commentsModel.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.service.js';
+import { AccessibleViewAction } from '../../accessibility/browser/accessibleViewActions.js';
 const _moduleId = "vs/workbench/contrib/comments/browser/commentsView";
 const CONTEXT_KEY_HAS_COMMENTS = ( (new RawContextKey('commentsView.hasComments', false)));
 const CONTEXT_KEY_SOME_COMMENTS_EXPANDED = ( (new RawContextKey('commentsView.someCommentsExpanded', false)));
@@ -44,7 +46,54 @@ function createResourceCommentsIterator(model) {
     );
 }
 let CommentsPanel = class CommentsPanel extends FilterViewPane {
-    constructor(options, instantiationService, viewDescriptorService, editorService, configurationService, contextKeyService, contextMenuService, keybindingService, openerService, themeService, commentService, telemetryService, uriIdentityService, storageService) {
+    get focusedCommentNode() {
+        const focused = this.tree?.getFocus();
+        if (focused?.length === 1 && focused[0] instanceof CommentNode) {
+            return focused[0];
+        }
+        return undefined;
+    }
+    get focusedCommentInfo() {
+        if (!this.focusedCommentNode) {
+            return;
+        }
+        return this.getScreenReaderInfoForNode(this.focusedCommentNode);
+    }
+    focusNextNode() {
+        if (!this.tree) {
+            return;
+        }
+        const focused = this.tree.getFocus()?.[0];
+        if (!focused) {
+            return;
+        }
+        let next = this.tree.navigate(focused).next();
+        while (next && !(next instanceof CommentNode)) {
+            next = this.tree.navigate(next).next();
+        }
+        if (!next) {
+            return;
+        }
+        this.tree.setFocus([next]);
+    }
+    focusPreviousNode() {
+        if (!this.tree) {
+            return;
+        }
+        const focused = this.tree.getFocus()?.[0];
+        if (!focused) {
+            return;
+        }
+        let previous = this.tree.navigate(focused).previous();
+        while (previous && !(previous instanceof CommentNode)) {
+            previous = this.tree.navigate(previous).previous();
+        }
+        if (!previous) {
+            return;
+        }
+        this.tree.setFocus([previous]);
+    }
+    constructor(options, instantiationService, viewDescriptorService, editorService, configurationService, contextKeyService, contextMenuService, keybindingService, openerService, themeService, commentService, telemetryService, hoverService, uriIdentityService, storageService) {
         const stateMemento = ( (new Memento(VIEW_STORAGE_ID, storageService)));
         const viewState = stateMemento.getMemento(1 , 1 );
         super({
@@ -56,7 +105,7 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
                 text: viewState['filter'] || '',
                 focusContextKey: CommentsViewFilterFocusContextKey.key
             }
-        }, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService);
+        }, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, hoverService);
         this.editorService = editorService;
         this.commentService = commentService;
         this.uriIdentityService = uriIdentityService;
@@ -96,6 +145,7 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
     render() {
         super.render();
         this._register(registerNavigableContainer({
+            name: 'commentsView',
             focusNotifiers: [this, this.filterWidget],
             focusNextWidget: () => {
                 if (this.filterWidget.hasFocus()) {
@@ -210,60 +260,90 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
         this.messageBoxContainer.textContent = this.commentService.commentsModel.getMessage();
         this.messageBoxContainer.classList.toggle('hidden', this.commentService.commentsModel.hasCommentThreads());
     }
-    getAriaForNode(element) {
+    getScreenReaderInfoForNode(element, forAriaLabel) {
+        let accessibleViewHint = '';
+        if (forAriaLabel && this.configurationService.getValue("accessibility.verbosity.comments" )) {
+            const kbLabel = this.keybindingService.lookupKeybinding(AccessibleViewAction.id)?.getAriaLabel();
+            accessibleViewHint = kbLabel ? ( localizeWithPath(_moduleId, 3, "Inspect this in the accessible view ({0}).\n", kbLabel)) : ( localizeWithPath(
+                _moduleId,
+                4,
+                "Inspect this in the accessible view via the command Open Accessible View which is currently not triggerable via keybinding.\n"
+            ));
+        }
+        const replyCount = this.getReplyCountAsString(element, forAriaLabel);
+        const replies = this.getRepliesAsString(element, forAriaLabel);
         if (element.range) {
             if (element.threadRelevance === CommentThreadApplicability.Outdated) {
-                return ( localizeWithPath(
+                return accessibleViewHint + ( localizeWithPath(
                     _moduleId,
-                    3,
-                    "Outdated from ${0} at line {1} column {2} in {3}, source: {4}",
+                    5,
+                    "Outdated from {0} at line {1} column {2} in {3},{4} comment: {5}",
                     element.comment.userName,
                     element.range.startLineNumber,
                     element.range.startColumn,
                     basename(element.resource),
+                    replyCount,
                     (typeof element.comment.body === 'string') ? element.comment.body : element.comment.body.value
-                ));
+                )) + replies;
             }
             else {
-                return ( localizeWithPath(
+                return accessibleViewHint + ( localizeWithPath(
                     _moduleId,
-                    4,
-                    "${0} at line {1} column {2} in {3}, source: {4}",
+                    6,
+                    "{0} at line {1} column {2} in {3},{4} comment: {5}",
                     element.comment.userName,
                     element.range.startLineNumber,
                     element.range.startColumn,
                     basename(element.resource),
+                    replyCount,
                     (typeof element.comment.body === 'string') ? element.comment.body : element.comment.body.value
-                ));
+                )) + replies;
             }
         }
         else {
             if (element.threadRelevance === CommentThreadApplicability.Outdated) {
-                return ( localizeWithPath(
+                return accessibleViewHint + ( localizeWithPath(
                     _moduleId,
-                    5,
-                    "Outdated from {0} in {1}, source: {2}",
+                    7,
+                    "Outdated from {0} in {1},{2} comment: {3}",
                     element.comment.userName,
                     basename(element.resource),
+                    replyCount,
                     (typeof element.comment.body === 'string') ? element.comment.body : element.comment.body.value
-                ));
+                )) + replies;
             }
             else {
-                return ( localizeWithPath(
+                return accessibleViewHint + ( localizeWithPath(
                     _moduleId,
-                    6,
-                    "{0} in {1}, source: {2}",
+                    8,
+                    "{0} in {1},{2} comment: {3}",
                     element.comment.userName,
                     basename(element.resource),
+                    replyCount,
                     (typeof element.comment.body === 'string') ? element.comment.body : element.comment.body.value
-                ));
+                )) + replies;
             }
         }
     }
+    getRepliesAsString(node, forAriaLabel) {
+        if (!node.replies.length || forAriaLabel) {
+            return '';
+        }
+        return '\n' + ( (node.replies.map(reply => ( localizeWithPath(
+            _moduleId,
+            9,
+            "{0} {1}",
+            reply.comment.userName,
+            (typeof reply.comment.body === 'string') ? reply.comment.body : reply.comment.body.value
+        ))))).join('\n');
+    }
+    getReplyCountAsString(node, forAriaLabel) {
+        return node.replies.length && !forAriaLabel ? ( localizeWithPath(_moduleId, 10, " {0} replies,", node.replies.length)) : '';
+    }
     createTree() {
         this.treeLabels = this._register(this.instantiationService.createInstance(ResourceLabels, this));
         this.tree = this._register(this.instantiationService.createInstance(CommentsList, this.treeLabels, this.treeContainer, {
-            overrideStyles: { listBackground: this.getBackgroundColor() },
+            overrideStyles: this.getLocationBasedColors().listOverrideStyles,
             selectionNavigation: true,
             filter: this.filter,
             keyboardNavigationLabelProvider: {
@@ -274,19 +354,19 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
             accessibilityProvider: {
                 getAriaLabel: (element) => {
                     if (element instanceof CommentsModel) {
-                        return ( localizeWithPath(_moduleId, 7, "Comments for current workspace"));
+                        return ( localizeWithPath(_moduleId, 11, "Comments for current workspace"));
                     }
                     if (element instanceof ResourceWithCommentThreads) {
                         return ( localizeWithPath(
                             _moduleId,
-                            8,
+                            12,
                             "Comments in {0}, full path {1}",
                             basename(element.resource),
                             element.resource.fsPath
                         ));
                     }
                     if (element instanceof CommentNode) {
-                        return this.getAriaForNode(element);
+                        return this.getScreenReaderInfoForNode(element, true);
                     }
                     return '';
                 },
@@ -397,7 +477,8 @@ CommentsPanel = ( (__decorate([
     ( (__param(9, IThemeService))),
     ( (__param(10, ICommentService))),
     ( (__param(11, ITelemetryService))),
-    ( (__param(12, IUriIdentityService))),
-    ( (__param(13, IStorageService)))
+    ( (__param(12, IHoverService))),
+    ( (__param(13, IUriIdentityService))),
+    ( (__param(14, IStorageService)))
 ], CommentsPanel)));
 export { CONTEXT_KEY_HAS_COMMENTS, CONTEXT_KEY_SOME_COMMENTS_EXPANDED, CommentsPanel };

package/vscode/src/vs/workbench/contrib/comments/browser/media/review.css.js

@@ -1,4 +1,4 @@
 import n from '../../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
-var css = ".review-widget{position:absolute;width:100%}.monaco-editor .review-widget{background-color:var(--vscode-peekViewResult-background)}.review-widget .hidden{display:none!important}.review-widget .body{overflow:hidden}.review-widget .body .review-comment{display:flex;padding:8px 16px 8px 20px}@keyframes monaco-review-widget-focus{0%{background:var(--vscode-peekViewResult-selectionBackground)}to{background:transparent}}.review-widget .body .review-comment.focus{animation:monaco-review-widget-focus 3s ease 0s}.review-widget .body .review-comment .comment-actions{margin-left:auto}.review-widget .body .review-comment .comment-actions .monaco-toolbar{height:22px}.review-widget .body .review-comment .comment-title .comment-header-info{overflow:hidden;text-overflow:ellipsis}.review-widget .body .review-comment .comment-title{display:flex;width:100%}.review-widget .body .review-comment .comment-title .action-label.codicon{line-height:18px}.review-widget .body .review-comment .comment-title .monaco-dropdown .toolbar-toggle-more{height:18px;line-height:18px;vertical-align:middle;width:16px}.review-widget .body .comment-body blockquote{border-left-style:solid;border-left-width:5px;margin:0 7px 0 5px;padding:0 16px 0 10px}.review-widget .body .review-comment .avatar-container{margin-top:4px!important}.review-widget .body .review-comment .avatar-container img.avatar{border-radius:3px;border-style:none;display:inline-block;height:28px;line-height:1;overflow:hidden;vertical-align:middle;width:28px}.review-widget .body .comment-reactions .monaco-text-button{background-color:transparent;border:1px solid grey;border-radius:3px;margin:0 7px 0 0;width:30px}.review-widget .body .review-comment .review-comment-contents{overflow:hidden;padding-left:20px;user-select:text;-webkit-user-select:text;width:100%}.review-widget .body pre{word-wrap:normal;overflow:auto;white-space:pre}.review-widget .body .review-comment .review-comment-contents .author{line-height:22px}.review-widget .body .review-comment .review-comment-contents .isPending{font-style:italic;line-height:22px;margin:0 5px;padding:0 2px}.review-widget .body .review-comment .review-comment-contents .timestamp{line-height:22px;margin:0 5px;padding:0 2px}.review-widget .body .review-comment .review-comment-contents .comment-body .comment-body-plainstring{white-space:pre-wrap}.review-widget .body .review-comment .review-comment-contents .comment-body{padding-top:4px}.review-widget .body .review-comment .review-comment-contents .comment-body-max-height{max-height:20em}.review-widget .body .review-comment .review-comment-contents .comment-reactions{margin-top:8px;min-height:25px}.review-widget .body .review-comment .review-comment-contents .comment-reactions .action-item .action-label{display:flex;font-size:12px;padding:1px 4px;text-align:center;white-space:pre}.review-widget .body .review-comment .review-comment-contents .comment-reactions .action-item .action-label .reaction-icon{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;background-position:0;background-repeat:no-repeat;background-size:14px;display:inline-block;margin-right:4px;width:14px}.review-widget .body .review-comment .review-comment-contents .comment-reactions .action-item .action-label .reaction-label{line-height:20px;margin-right:4px}.review-widget .body .review-comment .review-comment-contents .comment-reactions .action-item a.action-label.toolbar-toggle-pickReactions{background-position:50%;background-repeat:no-repeat;background-size:16px;border:none;display:none;font-size:16px;height:16px;margin-top:3px;width:26px}.review-widget .body .review-comment .review-comment-contents .comment-reactions:hover .action-item a.action-label.toolbar-toggle-pickReactions{background-size:16px;display:inline-block}.review-widget .body .review-comment .comment-title .action-label{background-position:50%;background-repeat:no-repeat;background-size:16px;display:block;height:16px;line-height:16px}.review-widget .body .review-comment .review-comment-contents .comment-reactions .action-item a.action-label{border:1px solid}.review-widget .body .review-comment .review-comment-contents .comment-reactions .action-item a.action-label.disabled{opacity:.6}.review-widget .body .review-comment .review-comment-contents .comment-reactions .action-item a.action-label.active:hover{background-color:var(--vscode-statusBarItem-hoverBackground)}.review-widget .body .review-comment .review-comment-contents .comment-reactions .action-item a.action-label:active{background-color:var(--vscode-statusBarItem-activeBackground);border:1px solid transparent}.review-widget .body .review-comment .review-comment-contents a{cursor:pointer}.review-widget .body .comment-body p,.review-widget .body .comment-body ul{margin:8px 0}.review-widget .body .comment-body p:first-child,.review-widget .body .comment-body ul:first-child{margin-top:0}.review-widget .body .comment-body p:last-child,.review-widget .body.comment-body ul:last-child{margin-bottom:0}.review-widget .body .comment-body ul{padding-left:20px}.review-widget .body .comment-body li>p{margin-bottom:0}.review-widget .body .comment-body li>ul{margin-top:0}.review-widget .body .comment-body code{border-radius:3px;padding:0 .4em}.review-widget .body .comment-body span{white-space:pre}.review-widget .body .comment-body img{max-width:100%}.review-widget .body .comment-form{margin:8px 20px}.review-widget .validation-error{word-wrap:break-word;box-sizing:border-box;display:inline-block;font-size:12px;line-height:17px;margin-left:-1px;margin-top:-1px;min-height:34px;overflow:hidden;padding:.4em;text-align:left;width:100%}.review-widget .body .comment-additional-actions{margin:10px 20px}.review-widget .body .comment-additional-actions .section-separator{border-top:1px solid var(--vscode-menu-separatorBackground);margin:10px 0 14px}.review-widget .body .comment-additional-actions .button-bar{display:flex;white-space:nowrap}.review-widget .body .comment-additional-actions .monaco-button,.review-widget .body .comment-additional-actions .monaco-button-dropdown,.review-widget .body .comment-additional-actions .monaco-text-button{display:flex;width:auto}.review-widget .body .comment-additional-actions .button-bar>.monaco-button-dropdown,.review-widget .body .comment-additional-actions .button-bar>.monaco-text-button{margin:0 10px 0 0}.review-widget .body .comment-additional-actions .button-bar .monaco-text-button{padding:4px 10px}.review-widget .body .comment-additional-actions .codicon-drop-down-button{align-items:center}.review-widget .body .monaco-editor{color:var(--vscode-editor-foreground)}.review-widget .body .comment-form.expand .review-thread-reply-button{display:none}.review-widget .body .comment-form.expand .form-actions,.review-widget .body .comment-form.expand .monaco-editor{box-sizing:content-box;display:block}.review-widget .body .comment-form .review-thread-reply-button{background-color:var(--vscode-editorCommentsWidget-replyInputBackground);border:0;border-radius:0;box-sizing:border-box;color:var(--vscode-editor-foreground);display:block;font-family:var(--monaco-monospace-font);font-size:inherit;font-weight:600;line-height:20px;outline:1px solid transparent;padding:6px 12px;resize:vertical;text-align:left;white-space:nowrap;width:100%}.review-widget .body .comment-form .review-thread-reply-button:focus{outline-style:solid;outline-width:1px}.review-widget .body .comment-form .monaco-editor,.review-widget .body .comment-form .monaco-editor .monaco-editor-background,.review-widget .body .edit-container .monaco-editor .monaco-editor-background{background-color:var(--vscode-editorCommentsWidget-replyInputBackground)}.review-widget .body .comment-form .monaco-editor,.review-widget .body .edit-container .monaco-editor{border:0;border-radius:3px;box-sizing:content-box;max-height:500px;min-height:90px;padding:6px 0 6px 12px;width:100%}.review-widget .body .comment-form .form-actions,.review-widget .body .comment-form .monaco-editor{display:none}.review-widget .body .comment-form .form-actions,.review-widget .body .edit-container .form-actions{margin:10px 0;overflow:auto}.review-widget .body .edit-container .form-actions{padding-top:10px}.review-widget .body .edit-textarea{margin:5px 12px 10px 0}.review-widget .body .comment-form .monaco-text-button,.review-widget .body .edit-container .monaco-text-button{margin-left:5px;padding:4px 10px;width:auto}.review-widget .body .form-actions .monaco-text-button{float:right}.review-widget .head{box-sizing:border-box;display:flex;height:100%}.review-widget .head .review-title{cursor:default;display:inline-block;font-size:13px;margin-left:20px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.review-widget .head .review-title .dirname:not(:empty){font-size:.9em;margin-left:.5em}.review-widget .head .review-actions{flex:1;padding-right:2px;text-align:right}.review-widget .head .review-actions>.monaco-action-bar{display:inline-block}.review-widget .head .review-actions>.monaco-action-bar,.review-widget .head .review-actions>.monaco-action-bar>.actions-container{height:100%}.review-widget .action-item{margin-left:4px;min-height:20px;min-width:18px}.review-widget .head .review-actions>.monaco-action-bar .action-label{background-position:50%;background-repeat:no-repeat;line-height:inherit;margin:0}.review-widget .head .review-actions>.monaco-action-bar .action-label.codicon{margin:0}.review-widget>.body{border-top:1px solid;position:relative}.monaco-editor .comment-range-glyph{cursor:pointer;margin-left:10px;width:4px!important;z-index:10}div.preview.inline .monaco-editor .comment-range-glyph{display:none!important}.monaco-editor .comment-diff-added{border-left-style:solid;border-left-width:3px}.monaco-editor .comment-diff-added,.monaco-editor .comment-range-glyph.multiline-add{border-left-color:var(--vscode-editorGutter-commentRangeForeground)}.monaco-editor .comment-diff-added:before,.monaco-editor .comment-range-glyph.line-hover:before,.monaco-editor .comment-thread-unresolved:before,.monaco-editor .comment-thread:before{background:var(--vscode-editorGutter-commentRangeForeground)}.monaco-editor .comment-thread-range{background-color:var(--vscode-editorCommentsWidget-rangeBackground)}.monaco-editor .comment-thread-range-current{background-color:var(--vscode-editorCommentsWidget-rangeActiveBackground)}.monaco-editor .margin-view-overlays .comment-range-glyph.comment-thread,.monaco-editor .margin-view-overlays .comment-range-glyph.comment-thread-unresolved,.monaco-editor .margin-view-overlays .comment-range-glyph.line-hover{margin-left:13px}.monaco-editor .comment-range-glyph.comment-thread-unresolved:before,.monaco-editor .comment-range-glyph.comment-thread:before,.monaco-editor .margin-view-overlays .comment-range-glyph.line-hover:before,.monaco-editor .margin-view-overlays>div:hover>.comment-range-glyph.comment-diff-added:before{align-items:center;color:var(--vscode-editorGutter-commentGlyphForeground);display:flex;flex-direction:row;height:100%;justify-content:center;left:-6px;position:absolute;text-align:center;width:9px;z-index:10}.monaco-editor .comment-range-glyph.comment-thread-unresolved:before{color:var(--vscode-editorGutter-commentUnresolvedGlyphForeground)}.monaco-editor .margin-view-overlays .comment-range-glyph.multiline-add{border-left-style:dotted;border-left-width:3px;height:16px;margin-top:2px}.monaco-editor .margin-view-overlays .comment-range-glyph.line-hover:before,.monaco-editor .margin-view-overlays>div:hover>.comment-range-glyph.comment-diff-added:before{border-radius:3px;content:\"\\ea60\";font-family:codicon;margin-left:-5px;padding-left:1px;width:18px!important}.monaco-editor .comment-range-glyph.comment-thread,.monaco-editor .comment-range-glyph.comment-thread-unresolved{z-index:20}.monaco-editor .comment-range-glyph.comment-thread-unresolved:before,.monaco-editor .comment-range-glyph.comment-thread:before{border-radius:3px;font-family:codicon;font-size:13px;line-height:100%;margin-left:-5px;padding-left:1px;padding-top:1px;width:18px!important;z-index:20}.monaco-editor .comment-range-glyph.comment-thread:before{content:\"\\ea6b\"}.monaco-editor .comment-range-glyph.comment-thread-unresolved:before{content:\"\\ec0a\"}.monaco-editor.inline-comment .margin-view-overlays .codicon-folding-collapsed,.monaco-editor.inline-comment .margin-view-overlays .codicon-folding-expanded{margin-left:11px}.monaco-editor.inline-comment .margin-view-overlays .dirty-diff-glyph{margin-left:25px}";
+var css = ".review-widget{position:absolute;width:100%}.monaco-editor .review-widget{background-color:var(--vscode-peekViewResult-background)}.review-widget .hidden{display:none!important}.review-widget .body{overflow:hidden}.review-widget .body .review-comment{display:flex;padding:8px 16px 8px 20px}@keyframes monaco-review-widget-focus{0%{background:var(--vscode-peekViewResult-selectionBackground)}to{background:transparent}}.review-widget .body .review-comment.focus{animation:monaco-review-widget-focus 3s ease 0s}.review-widget .body .review-comment .comment-actions{margin-left:auto}.review-widget .body .review-comment .comment-actions .monaco-toolbar{height:22px}.review-widget .body .review-comment .comment-title .comment-header-info{overflow:hidden;text-overflow:ellipsis}.review-widget .body .review-comment .comment-title{display:flex;width:100%}.review-widget .body .review-comment .comment-title .action-label.codicon{line-height:18px}.review-widget .body .review-comment .comment-title .monaco-dropdown .toolbar-toggle-more{height:18px;line-height:18px;vertical-align:middle;width:16px}.review-widget .body .comment-body blockquote{border-left-style:solid;border-left-width:5px;margin:0 7px 0 5px;padding:0 16px 0 10px}.review-widget .body .review-comment .avatar-container{margin-top:4px!important}.review-widget .body .review-comment .avatar-container img.avatar{border-radius:3px;border-style:none;display:inline-block;height:28px;line-height:1;overflow:hidden;vertical-align:middle;width:28px}.review-widget .body .comment-reactions .monaco-text-button{background-color:transparent;border:1px solid grey;border-radius:3px;margin:0 7px 0 0;width:30px}.review-widget .body .review-comment .review-comment-contents{overflow:hidden;padding-left:20px;user-select:text;-webkit-user-select:text;width:100%}.review-widget .body pre{word-wrap:normal;overflow:auto;white-space:pre}.review-widget .body .review-comment .review-comment-contents .author{line-height:22px}.review-widget .body .review-comment .review-comment-contents .isPending{font-style:italic;line-height:22px;margin:0 5px;padding:0 2px}.review-widget .body .review-comment .review-comment-contents .timestamp{line-height:22px;margin:0 5px;padding:0 2px}.review-widget .body .review-comment .review-comment-contents .comment-body .comment-body-plainstring{white-space:pre-wrap}.review-widget .body .review-comment .review-comment-contents .comment-body{padding-top:4px}.review-widget .body .review-comment .review-comment-contents .comment-body-max-height{max-height:20em}.review-widget .body .review-comment .review-comment-contents .comment-reactions{margin-top:8px;min-height:25px}.review-widget .body .review-comment .review-comment-contents .comment-reactions .action-item .action-label{display:flex;font-size:12px;padding:1px 4px;text-align:center;white-space:pre}.review-widget .body .review-comment .review-comment-contents .comment-reactions .action-item .action-label .reaction-icon{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;background-position:0;background-repeat:no-repeat;background-size:14px;display:inline-block;margin-right:4px;width:14px}.review-widget .body .review-comment .review-comment-contents .comment-reactions .action-item .action-label .reaction-label{line-height:20px;margin-right:4px}.review-widget .body .review-comment .review-comment-contents .comment-reactions .action-item a.action-label.toolbar-toggle-pickReactions{background-position:50%;background-repeat:no-repeat;background-size:16px;border:none;display:none;font-size:16px;height:16px;margin-top:3px;width:26px}.review-widget .body .review-comment .review-comment-contents .comment-reactions:hover .action-item a.action-label.toolbar-toggle-pickReactions{background-size:16px;display:inline-block}.review-widget .body .review-comment .comment-title .action-label{background-position:50%;background-repeat:no-repeat;background-size:16px;display:block;height:16px;line-height:16px}.review-widget .body .review-comment .review-comment-contents .comment-reactions .action-item a.action-label{border:1px solid}.review-widget .body .review-comment .review-comment-contents .comment-reactions .action-item a.action-label.disabled{opacity:.6}.review-widget .body .review-comment .review-comment-contents .comment-reactions .action-item a.action-label.active:hover{background-color:var(--vscode-statusBarItem-hoverBackground)}.review-widget .body .review-comment .review-comment-contents .comment-reactions .action-item a.action-label:active{background-color:var(--vscode-statusBarItem-activeBackground);border:1px solid transparent}.review-widget .body .review-comment .review-comment-contents a{cursor:pointer}.review-widget .body .comment-body p,.review-widget .body .comment-body ul{margin:8px 0}.review-widget .body .comment-body p:first-child,.review-widget .body .comment-body ul:first-child{margin-top:0}.review-widget .body .comment-body p:last-child,.review-widget .body.comment-body ul:last-child{margin-bottom:0}.review-widget .body .comment-body ul{padding-left:20px}.review-widget .body .comment-body li>p{margin-bottom:0}.review-widget .body .comment-body li>ul{margin-top:0}.review-widget .body .comment-body code{border-radius:3px;padding:0 .4em}.review-widget .body .comment-body span{white-space:pre}.review-widget .body .comment-body img{max-width:100%}.review-widget .body .comment-form{margin:8px 20px}.review-widget .validation-error{word-wrap:break-word;box-sizing:border-box;display:inline-block;font-size:12px;line-height:17px;margin-left:-1px;margin-top:-1px;min-height:34px;overflow:hidden;padding:.4em;text-align:left;width:100%}.review-widget .body .comment-additional-actions{margin:10px 20px}.review-widget .body .comment-additional-actions .section-separator{border-top:1px solid var(--vscode-menu-separatorBackground);margin:10px 0 14px}.review-widget .body .comment-additional-actions .button-bar{display:flex;white-space:nowrap}.review-widget .body .comment-additional-actions .monaco-button,.review-widget .body .comment-additional-actions .monaco-button-dropdown,.review-widget .body .comment-additional-actions .monaco-text-button{display:flex;width:auto}.review-widget .body .comment-additional-actions .button-bar>.monaco-button-dropdown,.review-widget .body .comment-additional-actions .button-bar>.monaco-text-button{margin:0 10px 0 0}.review-widget .body .comment-additional-actions .button-bar .monaco-text-button{padding:4px 10px}.review-widget .body .comment-additional-actions .codicon-drop-down-button{align-items:center}.review-widget .body .monaco-editor{color:var(--vscode-editor-foreground)}.review-widget .body .comment-form.expand .review-thread-reply-button{display:none}.review-widget .body .comment-form.expand .form-actions,.review-widget .body .comment-form.expand .monaco-editor{box-sizing:content-box;display:block}.review-widget .body .comment-form .review-thread-reply-button{background-color:var(--vscode-editorCommentsWidget-replyInputBackground);border:0;border-radius:0;box-sizing:border-box;color:var(--vscode-editor-foreground);display:block;font-family:var(--monaco-monospace-font);font-size:inherit;font-weight:600;line-height:20px;outline:1px solid transparent;padding:6px 12px;resize:vertical;text-align:left;white-space:nowrap;width:100%}.review-widget .body .comment-form .review-thread-reply-button:focus{outline-style:solid;outline-width:1px}.review-widget .body .comment-form .monaco-editor,.review-widget .body .comment-form .monaco-editor .monaco-editor-background,.review-widget .body .edit-container .monaco-editor .monaco-editor-background{background-color:var(--vscode-editorCommentsWidget-replyInputBackground)}.review-widget .body .comment-form .monaco-editor,.review-widget .body .edit-container .monaco-editor{border:0;border-radius:3px;box-sizing:content-box;max-height:500px;min-height:90px;padding:6px 0 6px 12px;width:100%}.review-widget .body .comment-form .form-actions,.review-widget .body .comment-form .monaco-editor{display:none}.review-widget .body .comment-form .form-actions,.review-widget .body .edit-container .form-actions{margin:10px 0;overflow:auto}.review-widget .body .edit-container .form-actions{padding-top:10px}.review-widget .body .edit-textarea{margin:5px 12px 10px 0}.review-widget .body .comment-form .form-actions .monaco-text-button,.review-widget .body .edit-container .monaco-text-button{margin-left:5px;padding:4px 10px;width:auto}.review-widget .body .form-actions .monaco-text-button{float:right}.review-widget .head{box-sizing:border-box;display:flex;height:100%}.review-widget .head .review-title{cursor:default;display:inline-block;font-size:13px;margin-left:20px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.review-widget .head .review-title .dirname:not(:empty){font-size:.9em;margin-left:.5em}.review-widget .head .review-actions{flex:1;padding-right:2px;text-align:right}.review-widget .head .review-actions>.monaco-action-bar{display:inline-block}.review-widget .head .review-actions>.monaco-action-bar,.review-widget .head .review-actions>.monaco-action-bar>.actions-container{height:100%}.review-widget .action-item{margin-left:4px;min-height:20px;min-width:18px}.review-widget .head .review-actions>.monaco-action-bar .action-label{background-position:50%;background-repeat:no-repeat;line-height:inherit;margin:0}.review-widget .head .review-actions>.monaco-action-bar .action-label.codicon{margin:0}.review-widget>.body{border-top:1px solid;position:relative}.monaco-editor .comment-range-glyph{cursor:pointer;margin-left:10px;width:4px!important;z-index:10}div.preview.inline .monaco-editor .comment-range-glyph{display:none!important}.monaco-editor .comment-diff-added{border-left-style:solid;border-left-width:3px}.monaco-editor .comment-diff-added,.monaco-editor .comment-range-glyph.multiline-add{border-left-color:var(--vscode-editorGutter-commentRangeForeground)}.monaco-editor .comment-diff-added:before,.monaco-editor .comment-range-glyph.line-hover:before,.monaco-editor .comment-thread-unresolved:before,.monaco-editor .comment-thread:before{background:var(--vscode-editorGutter-commentRangeForeground)}.monaco-editor .comment-thread-range{background-color:var(--vscode-editorCommentsWidget-rangeBackground)}.monaco-editor .comment-thread-range-current{background-color:var(--vscode-editorCommentsWidget-rangeActiveBackground)}.monaco-editor .margin-view-overlays .comment-range-glyph.comment-thread,.monaco-editor .margin-view-overlays .comment-range-glyph.comment-thread-unresolved,.monaco-editor .margin-view-overlays .comment-range-glyph.line-hover{margin-left:13px}.monaco-editor .comment-range-glyph.comment-thread-unresolved:before,.monaco-editor .comment-range-glyph.comment-thread:before,.monaco-editor .margin-view-overlays .comment-range-glyph.line-hover:before,.monaco-editor .margin-view-overlays>div:hover>.comment-range-glyph.comment-diff-added:before{align-items:center;color:var(--vscode-editorGutter-commentGlyphForeground);display:flex;flex-direction:row;height:100%;justify-content:center;left:-6px;position:absolute;text-align:center;width:9px;z-index:10}.monaco-editor .comment-range-glyph.comment-thread-unresolved:before{color:var(--vscode-editorGutter-commentUnresolvedGlyphForeground)}.monaco-editor .margin-view-overlays .comment-range-glyph.multiline-add{border-left-style:dotted;border-left-width:3px;height:16px;margin-top:2px}.monaco-editor .margin-view-overlays .comment-range-glyph.line-hover:before,.monaco-editor .margin-view-overlays>div:hover>.comment-range-glyph.comment-diff-added:before{border-radius:3px;content:var(--vscode-icon-plus-content);font-family:var(--vscode-icon-plus-font-family);font-family:codicon;margin-left:-5px;padding-left:1px;width:18px!important}.monaco-editor .comment-range-glyph.comment-thread,.monaco-editor .comment-range-glyph.comment-thread-unresolved{z-index:20}.monaco-editor .comment-range-glyph.comment-thread-unresolved:before,.monaco-editor .comment-range-glyph.comment-thread:before{border-radius:3px;font-family:codicon;font-size:13px;line-height:100%;margin-left:-5px;padding-left:1px;padding-top:1px;width:18px!important;z-index:20}.monaco-editor .comment-range-glyph.comment-thread:before{content:var(--vscode-icon-comment-add-content);font-family:var(--vscode-icon-comment-add-font-family)}.monaco-editor .comment-range-glyph.comment-thread-unresolved:before{content:var(--vscode-icon-comment-unresolved-content);font-family:var(--vscode-icon-comment-unresolved-font-family)}.monaco-editor.inline-comment .margin-view-overlays .codicon-folding-collapsed,.monaco-editor.inline-comment .margin-view-overlays .codicon-folding-expanded{margin-left:11px}.monaco-editor.inline-comment .margin-view-overlays .dirty-diff-glyph{margin-left:25px}";
 n(css,{});
 export { css, css as default };

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

@@ -18,6 +18,15 @@ import { CommentContextKeys } from '../common/commentContextKeys.js';
 import { ILanguageConfigurationService } from '../../../../editor/common/languages/languageConfigurationRegistry.js';
 import { ILanguageFeaturesService } from '../../../../editor/common/services/languageFeatures.js';
 import { clamp } from '../../../../base/common/numbers.js';
+import { CopyPasteController } from '../../../../editor/contrib/dropOrPasteInto/browser/copyPasteController.js';
+import { CodeActionController } from '../../../../editor/contrib/codeAction/browser/codeActionController.js';
+import { DropIntoEditorController } from '../../../../editor/contrib/dropOrPasteInto/browser/dropIntoEditorController.js';
+import { InlineCompletionsController } from '../../../../editor/contrib/inlineCompletions/browser/inlineCompletionsController.js';
+import { LinkDetector } from '../../../../editor/contrib/links/browser/links.js';
+import { MessageController } from '../../../../editor/contrib/message/browser/messageController.js';
+import { SelectionClipboardContributionID } from '../../codeEditor/browser/selectionClipboard.js';
+import { MenuId } from '../../../../platform/actions/common/actions.js';
+import { HoverController } from '../../../../editor/contrib/hover/browser/hoverController.js';
 const ctxCommentEditorFocused = ( new RawContextKey('commentEditorFocused', false));
 const MIN_EDITOR_HEIGHT = 5 * 18;
 const MAX_EDITOR_HEIGHT = 25 * 18;
@@ -30,8 +39,19 @@ let SimpleCommentEditor = class SimpleCommentEditor extends CodeEditorWidget {
                 { id: SuggestController.ID, ctor: SuggestController, instantiation: 0  },
                 { id: SnippetController2.ID, ctor: SnippetController2, instantiation: 4  },
                 { id: TabCompletionController.ID, ctor: TabCompletionController, instantiation: 0  },
-                { id: EditorDictation.ID, ctor: EditorDictation, instantiation: 4  }
-            ]
+                { id: EditorDictation.ID, ctor: EditorDictation, instantiation: 4  },
+                ...EditorExtensionsRegistry.getSomeEditorContributions([
+                    CopyPasteController.ID,
+                    DropIntoEditorController.ID,
+                    LinkDetector.ID,
+                    MessageController.ID,
+                    HoverController.ID,
+                    SelectionClipboardContributionID,
+                    InlineCompletionsController.ID,
+                    CodeActionController.ID,
+                ])
+            ],
+            contextMenuId: MenuId.SimpleEditorContext
         };
         super(domElement, options, codeEditorWidgetOptions, instantiationService, codeEditorService, commandService, scopedContextKeyService, themeService, notificationService, accessibilityService, languageConfigurationService, languageFeaturesService);
         this._commentEditorFocused = ctxCommentEditorFocused.bindTo(scopedContextKeyService);
@@ -73,6 +93,7 @@ let SimpleCommentEditor = class SimpleCommentEditor extends CodeEditorWidget {
             minimap: {
                 enabled: false
             },
+            dropIntoEditor: { enabled: true },
             autoClosingBrackets: configurationService.getValue('editor.autoClosingBrackets'),
             quickSuggestions: false,
             accessibilitySupport: configurationService.getValue('editor.accessibilitySupport'),

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

@@ -1,18 +1,17 @@
 import { append, $ } from '../../../../base/browser/dom.js';
 import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
-import { setupCustomHover } from '../../../../base/browser/ui/hover/updatableHoverWidget.js';
 import { fromNow } from '../../../../base/common/date.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { language } from '../../../../base/common/platform.js';
 import { COMMENTS_SECTION } from '../common/commentsConfiguration.js';
 class TimestampWidget extends Disposable {
-    constructor(configurationService, container, timeStamp) {
+    constructor(configurationService, hoverService, container, timeStamp) {
         super();
         this.configurationService = configurationService;
         this._date = append(container, $('span.timestamp'));
         this._date.style.display = 'none';
         this._useRelativeTime = this.useRelativeTimeSetting;
-        this.hover = this._register(setupCustomHover(getDefaultHoverDelegate('mouse'), this._date, ''));
+        this.hover = this._register(hoverService.setupUpdatableHover(getDefaultHoverDelegate('mouse'), this._date, ''));
         this.setTimestamp(timeStamp);
     }
     get useRelativeTimeSetting() {

package/vscode/src/vs/workbench/contrib/debug/browser/baseDebugView.js

@@ -1,9 +1,8 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { append, addDisposableListener, EventType, clearNode, addStandardDisposableListener, $ as $$1 } from '../../../../base/browser/dom.js';
+import { $ as $$1, append, addDisposableListener, EventType, clearNode, addStandardDisposableListener } from '../../../../base/browser/dom.js';
 import { ActionBar } from '../../../../base/browser/ui/actionbar/actionbar.js';
 import { HighlightedLabel } from '../../../../base/browser/ui/highlightedlabel/highlightedLabel.js';
 import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
-import { setupCustomHover } from '../../../../base/browser/ui/hover/updatableHoverWidget.js';
 import { InputBox } from '../../../../base/browser/ui/inputbox/inputBox.js';
 import { Codicon } from '../../../../base/common/codicons.js';
 import { createMatches } from '../../../../base/common/filters.js';
@@ -11,8 +10,11 @@ import { createSingleCallFunction } from '../../../../base/common/functional.js'
 import { toDisposable, DisposableStore, dispose } from '../../../../base/common/lifecycle.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
 import { localizeWithPath } from '../../../../nls.js';
+import { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
 import { IContextViewService } from '../../../../platform/contextview/browser/contextView.service.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.service.js';
 import { defaultInputBoxStyles } from '../../../../platform/theme/browser/defaultStyles.js';
+import { COPY_VALUE_ID, COPY_EVALUATE_PATH_ID } from './debugCommands.js';
 import { IDebugService } from '../common/debug.service.js';
 import { Expression, Variable, ExpressionContainer } from '../common/debugModel.js';
 import { IDebugVisualizerService } from '../common/debugVisualizers.service.js';
@@ -28,7 +30,7 @@ function renderViewTree(container) {
     container.appendChild(treeContainer);
     return treeContainer;
 }
-function renderExpressionValue(expressionOrValue, container, options) {
+function renderExpressionValue(expressionOrValue, container, options, hoverService) {
     let value = typeof expressionOrValue === 'string' ? expressionOrValue : expressionOrValue.value;
     container.className = 'value';
     if (value === null || ((expressionOrValue instanceof Expression || expressionOrValue instanceof Variable || expressionOrValue instanceof ReplEvaluationResult) && !expressionOrValue.available)) {
@@ -71,11 +73,29 @@ function renderExpressionValue(expressionOrValue, container, options) {
     else {
         container.textContent = value;
     }
-    if (options.showHover) {
-        container.title = value || '';
+    if (options.hover) {
+        const { store, commands, commandService } = options.hover instanceof DisposableStore ? { store: options.hover, commands: [], commandService: undefined } : options.hover;
+        store.add(hoverService.setupUpdatableHover(getDefaultHoverDelegate('mouse'), container, () => {
+            const container = $$1('div');
+            const markdownHoverElement = $$1('div.hover-row');
+            const hoverContentsElement = append(markdownHoverElement, $$1('div.hover-contents'));
+            const hoverContentsPre = append(hoverContentsElement, $$1('pre.debug-var-hover-pre'));
+            hoverContentsPre.textContent = value;
+            container.appendChild(markdownHoverElement);
+            return container;
+        }, {
+            actions: ( (commands.map(({ id, args }) => {
+                const description = CommandsRegistry.getCommand(id)?.metadata?.description;
+                return {
+                    label: typeof description === 'string' ? description : description ? description.value : id,
+                    commandId: id,
+                    run: () => commandService.executeCommand(id, ...args),
+                };
+            })))
+        }));
     }
 }
-function renderVariable(variable, data, showChanged, highlights, linkDetector) {
+function renderVariable(store, commandService, hoverService, variable, data, showChanged, highlights, linkDetector) {
     if (variable.available) {
         let text = variable.name;
         if (variable.value && typeof variable.name === 'string') {
@@ -89,13 +109,19 @@ function renderVariable(variable, data, showChanged, highlights, linkDetector) {
         data.label.set(':');
     }
     data.expression.classList.toggle('lazy', !!variable.presentationHint?.lazy);
+    const commands = [
+        { id: COPY_VALUE_ID, args: [variable, [variable]] }
+    ];
+    if (variable.evaluateName) {
+        commands.push({ id: COPY_EVALUATE_PATH_ID, args: [{ variable }] });
+    }
     renderExpressionValue(variable, data.value, {
         showChanged,
         maxValueLength: MAX_VALUE_RENDER_LENGTH_IN_VIEWLET,
-        showHover: true,
+        hover: { store, commands, commandService },
         colorize: true,
         linkDetector
-    });
+    }, hoverService);
 }
 let AbstractExpressionDataSource = class AbstractExpressionDataSource {
     constructor(debugService, debugVisualizer) {
@@ -126,9 +152,10 @@ AbstractExpressionDataSource = ( (__decorate([
     ( (__param(1, IDebugVisualizerService)))
 ], AbstractExpressionDataSource)));
 let AbstractExpressionsRenderer = class AbstractExpressionsRenderer {
-    constructor(debugService, contextViewService) {
+    constructor(debugService, contextViewService, hoverService) {
         this.debugService = debugService;
         this.contextViewService = contextViewService;
+        this.hoverService = hoverService;
     }
     renderTemplate(container) {
         const templateDisposable = ( (new DisposableStore()));
@@ -136,7 +163,7 @@ let AbstractExpressionsRenderer = class AbstractExpressionsRenderer {
         const name = append(expression, $('span.name'));
         const lazyButton = append(expression, $('span.lazy-button'));
         lazyButton.classList.add(...ThemeIcon.asClassNameArray(Codicon.eye));
-        templateDisposable.add(setupCustomHover(getDefaultHoverDelegate('mouse'), lazyButton, ( localizeWithPath(_moduleId, 0, "Click to expand"))));
+        templateDisposable.add(this.hoverService.setupUpdatableHover(getDefaultHoverDelegate('mouse'), lazyButton, ( localizeWithPath(_moduleId, 0, "Click to expand"))));
         const value = append(expression, $('span.value'));
         const label = templateDisposable.add(( (new HighlightedLabel(name))));
         const inputBoxContainer = append(expression, $('.inputBoxContainer'));
@@ -225,6 +252,7 @@ let AbstractExpressionsRenderer = class AbstractExpressionsRenderer {
 };
 AbstractExpressionsRenderer = ( (__decorate([
     ( (__param(0, IDebugService))),
-    ( (__param(1, IContextViewService)))
+    ( (__param(1, IContextViewService))),
+    ( (__param(2, IHoverService)))
 ], AbstractExpressionsRenderer)));
 export { AbstractExpressionDataSource, AbstractExpressionsRenderer, renderExpressionValue, renderVariable, renderViewTree };