@codingame/monaco-vscode-api 9.0.3 → 10.0.1

package/vscode/src/vs/workbench/contrib/chat/common/chatViewModel.js

@@ -16,9 +16,6 @@ function isRequestVM(item) {
 function isResponseVM(item) {
     return !!item && typeof item.setVote !== 'undefined';
 }
-function isWelcomeVM(item) {
-    return !!item && typeof item === 'object' && 'content' in item;
-}
 let ChatViewModel = class ChatViewModel extends Disposable {
     get inputPlaceholder() {
         return this._inputPlaceholder;
@@ -107,7 +104,7 @@ let ChatViewModel = class ChatViewModel extends Disposable {
         this.updateCodeBlockTextModels(response);
     }
     getItems() {
-        return [...(this._model.welcomeMessage ? [this._model.welcomeMessage] : []), ...this._items];
+        return [...this._items];
     }
     dispose() {
         super.dispose();
@@ -331,4 +328,4 @@ ChatResponseViewModel = ( __decorate([
     ( __param(1, ILogService)),
     ( __param(2, IChatAgentNameService))
 ], ChatResponseViewModel));
-export { ChatRequestViewModel, ChatResponseViewModel, ChatViewModel, isRequestVM, isResponseVM, isWelcomeVM };
+export { ChatRequestViewModel, ChatResponseViewModel, ChatViewModel, isRequestVM, isResponseVM };

package/vscode/src/vs/workbench/contrib/chat/common/codeBlockModelCollection.js

@@ -5,10 +5,9 @@ import { Schemas } from '../../../../base/common/network.js';
 import { URI } from '../../../../base/common/uri.js';
 import { Range } from '../../../../editor/common/core/range.js';
 import { ILanguageService } from '../../../../editor/common/languages/language.js';
-import { EndOfLinePreference } from '../../../../editor/common/model.js';
 import { ITextModelService } from '../../../../editor/common/services/resolverService.js';
+import { extractVulnerabilitiesFromText, extractCodeblockUrisFromText } from './annotations.js';
 import { isResponseVM } from './chatViewModel.js';
-import { extractVulnerabilitiesFromText } from './annotations.js';
 let CodeBlockModelCollection = class CodeBlockModelCollection extends Disposable {
     constructor(languageService, textModelService) {
         super();
@@ -27,7 +26,7 @@ let CodeBlockModelCollection = class CodeBlockModelCollection extends Disposable
         if (!entry) {
             return;
         }
-        return { model: entry.model.then(ref => ref.object), vulns: entry.vulns };
+        return { model: entry.model.then(ref => ref.object), vulns: entry.vulns, codemapperUri: entry.codemapperUri };
     }
     getOrCreate(sessionId, chat, codeBlockIndex) {
         const existing = this.get(sessionId, chat, codeBlockIndex);
@@ -36,7 +35,7 @@ let CodeBlockModelCollection = class CodeBlockModelCollection extends Disposable
         }
         const uri = this.getUri(sessionId, chat, codeBlockIndex);
         const ref = this.textModelService.createModelReference(uri);
-        this._models.set(uri, { model: ref, vulns: [] });
+        this._models.set(uri, { model: ref, vulns: [], codemapperUri: undefined });
         while (this._models.size > this.maxModelCount) {
             const first = Array.from(( this._models.keys())).at(0);
             if (!first) {
@@ -44,7 +43,7 @@ let CodeBlockModelCollection = class CodeBlockModelCollection extends Disposable
             }
             this.delete(first);
         }
-        return { model: ref.then(ref => ref.object), vulns: [] };
+        return { model: ref.then(ref => ref.object), vulns: [], codemapperUri: undefined };
     }
     delete(codeBlockUri) {
         const entry = this._models.get(codeBlockUri);
@@ -61,8 +60,13 @@ let CodeBlockModelCollection = class CodeBlockModelCollection extends Disposable
     async update(sessionId, chat, codeBlockIndex, content) {
         const entry = this.getOrCreate(sessionId, chat, codeBlockIndex);
         const extractedVulns = extractVulnerabilitiesFromText(content.text);
-        const newText = fixCodeText(extractedVulns.newText, content.languageId);
+        let newText = fixCodeText(extractedVulns.newText, content.languageId);
         this.setVulns(sessionId, chat, codeBlockIndex, extractedVulns.vulnerabilities);
+        const codeblockUri = extractCodeblockUrisFromText(newText);
+        if (codeblockUri) {
+            this.setCodemapperUri(sessionId, chat, codeBlockIndex, codeblockUri.uri);
+            newText = codeblockUri.textWithoutResult;
+        }
         const textModel = (await entry.model).textEditorModel;
         if (content.languageId) {
             const vscodeLanguageId = this.languageService.getLanguageIdByLanguageName(content.languageId);
@@ -70,9 +74,9 @@ let CodeBlockModelCollection = class CodeBlockModelCollection extends Disposable
                 textModel.setLanguage(vscodeLanguageId);
             }
         }
-        const currentText = textModel.getValue(EndOfLinePreference.LF);
+        const currentText = textModel.getValue(1 );
         if (newText === currentText) {
-            return;
+            return entry;
         }
         if (newText.startsWith(currentText)) {
             const text = newText.slice(currentText.length);
@@ -83,6 +87,14 @@ let CodeBlockModelCollection = class CodeBlockModelCollection extends Disposable
         else {
             textModel.setValue(newText);
         }
+        return entry;
+    }
+    setCodemapperUri(sessionId, chat, codeBlockIndex, codemapperUri) {
+        const uri = this.getUri(sessionId, chat, codeBlockIndex);
+        const entry = this._models.get(uri);
+        if (entry) {
+            entry.codemapperUri = codemapperUri;
+        }
     }
     setVulns(sessionId, chat, codeBlockIndex, vulnerabilities) {
         const uri = this.getUri(sessionId, chat, codeBlockIndex);

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

@@ -6,7 +6,6 @@ import { Extensions as Extensions$1 } from '../../../common/contributions.js';
 import { codeActionsExtensionPointDescriptor } from '../common/codeActionsExtensionPoint.js';
 import { documentationExtensionPointDescriptor } from '../common/documentationExtensionPoint.js';
 import { ExtensionsRegistry } from '../../../services/extensions/common/extensionsRegistry.js';
-import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
 import { editorConfiguration, notebookEditorConfiguration, CodeActionsContribution } from './codeActionsContribution.js';
 import { CodeActionDocumentationContribution } from './documentationContribution.js';
 const codeActionsExtensionPoint = ExtensionsRegistry.registerExtensionPoint(codeActionsExtensionPointDescriptor);
@@ -25,4 +24,4 @@ WorkbenchConfigurationContribution = ( __decorate([
     ( __param(0, IInstantiationService))
 ], WorkbenchConfigurationContribution));
 ( Registry.as(Extensions$1.Workbench))
-    .registerWorkbenchContribution(WorkbenchConfigurationContribution, LifecyclePhase.Eventually);
+    .registerWorkbenchContribution(WorkbenchConfigurationContribution, 4 );

package/vscode/src/vs/workbench/contrib/codeActions/browser/codeActionsContribution.js

@@ -7,7 +7,7 @@ import { ILanguageFeaturesService } from '../../../../editor/common/services/lan
 import { codeActionCommandId, refactorCommandId, sourceActionCommandId } from '../../../../editor/contrib/codeAction/browser/codeAction.js';
 import { CodeActionKind } from '../../../../editor/contrib/codeAction/common/types.js';
 import { localize } from '../../../../nls.js';
-import { ConfigurationScope, Extensions } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { Extensions } from '../../../../platform/configuration/common/configurationRegistry.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.service.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
 const createCodeActionsAutoSave = (description) => {
@@ -16,17 +16,17 @@ const createCodeActionsAutoSave = (description) => {
         enum: ['always', 'explicit', 'never', true, false],
         enumDescriptions: [
             ( localize(
-                4517,
+                4544,
                 'Triggers Code Actions on explicit saves and auto saves triggered by window or focus changes.'
             )),
-            ( localize(4518, 'Triggers Code Actions only when explicitly saved')),
-            ( localize(4519, 'Never triggers Code Actions on save')),
+            ( localize(4545, 'Triggers Code Actions only when explicitly saved')),
+            ( localize(4546, 'Never triggers Code Actions on save')),
             ( localize(
-                4520,
+                4547,
                 'Triggers Code Actions only when explicitly saved. This value will be deprecated in favor of "explicit".'
             )),
             ( localize(
-                4521,
+                4548,
                 'Never triggers Code Actions on save. This value will be deprecated in favor of "never".'
             ))
         ],
@@ -39,14 +39,14 @@ const createNotebookCodeActionsAutoSave = (description) => {
         type: ['string', 'boolean'],
         enum: ['explicit', 'never', true, false],
         enumDescriptions: [
-            ( localize(4522, 'Triggers Code Actions only when explicitly saved.')),
-            ( localize(4523, 'Never triggers Code Actions on save.')),
+            ( localize(4549, 'Triggers Code Actions only when explicitly saved.')),
+            ( localize(4550, 'Never triggers Code Actions on save.')),
             ( localize(
-                4524,
+                4551,
                 'Triggers Code Actions only when explicitly saved. This value will be deprecated in favor of "explicit".'
             )),
             ( localize(
-                4525,
+                4552,
                 'Triggers Code Actions only when explicitly saved. This value will be deprecated in favor of "never".'
             ))
         ],
@@ -68,7 +68,7 @@ const codeActionsOnSaveSchema = {
         }
     ],
     markdownDescription: ( localize(
-        4526,
+        4553,
         'Run Code Actions for the editor on save. Code Actions must be specified and the editor must not be shutting down. Example: `"source.organizeImports": "explicit" `'
     )),
     type: ['object', 'array'],
@@ -77,7 +77,7 @@ const codeActionsOnSaveSchema = {
         enum: ['always', 'explicit', 'never', true, false],
     },
     default: {},
-    scope: ConfigurationScope.LANGUAGE_OVERRIDABLE,
+    scope: 5 ,
 };
 const editorConfiguration = ( (Object.freeze({
     ...editorConfigurationBaseNode,
@@ -99,7 +99,7 @@ const notebookCodeActionsOnSaveSchema = {
         }
     ],
     markdownDescription: ( localize(
-        4527,
+        4554,
         'Run a series of Code Actions for a notebook on save. Code Actions must be specified, the file must not be saved after delay, and the editor must not be shutting down. Example: `"notebook.source.organizeImports": "explicit"`'
     )),
     type: 'object',
@@ -154,12 +154,12 @@ let CodeActionsContribution = class CodeActionsContribution extends Disposable {
         for (const [sourceAction, props] of this.getSourceActions(codeActionContributions)) {
             this.settings.add(sourceAction);
             newProperties[sourceAction] = createCodeActionsAutoSave(( localize(
-                4528,
+                4555,
                 "Controls whether '{0}' actions should be run on file save.",
                 props.title
             )));
             newNotebookProperties[sourceAction] = createNotebookCodeActionsAutoSave(( localize(
-                4528,
+                4555,
                 "Controls whether '{0}' actions should be run on file save.",
                 props.title
             )));
@@ -175,12 +175,12 @@ let CodeActionsContribution = class CodeActionsContribution extends Disposable {
         for (const codeActionKind of this.settings) {
             if (!properties[codeActionKind]) {
                 properties[codeActionKind] = createCodeActionsAutoSave(( localize(
-                    4528,
+                    4555,
                     "Controls whether '{0}' actions should be run on file save.",
                     codeActionKind
                 )));
                 notebookProperties[codeActionKind] = createNotebookCodeActionsAutoSave(( localize(
-                    4528,
+                    4555,
                     "Controls whether '{0}' actions should be run on file save.",
                     codeActionKind
                 )));

package/vscode/src/vs/workbench/contrib/codeActions/common/codeActionsExtensionPoint.js

@@ -15,14 +15,14 @@ var CodeActionExtensionPointFields;
 })(CodeActionExtensionPointFields || (CodeActionExtensionPointFields = {}))));
 const codeActionsExtensionPointSchema = ( (Object.freeze({
     type: 'array',
-    markdownDescription: ( localize(4501, "Configure which editor to use for a resource.")),
+    markdownDescription: ( localize(4528, "Configure which editor to use for a resource.")),
     items: {
         type: 'object',
         required: [CodeActionExtensionPointFields.languages, CodeActionExtensionPointFields.actions],
         properties: {
             [CodeActionExtensionPointFields.languages]: {
                 type: 'array',
-                description: ( localize(4502, "Language modes that the code actions are enabled for.")),
+                description: ( localize(4529, "Language modes that the code actions are enabled for.")),
                 items: { type: 'string' }
             },
             [CodeActionExtensionPointFields.actions]: {
@@ -31,15 +31,15 @@ const codeActionsExtensionPointSchema = ( (Object.freeze({
                 properties: {
                     [CodeActionExtensionPointFields.kind]: {
                         type: 'string',
-                        markdownDescription: ( localize(4503, "`CodeActionKind` of the contributed code action.")),
+                        markdownDescription: ( localize(4530, "`CodeActionKind` of the contributed code action.")),
                     },
                     [CodeActionExtensionPointFields.title]: {
                         type: 'string',
-                        description: ( localize(4504, "Label for the code action used in the UI.")),
+                        description: ( localize(4531, "Label for the code action used in the UI.")),
                     },
                     [CodeActionExtensionPointFields.description]: {
                         type: 'string',
-                        description: ( localize(4505, "Description of what the code action does.")),
+                        description: ( localize(4532, "Description of what the code action does.")),
                     },
                 }
             }
@@ -68,10 +68,10 @@ class CodeActionsTableRenderer extends Disposable {
             contribution => ( (contribution.actions.map(action => ({ ...action, languages: contribution.languages }))))
         ))).flat();
         const headers = [
-            ( localize(4506, "Title")),
-            ( localize(4507, "Kind")),
-            ( localize(4508, "Description")),
-            ( localize(4509, "Languages"))
+            ( localize(4533, "Title")),
+            ( localize(4534, "Kind")),
+            ( localize(4535, "Description")),
+            ( localize(4536, "Languages"))
         ];
         const rows = ( (flatActions.sort((a, b) => a.title.localeCompare(b.title))
             .map(action => {
@@ -93,7 +93,7 @@ class CodeActionsTableRenderer extends Disposable {
 }
 ( (Registry.as(Extensions.ExtensionFeaturesRegistry))).registerExtensionFeature({
     id: 'codeActions',
-    label: ( localize(4510, "Code Actions")),
+    label: ( localize(4537, "Code Actions")),
     access: {
         canToggle: false,
     },

package/vscode/src/vs/workbench/contrib/codeActions/common/documentationExtensionPoint.js

@@ -10,14 +10,14 @@ var DocumentationExtensionPointFields;
 )));
 const documentationExtensionPointSchema = ( (Object.freeze({
     type: 'object',
-    description: ( localize(4511, "Contributed documentation.")),
+    description: ( localize(4538, "Contributed documentation.")),
     properties: {
         'refactoring': {
             type: 'array',
-            description: ( localize(4512, "Contributed documentation for refactorings.")),
+            description: ( localize(4539, "Contributed documentation for refactorings.")),
             items: {
                 type: 'object',
-                description: ( localize(4513, "Contributed documentation for refactoring.")),
+                description: ( localize(4540, "Contributed documentation for refactoring.")),
                 required: [
                     DocumentationExtensionPointFields.title,
                     DocumentationExtensionPointFields.when,
@@ -26,15 +26,15 @@ const documentationExtensionPointSchema = ( (Object.freeze({
                 properties: {
                     [DocumentationExtensionPointFields.title]: {
                         type: 'string',
-                        description: ( localize(4514, "Label for the documentation used in the UI.")),
+                        description: ( localize(4541, "Label for the documentation used in the UI.")),
                     },
                     [DocumentationExtensionPointFields.when]: {
                         type: 'string',
-                        description: ( localize(4515, "When clause.")),
+                        description: ( localize(4542, "When clause.")),
                     },
                     [DocumentationExtensionPointFields.command]: {
                         type: 'string',
-                        description: ( localize(4516, "Command executed.")),
+                        description: ( localize(4543, "Command executed.")),
                     },
                 },
             }

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

@@ -3,17 +3,13 @@ import './editorDictation.css.js';
 import { localize2, localize } from '../../../../../nls.js';
 import { CancellationTokenSource } from '../../../../../base/common/cancellation.js';
 import { Disposable, MutableDisposable, toDisposable, DisposableStore } from '../../../../../base/common/lifecycle.js';
-import { ContentWidgetPositionPreference } from '../../../../../editor/browser/editorBrowser.js';
 import { RawContextKey, ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
 import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.service.js';
 import { SpeechToTextStatus, HasSpeechProvider, SpeechToTextInProgress } from '../../../speech/common/speechService.js';
 import { ISpeechService } from '../../../speech/common/speechService.service.js';
 import { Codicon } from '../../../../../base/common/codicons.js';
-import { EditorOption } from '../../../../../editor/common/config/editorOptions.js';
-import { EditorAction2, registerEditorContribution, EditorContributionInstantiation } from '../../../../../editor/browser/editorExtensions.js';
+import { registerEditorContribution, EditorAction2 } from '../../../../../editor/browser/editorExtensions.js';
 import { EditorContextKeys } from '../../../../../editor/common/editorContextKeys.js';
-import { KeyCode, KeyMod as KeyMod$1 } from '../../../../../base/common/keyCodes.js';
-import { KeybindingWeight } from '../../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { IKeybindingService } from '../../../../../platform/keybinding/common/keybinding.service.js';
 import { EditOperation } from '../../../../../editor/common/core/editOperation.js';
 import { Selection } from '../../../../../editor/common/core/selection.js';
@@ -27,12 +23,12 @@ import { ThemeIcon } from '../../../../../base/common/themables.js';
 import { isWindows } from '../../../../../base/common/platform.js';
 var EditorDictation_1;
 const EDITOR_DICTATION_IN_PROGRESS = ( (new RawContextKey('editorDictation.inProgress', false)));
-const VOICE_CATEGORY = ( localize2(10466, "Voice"));
+const VOICE_CATEGORY = ( localize2(10551, "Voice"));
 class EditorDictationStartAction extends EditorAction2 {
     constructor() {
         super({
             id: 'workbench.action.editorDictation.start',
-            title: ( localize2(10467, "Start Dictation in Editor")),
+            title: ( localize2(10552, "Start Dictation in Editor")),
             category: VOICE_CATEGORY,
             precondition: ( (ContextKeyExpr.and(
                 HasSpeechProvider,
@@ -41,10 +37,10 @@ class EditorDictationStartAction extends EditorAction2 {
             ))),
             f1: true,
             keybinding: {
-                primary: KeyMod$1.CtrlCmd | KeyMod$1.Alt | KeyCode.KeyV,
-                weight: KeybindingWeight.WorkbenchContrib,
+                primary: 2048  | 512  | 52 ,
+                weight: 200 ,
                 secondary: isWindows ? [
-                    KeyMod$1.Alt | KeyCode.Backquote
+                    512  | 91
                 ] : undefined
             }
         });
@@ -72,13 +68,13 @@ class EditorDictationStopAction extends EditorAction2 {
     constructor() {
         super({
             id: EditorDictationStopAction.ID,
-            title: ( localize2(10468, "Stop Dictation in Editor")),
+            title: ( localize2(10553, "Stop Dictation in Editor")),
             category: VOICE_CATEGORY,
             precondition: EDITOR_DICTATION_IN_PROGRESS,
             f1: true,
             keybinding: {
-                primary: KeyCode.Escape,
-                weight: KeybindingWeight.WorkbenchContrib + 100
+                primary: 9 ,
+                weight: 200  + 100
             }
         });
     }
@@ -97,7 +93,7 @@ class DictationWidget extends Disposable {
         const stopActionKeybinding = keybindingService.lookupKeybinding(EditorDictationStopAction.ID)?.getLabel();
         actionBar.push(toAction({
             id: EditorDictationStopAction.ID,
-            label: stopActionKeybinding ? ( localize(10469, "Stop Dictation ({0})", stopActionKeybinding)) : ( localize(10470, "Stop Dictation")),
+            label: stopActionKeybinding ? ( localize(10554, "Stop Dictation ({0})", stopActionKeybinding)) : ( localize(10555, "Stop Dictation")),
             class: ThemeIcon.asClassName(Codicon.micFilled),
             run: () => EditorDictation.get(editor)?.stop()
         }), { icon: true, label: false, keybinding: stopActionKeybinding });
@@ -118,13 +114,13 @@ class DictationWidget extends Disposable {
         return {
             position: selection.getPosition(),
             preference: [
-                selection.getPosition().equals(selection.getStartPosition()) ? ContentWidgetPositionPreference.ABOVE : ContentWidgetPositionPreference.BELOW,
-                ContentWidgetPositionPreference.EXACT
+                selection.getPosition().equals(selection.getStartPosition()) ? 1  : 2 ,
+                0
             ]
         };
     }
     beforeRender() {
-        const lineHeight = this.editor.getOption(EditorOption.lineHeight);
+        const lineHeight = this.editor.getOption(69 );
         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`);
@@ -243,7 +239,7 @@ EditorDictation = EditorDictation_1 = ( (__decorate([
     ( (__param(2, IContextKeyService))),
     ( (__param(3, IKeybindingService)))
 ], EditorDictation)));
-registerEditorContribution(EditorDictation.ID, EditorDictation, EditorContributionInstantiation.Lazy);
+registerEditorContribution(EditorDictation.ID, EditorDictation, 4 );
 registerAction2(EditorDictationStartAction);
 registerAction2(EditorDictationStopAction);
 export { DictationWidget, EditorDictation, EditorDictationStartAction, EditorDictationStopAction };

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

@@ -2,11 +2,10 @@ import { ICodeEditorService } from '../../../../editor/browser/services/codeEdit
 import { AccessibleDiffViewerPrev, AccessibleDiffViewerNext } from '../../../../editor/browser/widget/diffEditor/commands.js';
 import { DiffEditorWidget } from '../../../../editor/browser/widget/diffEditor/diffEditorWidget.js';
 import { localize } from '../../../../nls.js';
-import { AccessibleViewType, AccessibleContentProvider, AccessibleViewProviderId } from '../../../../platform/accessibility/browser/accessibleView.js';
+import { AccessibleContentProvider } from '../../../../platform/accessibility/browser/accessibleView.js';
 import { ContextKeyEqualsExpr } from '../../../../platform/contextkey/common/contextkey.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.service.js';
-import { AccessibilityVerbositySettingId } from '../../accessibility/browser/accessibilityConfiguration.js';
 import { getCommentCommandInfo } from '../../accessibility/browser/editorAccessibilityHelp.js';
 import { IEditorService } from '../../../services/editor/common/editorService.service.js';
 class DiffEditorAccessibilityHelp {
@@ -14,7 +13,7 @@ class DiffEditorAccessibilityHelp {
         this.priority = 105;
         this.name = 'diff-editor';
         this.when = ContextKeyEqualsExpr.create('isInDiffEditor', true);
-        this.type = AccessibleViewType.Help;
+        this.type = "help" ;
     }
     getProvider(accessor) {
         const editorService = accessor.get(IEditorService);
@@ -29,19 +28,19 @@ class DiffEditorAccessibilityHelp {
             return;
         }
         const switchSides = ( localize(
-            4465,
+            4492,
             "Run the command Diff Editor: Switch Side{0} to toggle between the original and modified editors.",
             '<keybinding:diffEditor.switchSide>'
         ));
         const diffEditorActiveAnnouncement = ( localize(
-            4466,
+            4493,
             "The setting, accessibility.verbosity.diffEditorActive, controls if a diff editor announcement is made when it becomes the active editor."
         ));
         const keys = ['accessibility.signals.diffLineDeleted', 'accessibility.signals.diffLineInserted', 'accessibility.signals.diffLineModified'];
         const content = [
-            ( localize(4467, "You are in a diff editor.")),
+            ( localize(4494, "You are in a diff editor.")),
             ( localize(
-                4468,
+                4495,
                 "View the next{0} or previous{1} diff in diff review mode, which is optimized for screen readers.",
                 '<keybinding:' + AccessibleDiffViewerNext.id + '>',
                 '<keybinding:' + AccessibleDiffViewerPrev.id + '>'
@@ -49,7 +48,7 @@ class DiffEditorAccessibilityHelp {
             switchSides,
             diffEditorActiveAnnouncement,
             ( localize(
-                4469,
+                4496,
                 "To control which accessibility signals should be played, the following settings can be configured: {0}.",
                 keys.join(', ')
             )),
@@ -60,11 +59,11 @@ class DiffEditorAccessibilityHelp {
         }
         return (
              (new AccessibleContentProvider(
-                AccessibleViewProviderId.DiffEditor,
-                { type: AccessibleViewType.Help },
+                "diffEditor" ,
+                { type: "help"  },
                 () => content.join('\n'),
                 () => codeEditor.focus(),
-                AccessibilityVerbositySettingId.DiffEditor
+                "accessibility.verbosity.diffEditor"
             ))
         );
     }

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

@@ -1,10 +1,11 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import '../../../../base/common/arrays.js';
-import '../../../../base/common/observableInternal/derived.js';
+import '../../../../base/common/event.js';
 import { autorunWithStore } from '../../../../base/common/observableInternal/autorun.js';
-import { observableFromEvent } from '../../../../base/common/observableInternal/utils.js';
+import '../../../../base/common/observableInternal/derived.js';
 import '../../../../base/common/cancellation.js';
+import { observableFromEvent } from '../../../../base/common/observableInternal/utils.js';
 import { registerDiffEditorContribution } from '../../../../editor/browser/editorExtensions.js';
 import { EmbeddedDiffEditorWidget } from '../../../../editor/browser/widget/diffEditor/embeddedDiffEditorWidget.js';
 import { ITextResourceConfigurationService } from '../../../../editor/common/services/textResourceConfiguration.js';
@@ -32,7 +33,7 @@ let DiffEditorHelperContribution = class DiffEditorHelperContribution extends Di
             const onlyWhiteSpaceChange = ( (computationResult.map(r => r && !r.identical && r.changes2.length === 0)));
             this._register(autorunWithStore((reader, store) => {
                 if (onlyWhiteSpaceChange.read(reader)) {
-                    const helperWidget = store.add(this._instantiationService.createInstance(FloatingEditorClickWidget, this._diffEditor.getModifiedEditor(), ( localize(628, "Show Whitespace Differences")), null));
+                    const helperWidget = store.add(this._instantiationService.createInstance(FloatingEditorClickWidget, this._diffEditor.getModifiedEditor(), ( localize(640, "Show Whitespace Differences")), null));
                     store.add(helperWidget.onClick(() => {
                         this._textResourceConfigurationService.updateValue(this._diffEditor.getModel().modified.uri, 'diffEditor.ignoreTrimWhitespace', false);
                     }));
@@ -43,11 +44,11 @@ let DiffEditorHelperContribution = class DiffEditorHelperContribution extends Di
                 const diffComputationResult = this._diffEditor.getDiffComputationResult();
                 if (diffComputationResult && diffComputationResult.quitEarly) {
                     this._notificationService.prompt(Severity$1.Warning, ( localize(
-                        629,
+                        641,
                         "The diff algorithm was stopped early (after {0} ms.)",
                         this._diffEditor.maxComputationTime
                     )), [{
-                            label: ( localize(630, "Remove Limit")),
+                            label: ( localize(642, "Remove Limit")),
                             run: () => {
                                 this._textResourceConfigurationService.updateValue(this._diffEditor.getModel().modified.uri, 'diffEditor.maxComputationTime', 0);
                             }

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

@@ -4,7 +4,7 @@ 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 { registerWorkbenchContribution2, WorkbenchPhase } 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) {
@@ -40,4 +40,4 @@ EditorFeaturesInstantiator = ( __decorate([
     ( __param(0, ICodeEditorService)),
     ( __param(1, IInstantiationService))
 ], EditorFeaturesInstantiator));
-registerWorkbenchContribution2(EditorFeaturesInstantiator.ID, EditorFeaturesInstantiator, WorkbenchPhase.BlockRestore);
+registerWorkbenchContribution2(EditorFeaturesInstantiator.ID, EditorFeaturesInstantiator, 2 );

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

@@ -2,13 +2,11 @@ import { __decorate, __param } from '../../../../../../../external/tslib/tslib.e
 import { Separator } from '../../../../base/common/actions.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { isMacintosh } from '../../../../base/common/platform.js';
-import { MouseTargetType } from '../../../../editor/browser/editorBrowser.js';
-import { registerEditorContribution, EditorContributionInstantiation } from '../../../../editor/browser/editorExtensions.js';
+import { registerEditorContribution } from '../../../../editor/browser/editorExtensions.js';
 import { MenuId } from '../../../../platform/actions/common/actions.js';
 import { IMenuService } from '../../../../platform/actions/common/actions.service.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
 import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.service.js';
-import { TextEditorSelectionSource } from '../../../../platform/editor/common/editor.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
 class GutterActionsRegistryImpl {
@@ -46,7 +44,7 @@ let EditorLineNumberContextMenu = class EditorLineNumberContextMenu extends Disp
     doShow(e, force) {
         const model = this.editor.getModel();
         if (!e.event.rightButton && !(isMacintosh && e.event.leftButton && e.event.ctrlKey) && !force
-            || e.target.type !== MouseTargetType.GUTTER_LINE_NUMBERS && e.target.type !== MouseTargetType.GUTTER_GLYPH_MARGIN
+            || e.target.type !== 3  && e.target.type !== 2
             || !e.target.position || !model) {
             return;
         }
@@ -71,7 +69,7 @@ let EditorLineNumberContextMenu = class EditorLineNumberContextMenu extends Disp
             allActions.sort((a, b) => a[0].localeCompare(b[0]));
             const menuActions = menu.getActions({ arg: { lineNumber, uri: model.uri }, shouldForwardArgs: true });
             allActions.push(...menuActions);
-            if (e.target.type === MouseTargetType.GUTTER_LINE_NUMBERS) {
+            if (e.target.type === 3 ) {
                 const currentSelections = this.editor.getSelections();
                 const lineRange = {
                     startLineNumber: lineNumber,
@@ -81,7 +79,7 @@ let EditorLineNumberContextMenu = class EditorLineNumberContextMenu extends Disp
                 };
                 const containsSelection = currentSelections?.some(selection => !selection.isEmpty() && selection.intersectRanges(lineRange) !== null);
                 if (!containsSelection) {
-                    this.editor.setSelection(lineRange, TextEditorSelectionSource.PROGRAMMATIC);
+                    this.editor.setSelection(lineRange, "api" );
                 }
             }
             this.contextMenuService.showContextMenu({
@@ -98,5 +96,5 @@ EditorLineNumberContextMenu = ( __decorate([
     ( __param(3, IContextKeyService)),
     ( __param(4, IInstantiationService))
 ], EditorLineNumberContextMenu));
-registerEditorContribution(EditorLineNumberContextMenu.ID, EditorLineNumberContextMenu, EditorContributionInstantiation.AfterFirstRender);
+registerEditorContribution(EditorLineNumberContextMenu.ID, EditorLineNumberContextMenu, 1 );
 export { EditorLineNumberContextMenu, GutterActionsRegistry, GutterActionsRegistryImpl };