@codingame/monaco-vscode-api 2.2.2 → 3.1.0

package/vscode/src/vs/workbench/contrib/codeEditor/browser/dictation/editorDictation.js

@@ -0,0 +1,256 @@
+import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
+import './editorDictation.css.js';
+import { localizeWithPath, localize2WithPath } from '../../../../../nls.js';
+import { CancellationTokenSource } from '../../../../../base/common/cancellation.js';
+import { Disposable, MutableDisposable, toDisposable, DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { RawContextKey, IContextKeyService, ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
+import { SpeechToTextStatus, ISpeechService, HasSpeechProvider } from '../../../speech/common/speechService.js';
+import { Codicon } from '../../../../../base/common/codicons.js';
+import { registerEditorContribution, EditorAction2 } from '../../../../../editor/browser/editorExtensions.js';
+import { EditorContextKeys } from '../../../../../editor/common/editorContextKeys.js';
+import { IKeybindingService } from '../../../../../platform/keybinding/common/keybinding.js';
+import { EditOperation } from '../../../../../editor/common/core/editOperation.js';
+import { Selection } from '../../../../../editor/common/core/selection.js';
+import { Position } from '../../../../../editor/common/core/position.js';
+import { Range } from '../../../../../editor/common/core/range.js';
+import { registerAction2 } from '../../../../../platform/actions/common/actions.js';
+import { assertIsDefined } from '../../../../../base/common/types.js';
+import { ActionBar } from '../../../../../base/browser/ui/actionbar/actionbar.js';
+import { toAction } from '../../../../../base/common/actions.js';
+import { ThemeIcon } from '../../../../../base/common/themables.js';
+var EditorDictation_1;
+const EDITOR_DICTATION_IN_PROGRESS = ( new RawContextKey('editorDictation.inProgress', false));
+const VOICE_CATEGORY = ( localize2WithPath(
+    'vs/workbench/contrib/codeEditor/browser/dictation/editorDictation',
+    'voiceCategory',
+    "Voice"
+));
+class EditorDictationStartAction extends EditorAction2 {
+    constructor() {
+        super({
+            id: 'workbench.action.editorDictation.start',
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/codeEditor/browser/dictation/editorDictation',
+                'startDictation',
+                "Start Dictation in Editor"
+            )),
+            category: VOICE_CATEGORY,
+            precondition: ( ContextKeyExpr.and(HasSpeechProvider, ( EDITOR_DICTATION_IN_PROGRESS.toNegated()), ( EditorContextKeys.readOnly.toNegated()))),
+            f1: true,
+            keybinding: {
+                primary: 2048  | 512  | 52 ,
+                weight: 200
+            }
+        });
+    }
+    runEditorCommand(accessor, editor) {
+        const keybindingService = accessor.get(IKeybindingService);
+        const holdMode = keybindingService.enableKeybindingHoldMode(this.desc.id);
+        if (holdMode) {
+            let shouldCallStop = false;
+            const handle = setTimeout(() => {
+                shouldCallStop = true;
+            }, 500);
+            holdMode.finally(() => {
+                clearTimeout(handle);
+                if (shouldCallStop) {
+                    EditorDictation.get(editor)?.stop();
+                }
+            });
+        }
+        EditorDictation.get(editor)?.start();
+    }
+}
+class EditorDictationStopAction extends EditorAction2 {
+    static { this.ID = 'workbench.action.editorDictation.stop'; }
+    constructor() {
+        super({
+            id: EditorDictationStopAction.ID,
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/codeEditor/browser/dictation/editorDictation',
+                'stopDictation',
+                "Stop Dictation in Editor"
+            )),
+            category: VOICE_CATEGORY,
+            precondition: EDITOR_DICTATION_IN_PROGRESS,
+            f1: true,
+            keybinding: {
+                primary: 9 ,
+                weight: 200  + 100
+            }
+        });
+    }
+    runEditorCommand(_accessor, editor) {
+        EditorDictation.get(editor)?.stop();
+    }
+}
+class DictationWidget extends Disposable {
+    constructor(editor, keybindingService) {
+        super();
+        this.editor = editor;
+        this.suppressMouseDown = true;
+        this.allowEditorOverflow = true;
+        this.domNode = document.createElement('div');
+        const actionBar = this._register(( new ActionBar(this.domNode)));
+        const stopActionKeybinding = keybindingService.lookupKeybinding(EditorDictationStopAction.ID)?.getLabel();
+        actionBar.push(toAction({
+            id: EditorDictationStopAction.ID,
+            label: stopActionKeybinding ? ( localizeWithPath(
+                'vs/workbench/contrib/codeEditor/browser/dictation/editorDictation',
+                'stopDictationShort1',
+                "Stop Dictation ({0})",
+                stopActionKeybinding
+            )) : ( localizeWithPath(
+                'vs/workbench/contrib/codeEditor/browser/dictation/editorDictation',
+                'stopDictationShort2',
+                "Stop Dictation"
+            )),
+            class: ThemeIcon.asClassName(Codicon.micFilled),
+            run: () => EditorDictation.get(editor)?.stop()
+        }), { icon: true, label: false, keybinding: stopActionKeybinding });
+        this.domNode.classList.add('editor-dictation-widget');
+        this.domNode.appendChild(actionBar.domNode);
+    }
+    getId() {
+        return 'editorDictation';
+    }
+    getDomNode() {
+        return this.domNode;
+    }
+    getPosition() {
+        if (!this.editor.hasModel()) {
+            return null;
+        }
+        const selection = this.editor.getSelection();
+        return {
+            position: selection.getPosition(),
+            preference: [
+                selection.getPosition().equals(selection.getStartPosition()) ? 1  : 2 ,
+                0
+            ]
+        };
+    }
+    beforeRender() {
+        const lineHeight = this.editor.getOption(67 );
+        const width = this.editor.getLayoutInfo().contentWidth * 0.7;
+        this.domNode.style.setProperty('--vscode-editor-dictation-widget-height', `${lineHeight}px`);
+        this.domNode.style.setProperty('--vscode-editor-dictation-widget-width', `${width}px`);
+        return null;
+    }
+    show() {
+        this.editor.addContentWidget(this);
+    }
+    layout() {
+        this.editor.layoutContentWidget(this);
+    }
+    active() {
+        this.domNode.classList.add('recording');
+    }
+    hide() {
+        this.domNode.classList.remove('recording');
+        this.editor.removeContentWidget(this);
+    }
+}
+let EditorDictation = class EditorDictation extends Disposable {
+    static { EditorDictation_1 = this; }
+    static { this.ID = 'editorDictation'; }
+    static get(editor) {
+        return editor.getContribution(EditorDictation_1.ID);
+    }
+    constructor(editor, speechService, contextKeyService, keybindingService) {
+        super();
+        this.editor = editor;
+        this.speechService = speechService;
+        this.contextKeyService = contextKeyService;
+        this.keybindingService = keybindingService;
+        this.widget = this._register(( new DictationWidget(this.editor, this.keybindingService)));
+        this.editorDictationInProgress = EDITOR_DICTATION_IN_PROGRESS.bindTo(this.contextKeyService);
+        this.sessionDisposables = this._register(( new MutableDisposable()));
+    }
+    start() {
+        const disposables = ( new DisposableStore());
+        this.sessionDisposables.value = disposables;
+        this.widget.show();
+        disposables.add(toDisposable(() => this.widget.hide()));
+        this.editorDictationInProgress.set(true);
+        disposables.add(toDisposable(() => this.editorDictationInProgress.reset()));
+        const collection = this.editor.createDecorationsCollection();
+        disposables.add(toDisposable(() => collection.clear()));
+        let previewStart = undefined;
+        let lastReplaceTextLength = 0;
+        const replaceText = (text, isPreview) => {
+            if (!previewStart) {
+                previewStart = assertIsDefined(this.editor.getPosition());
+            }
+            const endPosition = ( new Position(previewStart.lineNumber, previewStart.column + text.length));
+            this.editor.executeEdits(EditorDictation_1.ID, [
+                EditOperation.replace(Range.fromPositions(previewStart, previewStart.with(undefined, previewStart.column + lastReplaceTextLength)), text)
+            ], [
+                Selection.fromPositions(endPosition)
+            ]);
+            if (isPreview) {
+                collection.set([
+                    {
+                        range: Range.fromPositions(previewStart, previewStart.with(undefined, previewStart.column + text.length)),
+                        options: {
+                            description: 'editor-dictation-preview',
+                            inlineClassName: 'ghost-text-decoration-preview'
+                        }
+                    }
+                ]);
+            }
+            else {
+                collection.clear();
+            }
+            lastReplaceTextLength = text.length;
+            if (!isPreview) {
+                previewStart = undefined;
+                lastReplaceTextLength = 0;
+            }
+            this.editor.revealPositionInCenterIfOutsideViewport(endPosition);
+            this.widget.layout();
+        };
+        const cts = ( new CancellationTokenSource());
+        disposables.add(toDisposable(() => cts.dispose(true)));
+        const session = this.speechService.createSpeechToTextSession(cts.token);
+        disposables.add(session.onDidChange(e => {
+            if (cts.token.isCancellationRequested) {
+                return;
+            }
+            switch (e.status) {
+                case SpeechToTextStatus.Started:
+                    this.widget.active();
+                    break;
+                case SpeechToTextStatus.Stopped:
+                    disposables.dispose();
+                    break;
+                case SpeechToTextStatus.Recognizing: {
+                    if (!e.text) {
+                        return;
+                    }
+                    replaceText(e.text, true);
+                    break;
+                }
+                case SpeechToTextStatus.Recognized: {
+                    if (!e.text) {
+                        return;
+                    }
+                    replaceText(`${e.text} `, false);
+                    break;
+                }
+            }
+        }));
+    }
+    stop() {
+        this.sessionDisposables.clear();
+    }
+};
+EditorDictation = EditorDictation_1 = ( __decorate([
+    ( __param(1, ISpeechService)),
+    ( __param(2, IContextKeyService)),
+    ( __param(3, IKeybindingService))
+], EditorDictation));
+registerEditorContribution(EditorDictation.ID, EditorDictation, 4 );
+registerAction2(EditorDictationStartAction);
+registerAction2(EditorDictationStopAction);
+export { DictationWidget, EditorDictation, EditorDictationStartAction, EditorDictationStopAction };

package/vscode/src/vs/workbench/contrib/codeEditor/browser/diffEditorHelper.js

@@ -90,7 +90,7 @@ function createScreenReaderHelp() {
         if (!codeEditor) {
             return;
         }
-        const keys = ['audioCues.diffLineDeleted', 'audioCues.diffLineInserted', 'audioCues.diffLineModified'];
+        const keys = ['accessibility.signals.diffLineDeleted', 'accessibility.signals.diffLineInserted', 'accessibility.signals.diffLineModified'];
         const content = [
             ( localizeWithPath(
                 'vs/workbench/contrib/codeEditor/browser/diffEditorHelper',
@@ -107,7 +107,7 @@ function createScreenReaderHelp() {
             ( localizeWithPath(
                 'vs/workbench/contrib/codeEditor/browser/diffEditorHelper',
                 'msg3',
-                "To control which audio cues should be played, the following settings can be configured: {0}.",
+                "To control which accessibility signals should be played, the following settings can be configured: {0}.",
                 keys.join(', ')
             )),
         ];

package/vscode/src/vs/workbench/contrib/codeEditor/browser/editorFeatures.js

@@ -4,9 +4,9 @@ import { Disposable } from '../../../../base/common/lifecycle.js';
 import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
 import { getEditorFeatures } from '../../../../editor/common/editorFeatures.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
-import { Registry } from '../../../../platform/registry/common/platform.js';
-import { Extensions } from '../../../common/contributions.js';
+import { registerWorkbenchContribution2 } from '../../../common/contributions.js';
 let EditorFeaturesInstantiator = class EditorFeaturesInstantiator extends Disposable {
+    static { this.ID = 'workbench.contrib.editorFeaturesInstantiator'; }
     constructor(codeEditorService, _instantiationService) {
         super();
         this._instantiationService = _instantiationService;
@@ -40,5 +40,4 @@ EditorFeaturesInstantiator = ( __decorate([
     ( __param(0, ICodeEditorService)),
     ( __param(1, IInstantiationService))
 ], EditorFeaturesInstantiator));
-const workbenchRegistry = ( Registry.as(Extensions.Workbench));
-workbenchRegistry.registerWorkbenchContribution(EditorFeaturesInstantiator, 2 );
+registerWorkbenchContribution2(EditorFeaturesInstantiator.ID, EditorFeaturesInstantiator, 2 );

package/vscode/src/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoSymbolQuickAccess.js

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
-import { localizeWithPath } from '../../../../../nls.js';
+import { localizeWithPath, localize2WithPath } from '../../../../../nls.js';
 import { IQuickInputService, ItemActivation } from '../../../../../platform/quickinput/common/quickInput.js';
 import { IEditorService } from '../../../../services/editor/common/editorService.js';
 import { Registry } from '../../../../../platform/registry/common/platform.js';
@@ -11,7 +11,7 @@ import { timeout } from '../../../../../base/common/async.js';
 import { CancellationTokenSource } from '../../../../../base/common/cancellation.js';
 import { registerAction2, Action2, MenuId } from '../../../../../platform/actions/common/actions.js';
 import { prepareQuery } from '../../../../../base/common/fuzzyScorer.js';
-import { fuzzyScore, createMatches } from '../../../../../base/common/filters.js';
+import { fuzzyScore } from '../../../../../base/common/filters.js';
 import { onUnexpectedError } from '../../../../../base/common/errors.js';
 import { IOutlineService } from '../../../../services/outline/browser/outline.js';
 import { isCompositeEditor } from '../../../../../editor/browser/editorBrowser.js';
@@ -20,6 +20,7 @@ import { IOutlineModelService } from '../../../../../editor/contrib/documentSymb
 import { ILanguageFeaturesService } from '../../../../../editor/common/services/languageFeatures.js';
 import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
 import { accessibleViewIsShown, accessibilityHelpIsShown } from '../../../accessibility/browser/accessibilityConfiguration.js';
+import { parseLabelWithIcons, matchesFuzzyIconAware } from '../../../../../base/common/iconLabels.js';
 var GotoSymbolQuickAccessProvider_1;
 let GotoSymbolQuickAccessProvider = class GotoSymbolQuickAccessProvider extends AbstractGotoSymbolQuickAccessProvider {
     static { GotoSymbolQuickAccessProvider_1 = this; }
@@ -130,12 +131,14 @@ let GotoSymbolQuickAccessProvider = class GotoSymbolQuickAccessProvider extends
                         item.highlights = undefined;
                         return true;
                     }
-                    const score = fuzzyScore(picker.value, picker.value.toLowerCase(), 1 , item.label, item.label.toLowerCase(), 0, { firstMatchCanBeWeak: true, boostFullMatch: true });
+                    const trimmedQuery = picker.value.substring(AbstractGotoSymbolQuickAccessProvider.PREFIX.length).trim();
+                    const parsedLabel = parseLabelWithIcons(item.label);
+                    const score = fuzzyScore(trimmedQuery, trimmedQuery.toLowerCase(), 0, parsedLabel.text, parsedLabel.text.toLowerCase(), 0, { firstMatchCanBeWeak: true, boostFullMatch: true });
                     if (!score) {
                         return false;
                     }
                     item.score = score[1];
-                    item.highlights = { label: createMatches(score) };
+                    item.highlights = { label: matchesFuzzyIconAware(trimmedQuery, parsedLabel) ?? undefined };
                     return true;
                 });
                 if (filteredItems.length === 0) {
@@ -187,7 +190,7 @@ class GotoSymbolAction extends Action2 {
         super({
             id: GotoSymbolAction.ID,
             title: {
-                value: ( localizeWithPath(
+                ...( localize2WithPath(
                     'vs/workbench/contrib/codeEditor/browser/quickaccess/gotoSymbolQuickAccess',
                     'gotoSymbol',
                     "Go to Symbol in Editor..."
@@ -197,7 +200,6 @@ class GotoSymbolAction extends Action2 {
                     { key: 'miGotoSymbolInEditor', comment: ['&& denotes a mnemonic'] },
                     "Go to &&Symbol in Editor..."
                 )),
-                original: 'Go to Symbol in Editor...'
             },
             f1: true,
             keybinding: {

package/vscode/src/vs/workbench/contrib/codeEditor/browser/saveParticipants.js

@@ -25,12 +25,12 @@ let TrimWhitespaceParticipant = class TrimWhitespaceParticipant {
         this.configurationService = configurationService;
         this.codeEditorService = codeEditorService;
     }
-    async participate(model, env) {
+    async participate(model, context) {
         if (!model.textEditorModel) {
             return;
         }
         if (this.configurationService.getValue('files.trimTrailingWhitespace', { overrideIdentifier: model.textEditorModel.getLanguageId(), resource: model.resource })) {
-            this.doTrimTrailingWhitespace(model.textEditorModel, env.reason === 2 );
+            this.doTrimTrailingWhitespace(model.textEditorModel, context.reason === 2 );
         }
     }
     doTrimTrailingWhitespace(model, isAutoSaved) {
@@ -79,7 +79,7 @@ let FinalNewLineParticipant = class FinalNewLineParticipant {
         this.configurationService = configurationService;
         this.codeEditorService = codeEditorService;
     }
-    async participate(model, _env) {
+    async participate(model, context) {
         if (!model.textEditorModel) {
             return;
         }
@@ -113,12 +113,12 @@ let TrimFinalNewLinesParticipant = class TrimFinalNewLinesParticipant {
         this.configurationService = configurationService;
         this.codeEditorService = codeEditorService;
     }
-    async participate(model, env) {
+    async participate(model, context) {
         if (!model.textEditorModel) {
             return;
         }
         if (this.configurationService.getValue('files.trimFinalNewlines', { overrideIdentifier: model.textEditorModel.getLanguageId(), resource: model.resource })) {
-            this.doTrimFinalNewLines(model.textEditorModel, env.reason === 2 );
+            this.doTrimFinalNewLines(model.textEditorModel, context.reason === 2 );
         }
     }
     findLastNonEmptyLine(model) {
@@ -169,11 +169,11 @@ let FormatOnSaveParticipant = class FormatOnSaveParticipant {
         this.codeEditorService = codeEditorService;
         this.instantiationService = instantiationService;
     }
-    async participate(model, env, progress, token) {
+    async participate(model, context, progress, token) {
         if (!model.textEditorModel) {
             return;
         }
-        if (env.reason === 2 ) {
+        if (context.reason === 2 ) {
             return undefined;
         }
         const textEditorModel = model.textEditorModel;
@@ -220,7 +220,7 @@ let CodeActionOnSaveParticipant = class CodeActionOnSaveParticipant {
         this.instantiationService = instantiationService;
         this.languageFeaturesService = languageFeaturesService;
     }
-    async participate(model, env, progress, token) {
+    async participate(model, context, progress, token) {
         if (!model.textEditorModel) {
             return;
         }
@@ -230,10 +230,10 @@ let CodeActionOnSaveParticipant = class CodeActionOnSaveParticipant {
         if (!setting) {
             return undefined;
         }
-        if (env.reason === 2 ) {
+        if (context.reason === 2 ) {
             return undefined;
         }
-        if (env.reason !== 1  && Array.isArray(setting)) {
+        if (context.reason !== 1  && Array.isArray(setting)) {
             return undefined;
         }
         const settingItems = Array.isArray(setting)
@@ -267,7 +267,7 @@ let CodeActionOnSaveParticipant = class CodeActionOnSaveParticipant {
             'codeaction',
             "Quick Fixes"
         )) });
-        const filteredSaveList = Array.isArray(setting) ? codeActionsOnSave : codeActionsOnSave.filter(x => setting[x.value] === 'always' || (((setting[x.value] === 'explicit' || setting[x.value] === true) && env.reason === 1) ));
+        const filteredSaveList = Array.isArray(setting) ? codeActionsOnSave : codeActionsOnSave.filter(x => setting[x.value] === 'always' || (((setting[x.value] === 'explicit' || setting[x.value] === true) && context.reason === 1) ));
         await this.applyOnSaveActions(textEditorModel, filteredSaveList, excludedActions, progress, token);
     }
     createCodeActionsOnSave(settingItems) {

package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleMinimap.js

@@ -1,4 +1,4 @@
-import { localizeWithPath } from '../../../../nls.js';
+import { localize2WithPath, localizeWithPath } from '../../../../nls.js';
 import { registerAction2, Action2, MenuId } from '../../../../platform/actions/common/actions.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
@@ -9,17 +9,16 @@ class ToggleMinimapAction extends Action2 {
         super({
             id: ToggleMinimapAction.ID,
             title: {
-                value: ( localizeWithPath(
+                ...( localize2WithPath(
                     'vs/workbench/contrib/codeEditor/browser/toggleMinimap',
                     'toggleMinimap',
                     "Toggle Minimap"
                 )),
-                original: 'Toggle Minimap',
                 mnemonicTitle: ( localizeWithPath(
                     'vs/workbench/contrib/codeEditor/browser/toggleMinimap',
                     { key: 'miMinimap', comment: ['&& denotes a mnemonic'] },
                     "&&Minimap"
-                ))
+                )),
             },
             category: Categories.View,
             f1: true,

package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleRenderControlCharacter.js

@@ -1,4 +1,4 @@
-import { localizeWithPath } from '../../../../nls.js';
+import { localize2WithPath, localizeWithPath } from '../../../../nls.js';
 import { registerAction2, Action2, MenuId } from '../../../../platform/actions/common/actions.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
@@ -9,7 +9,7 @@ class ToggleRenderControlCharacterAction extends Action2 {
         super({
             id: ToggleRenderControlCharacterAction.ID,
             title: {
-                value: ( localizeWithPath(
+                ...( localize2WithPath(
                     'vs/workbench/contrib/codeEditor/browser/toggleRenderControlCharacter',
                     'toggleRenderControlCharacters',
                     "Toggle Control Characters"
@@ -19,7 +19,6 @@ class ToggleRenderControlCharacterAction extends Action2 {
                     { key: 'miToggleRenderControlCharacters', comment: ['&& denotes a mnemonic'] },
                     "Render &&Control Characters"
                 )),
-                original: 'Toggle Control Characters'
             },
             category: Categories.View,
             f1: true,

package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleRenderWhitespace.js

@@ -1,4 +1,4 @@
-import { localizeWithPath } from '../../../../nls.js';
+import { localize2WithPath, localizeWithPath } from '../../../../nls.js';
 import { registerAction2, Action2, MenuId } from '../../../../platform/actions/common/actions.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
@@ -9,7 +9,7 @@ class ToggleRenderWhitespaceAction extends Action2 {
         super({
             id: ToggleRenderWhitespaceAction.ID,
             title: {
-                value: ( localizeWithPath(
+                ...( localize2WithPath(
                     'vs/workbench/contrib/codeEditor/browser/toggleRenderWhitespace',
                     'toggleRenderWhitespace',
                     "Toggle Render Whitespace"
@@ -19,7 +19,6 @@ class ToggleRenderWhitespaceAction extends Action2 {
                     { key: 'miToggleRenderWhitespace', comment: ['&& denotes a mnemonic'] },
                     "&&Render Whitespace"
                 )),
-                original: 'Toggle Render Whitespace'
             },
             category: Categories.View,
             f1: true,

package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleWordWrap.js

@@ -7,8 +7,7 @@ import { MenuRegistry, MenuId } from '../../../../platform/actions/common/action
 import { ContextKeyExpr, RawContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
 import { EditorContextKeys } from '../../../../editor/common/editorContextKeys.js';
 import { Codicon } from '../../../../base/common/codicons.js';
-import { Registry } from '../../../../platform/registry/common/platform.js';
-import { Extensions } from '../../../common/contributions.js';
+import { registerWorkbenchContribution2 } from '../../../common/contributions.js';
 import { IEditorService } from '../../../services/editor/common/editorService.js';
 import { Event } from '../../../../base/common/event.js';
 import { onDidRegisterWindow, addDisposableListener } from '../../../../base/browser/dom.js';
@@ -59,7 +58,7 @@ class ToggleWordWrapAction extends EditorAction {
             newState = null;
         }
         else {
-            const actualWrappingInfo = editor.getOption(144 );
+            const actualWrappingInfo = editor.getOption(145 );
             const wordWrapOverride = (actualWrappingInfo.wrappingColumn === -1 ? 'on' : 'off');
             newState = { wordWrapOverride };
         }
@@ -97,16 +96,16 @@ let ToggleWordWrapController = class ToggleWordWrapController extends Disposable
         this._contextKeyService = _contextKeyService;
         this._codeEditorService = _codeEditorService;
         const options = this._editor.getOptions();
-        const wrappingInfo = options.get(144 );
+        const wrappingInfo = options.get(145 );
         const isWordWrapMinified = this._contextKeyService.createKey(isWordWrapMinifiedKey, wrappingInfo.isWordWrapMinified);
         const isDominatedByLongLines = this._contextKeyService.createKey(isDominatedByLongLinesKey, wrappingInfo.isDominatedByLongLines);
         let currentlyApplyingEditorConfig = false;
         this._register(_editor.onDidChangeConfiguration((e) => {
-            if (!e.hasChanged(144 )) {
+            if (!e.hasChanged(145 )) {
                 return;
             }
             const options = this._editor.getOptions();
-            const wrappingInfo = options.get(144 );
+            const wrappingInfo = options.get(145 );
             isWordWrapMinified.set(wrappingInfo.isWordWrapMinified);
             isDominatedByLongLines.set(wrappingInfo.isDominatedByLongLines);
             if (!currentlyApplyingEditorConfig) {
@@ -196,6 +195,7 @@ function canToggleWordWrap(codeEditorService, editor) {
     return true;
 }
 let EditorWordWrapContextKeyTracker = class EditorWordWrapContextKeyTracker extends Disposable {
+    static { this.ID = 'workbench.contrib.editorWordWrapContextKeyTracker'; }
     constructor(_editorService, _codeEditorService, _contextService) {
         super();
         this._editorService = _editorService;
@@ -222,7 +222,7 @@ let EditorWordWrapContextKeyTracker = class EditorWordWrapContextKeyTracker exte
         if (activeEditor) {
             this._activeEditorListener.add(activeEditor.onDidChangeModel(() => this._updateFromCodeEditor()));
             this._activeEditorListener.add(activeEditor.onDidChangeConfiguration((e) => {
-                if (e.hasChanged(144 )) {
+                if (e.hasChanged(145 )) {
                     this._updateFromCodeEditor();
                 }
             }));
@@ -234,7 +234,7 @@ let EditorWordWrapContextKeyTracker = class EditorWordWrapContextKeyTracker exte
             return this._setValues(false, false);
         }
         else {
-            const wrappingInfo = this._activeEditor.getOption(144 );
+            const wrappingInfo = this._activeEditor.getOption(145 );
             this._setValues(true, wrappingInfo.wrappingColumn !== -1);
         }
     }
@@ -248,8 +248,7 @@ EditorWordWrapContextKeyTracker = ( __decorate([
     ( __param(1, ICodeEditorService)),
     ( __param(2, IContextKeyService))
 ], EditorWordWrapContextKeyTracker));
-const workbenchRegistry = ( Registry.as(Extensions.Workbench));
-workbenchRegistry.registerWorkbenchContribution(EditorWordWrapContextKeyTracker, 2 );
+registerWorkbenchContribution2(EditorWordWrapContextKeyTracker.ID, EditorWordWrapContextKeyTracker, 3 );
 registerEditorContribution(ToggleWordWrapController.ID, ToggleWordWrapController, 0 );
 registerDiffEditorContribution(DiffToggleWordWrapController.ID, DiffToggleWordWrapController);
 registerEditorAction(ToggleWordWrapAction);

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

@@ -2,7 +2,9 @@ import { Button } from '../../../../base/browser/ui/button/button.js';
 import { DisposableStore } from '../../../../base/common/lifecycle.js';
 import { defaultButtonStyles } from '../../../../platform/theme/browser/defaultStyles.js';
 class CommentFormActions {
-    constructor(container, actionHandler, maxActions) {
+    constructor(keybindingService, contextKeyService, container, actionHandler, maxActions) {
+        this.keybindingService = keybindingService;
+        this.contextKeyService = contextKeyService;
         this.container = container;
         this.actionHandler = actionHandler;
         this.maxActions = maxActions;
@@ -20,7 +22,12 @@ class CommentFormActions {
             const [, actions] = group;
             this._actions = actions;
             for (const action of actions) {
-                const button = ( new Button(this.container, { secondary: !isPrimary, ...defaultButtonStyles }));
+                let keybinding = this.keybindingService.lookupKeybinding(action.id, this.contextKeyService)?.getLabel();
+                if (!keybinding && isPrimary) {
+                    keybinding = this.keybindingService.lookupKeybinding("editor.action.submitComment" , this.contextKeyService)?.getLabel();
+                }
+                const title = keybinding ? `${action.label} (${keybinding})` : action.label;
+                const button = ( new Button(this.container, { secondary: !isPrimary, title, ...defaultButtonStyles }));
                 isPrimary = false;
                 this._buttonElements.push(button.element);
                 this._toDispose.add(button);