@codingame/monaco-vscode-api 2.2.2 → 3.1.0

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

@@ -4,7 +4,7 @@ import { $, append, addDisposableListener, EventType, scheduleAtNextAnimationFra
 import { CommentMode } from '../../../../editor/common/languages.js';
 import { ActionBar } from '../../../../base/browser/ui/actionbar/actionbar.js';
 import { Separator, ActionRunner, Action } from '../../../../base/common/actions.js';
-import { Disposable } from '../../../../base/common/lifecycle.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';
@@ -36,6 +36,7 @@ import { FileAccess } 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.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
 class CommentsActionRunner extends ActionRunner {
     async runAction(action, context) {
         await action.run(...context);
@@ -45,7 +46,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) {
+    constructor(parentEditor, commentThread, comment, pendingEdit, owner, resource, parentThread, markdownRenderer, instantiationService, commentService, modelService, languageService, notificationService, contextMenuService, contextKeyService, configurationService, accessibilityService, keybindingService) {
         super();
         this.parentEditor = parentEditor;
         this.commentThread = commentThread;
@@ -63,6 +64,7 @@ let CommentNode = class CommentNode extends Disposable {
         this.contextMenuService = contextMenuService;
         this.configurationService = configurationService;
         this.accessibilityService = accessibilityService;
+        this.keybindingService = keybindingService;
         this._editAction = null;
         this._commentEditContainer = null;
         this._commentEditor = null;
@@ -112,6 +114,12 @@ let CommentNode = class CommentNode extends Disposable {
         this._register(this.accessibilityService.onDidChangeScreenReaderOptimized(() => {
             this.toggleToolbarHidden(true);
         }));
+        this.activeCommentListeners();
+    }
+    activeCommentListeners() {
+        this._register(addDisposableListener(this._domNode, EventType.FOCUS_IN, () => {
+            this.commentService.setActiveCommentAndThread(this.owner, { thread: this.commentThread, comment: this.comment });
+        }, true));
     }
     createScroll(container, body) {
         this._scrollable = ( new Scrollable({
@@ -402,13 +410,15 @@ let CommentNode = class CommentNode extends Disposable {
             uri: this._commentEditor.getModel().uri,
             value: this.commentBodyValue
         };
-        this.commentService.setActiveCommentThread(commentThread);
+        this.commentService.setActiveEditingCommentThread(commentThread);
+        this.commentService.setActiveCommentAndThread(this.owner, { thread: commentThread, comment: this.comment });
         this._commentEditorDisposables.push(this._commentEditor.onDidFocusEditorWidget(() => {
             commentThread.input = {
                 uri: this._commentEditor.getModel().uri,
                 value: this.commentBodyValue
             };
-            this.commentService.setActiveCommentThread(commentThread);
+            this.commentService.setActiveEditingCommentThread(commentThread);
+            this.commentService.setActiveCommentAndThread(this.owner, { thread: commentThread, comment: this.comment });
         }));
         this._commentEditorDisposables.push(this._commentEditor.onDidChangeModelContent(e => {
             if (commentThread.input && this._commentEditor && this._commentEditor.getModel().uri === commentThread.input.uri) {
@@ -417,7 +427,8 @@ let CommentNode = class CommentNode extends Disposable {
                     const input = commentThread.input;
                     input.value = newVal;
                     commentThread.input = input;
-                    this.commentService.setActiveCommentThread(commentThread);
+                    this.commentService.setActiveEditingCommentThread(commentThread);
+                    this.commentService.setActiveCommentAndThread(this.owner, { thread: commentThread, comment: this.comment });
                 }
             }
         }));
@@ -455,12 +466,10 @@ let CommentNode = class CommentNode extends Disposable {
         }
         this._body.classList.remove('hidden');
         this._commentEditorModel?.dispose();
-        this._commentEditorDisposables.forEach(dispose => dispose.dispose());
+        dispose(this._commentEditorDisposables);
         this._commentEditorDisposables = [];
-        if (this._commentEditor) {
-            this._commentEditor.dispose();
-            this._commentEditor = null;
-        }
+        this._commentEditor?.dispose();
+        this._commentEditor = null;
         this._commentEditContainer.remove();
     }
     layout(widthInPixel) {
@@ -493,7 +502,7 @@ let CommentNode = class CommentNode extends Disposable {
         this._register(menu.onDidChange(() => {
             this._commentFormActions?.setActions(menu);
         }));
-        this._commentFormActions = ( new CommentFormActions(container, (action) => {
+        this._commentFormActions = ( new CommentFormActions(this.keybindingService, this._contextKeyService, container, (action) => {
             const text = this._commentEditor.getValue();
             action.run({
                 thread: this.commentThread,
@@ -513,7 +522,7 @@ let CommentNode = class CommentNode extends Disposable {
         this._register(menu.onDidChange(() => {
             this._commentEditorActions?.setActions(menu);
         }));
-        this._commentEditorActions = ( new CommentFormActions(container, (action) => {
+        this._commentEditorActions = ( new CommentFormActions(this.keybindingService, this._contextKeyService, container, (action) => {
             const text = this._commentEditor.getValue();
             action.run({
                 thread: this.commentThread,
@@ -613,6 +622,10 @@ let CommentNode = class CommentNode extends Disposable {
             }, 3000);
         }
     }
+    dispose() {
+        super.dispose();
+        dispose(this._commentEditorDisposables);
+    }
 };
 CommentNode = ( __decorate([
     ( __param(8, IInstantiationService)),
@@ -623,7 +636,8 @@ CommentNode = ( __decorate([
     ( __param(13, IContextMenuService)),
     ( __param(14, IContextKeyService)),
     ( __param(15, IConfigurationService)),
-    ( __param(16, IAccessibilityService))
+    ( __param(16, IAccessibilityService)),
+    ( __param(17, IKeybindingService))
 ], CommentNode));
 function fillInActions(groups, target, useAlternativeActions, isPrimaryGroup = group => group === 'navigation') {
     for (const tuple of groups) {

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

@@ -1,7 +1,7 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { append, $, addDisposableListener } from '../../../../base/browser/dom.js';
 import { MOUSE_CURSOR_TEXT_CSS_CLASS_NAME } from '../../../../base/browser/ui/mouseCursor/mouseCursor.js';
-import { Disposable } from '../../../../base/common/lifecycle.js';
+import { Disposable, dispose } from '../../../../base/common/lifecycle.js';
 import { URI } from '../../../../base/common/uri.js';
 import { generateUuid } from '../../../../base/common/uuid.js';
 import { ILanguageService } from '../../../../editor/common/languages/language.js';
@@ -14,11 +14,12 @@ import { CommentFormActions } from './commentFormActions.js';
 import { ICommentService } from './commentService.js';
 import { CommentContextKeys } from '../common/commentContextKeys.js';
 import { MIN_EDITOR_HEIGHT, SimpleCommentEditor, calculateEditorHeight } from './simpleCommentEditor.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
 const COMMENT_SCHEME = 'comment';
 let INMEM_MODEL_ID = 0;
 const COMMENTEDITOR_DECORATION_KEY = 'commenteditordecoration';
 let CommentReply = class CommentReply extends Disposable {
-    constructor(owner, container, _parentEditor, _commentThread, _scopedInstatiationService, _contextKeyService, _commentMenus, _commentOptions, _pendingComment, _parentThread, _actionRunDelegate, commentService, languageService, modelService, themeService, configurationService) {
+    constructor(owner, container, _parentEditor, _commentThread, _scopedInstatiationService, _contextKeyService, _commentMenus, _commentOptions, _pendingComment, _parentThread, _actionRunDelegate, commentService, languageService, modelService, themeService, configurationService, keybindingService) {
         super();
         this.owner = owner;
         this._parentEditor = _parentEditor;
@@ -34,6 +35,7 @@ let CommentReply = class CommentReply extends Disposable {
         this.languageService = languageService;
         this.modelService = modelService;
         this.themeService = themeService;
+        this.keybindingService = keybindingService;
         this._commentThreadDisposables = [];
         this._editorHeight = MIN_EDITOR_HEIGHT;
         this.form = append(container, $('.comment-form'));
@@ -185,7 +187,8 @@ let CommentReply = class CommentReply extends Disposable {
                 uri: commentEditor.getModel().uri,
                 value: commentEditor.getValue()
             };
-            this.commentService.setActiveCommentThread(this._commentThread);
+            this.commentService.setActiveEditingCommentThread(this._commentThread);
+            this.commentService.setActiveCommentAndThread(this.owner, { thread: this._commentThread });
         }));
         this._commentThreadDisposables.push(commentEditor.getModel().onDidChangeContent(() => {
             const modelContent = commentEditor.getValue();
@@ -194,7 +197,7 @@ let CommentReply = class CommentReply extends Disposable {
                 newInput.value = modelContent;
                 this._commentThread.input = newInput;
             }
-            this.commentService.setActiveCommentThread(this._commentThread);
+            this.commentService.setActiveEditingCommentThread(this._commentThread);
         }));
         this._commentThreadDisposables.push(this._commentThread.onDidChangeInput(input => {
             const thread = this._commentThread;
@@ -223,15 +226,20 @@ let CommentReply = class CommentReply extends Disposable {
         this._register(menu.onDidChange(() => {
             this._commentFormActions.setActions(menu);
         }));
-        this._commentFormActions = ( new CommentFormActions(container, async (action) => {
-            await this._actionRunDelegate?.();
-            await action.run({
-                thread: this._commentThread,
-                text: this.commentEditor.getValue(),
-                $mid: 9
-            });
-            this.hideReplyArea();
-        }));
+        this._commentFormActions = ( new CommentFormActions(
+            this.keybindingService,
+            this._contextKeyService,
+            container,
+            async (action) => {
+                await this._actionRunDelegate?.();
+                await action.run({
+                    thread: this._commentThread,
+                    text: this.commentEditor.getValue(),
+                    $mid: 9
+                });
+                this.hideReplyArea();
+            }
+        ));
         this._register(this._commentFormActions);
         this._commentFormActions.setActions(menu);
     }
@@ -241,15 +249,20 @@ let CommentReply = class CommentReply extends Disposable {
         this._register(editorMenu.onDidChange(() => {
             this._commentEditorActions.setActions(editorMenu);
         }));
-        this._commentEditorActions = ( new CommentFormActions(container, async (action) => {
-            this._actionRunDelegate?.();
-            action.run({
-                thread: this._commentThread,
-                text: this.commentEditor.getValue(),
-                $mid: 9
-            });
-            this.focusCommentEditor();
-        }));
+        this._commentEditorActions = ( new CommentFormActions(
+            this.keybindingService,
+            this._contextKeyService,
+            container,
+            async (action) => {
+                this._actionRunDelegate?.();
+                action.run({
+                    thread: this._commentThread,
+                    text: this.commentEditor.getValue(),
+                    $mid: 9
+                });
+                this.focusCommentEditor();
+            }
+        ));
         this._register(this._commentEditorActions);
         this._commentEditorActions.setActions(editorMenu, true);
     }
@@ -289,12 +302,17 @@ let CommentReply = class CommentReply extends Disposable {
             }
         });
     }
+    dispose() {
+        super.dispose();
+        dispose(this._commentThreadDisposables);
+    }
 };
 CommentReply = ( __decorate([
     ( __param(11, ICommentService)),
     ( __param(12, ILanguageService)),
     ( __param(13, IModelService)),
     ( __param(14, IThemeService)),
-    ( __param(15, IConfigurationService))
+    ( __param(15, IConfigurationService)),
+    ( __param(16, IKeybindingService))
 ], CommentReply));
 export { COMMENTEDITOR_DECORATION_KEY, CommentReply };

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

@@ -37,8 +37,8 @@ let CommentService = class CommentService extends Disposable {
         this.onDidUpdateNotebookCommentThreads = this._onDidUpdateNotebookCommentThreads.event;
         this._onDidUpdateCommentingRanges = this._register(( new Emitter()));
         this.onDidUpdateCommentingRanges = this._onDidUpdateCommentingRanges.event;
-        this._onDidChangeActiveCommentThread = this._register(( new Emitter()));
-        this.onDidChangeActiveCommentThread = this._onDidChangeActiveCommentThread.event;
+        this._onDidChangeActiveEditingCommentThread = this._register(( new Emitter()));
+        this.onDidChangeActiveEditingCommentThread = this._onDidChangeActiveEditingCommentThread.event;
         this._onDidChangeCurrentCommentThread = this._register(( new Emitter()));
         this.onDidChangeCurrentCommentThread = this._onDidChangeCurrentCommentThread.event;
         this._onDidChangeCommentingEnabled = this._register(( new Emitter()));
@@ -127,13 +127,21 @@ let CommentService = class CommentService extends Disposable {
     setCurrentCommentThread(commentThread) {
         this._onDidChangeCurrentCommentThread.fire(commentThread);
     }
-    setActiveCommentThread(commentThread) {
-        this._onDidChangeActiveCommentThread.fire(commentThread);
+    setActiveEditingCommentThread(commentThread) {
+        this._onDidChangeActiveEditingCommentThread.fire(commentThread);
     }
-    setDocumentComments(resource, commentInfos) {
-        if (commentInfos.length) {
-            this._workspaceHasCommenting.set(true);
+    async setActiveCommentAndThread(owner, commentInfo) {
+        const commentController = this._commentControls.get(owner);
+        if (!commentController) {
+            return;
+        }
+        if (commentController !== this._lastActiveCommentController) {
+            await this._lastActiveCommentController?.setActiveCommentAndThread(undefined);
         }
+        this._lastActiveCommentController = commentController;
+        return commentController.setActiveCommentAndThread(commentInfo);
+    }
+    setDocumentComments(resource, commentInfos) {
         this._onDidSetResourceCommentInfos.fire({ resource, commentInfos });
     }
     setModelThreads(ownerId, ownerLabel, commentThreads) {

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

@@ -1,13 +1,16 @@
+import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { append, $ } from '../../../../base/browser/dom.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { CommentFormActions } from './commentFormActions.js';
-class CommentThreadAdditionalActions extends Disposable {
-    constructor(container, _commentThread, _contextKeyService, _commentMenus, _actionRunDelegate) {
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+let CommentThreadAdditionalActions = class CommentThreadAdditionalActions extends Disposable {
+    constructor(container, _commentThread, _contextKeyService, _commentMenus, _actionRunDelegate, _keybindingService) {
         super();
         this._commentThread = _commentThread;
         this._contextKeyService = _contextKeyService;
         this._commentMenus = _commentMenus;
         this._actionRunDelegate = _actionRunDelegate;
+        this._keybindingService = _keybindingService;
         this._container = append(container, $('.comment-additional-actions'));
         append(this._container, $('.section-separator'));
         this._buttonBar = append(this._container, $('.button-bar'));
@@ -45,16 +48,25 @@ class CommentThreadAdditionalActions extends Disposable {
             this._commentFormActions.setActions(menu,  true);
             this._enableDisableMenu(menu);
         }));
-        this._commentFormActions = ( new CommentFormActions(container, async (action) => {
-            this._actionRunDelegate?.();
-            action.run({
-                thread: this._commentThread,
-                $mid: 8
-            });
-        }, 4));
+        this._commentFormActions = ( new CommentFormActions(
+            this._keybindingService,
+            this._contextKeyService,
+            container,
+            async (action) => {
+                this._actionRunDelegate?.();
+                action.run({
+                    thread: this._commentThread,
+                    $mid: 8
+                });
+            },
+            4
+        ));
         this._register(this._commentFormActions);
         this._commentFormActions.setActions(menu,  true);
         this._enableDisableMenu(menu);
     }
-}
+};
+CommentThreadAdditionalActions = ( __decorate([
+    ( __param(5, IKeybindingService))
+], CommentThreadAdditionalActions));
 export { CommentThreadAdditionalActions };

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

@@ -37,7 +37,7 @@ let CommentThreadBody = class CommentThreadBody extends Disposable {
         this.onDidResize = this._onDidResize.event;
         this._commentDisposable = ( new Map());
         this._register(addDisposableListener(container, EventType.FOCUS_IN, e => {
-            this.commentService.setActiveCommentThread(this._commentThread);
+            this.commentService.setActiveEditingCommentThread(this._commentThread);
         }));
         this._markdownRenderer = this._register(( new MarkdownRenderer(this._options, this.languageService, this.openerService)));
     }

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

@@ -193,6 +193,7 @@ let CommentThreadWidget = class CommentThreadWidget extends Disposable {
     }
     dispose() {
         super.dispose();
+        dispose(this._commentThreadDisposables);
         this.updateCurrentThread(false, false);
     }
     _bindCommentThreadListeners() {

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

@@ -249,7 +249,7 @@ let ReviewZoneWidget = class ReviewZoneWidget extends ZoneWidget {
             this._commentGlyph = ( new CommentGlyphWidget(this.editor, range?.endLineNumber ?? -1));
             this._commentGlyph.setThreadState(this._commentThread.state);
         }
-        this._commentThreadWidget.display(this.editor.getOption(66 ));
+        this._commentThreadWidget.display(this.editor.getOption(67 ));
         this._disposables.add(this._commentThreadWidget.onDidResize(dimension => {
             this._refresh(dimension);
         }));
@@ -316,8 +316,8 @@ let ReviewZoneWidget = class ReviewZoneWidget extends ZoneWidget {
         }
         if (this._isExpanded) {
             this._commentThreadWidget.layout();
-            const headHeight = Math.ceil(this.editor.getOption(66 ) * 1.2);
-            const lineHeight = this.editor.getOption(66 );
+            const headHeight = Math.ceil(this.editor.getOption(67 ) * 1.2);
+            const lineHeight = this.editor.getOption(67 );
             const arrowHeight = Math.round(lineHeight / 3);
             const frameThickness = Math.round(lineHeight / 9) * 2;
             const computedLinesNumber = Math.ceil(((headHeight + dimensions.height + arrowHeight + frameThickness + 8) ) / lineHeight);

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

@@ -1113,7 +1113,7 @@ let CommentController = class CommentController {
         return;
     }
     getExistingCommentEditorOptions(editor) {
-        const lineDecorationsWidth = editor.getOption(65 );
+        const lineDecorationsWidth = editor.getOption(66 );
         let extraEditorClassName = [];
         const configuredExtraClassName = editor.getRawOptions().extraEditorClassName;
         if (configuredExtraClassName) {
@@ -1128,7 +1128,7 @@ let CommentController = class CommentController {
             extraEditorClassName.splice(inlineCommentPos, 1);
         }
         const options = editor.getOptions();
-        if (options.get(43 ) && options.get(109 ) !== 'never') {
+        if (options.get(43 ) && options.get(110 ) !== 'never') {
             lineDecorationsWidth += 11;
         }
         lineDecorationsWidth -= 24;
@@ -1137,7 +1137,7 @@ let CommentController = class CommentController {
     getWithCommentsEditorOptions(editor, extraEditorClassName, startingLineDecorationsWidth) {
         let lineDecorationsWidth = startingLineDecorationsWidth;
         const options = editor.getOptions();
-        if (options.get(43 ) && options.get(109 ) !== 'never') {
+        if (options.get(43 ) && options.get(110 ) !== 'never') {
             lineDecorationsWidth -= 11;
         }
         lineDecorationsWidth += 24;

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

@@ -282,7 +282,7 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
                             return ( localizeWithPath(
                                 'vs/workbench/contrib/comments/browser/commentsView',
                                 'resourceWithCommentLabel',
-                                "Comment from ${0} at line {1} column {2} in {3}, source: {4}",
+                                "${0} at line {1} column {2} in {3}, source: {4}",
                                 element.comment.userName,
                                 element.range.startLineNumber,
                                 element.range.startColumn,
@@ -294,7 +294,7 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
                             return ( localizeWithPath(
                                 'vs/workbench/contrib/comments/browser/commentsView',
                                 'resourceWithCommentLabelFile',
-                                "Comment from ${0} in {1}, source: {2}",
+                                "${0} in {1}, source: {2}",
                                 element.comment.userName,
                                 basename(element.resource),
                                 (typeof element.comment.body === 'string') ? element.comment.body : element.comment.body.value

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

@@ -6,6 +6,7 @@ import { RawContextKey } from '../../../../platform/contextkey/common/contextkey
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { ICommandService } from '../../../../platform/commands/common/commands.js';
 import { MenuPreventer } from '../../codeEditor/browser/menuPreventer.js';
+import { EditorDictation } from '../../codeEditor/browser/dictation/editorDictation.js';
 import { ContextMenuController } from '../../../../editor/contrib/contextmenu/browser/contextmenu.js';
 import { SuggestController } from '../../../../editor/contrib/suggest/browser/suggestController.js';
 import { SnippetController2 } from '../../../../editor/contrib/snippet/browser/snippetController2.js';
@@ -29,6 +30,7 @@ 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  }
             ]
         };
         super(domElement, options, codeEditorWidgetOptions, instantiationService, codeEditorService, commandService, scopedContextKeyService, themeService, notificationService, accessibilityService, languageConfigurationService, languageFeaturesService);
@@ -89,7 +91,7 @@ SimpleCommentEditor = ( __decorate([
 ], SimpleCommentEditor));
 function calculateEditorHeight(parentEditor, editor, currentHeight) {
     const layoutInfo = editor.getLayoutInfo();
-    const lineHeight = editor.getOption(66 );
+    const lineHeight = editor.getOption(67 );
     const contentHeight = (editor.getModel()?.getLineCount() * lineHeight) ?? editor.getContentHeight();
     if ((contentHeight > layoutInfo.height) ||
         (contentHeight < layoutInfo.height && currentHeight > MIN_EDITOR_HEIGHT)) {

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

@@ -1,7 +1,7 @@
 import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
 import { EditorPaneDescriptor } from '../../../browser/editor.js';
-import { Extensions } from '../../../common/contributions.js';
+import { registerWorkbenchContribution2 } from '../../../common/contributions.js';
 import { EditorExtensions } from '../../../common/editor.js';
 import { CustomEditorInputSerializer, ComplexCustomWorkingCopyEditorHandler } from './customEditorInputFactory.js';
 import { WebviewEditor } from '../../webviewPanel/browser/webviewEditor.js';
@@ -12,5 +12,4 @@ import { CustomEditorInput } from './customEditorInput.js';
 ]);
 ( Registry.as(EditorExtensions.EditorFactory))
     .registerEditorSerializer(CustomEditorInputSerializer.ID, CustomEditorInputSerializer);
-( Registry.as(Extensions.Workbench))
-    .registerWorkbenchContribution(ComplexCustomWorkingCopyEditorHandler, 1 );
+registerWorkbenchContribution2(ComplexCustomWorkingCopyEditorHandler.ID, ComplexCustomWorkingCopyEditorHandler, 1 );

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

@@ -73,6 +73,7 @@ function reviveWebview(webviewService, data) {
     return webview;
 }
 let ComplexCustomWorkingCopyEditorHandler = class ComplexCustomWorkingCopyEditorHandler extends Disposable {
+    static { this.ID = 'workbench.contrib.complexCustomWorkingCopyEditorHandler'; }
     constructor(_instantiationService, _workingCopyEditorService, _workingCopyBackupService, _webviewService, _customEditorService
     ) {
         super();

package/vscode/src/vs/workbench/contrib/customEditor/common/extensionPoint.js

@@ -1,4 +1,9 @@
+import { coalesce } from '../../../../base/common/arrays.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
 import { localizeWithPath } from '../../../../nls.js';
+import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { Extensions } from '../../../services/extensionManagement/common/extensionFeatures.js';
 import { ExtensionsRegistry } from '../../../services/extensions/common/extensionsRegistry.js';
 import { languagesExtPoint } from '../../../services/language/common/languageService.js';
 const Fields = ( Object.freeze({
@@ -101,7 +106,7 @@ const CustomEditorsContribution = {
         }
     }
 };
-const customEditorsExtensionPoint = ( ExtensionsRegistry.registerExtensionPoint({
+const customEditorsExtensionPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'customEditors',
     deps: [languagesExtPoint],
     jsonSchema: CustomEditorsContribution,
@@ -113,5 +118,64 @@ const customEditorsExtensionPoint = ( ExtensionsRegistry.registerExtensionPoint(
             }
         }
     },
-}));
+});
+class CustomEditorsDataRenderer extends Disposable {
+    constructor() {
+        super(...arguments);
+        this.type = 'table';
+    }
+    shouldRender(manifest) {
+        return !!manifest.contributes?.customEditors;
+    }
+    render(manifest) {
+        const customEditors = manifest.contributes?.customEditors || [];
+        if (!customEditors.length) {
+            return { data: { headers: [], rows: [] }, dispose: () => { } };
+        }
+        const headers = [
+            ( localizeWithPath(
+                'vs/workbench/contrib/customEditor/common/extensionPoint',
+                'customEditors view type',
+                "View Type"
+            )),
+            ( localizeWithPath(
+                'vs/workbench/contrib/customEditor/common/extensionPoint',
+                'customEditors priority',
+                "Priority"
+            )),
+            ( localizeWithPath(
+                'vs/workbench/contrib/customEditor/common/extensionPoint',
+                'customEditors filenamePattern',
+                "Filename Pattern"
+            )),
+        ];
+        const rows = ( customEditors
+            .map(customEditor => {
+            return [
+                customEditor.viewType,
+                customEditor.priority ?? '',
+                coalesce(( customEditor.selector.map(x => x.filenamePattern))).join(', ')
+            ];
+        }));
+        return {
+            data: {
+                headers,
+                rows
+            },
+            dispose: () => { }
+        };
+    }
+}
+( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
+    id: 'customEditors',
+    label: ( localizeWithPath(
+        'vs/workbench/contrib/customEditor/common/extensionPoint',
+        'customEditors',
+        "Custom Editors"
+    )),
+    access: {
+        canToggle: false
+    },
+    renderer: ( new SyncDescriptor(CustomEditorsDataRenderer)),
+});
 export { customEditorsExtensionPoint };

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

@@ -4,15 +4,16 @@ import { ActionBar } from '../../../../base/browser/ui/actionbar/actionbar.js';
 import { HighlightedLabel } from '../../../../base/browser/ui/highlightedlabel/highlightedLabel.js';
 import { InputBox } from '../../../../base/browser/ui/inputbox/inputBox.js';
 import { Codicon } from '../../../../base/common/codicons.js';
-import { ThemeIcon } from '../../../../base/common/themables.js';
 import { createMatches } from '../../../../base/common/filters.js';
 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 { IContextViewService } from '../../../../platform/contextview/browser/contextView.js';
 import { defaultInputBoxStyles } from '../../../../platform/theme/browser/defaultStyles.js';
 import { IDebugService } from '../common/debug.js';
 import { Expression, Variable, ExpressionContainer } from '../common/debugModel.js';
+import { IDebugVisualizerService } from '../common/debugVisualizers.js';
 import { ReplEvaluationResult } from '../common/replModel.js';
 const MAX_VALUE_RENDER_LENGTH_IN_VIEWLET = 1024;
 const booleanRegex = /^(true|false)$/i;
@@ -93,6 +94,34 @@ function renderVariable(variable, data, showChanged, highlights, linkDetector) {
         linkDetector
     });
 }
+let AbstractExpressionDataSource = class AbstractExpressionDataSource {
+    constructor(debugService, debugVisualizer) {
+        this.debugService = debugService;
+        this.debugVisualizer = debugVisualizer;
+    }
+    async getChildren(element) {
+        const vm = this.debugService.getViewModel();
+        const children = await this.doGetChildren(element);
+        return Promise.all(( children.map(async (r) => {
+            const vizOrTree = vm.getVisualizedExpression(r);
+            if (typeof vizOrTree === 'string') {
+                const viz = await this.debugVisualizer.getVisualizedNodeFor(vizOrTree, r);
+                if (viz) {
+                    vm.setVisualizedExpression(r, viz);
+                    return viz;
+                }
+            }
+            else if (vizOrTree) {
+                return vizOrTree;
+            }
+            return r;
+        })));
+    }
+};
+AbstractExpressionDataSource = ( __decorate([
+    ( __param(0, IDebugService)),
+    ( __param(1, IDebugVisualizerService))
+], AbstractExpressionDataSource));
 let AbstractExpressionsRenderer = class AbstractExpressionsRenderer {
     constructor(debugService, contextViewService) {
         this.debugService = debugService;
@@ -199,4 +228,4 @@ AbstractExpressionsRenderer = ( __decorate([
     ( __param(0, IDebugService)),
     ( __param(1, IContextViewService))
 ], AbstractExpressionsRenderer));
-export { AbstractExpressionsRenderer, renderExpressionValue, renderVariable, renderViewTree };
+export { AbstractExpressionDataSource, AbstractExpressionsRenderer, renderExpressionValue, renderVariable, renderViewTree };

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

@@ -761,14 +761,14 @@ class InlineBreakpointWidget {
             });
         }));
         const updateSize = () => {
-            const lineHeight = this.editor.getOption(66 );
+            const lineHeight = this.editor.getOption(67 );
             this.domNode.style.height = `${lineHeight}px`;
             this.domNode.style.width = `${Math.ceil(0.8 * lineHeight)}px`;
             this.domNode.style.marginLeft = `4px`;
         };
         updateSize();
         this.toDispose.push(this.editor.onDidChangeConfiguration(c => {
-            if (c.hasChanged(52 ) || c.hasChanged(66 )) {
+            if (c.hasChanged(52 ) || c.hasChanged(67 )) {
                 updateSize();
             }
         }));