@codingame/monaco-vscode-api 9.0.3 → 10.0.1

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

@@ -21,9 +21,8 @@ import { IOpenerService } from '../../../../platform/opener/common/opener.servic
 import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.service.js';
 import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.service.js';
 import { CommentsViewFilterFocusContextKey } from './comments.js';
-import { CommentsFilters, CommentsSortOrder } from './commentsViewActions.js';
+import { CommentsFilters } from './commentsViewActions.js';
 import { Memento } from '../../../common/memento.js';
-import { StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
 import { IStorageService } from '../../../../platform/storage/common/storage.service.js';
 import { FilterOptions } from './commentsFilterOptions.js';
 import { CommentThreadApplicability } from '../../../../editor/common/languages.js';
@@ -31,9 +30,9 @@ import { revealCommentThread } from './commentsController.js';
 import { registerNavigableContainer } from '../../../browser/actions/widgetNavigationCommands.js';
 import { CommentsModel, threadHasMeaningfulComments } from './commentsModel.js';
 import { IHoverService } from '../../../../platform/hover/browser/hover.service.js';
-import { AccessibilityVerbositySettingId } from '../../accessibility/browser/accessibilityConfiguration.js';
 import { AccessibleViewAction } from '../../accessibility/browser/accessibleViewActions.js';
 import { IPathService } from '../../../services/path/common/pathService.service.js';
+import { isCodeEditor } from '../../../../editor/browser/editorBrowser.js';
 const CONTEXT_KEY_HAS_COMMENTS = ( (new RawContextKey('commentsView.hasComments', false)));
 const CONTEXT_KEY_SOME_COMMENTS_EXPANDED = ( (new RawContextKey('commentsView.someCommentsExpanded', false)));
 const CONTEXT_KEY_COMMENT_FOCUSED = ( (new RawContextKey('commentsView.commentFocused', false)));
@@ -103,12 +102,12 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
     }
     constructor(options, instantiationService, viewDescriptorService, editorService, configurationService, contextKeyService, contextMenuService, keybindingService, openerService, themeService, commentService, telemetryService, hoverService, uriIdentityService, storageService, pathService) {
         const stateMemento = ( (new Memento(VIEW_STORAGE_ID, storageService)));
-        const viewState = stateMemento.getMemento(StorageScope.WORKSPACE, StorageTarget.MACHINE);
+        const viewState = stateMemento.getMemento(1 , 1 );
         super({
             ...options,
             filterOptions: {
-                placeholder: ( localize(5309, "Filter (e.g. text, author)")),
-                ariaLabel: ( localize(5310, "Filter comments")),
+                placeholder: ( localize(5354, "Filter (e.g. text, author)")),
+                ariaLabel: ( localize(5355, "Filter comments")),
                 history: viewState['filterHistory'] || [],
                 text: viewState['filter'] || '',
                 focusContextKey: CommentsViewFilterFocusContextKey.key
@@ -131,7 +130,7 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
         this.filters = this._register(( (new CommentsFilters({
             showResolved: this.viewState['showResolved'] !== false,
             showUnresolved: this.viewState['showUnresolved'] !== false,
-            sortBy: this.viewState['sortBy'] ?? CommentsSortOrder.ResourceAscending,
+            sortBy: this.viewState['sortBy'] ?? "resourceAscending" ,
         }, this.contextKeyService))));
         this.filter = ( (new Filter( (new FilterOptions(
             this.filterWidget.getFilterText(),
@@ -198,7 +197,7 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
         this.tree?.filterComments();
         this.cachedFilterStats = undefined;
         const { total, filtered } = this.getFilterStats();
-        this.filterWidget.updateBadge(total === filtered || total === 0 ? undefined : ( localize(5311, "Showing {0} of {1}", filtered, total)));
+        this.filterWidget.updateBadge(total === filtered || total === 0 ? undefined : ( localize(5356, "Showing {0} of {1}", filtered, total)));
         this.filterWidget.checkMoreFilters(!this.filters.showResolved || !this.filters.showUnresolved);
     }
     renderBody(container) {
@@ -277,46 +276,57 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
     }
     getScreenReaderInfoForNode(element, forAriaLabel) {
         let accessibleViewHint = '';
-        if (forAriaLabel && this.configurationService.getValue(AccessibilityVerbositySettingId.Comments)) {
+        if (forAriaLabel && this.configurationService.getValue("accessibility.verbosity.comments" )) {
             const kbLabel = this.keybindingService.lookupKeybinding(AccessibleViewAction.id)?.getAriaLabel();
-            accessibleViewHint = kbLabel ? ( localize(5312, "Inspect this in the accessible view ({0}).\n", kbLabel)) : ( localize(
-                5313,
+            accessibleViewHint = kbLabel ? ( localize(5357, "Inspect this in the accessible view ({0}).\n", kbLabel)) : ( localize(
+                5358,
                 "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);
+        const editor = this.editorService.findEditors(element.resource);
+        const codeEditor = this.editorService.activeEditorPane?.getControl();
+        let content;
+        if (element.range && editor?.length && isCodeEditor(codeEditor)) {
+            content = codeEditor.getModel()?.getValueInRange(element.range);
+            if (content) {
+                content = '\nCorresponding code: \n' + content;
+            }
+        }
         if (element.range) {
             if (element.threadRelevance === CommentThreadApplicability.Outdated) {
                 return accessibleViewHint + ( localize(
-                    5314,
-                    "Outdated from {0} at line {1} column {2} in {3},{4} comment: {5}",
+                    5359,
+                    "Outdated from {0} at line {1} column {2} in {3}{4}\nComment: {5}{6}",
                     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
+                    (typeof element.comment.body === 'string') ? element.comment.body : element.comment.body.value,
+                    content
                 )) + replies;
             }
             else {
                 return accessibleViewHint + ( localize(
-                    5315,
-                    "{0} at line {1} column {2} in {3},{4} comment: {5}",
+                    5360,
+                    "{0} at line {1} column {2} in {3} {4}\nComment: {5}{6}",
                     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
+                    (typeof element.comment.body === 'string') ? element.comment.body : element.comment.body.value,
+                    content
                 )) + replies;
             }
         }
         else {
             if (element.threadRelevance === CommentThreadApplicability.Outdated) {
                 return accessibleViewHint + ( localize(
-                    5316,
-                    "Outdated from {0} in {1},{2} comment: {3}",
+                    5361,
+                    "Outdated from {0} in {1} {2}\nComment: {3}{4}{5}",
                     element.comment.userName,
                     basename(element.resource),
                     replyCount,
@@ -325,12 +335,13 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
             }
             else {
                 return accessibleViewHint + ( localize(
-                    5317,
-                    "{0} in {1},{2} comment: {3}",
+                    5362,
+                    "{0} in {1} {2}\nComment: {3}{4}",
                     element.comment.userName,
                     basename(element.resource),
                     replyCount,
-                    (typeof element.comment.body === 'string') ? element.comment.body : element.comment.body.value
+                    (typeof element.comment.body === 'string') ? element.comment.body : element.comment.body.value,
+                    content
                 )) + replies;
             }
         }
@@ -340,14 +351,14 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
             return '';
         }
         return '\n' + ( (node.replies.map(reply => ( localize(
-            5318,
+            5363,
             "{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 ? ( localize(5319, " {0} replies,", node.replies.length)) : '';
+        return node.replies.length && !forAriaLabel ? ( localize(5364, " {0} replies,", node.replies.length)) : '';
     }
     createTree() {
         this.treeLabels = this._register(this.instantiationService.createInstance(ResourceLabels, this));
@@ -360,10 +371,10 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
                     if (a instanceof CommentsModel || b instanceof CommentsModel) {
                         return 0;
                     }
-                    if (this.filters.sortBy === CommentsSortOrder.UpdatedAtDescending) {
+                    if (this.filters.sortBy === "updatedAtDescending" ) {
                         return a.lastUpdatedAt > b.lastUpdatedAt ? -1 : 1;
                     }
-                    else if (this.filters.sortBy === CommentsSortOrder.ResourceAscending) {
+                    else if (this.filters.sortBy === "resourceAscending" ) {
                         if (a instanceof ResourceWithCommentThreads && b instanceof ResourceWithCommentThreads) {
                             const workspaceScheme = this.pathService.defaultUriScheme;
                             if ((a.resource.scheme !== b.resource.scheme) && (a.resource.scheme === workspaceScheme || b.resource.scheme === workspaceScheme)) {
@@ -386,11 +397,11 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
             accessibilityProvider: {
                 getAriaLabel: (element) => {
                     if (element instanceof CommentsModel) {
-                        return ( localize(5320, "Comments for current workspace"));
+                        return ( localize(5365, "Comments for current workspace"));
                     }
                     if (element instanceof ResourceWithCommentThreads) {
                         return ( localize(
-                            5321,
+                            5366,
                             "Comments in {0}, full path {1}",
                             basename(element.resource),
                             element.resource.fsPath

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

@@ -1,4 +1,3 @@
-import { KeyMod as KeyMod$1, KeyCode } from '../../../../base/common/keyCodes.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { localize } from '../../../../nls.js';
 import { ContextKeyExpr, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
@@ -6,19 +5,16 @@ import { Emitter } from '../../../../base/common/event.js';
 import { CommentsViewFilterFocusContextKey } from './comments.js';
 import { registerAction2, MenuRegistry, MenuId } from '../../../../platform/actions/common/actions.js';
 import { ViewAction } from '../../../browser/parts/views/viewPane.js';
-import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { COMMENTS_VIEW_ID } from './commentsTreeViewer.js';
 import { FocusedViewContext } from '../../../common/contextkeys.js';
 import { viewFilterSubmenu } from '../../../browser/parts/views/viewFilter.js';
 import { Codicon } from '../../../../base/common/codicons.js';
-var CommentsSortOrder;
-( ((function(CommentsSortOrder) {
-    CommentsSortOrder["ResourceAscending"] = "resourceAscending";
-    CommentsSortOrder["UpdatedAtDescending"] = "updatedAtDescending";
-})(CommentsSortOrder || (CommentsSortOrder = {}))));
 const CONTEXT_KEY_SHOW_RESOLVED = ( (new RawContextKey('commentsView.showResolvedFilter', true)));
 const CONTEXT_KEY_SHOW_UNRESOLVED = ( (new RawContextKey('commentsView.showUnResolvedFilter', true)));
-const CONTEXT_KEY_SORT_BY = ( (new RawContextKey('commentsView.sortBy', CommentsSortOrder.ResourceAscending)));
+const CONTEXT_KEY_SORT_BY = ( (new RawContextKey(
+    'commentsView.sortBy',
+    "resourceAscending"
+)));
 class CommentsFilters extends Disposable {
     constructor(options, contextKeyService) {
         super();
@@ -51,7 +47,7 @@ class CommentsFilters extends Disposable {
         }
     }
     get sortBy() {
-        return this._sortBy.get() ?? CommentsSortOrder.ResourceAscending;
+        return this._sortBy.get() ?? "resourceAscending" ;
     }
     set sortBy(sortBy) {
         if (this._sortBy.get() !== sortBy) {
@@ -64,11 +60,11 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: 'commentsFocusViewFromFilter',
-            title: ( localize(10032, "Focus Comments view")),
+            title: ( localize(10118, "Focus Comments view")),
             keybinding: {
                 when: CommentsViewFilterFocusContextKey,
-                weight: KeybindingWeight.WorkbenchContrib,
-                primary: KeyMod$1.CtrlCmd | KeyCode.DownArrow
+                weight: 200 ,
+                primary: 2048  | 18
             },
             viewId: COMMENTS_VIEW_ID
         });
@@ -81,11 +77,11 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: 'commentsClearFilterText',
-            title: ( localize(10033, "Clear filter text")),
+            title: ( localize(10119, "Clear filter text")),
             keybinding: {
                 when: CommentsViewFilterFocusContextKey,
-                weight: KeybindingWeight.WorkbenchContrib,
-                primary: KeyCode.Escape
+                weight: 200 ,
+                primary: 9
             },
             viewId: COMMENTS_VIEW_ID
         });
@@ -98,11 +94,11 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: 'commentsFocusFilter',
-            title: ( localize(10034, "Focus comments filter")),
+            title: ( localize(10120, "Focus comments filter")),
             keybinding: {
                 when: ( (FocusedViewContext.isEqualTo(COMMENTS_VIEW_ID))),
-                weight: KeybindingWeight.WorkbenchContrib,
-                primary: KeyMod$1.CtrlCmd | KeyCode.KeyF
+                weight: 200 ,
+                primary: 2048  | 36
             },
             viewId: COMMENTS_VIEW_ID
         });
@@ -115,11 +111,11 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: `workbench.actions.${COMMENTS_VIEW_ID}.toggleUnResolvedComments`,
-            title: ( localize(10035, "Show Unresolved")),
-            category: ( localize(10036, "Comments")),
+            title: ( localize(10121, "Show Unresolved")),
+            category: ( localize(10122, "Comments")),
             toggled: {
                 condition: CONTEXT_KEY_SHOW_UNRESOLVED,
-                title: ( localize(10037, "Show Unresolved")),
+                title: ( localize(10123, "Show Unresolved")),
             },
             menu: {
                 id: viewFilterSubmenu,
@@ -138,11 +134,11 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: `workbench.actions.${COMMENTS_VIEW_ID}.toggleResolvedComments`,
-            title: ( localize(10038, "Show Resolved")),
-            category: ( localize(10036, "Comments")),
+            title: ( localize(10124, "Show Resolved")),
+            category: ( localize(10122, "Comments")),
             toggled: {
                 condition: CONTEXT_KEY_SHOW_RESOLVED,
-                title: ( localize(10039, "Show Resolved")),
+                title: ( localize(10125, "Show Resolved")),
             },
             menu: {
                 id: viewFilterSubmenu,
@@ -160,7 +156,7 @@ registerAction2(class extends ViewAction {
 const commentSortSubmenu = ( (new MenuId('submenu.filter.commentSort')));
 MenuRegistry.appendMenuItem(viewFilterSubmenu, {
     submenu: commentSortSubmenu,
-    title: ( localize(10040, "Sort By")),
+    title: ( localize(10126, "Sort By")),
     group: '2_sort',
     icon: Codicon.history,
     when: ( (ContextKeyExpr.equals('view', COMMENTS_VIEW_ID))),
@@ -169,13 +165,16 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: `workbench.actions.${COMMENTS_VIEW_ID}.toggleSortByUpdatedAt`,
-            title: ( localize(10041, "Updated Time")),
-            category: ( localize(10036, "Comments")),
+            title: ( localize(10127, "Updated Time")),
+            category: ( localize(10122, "Comments")),
             icon: Codicon.history,
             viewId: COMMENTS_VIEW_ID,
             toggled: {
-                condition: ( (ContextKeyExpr.equals(CONTEXT_KEY_SORT_BY.key, CommentsSortOrder.UpdatedAtDescending))),
-                title: ( localize(10042, "Updated Time")),
+                condition: ( (ContextKeyExpr.equals(
+                    CONTEXT_KEY_SORT_BY.key,
+                    "updatedAtDescending"
+                ))),
+                title: ( localize(10128, "Updated Time")),
             },
             menu: {
                 id: commentSortSubmenu,
@@ -186,20 +185,23 @@ registerAction2(class extends ViewAction {
         });
     }
     async runInView(serviceAccessor, view) {
-        view.filters.sortBy = CommentsSortOrder.UpdatedAtDescending;
+        view.filters.sortBy = "updatedAtDescending" ;
     }
 });
 registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: `workbench.actions.${COMMENTS_VIEW_ID}.toggleSortByResource`,
-            title: ( localize(10043, "Position in File")),
-            category: ( localize(10036, "Comments")),
+            title: ( localize(10129, "Position in File")),
+            category: ( localize(10122, "Comments")),
             icon: Codicon.history,
             viewId: COMMENTS_VIEW_ID,
             toggled: {
-                condition: ( (ContextKeyExpr.equals(CONTEXT_KEY_SORT_BY.key, CommentsSortOrder.ResourceAscending))),
-                title: ( localize(10044, "Position in File")),
+                condition: ( (ContextKeyExpr.equals(
+                    CONTEXT_KEY_SORT_BY.key,
+                    "resourceAscending"
+                ))),
+                title: ( localize(10130, "Position in File")),
             },
             menu: {
                 id: commentSortSubmenu,
@@ -210,7 +212,7 @@ registerAction2(class extends ViewAction {
         });
     }
     async runInView(serviceAccessor, view) {
-        view.filters.sortBy = CommentsSortOrder.ResourceAscending;
+        view.filters.sortBy = "resourceAscending" ;
     }
 });
-export { CommentsFilters, CommentsSortOrder };
+export { CommentsFilters };

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

@@ -6,7 +6,7 @@ import { ActionViewItem } from '../../../../base/browser/ui/actionbar/actionView
 class ToggleReactionsAction extends Action {
     static { this.ID = 'toolbar.toggle.pickReactions'; }
     constructor(toggleDropdownMenu, title) {
-        super(ToggleReactionsAction.ID, title || ( localize(11611, "Pick Reactions...")), 'toggle-reactions', true);
+        super(ToggleReactionsAction.ID, title || ( localize(11754, "Pick Reactions...")), 'toggle-reactions', true);
         this._menuActions = [];
         this.toggleDropdownMenu = toggleDropdownMenu;
     }
@@ -49,17 +49,17 @@ class ReactionActionViewItem extends ActionViewItem {
     }
     getTooltip() {
         const action = this.action;
-        const toggleMessage = action.enabled ? ( localize(11612, "Toggle reaction, ")) : '';
+        const toggleMessage = action.enabled ? ( localize(11755, "Toggle reaction, ")) : '';
         if (action.count === undefined) {
-            return ( localize(11613, "{0}{1} reaction", toggleMessage, action.label));
+            return ( localize(11756, "{0}{1} reaction", toggleMessage, action.label));
         }
         else if (action.reactors === undefined || action.reactors.length === 0) {
             if (action.count === 1) {
-                return ( localize(11614, "{0}1 reaction with {1}", toggleMessage, action.label));
+                return ( localize(11757, "{0}1 reaction with {1}", toggleMessage, action.label));
             }
             else if (action.count > 1) {
                 return ( localize(
-                    11615,
+                    11758,
                     "{0}{1} reactions with {2}",
                     toggleMessage,
                     action.count,
@@ -70,7 +70,7 @@ class ReactionActionViewItem extends ActionViewItem {
         else {
             if (action.reactors.length <= 10 && action.reactors.length === action.count) {
                 return ( localize(
-                    11616,
+                    11759,
                     "{0}{1} reacted with {2}",
                     toggleMessage,
                     action.reactors.join(', '),
@@ -80,7 +80,7 @@ class ReactionActionViewItem extends ActionViewItem {
             else if (action.count > 1) {
                 const displayedReactors = action.reactors.slice(0, 10);
                 return ( localize(
-                    11617,
+                    11760,
                     "{0}{1} and {2} more reacted with {3}",
                     toggleMessage,
                     displayedReactors.join(', '),

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

@@ -1,6 +1,5 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { EditorOption } from '../../../../editor/common/config/editorOptions.js';
-import { EditorContributionInstantiation, EditorExtensionsRegistry } from '../../../../editor/browser/editorExtensions.js';
+import { EditorExtensionsRegistry } from '../../../../editor/browser/editorExtensions.js';
 import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
 import { CodeEditorWidget } from '../../../../editor/browser/widget/codeEditor/codeEditorWidget.js';
 import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
@@ -27,8 +26,8 @@ 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 { ContentHoverController } from '../../../../editor/contrib/hover/browser/contentHoverController2.js';
-import { MarginHoverController } from '../../../../editor/contrib/hover/browser/marginHoverController.js';
+import { ContentHoverController } from '../../../../editor/contrib/hover/browser/contentHoverController.js';
+import { GlyphHoverController } from '../../../../editor/contrib/hover/browser/glyphHoverController.js';
 const ctxCommentEditorFocused = ( new RawContextKey('commentEditorFocused', false));
 const MIN_EDITOR_HEIGHT = 5 * 18;
 const MAX_EDITOR_HEIGHT = 25 * 18;
@@ -36,19 +35,19 @@ let SimpleCommentEditor = class SimpleCommentEditor extends CodeEditorWidget {
     constructor(domElement, options, scopedContextKeyService, parentThread, instantiationService, codeEditorService, commandService, themeService, notificationService, accessibilityService, languageConfigurationService, languageFeaturesService) {
         const codeEditorWidgetOptions = {
             contributions: [
-                { id: MenuPreventer.ID, ctor: MenuPreventer, instantiation: EditorContributionInstantiation.BeforeFirstInteraction },
-                { id: ContextMenuController.ID, ctor: ContextMenuController, instantiation: EditorContributionInstantiation.BeforeFirstInteraction },
-                { id: SuggestController.ID, ctor: SuggestController, instantiation: EditorContributionInstantiation.Eager },
-                { id: SnippetController2.ID, ctor: SnippetController2, instantiation: EditorContributionInstantiation.Lazy },
-                { id: TabCompletionController.ID, ctor: TabCompletionController, instantiation: EditorContributionInstantiation.Eager },
-                { id: EditorDictation.ID, ctor: EditorDictation, instantiation: EditorContributionInstantiation.Lazy },
+                { id: MenuPreventer.ID, ctor: MenuPreventer, instantiation: 2  },
+                { id: ContextMenuController.ID, ctor: ContextMenuController, instantiation: 2  },
+                { 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  },
                 ...EditorExtensionsRegistry.getSomeEditorContributions([
                     CopyPasteController.ID,
                     DropIntoEditorController.ID,
                     LinkDetector.ID,
                     MessageController.ID,
                     ContentHoverController.ID,
-                    MarginHoverController.ID,
+                    GlyphHoverController.ID,
                     SelectionClipboardContributionID,
                     InlineCompletionsController.ID,
                     CodeActionController.ID,
@@ -116,7 +115,7 @@ SimpleCommentEditor = ( __decorate([
 ], SimpleCommentEditor));
 function calculateEditorHeight(parentEditor, editor, currentHeight) {
     const layoutInfo = editor.getLayoutInfo();
-    const lineHeight = editor.getOption(EditorOption.lineHeight);
+    const lineHeight = editor.getOption(69 );
     const contentHeight = (editor._getViewModel()?.getLineCount() * lineHeight);
     if ((contentHeight > layoutInfo.height) ||
         (contentHeight < layoutInfo.height && currentHeight > MIN_EDITOR_HEIGHT)) {

package/vscode/src/vs/workbench/contrib/comments/common/commentContextKeys.js

@@ -3,16 +3,20 @@ import { RawContextKey } from '../../../../platform/contextkey/common/contextkey
 var CommentContextKeys;
 ( ((function(CommentContextKeys) {
     CommentContextKeys.activeCursorHasCommentingRange = ( (new RawContextKey('activeCursorHasCommentingRange', false, {
-        description: ( localize(5281, "Whether the position at the active cursor has a commenting range")),
+        description: ( localize(5316, "Whether the position at the active cursor has a commenting range")),
+        type: 'boolean'
+    })));
+    CommentContextKeys.activeCursorHasComment = ( (new RawContextKey('activeCursorHasComment', false, {
+        description: ( localize(5317, "Whether the position at the active cursor has a comment")),
         type: 'boolean'
     })));
     CommentContextKeys.activeEditorHasCommentingRange = ( (new RawContextKey('activeEditorHasCommentingRange', false, {
-        description: ( localize(5282, "Whether the active editor has a commenting range")),
+        description: ( localize(5318, "Whether the active editor has a commenting range")),
         type: 'boolean'
     })));
     CommentContextKeys.WorkspaceHasCommenting = ( (new RawContextKey('workspaceHasCommenting', false, {
         description: ( localize(
-         5283,
+         5319,
          "Whether the open workspace has either comments or commenting ranges."
         )),
         type: 'boolean'
@@ -20,16 +24,16 @@ var CommentContextKeys;
     CommentContextKeys.commentThreadIsEmpty = ( (new RawContextKey(
      'commentThreadIsEmpty',
      false,
-     { type: 'boolean', description: ( localize(5284, "Set when the comment thread has no comments")) }
+     { type: 'boolean', description: ( localize(5320, "Set when the comment thread has no comments")) }
     )));
-    CommentContextKeys.commentIsEmpty = ( (new RawContextKey('commentIsEmpty', false, { type: 'boolean', description: ( localize(5285, "Set when the comment has no input")) })));
-    CommentContextKeys.commentContext = ( (new RawContextKey('comment', undefined, { type: 'string', description: ( localize(5286, "The context value of the comment")) })));
-    CommentContextKeys.commentThreadContext = ( (new RawContextKey('commentThread', undefined, { type: 'string', description: ( localize(5287, "The context value of the comment thread")) })));
+    CommentContextKeys.commentIsEmpty = ( (new RawContextKey('commentIsEmpty', false, { type: 'boolean', description: ( localize(5321, "Set when the comment has no input")) })));
+    CommentContextKeys.commentContext = ( (new RawContextKey('comment', undefined, { type: 'string', description: ( localize(5322, "The context value of the comment")) })));
+    CommentContextKeys.commentThreadContext = ( (new RawContextKey('commentThread', undefined, { type: 'string', description: ( localize(5323, "The context value of the comment thread")) })));
     CommentContextKeys.commentControllerContext = ( (new RawContextKey(
      'commentController',
      undefined,
-     { type: 'string', description: ( localize(5288, "The comment controller id associated with a comment thread")) }
+     { type: 'string', description: ( localize(5324, "The comment controller id associated with a comment thread")) }
     )));
-    CommentContextKeys.commentFocused = ( (new RawContextKey('commentFocused', false, { type: 'boolean', description: ( localize(5289, "Set when the comment is focused")) })));
+    CommentContextKeys.commentFocused = ( (new RawContextKey('commentFocused', false, { type: 'boolean', description: ( localize(5325, "Set when the comment is focused")) })));
 })(CommentContextKeys || (CommentContextKeys = {}))));
 export { CommentContextKeys };

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

@@ -4,7 +4,6 @@ import { IContextMenuService } from '../../../../platform/contextview/browser/co
 import { ILayoutService } from '../../../../platform/layout/browser/layoutService.service.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
 import { Extensions } from '../../../common/contributions.js';
-import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
 let ContextMenuContribution = class ContextMenuContribution extends Disposable {
     constructor(layoutService, contextMenuService) {
         super();
@@ -18,4 +17,4 @@ ContextMenuContribution = ( __decorate([
     ( __param(1, IContextMenuService))
 ], ContextMenuContribution));
 ( Registry.as(Extensions.Workbench))
-    .registerWorkbenchContribution(ContextMenuContribution, LifecyclePhase.Eventually);
+    .registerWorkbenchContribution(ContextMenuContribution, 4 );

package/vscode/src/vs/workbench/contrib/customEditor/browser/customEditorInput.js

@@ -12,7 +12,7 @@ import { IFileService } from '../../../../platform/files/common/files.service.js
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { ILabelService } from '../../../../platform/label/common/label.service.js';
 import { IUndoRedoService } from '../../../../platform/undoRedo/common/undoRedo.service.js';
-import { Verbosity, createEditorOpenError, EditorInputCapabilities } from '../../../common/editor.js';
+import { createEditorOpenError } from '../../../common/editor.js';
 import { ICustomEditorLabelService } from '../../../services/editor/common/customEditorLabelService.service.js';
 import { ICustomEditorService } from '../common/customEditor.service.js';
 import { IWebviewService } from '../../webview/browser/webview.service.js';
@@ -99,23 +99,23 @@ let CustomEditorInput = class CustomEditorInput extends LazilyResolvedWebviewEdi
         return this.viewType;
     }
     get capabilities() {
-        let capabilities = EditorInputCapabilities.None;
-        capabilities |= EditorInputCapabilities.CanDropIntoEditor;
+        let capabilities = 0 ;
+        capabilities |= 128 ;
         if (!this.customEditorService.getCustomEditorCapabilities(this.viewType)?.supportsMultipleEditorsPerDocument) {
-            capabilities |= EditorInputCapabilities.Singleton;
+            capabilities |= 8 ;
         }
         if (this._modelRef) {
             if (this._modelRef.object.isReadonly()) {
-                capabilities |= EditorInputCapabilities.Readonly;
+                capabilities |= 2 ;
             }
         }
         else {
             if (this.filesConfigurationService.isReadonly(this.resource)) {
-                capabilities |= EditorInputCapabilities.Readonly;
+                capabilities |= 2 ;
             }
         }
         if (this.resource.scheme === Schemas.untitled) {
-            capabilities |= EditorInputCapabilities.Untitled;
+            capabilities |= 4 ;
         }
         return capabilities;
     }
@@ -125,13 +125,13 @@ let CustomEditorInput = class CustomEditorInput extends LazilyResolvedWebviewEdi
         }
         return this._editorName;
     }
-    getDescription(verbosity = Verbosity.MEDIUM) {
+    getDescription(verbosity = 1 ) {
         switch (verbosity) {
-            case Verbosity.SHORT:
+            case 0 :
                 return this.shortDescription;
-            case Verbosity.LONG:
+            case 2 :
                 return this.longDescription;
-            case Verbosity.MEDIUM:
+            case 1 :
             default:
                 return this.mediumDescription;
         }
@@ -174,12 +174,12 @@ let CustomEditorInput = class CustomEditorInput extends LazilyResolvedWebviewEdi
     }
     getTitle(verbosity) {
         switch (verbosity) {
-            case Verbosity.SHORT:
+            case 0 :
                 return this.shortTitle;
-            case Verbosity.LONG:
+            case 2 :
                 return this.longTitle;
             default:
-            case Verbosity.MEDIUM:
+            case 1 :
                 return this.mediumTitle;
         }
     }
@@ -304,12 +304,12 @@ let CustomEditorInput = class CustomEditorInput extends LazilyResolvedWebviewEdi
     claim(claimant, targetWindow, scopedContextKeyService) {
         if (this.doCanMove(targetWindow.vscodeWindowId) !== true) {
             throw createEditorOpenError(localize(
-                9534,
+                9608,
                 "Unable to open the editor in this window, it contains modifications that can only be saved in the original window."
             ), [
                 toAction({
                     id: 'openInOriginalWindow',
-                    label: localize(9535, "Open in Original Window"),
+                    label: localize(9609, "Open in Original Window"),
                     run: async () => {
                         const originalPart = this.editorGroupsService.getPart(this.layoutService.getContainer(getWindow(this.webview.container).window));
                         const currentPart = this.editorGroupsService.getPart(this.layoutService.getContainer(targetWindow.window));
@@ -335,7 +335,7 @@ let CustomEditorInput = class CustomEditorInput extends LazilyResolvedWebviewEdi
             const sourceWindowId = getWindow(this.webview.container).vscodeWindowId;
             if (sourceWindowId !== targetWindowId) {
                 return ( localize(
-                    9536,
+                    9610,
                     "Unable to move '{0}': The editor contains changes that can only be saved in its current window.",
                     this.getName()
                 ));