@codingame/monaco-vscode-api 7.0.11 → 7.1.1

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

@@ -33,7 +33,7 @@ let ChatRequestParser = class ChatRequestParser {
                     newPart = this.tryToParseAgent(message.slice(i), message, i, ( new Position(lineNumber, column)), parts, location, context);
                 }
                 else if (char === chatSubcommandLeader) {
-                    newPart = this.tryToParseSlashCommand(message.slice(i), message, i, ( new Position(lineNumber, column)), parts);
+                    newPart = this.tryToParseSlashCommand(message.slice(i), message, i, ( new Position(lineNumber, column)), parts, location);
                 }
                 if (!newPart) {
                     newPart = this.tryToParseDynamicVariable(message.slice(i), i, ( new Position(lineNumber, column)), references);
@@ -141,7 +141,7 @@ let ChatRequestParser = class ChatRequestParser {
         }
         return;
     }
-    tryToParseSlashCommand(remainingMessage, fullMessage, offset, position, parts) {
+    tryToParseSlashCommand(remainingMessage, fullMessage, offset, position, parts, location) {
         const nextSlashMatch = remainingMessage.match(slashReg);
         if (!nextSlashMatch) {
             return;
@@ -176,11 +176,18 @@ let ChatRequestParser = class ChatRequestParser {
             }
         }
         else {
-            const slashCommands = this.slashCommandService.getCommands();
+            const slashCommands = this.slashCommandService.getCommands(location);
             const slashCommand = slashCommands.find(c => c.command === command);
             if (slashCommand) {
                 return ( new ChatRequestSlashCommandPart(slashRange, slashEditorRange, slashCommand));
             }
+            else {
+                const defaultAgent = this.agentService.getDefaultAgent(location);
+                const subCommand = defaultAgent?.slashCommands.find(c => c.name === command);
+                if (subCommand) {
+                    return ( new ChatRequestAgentSubcommandPart(slashRange, slashEditorRange, subCommand));
+                }
+            }
         }
         return;
     }

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

@@ -14,6 +14,14 @@ function isIUsedContext(obj) {
         Array.isArray(obj.documents) &&
         obj.documents.every(isIDocumentContext));
 }
+var ChatResponseReferencePartStatusKind;
+( (function(ChatResponseReferencePartStatusKind) {
+    ChatResponseReferencePartStatusKind[ChatResponseReferencePartStatusKind["Complete"] = 1] = "Complete";
+    ChatResponseReferencePartStatusKind[ChatResponseReferencePartStatusKind["Partial"] = 2] = "Partial";
+    ChatResponseReferencePartStatusKind[ChatResponseReferencePartStatusKind["Omitted"] = 3] = "Omitted";
+})(
+    ChatResponseReferencePartStatusKind || (ChatResponseReferencePartStatusKind = {})
+));
 var ChatAgentVoteDirection;
 ( (function(ChatAgentVoteDirection) {
     ChatAgentVoteDirection[ChatAgentVoteDirection["Down"] = 0] = "Down";
@@ -24,4 +32,4 @@ var ChatCopyKind;
     ChatCopyKind[ChatCopyKind["Action"] = 1] = "Action";
     ChatCopyKind[ChatCopyKind["Toolbar"] = 2] = "Toolbar";
 })(ChatCopyKind || (ChatCopyKind = {})));
-export { ChatAgentVoteDirection, ChatCopyKind, isIDocumentContext, isIUsedContext };
+export { ChatAgentVoteDirection, ChatCopyKind, ChatResponseReferencePartStatusKind, isIDocumentContext, isIUsedContext };

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

@@ -9,6 +9,7 @@ import { getFullyQualifiedId } from './chatAgents.js';
 import { IChatAgentNameService } from './chatAgents.service.js';
 import { ChatModelInitState } from './chatModel.js';
 import { countWords } from './chatWordCounter.js';
+import { hash } from '../../../../base/common/hash.js';
 function isRequestVM(item) {
     return !!item && typeof item === 'object' && 'message' in item;
 }
@@ -154,7 +155,7 @@ class ChatRequestViewModel {
         return this._model.id;
     }
     get dataId() {
-        return this.id + `_${ChatModelInitState[this._model.session.initState]}`;
+        return this.id + `_${ChatModelInitState[this._model.session.initState]}_${hash(this.variables)}`;
     }
     get sessionId() {
         return this._model.session.sessionId;
@@ -174,6 +175,12 @@ class ChatRequestViewModel {
     get attempt() {
         return this._model.attempt;
     }
+    get variables() {
+        return this._model.variableData.variables;
+    }
+    get contentReferences() {
+        return this._model.response?.contentReferences;
+    }
     constructor(_model) {
         this._model = _model;
     }
@@ -224,6 +231,9 @@ let ChatResponseViewModel = class ChatResponseViewModel extends Disposable {
     get contentReferences() {
         return this._model.contentReferences;
     }
+    get codeCitations() {
+        return this._model.codeCitations;
+    }
     get progressMessages() {
         return this._model.progressMessages;
     }
@@ -282,7 +292,7 @@ let ChatResponseViewModel = class ChatResponseViewModel extends Disposable {
         this._contentUpdateTimings = undefined;
         if (!_model.isComplete) {
             this._contentUpdateTimings = {
-                loadingStartTime: Date.now(),
+                firstWordTime: 0,
                 lastUpdateTime: Date.now(),
                 impliedWordLoadRate: 0,
                 lastWordCount: 0
@@ -291,12 +301,12 @@ let ChatResponseViewModel = class ChatResponseViewModel extends Disposable {
         this._register(_model.onDidChange(() => {
             if (this._contentUpdateTimings) {
                 const now = Date.now();
-                const wordCount = countWords(_model.response.asString());
-                const timeDiff = now - this._contentUpdateTimings.loadingStartTime;
+                const wordCount = countWords(( _model.response.toString()));
+                const timeDiff = Math.max(now - this._contentUpdateTimings.firstWordTime, 250);
                 const impliedWordLoadRate = this._contentUpdateTimings.lastWordCount / (timeDiff / 1000);
-                this.trace('onDidChange', `Update- got ${this._contentUpdateTimings.lastWordCount} words over ${timeDiff}ms = ${impliedWordLoadRate} words/s. ${wordCount} words are now available.`);
+                this.trace('onDidChange', `Update- got ${this._contentUpdateTimings.lastWordCount} words over last ${timeDiff}ms = ${impliedWordLoadRate} words/s. ${wordCount} words are now available.`);
                 this._contentUpdateTimings = {
-                    loadingStartTime: this._contentUpdateTimings.loadingStartTime,
+                    firstWordTime: this._contentUpdateTimings.firstWordTime === 0 && ( this.response.value.some(v => v.kind === 'markdownContent')) ? now : this._contentUpdateTimings.firstWordTime,
                     lastUpdateTime: now,
                     impliedWordLoadRate,
                     lastWordCount: wordCount

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

@@ -1,5 +1,5 @@
 function getNWords(str, numWordsToCount) {
-    const allWordMatches = Array.from(str.matchAll(/\[([^\]]+)\]\(([^)]+)\)|\p{sc=Han}|[^\s\|\-|\p{sc=Han}]+/gu));
+    const allWordMatches = Array.from(str.matchAll(/\[([^\]]+)\]\(([^)]+)\)|\p{sc=Han}|=+|\++|-+|[^\s\|\p{sc=Han}|=|\+|\-]+/gu));
     const targetWords = allWordMatches.slice(0, numWordsToCount);
     const endIndex = numWordsToCount > allWordMatches.length
         ? str.length

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

@@ -3,13 +3,12 @@ import { Emitter } from '../../../../base/common/event.js';
 import { Iterable } from '../../../../base/common/iterator.js';
 import { DisposableStore, toDisposable } from '../../../../base/common/lifecycle.js';
 import { isFalsyOrWhitespace } from '../../../../base/common/strings.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { ExtensionIdentifier } from '../../../../platform/extensions/common/extensions.js';
 import { ILogService } from '../../../../platform/log/common/log.service.js';
 import { isProposedApiEnabled } from '../../../services/extensions/common/extensions.js';
 import { IExtensionService } from '../../../services/extensions/common/extensions.service.js';
 import { ExtensionsRegistry } from '../../../services/extensions/common/extensionsRegistry.js';
-const _moduleId = "vs/workbench/contrib/chat/common/languageModels";
 var ChatMessageRole;
 ( ((function(ChatMessageRole) {
     ChatMessageRole[ChatMessageRole["System"] = 0] = "System";
@@ -21,14 +20,14 @@ const languageModelType = {
     properties: {
         vendor: {
             type: 'string',
-            description: ( localizeWithPath(_moduleId, 0, "A globally unique vendor of language models."))
+            description: ( localize(3098, "A globally unique vendor of language models."))
         }
     }
 };
 const languageModelExtensionPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'languageModels',
     jsonSchema: {
-        description: ( localizeWithPath(_moduleId, 1, "Contribute language models of a specific vendor.")),
+        description: ( localize(3099, "Contribute language models of a specific vendor.")),
         oneOf: [
             languageModelType,
             {
@@ -56,29 +55,24 @@ let LanguageModelsService = class LanguageModelsService {
             this._vendors.clear();
             for (const extension of extensions) {
                 if (!isProposedApiEnabled(extension.description, 'chatProvider')) {
-                    extension.collector.error(( localizeWithPath(
-                        _moduleId,
-                        2,
-                        "This contribution point requires the 'chatProvider' proposal."
-                    )));
+                    extension.collector.error(( localize(3100, "This contribution point requires the 'chatProvider' proposal.")));
                     continue;
                 }
                 for (const item of Iterable.wrap(extension.value)) {
                     if (( (this._vendors.has(item.vendor)))) {
-                        extension.collector.error(( localizeWithPath(
-                            _moduleId,
-                            3,
+                        extension.collector.error(( localize(
+                            3101,
                             "The vendor '{0}' is already registered and cannot be registered twice",
                             item.vendor
                         )));
                         continue;
                     }
                     if (isFalsyOrWhitespace(item.vendor)) {
-                        extension.collector.error(( localizeWithPath(_moduleId, 4, "The vendor field cannot be empty.")));
+                        extension.collector.error(( localize(3102, "The vendor field cannot be empty.")));
                         continue;
                     }
                     if (item.vendor.trim() !== item.vendor) {
-                        extension.collector.error(( localizeWithPath(_moduleId, 5, "The vendor field cannot start or end with whitespace.")));
+                        extension.collector.error(( localize(3103, "The vendor field cannot start or end with whitespace.")));
                         continue;
                     }
                     this._vendors.add(item.vendor);

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

@@ -7,12 +7,14 @@ import { codeActionsExtensionPointDescriptor } from '../common/codeActionsExtens
 import { documentationExtensionPointDescriptor } from '../common/documentationExtensionPoint.js';
 import { ExtensionsRegistry } from '../../../services/extensions/common/extensionsRegistry.js';
 import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
-import { editorConfiguration, CodeActionsContribution } from './codeActionsContribution.js';
+import { editorConfiguration, notebookEditorConfiguration, CodeActionsContribution } from './codeActionsContribution.js';
 import { CodeActionDocumentationContribution } from './documentationContribution.js';
 const codeActionsExtensionPoint = ExtensionsRegistry.registerExtensionPoint(codeActionsExtensionPointDescriptor);
 const documentationExtensionPoint = ExtensionsRegistry.registerExtensionPoint(documentationExtensionPointDescriptor);
 ( Registry.as(Extensions.Configuration))
     .registerConfiguration(editorConfiguration);
+( Registry.as(Extensions.Configuration))
+    .registerConfiguration(notebookEditorConfiguration);
 let WorkbenchConfigurationContribution = class WorkbenchConfigurationContribution {
     constructor(instantiationService) {
         instantiationService.createInstance(CodeActionsContribution, codeActionsExtensionPoint);

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

@@ -6,31 +6,27 @@ import { editorConfigurationBaseNode } from '../../../../editor/common/config/ed
 import { ILanguageFeaturesService } from '../../../../editor/common/services/languageFeatures.js';
 import { codeActionCommandId, refactorCommandId, sourceActionCommandId } from '../../../../editor/contrib/codeAction/browser/codeAction.js';
 import { CodeActionKind } from '../../../../editor/contrib/codeAction/common/types.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { ConfigurationScope, 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 _moduleId = "vs/workbench/contrib/codeActions/browser/codeActionsContribution";
 const createCodeActionsAutoSave = (description) => {
     return {
         type: 'string',
         enum: ['always', 'explicit', 'never', true, false],
         enumDescriptions: [
-            ( localizeWithPath(
-                _moduleId,
-                0,
+            ( localize(
+                4755,
                 'Triggers Code Actions on explicit saves and auto saves triggered by window or focus changes.'
             )),
-            ( localizeWithPath(_moduleId, 1, 'Triggers Code Actions only when explicitly saved')),
-            ( localizeWithPath(_moduleId, 2, 'Never triggers Code Actions on save')),
-            ( localizeWithPath(
-                _moduleId,
-                3,
+            ( localize(4756, 'Triggers Code Actions only when explicitly saved')),
+            ( localize(4757, 'Never triggers Code Actions on save')),
+            ( localize(
+                4758,
                 'Triggers Code Actions only when explicitly saved. This value will be deprecated in favor of "explicit".'
             )),
-            ( localizeWithPath(
-                _moduleId,
-                4,
+            ( localize(
+                4759,
                 'Never triggers Code Actions on save. This value will be deprecated in favor of "never".'
             ))
         ],
@@ -38,6 +34,26 @@ const createCodeActionsAutoSave = (description) => {
         description: description
     };
 };
+const createNotebookCodeActionsAutoSave = (description) => {
+    return {
+        type: ['string', 'boolean'],
+        enum: ['explicit', 'never', true, false],
+        enumDescriptions: [
+            ( localize(4760, 'Triggers Code Actions only when explicitly saved.')),
+            ( localize(4761, 'Never triggers Code Actions on save.')),
+            ( localize(
+                4762,
+                'Triggers Code Actions only when explicitly saved. This value will be deprecated in favor of "explicit".'
+            )),
+            ( localize(
+                4763,
+                'Triggers Code Actions only when explicitly saved. This value will be deprecated in favor of "never".'
+            ))
+        ],
+        default: 'explicit',
+        description: description
+    };
+};
 const codeActionsOnSaveSchema = {
     oneOf: [
         {
@@ -51,9 +67,8 @@ const codeActionsOnSaveSchema = {
             items: { type: 'string' }
         }
     ],
-    markdownDescription: ( localizeWithPath(
-        _moduleId,
-        5,
+    markdownDescription: ( localize(
+        4764,
         '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'],
@@ -70,6 +85,36 @@ const editorConfiguration = ( (Object.freeze({
         'editor.codeActionsOnSave': codeActionsOnSaveSchema
     }
 })));
+const notebookCodeActionsOnSaveSchema = {
+    oneOf: [
+        {
+            type: 'object',
+            additionalProperties: {
+                type: 'string'
+            },
+        },
+        {
+            type: 'array',
+            items: { type: 'string' }
+        }
+    ],
+    markdownDescription: ( localize(
+        4765,
+        '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',
+    additionalProperties: {
+        type: ['string', 'boolean'],
+        enum: ['explicit', 'never', true, false],
+    },
+    default: {}
+};
+const notebookEditorConfiguration = ( (Object.freeze({
+    ...editorConfigurationBaseNode,
+    properties: {
+        'notebook.codeActionsOnSave': notebookCodeActionsOnSaveSchema
+    }
+})));
 let CodeActionsContribution = class CodeActionsContribution extends Disposable {
     constructor(codeActionsExtensionPoint, keybindingService, languageFeatures) {
         super();
@@ -105,32 +150,44 @@ let CodeActionsContribution = class CodeActionsContribution extends Disposable {
     }
     updateConfigurationSchema(codeActionContributions) {
         const newProperties = {};
+        const newNotebookProperties = {};
         for (const [sourceAction, props] of this.getSourceActions(codeActionContributions)) {
             this.settings.add(sourceAction);
-            newProperties[sourceAction] = createCodeActionsAutoSave(( localizeWithPath(
-                _moduleId,
-                6,
+            newProperties[sourceAction] = createCodeActionsAutoSave(( localize(
+                4766,
+                "Controls whether '{0}' actions should be run on file save.",
+                props.title
+            )));
+            newNotebookProperties[sourceAction] = createNotebookCodeActionsAutoSave(( localize(
+                4766,
                 "Controls whether '{0}' actions should be run on file save.",
                 props.title
             )));
         }
         codeActionsOnSaveSchema.properties = newProperties;
+        notebookCodeActionsOnSaveSchema.properties = newNotebookProperties;
         ( (Registry.as(Extensions.Configuration)))
             .notifyConfigurationSchemaUpdated(editorConfiguration);
     }
     updateConfigurationSchemaFromContribs() {
         const properties = { ...codeActionsOnSaveSchema.properties };
+        const notebookProperties = { ...notebookCodeActionsOnSaveSchema.properties };
         for (const codeActionKind of this.settings) {
             if (!properties[codeActionKind]) {
-                properties[codeActionKind] = createCodeActionsAutoSave(( localizeWithPath(
-                    _moduleId,
-                    6,
+                properties[codeActionKind] = createCodeActionsAutoSave(( localize(
+                    4766,
+                    "Controls whether '{0}' actions should be run on file save.",
+                    codeActionKind
+                )));
+                notebookProperties[codeActionKind] = createNotebookCodeActionsAutoSave(( localize(
+                    4766,
                     "Controls whether '{0}' actions should be run on file save.",
                     codeActionKind
                 )));
             }
         }
         codeActionsOnSaveSchema.properties = properties;
+        notebookCodeActionsOnSaveSchema.properties = notebookProperties;
         ( (Registry.as(Extensions.Configuration)))
             .notifyConfigurationSchemaUpdated(editorConfiguration);
     }
@@ -196,4 +253,4 @@ CodeActionsContribution = ( (__decorate([
     ( (__param(1, IKeybindingService))),
     ( (__param(2, ILanguageFeaturesService)))
 ], CodeActionsContribution)));
-export { CodeActionsContribution, editorConfiguration };
+export { CodeActionsContribution, editorConfiguration, notebookEditorConfiguration };

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

@@ -1,11 +1,10 @@
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { languagesExtPoint } from '../../../services/language/common/languageService.js';
 import { Extensions } from '../../../services/extensionManagement/common/extensionFeatures.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
 import { MarkdownString } from '../../../../base/common/htmlContent.js';
-const _moduleId = "vs/workbench/contrib/codeActions/common/codeActionsExtensionPoint";
 var CodeActionExtensionPointFields;
 ( ((function(CodeActionExtensionPointFields) {
     CodeActionExtensionPointFields["languages"] = "languages";
@@ -16,14 +15,14 @@ var CodeActionExtensionPointFields;
 })(CodeActionExtensionPointFields || (CodeActionExtensionPointFields = {}))));
 const codeActionsExtensionPointSchema = ( (Object.freeze({
     type: 'array',
-    markdownDescription: ( localizeWithPath(_moduleId, 0, "Configure which editor to use for a resource.")),
+    markdownDescription: ( localize(4739, "Configure which editor to use for a resource.")),
     items: {
         type: 'object',
         required: [CodeActionExtensionPointFields.languages, CodeActionExtensionPointFields.actions],
         properties: {
             [CodeActionExtensionPointFields.languages]: {
                 type: 'array',
-                description: ( localizeWithPath(_moduleId, 1, "Language modes that the code actions are enabled for.")),
+                description: ( localize(4740, "Language modes that the code actions are enabled for.")),
                 items: { type: 'string' }
             },
             [CodeActionExtensionPointFields.actions]: {
@@ -32,15 +31,15 @@ const codeActionsExtensionPointSchema = ( (Object.freeze({
                 properties: {
                     [CodeActionExtensionPointFields.kind]: {
                         type: 'string',
-                        markdownDescription: ( localizeWithPath(_moduleId, 2, "`CodeActionKind` of the contributed code action.")),
+                        markdownDescription: ( localize(4741, "`CodeActionKind` of the contributed code action.")),
                     },
                     [CodeActionExtensionPointFields.title]: {
                         type: 'string',
-                        description: ( localizeWithPath(_moduleId, 3, "Label for the code action used in the UI.")),
+                        description: ( localize(4742, "Label for the code action used in the UI.")),
                     },
                     [CodeActionExtensionPointFields.description]: {
                         type: 'string',
-                        description: ( localizeWithPath(_moduleId, 4, "Description of what the code action does.")),
+                        description: ( localize(4743, "Description of what the code action does.")),
                     },
                 }
             }
@@ -69,10 +68,10 @@ class CodeActionsTableRenderer extends Disposable {
             contribution => ( (contribution.actions.map(action => ({ ...action, languages: contribution.languages }))))
         ))).flat();
         const headers = [
-            ( localizeWithPath(_moduleId, 5, "Title")),
-            ( localizeWithPath(_moduleId, 6, "Kind")),
-            ( localizeWithPath(_moduleId, 7, "Description")),
-            ( localizeWithPath(_moduleId, 8, "Languages"))
+            ( localize(4744, "Title")),
+            ( localize(4745, "Kind")),
+            ( localize(4746, "Description")),
+            ( localize(4747, "Languages"))
         ];
         const rows = ( (flatActions.sort((a, b) => a.title.localeCompare(b.title))
             .map(action => {
@@ -94,7 +93,7 @@ class CodeActionsTableRenderer extends Disposable {
 }
 ( (Registry.as(Extensions.ExtensionFeaturesRegistry))).registerExtensionFeature({
     id: 'codeActions',
-    label: ( localizeWithPath(_moduleId, 9, "Code Actions")),
+    label: ( localize(4748, "Code Actions")),
     access: {
         canToggle: false,
     },

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

@@ -1,6 +1,5 @@
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { languagesExtPoint } from '../../../services/language/common/languageService.js';
-const _moduleId = "vs/workbench/contrib/codeActions/common/documentationExtensionPoint";
 var DocumentationExtensionPointFields;
 ( ((function(DocumentationExtensionPointFields) {
     DocumentationExtensionPointFields["when"] = "when";
@@ -11,14 +10,14 @@ var DocumentationExtensionPointFields;
 )));
 const documentationExtensionPointSchema = ( (Object.freeze({
     type: 'object',
-    description: ( localizeWithPath(_moduleId, 0, "Contributed documentation.")),
+    description: ( localize(4749, "Contributed documentation.")),
     properties: {
         'refactoring': {
             type: 'array',
-            description: ( localizeWithPath(_moduleId, 1, "Contributed documentation for refactorings.")),
+            description: ( localize(4750, "Contributed documentation for refactorings.")),
             items: {
                 type: 'object',
-                description: ( localizeWithPath(_moduleId, 2, "Contributed documentation for refactoring.")),
+                description: ( localize(4751, "Contributed documentation for refactoring.")),
                 required: [
                     DocumentationExtensionPointFields.title,
                     DocumentationExtensionPointFields.when,
@@ -27,15 +26,15 @@ const documentationExtensionPointSchema = ( (Object.freeze({
                 properties: {
                     [DocumentationExtensionPointFields.title]: {
                         type: 'string',
-                        description: ( localizeWithPath(_moduleId, 3, "Label for the documentation used in the UI.")),
+                        description: ( localize(4752, "Label for the documentation used in the UI.")),
                     },
                     [DocumentationExtensionPointFields.when]: {
                         type: 'string',
-                        description: ( localizeWithPath(_moduleId, 4, "When clause.")),
+                        description: ( localize(4753, "When clause.")),
                     },
                     [DocumentationExtensionPointFields.command]: {
                         type: 'string',
-                        description: ( localizeWithPath(_moduleId, 5, "Command executed.")),
+                        description: ( localize(4754, "Command executed.")),
                     },
                 },
             }

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

@@ -1,6 +1,6 @@
 import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
 import './editorDictation.css.js';
-import { localize2WithPath, localizeWithPath } from '../../../../../nls.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';
@@ -26,14 +26,13 @@ import { toAction } from '../../../../../base/common/actions.js';
 import { ThemeIcon } from '../../../../../base/common/themables.js';
 import { isWindows } from '../../../../../base/common/platform.js';
 var EditorDictation_1;
-const _moduleId = "vs/workbench/contrib/codeEditor/browser/dictation/editorDictation";
 const EDITOR_DICTATION_IN_PROGRESS = ( (new RawContextKey('editorDictation.inProgress', false)));
-const VOICE_CATEGORY = ( localize2WithPath(_moduleId, 0, "Voice"));
+const VOICE_CATEGORY = ( localize2(10420, "Voice"));
 class EditorDictationStartAction extends EditorAction2 {
     constructor() {
         super({
             id: 'workbench.action.editorDictation.start',
-            title: ( localize2WithPath(_moduleId, 1, "Start Dictation in Editor")),
+            title: ( localize2(10421, "Start Dictation in Editor")),
             category: VOICE_CATEGORY,
             precondition: ( (ContextKeyExpr.and(
                 HasSpeechProvider,
@@ -73,7 +72,7 @@ class EditorDictationStopAction extends EditorAction2 {
     constructor() {
         super({
             id: EditorDictationStopAction.ID,
-            title: ( localize2WithPath(_moduleId, 2, "Stop Dictation in Editor")),
+            title: ( localize2(10422, "Stop Dictation in Editor")),
             category: VOICE_CATEGORY,
             precondition: EDITOR_DICTATION_IN_PROGRESS,
             f1: true,
@@ -98,7 +97,7 @@ class DictationWidget extends Disposable {
         const stopActionKeybinding = keybindingService.lookupKeybinding(EditorDictationStopAction.ID)?.getLabel();
         actionBar.push(toAction({
             id: EditorDictationStopAction.ID,
-            label: stopActionKeybinding ? ( localizeWithPath(_moduleId, 3, "Stop Dictation ({0})", stopActionKeybinding)) : ( localizeWithPath(_moduleId, 4, "Stop Dictation")),
+            label: stopActionKeybinding ? ( localize(10423, "Stop Dictation ({0})", stopActionKeybinding)) : ( localize(10424, "Stop Dictation")),
             class: ThemeIcon.asClassName(Codicon.micFilled),
             run: () => EditorDictation.get(editor)?.stop()
         }), { icon: true, label: false, keybinding: stopActionKeybinding });

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

@@ -1,15 +1,14 @@
 import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
 import { AccessibleDiffViewerPrev, AccessibleDiffViewerNext } from '../../../../editor/browser/widget/diffEditor/commands.js';
 import { DiffEditorWidget } from '../../../../editor/browser/widget/diffEditor/diffEditorWidget.js';
-import { localizeWithPath } from '../../../../nls.js';
-import { AccessibleViewType, AccessibleViewProviderId } from '../../../../platform/accessibility/browser/accessibleView.js';
+import { localize } from '../../../../nls.js';
+import { AccessibleViewType, AccessibleContentProvider, AccessibleViewProviderId } 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';
-const _moduleId = "vs/workbench/contrib/codeEditor/browser/diffEditorAccessibilityHelp";
 class DiffEditorAccessibilityHelp {
     constructor() {
         this.priority = 105;
@@ -29,31 +28,28 @@ class DiffEditorAccessibilityHelp {
         if (!codeEditor) {
             return;
         }
-        const switchSides = ( localizeWithPath(
-            _moduleId,
-            0,
-            "Run the command Diff Editor: Switch Side<keybinding:diffEditor.switchSide> to toggle between the original and modified editors."
+        const switchSides = ( localize(
+            4709,
+            "Run the command Diff Editor: Switch Side{0} to toggle between the original and modified editors.",
+            '<keybinding:diffEditor.switchSide>'
         ));
-        const diffEditorActiveAnnouncement = ( localizeWithPath(
-            _moduleId,
-            1,
+        const diffEditorActiveAnnouncement = ( localize(
+            4710,
             "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 = [
-            ( localizeWithPath(_moduleId, 2, "You are in a diff editor.")),
-            ( localizeWithPath(
-                _moduleId,
-                3,
-                "View the next<keybinding:{0}> or previous<keybinding:{1}> diff in diff review mode, which is optimized for screen readers.",
-                AccessibleDiffViewerNext.id,
-                AccessibleDiffViewerPrev.id
+            ( localize(4711, "You are in a diff editor.")),
+            ( localize(
+                4712,
+                "View the next{0} or previous{1} diff in diff review mode, which is optimized for screen readers.",
+                '<keybinding:' + AccessibleDiffViewerNext.id + '>',
+                '<keybinding:' + AccessibleDiffViewerPrev.id + '>'
             )),
             switchSides,
             diffEditorActiveAnnouncement,
-            ( localizeWithPath(
-                _moduleId,
-                4,
+            ( localize(
+                4713,
                 "To control which accessibility signals should be played, the following settings can be configured: {0}.",
                 keys.join(', ')
             )),
@@ -62,16 +58,15 @@ class DiffEditorAccessibilityHelp {
         if (commentCommandInfo) {
             content.push(commentCommandInfo);
         }
-        return {
-            id: AccessibleViewProviderId.DiffEditor,
-            verbositySettingKey: AccessibilityVerbositySettingId.DiffEditor,
-            provideContent: () => content.join('\n\n'),
-            onClose: () => {
-                codeEditor.focus();
-            },
-            options: { type: AccessibleViewType.Help }
-        };
+        return (
+             (new AccessibleContentProvider(
+                AccessibleViewProviderId.DiffEditor,
+                { type: AccessibleViewType.Help },
+                () => content.join('\n'),
+                () => codeEditor.focus(),
+                AccessibilityVerbositySettingId.DiffEditor
+            ))
+        );
     }
-    dispose() { }
 }
 export { DiffEditorAccessibilityHelp };