@codingame/monaco-vscode-notebook-service-override 7.0.11 → 7.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-notebook-service-override",
-  "version": "7.0.11",
+  "version": "7.1.1",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -29,6 +29,6 @@
     }
   },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@7.0.11"
+    "vscode": "npm:@codingame/monaco-vscode-api@7.1.1"
   }
 }

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

@@ -3,7 +3,7 @@ import './emptyTextEditorHint.css.js';
 import { $ as $$1, getActiveWindow, addDisposableListener, EventType } from 'vscode/vscode/vs/base/browser/dom';
 import { dispose, DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
 import { ContentWidgetPositionPreference } from 'vscode/vscode/vs/editor/browser/editorBrowser';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { ChangeLanguageAction } from 'vscode/vscode/vs/workbench/browser/parts/editor/editorStatus';
 import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
 import { PLAINTEXT_LANGUAGE_ID } from 'vscode/vscode/vs/editor/common/languages/modesRegistry';
@@ -32,7 +32,6 @@ import { IChatAgentService } from 'vscode/vscode/vs/workbench/contrib/chat/commo
 import { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView.service';
 import { StandardMouseEvent } from 'vscode/vscode/vs/base/browser/mouseEvent';
 
-const _moduleId = "vs/workbench/contrib/codeEditor/browser/emptyTextEditorHint/emptyTextEditorHint";
 const $ = $$1;
 const emptyTextEditorHintSetting = 'workbench.editor.empty.hint';
 let EmptyTextEditorHintContribution = class EmptyTextEditorHintContribution {
@@ -198,8 +197,8 @@ class EmptyTextEditorHintContentWidget {
             getActions: () => {
                 return [{
                         id: 'workench.action.disableEmptyEditorHint',
-                        label: ( localizeWithPath(_moduleId, 0, "Disable Empty Editor Hint")),
-                        tooltip: ( localizeWithPath(_moduleId, 0, "Disable Empty Editor Hint")),
+                        label: ( localize(10714, "Disable Empty Editor Hint")),
+                        tooltip: ( localize(10714, "Disable Empty Editor Hint")),
                         enabled: true,
                         class: undefined,
                         run: () => {
@@ -236,9 +235,8 @@ class EmptyTextEditorHintContentWidget {
         const keybindingHint = this.keybindingService.lookupKeybinding(inlineChatId);
         const keybindingHintLabel = keybindingHint?.getLabel();
         if (keybindingHint && keybindingHintLabel) {
-            const actionPart = ( localizeWithPath(
-                _moduleId,
-                1,
+            const actionPart = ( localize(
+                10715,
                 'Press {0} to ask {1} to do something. ',
                 keybindingHintLabel,
                 providerName
@@ -269,16 +267,15 @@ class EmptyTextEditorHintContentWidget {
                 this.toDispose.add(addDisposableListener(label.element, EventType.CLICK, handleClick));
             }
             hintElement.appendChild(after);
-            const typeToDismiss = ( localizeWithPath(_moduleId, 2, 'Start typing to dismiss.'));
+            const typeToDismiss = ( localize(10716, 'Start typing to dismiss.'));
             const textHint2 = $('span', undefined, typeToDismiss);
             textHint2.style.fontStyle = 'italic';
             hintElement.appendChild(textHint2);
             ariaLabel = actionPart.concat(typeToDismiss);
         }
         else {
-            const hintMsg = ( localizeWithPath(
-                _moduleId,
-                3,
+            const hintMsg = ( localize(
+                10717,
                 '[[Ask {0} to do something]] or start typing to dismiss.',
                 providerName
             ));
@@ -337,9 +334,8 @@ class EmptyTextEditorHintContentWidget {
                 this.editorGroupsService.activeGroup.closeEditor(activeEditorInput, { preserveFocus: true });
             }
         };
-        const hintMsg = ( localizeWithPath(
-            _moduleId,
-            4,
+        const hintMsg = ( localize(
+            10718,
             '[[Select a language]], or [[fill with template]], or [[open a different editor]] to get started.\nStart typing to dismiss or [[don\'t show]] this again.'
         ));
         const hintElement = renderFormattedText(hintMsg, {
@@ -349,9 +345,8 @@ class EmptyTextEditorHintContentWidget {
         hintElement.style.fontStyle = 'italic';
         const keybindingsLookup = [ChangeLanguageAction.ID, ApplyFileSnippetAction.Id, 'welcome.showNewFileEntries'];
         const keybindingLabels = ( (keybindingsLookup.map((id) => this.keybindingService.lookupKeybinding(id)?.getLabel() ?? id)));
-        const ariaLabel = ( localizeWithPath(
-            _moduleId,
-            5,
+        const ariaLabel = ( localize(
+            10719,
             'Execute {0} to select a language, execute {1} to fill with template, or execute {2} to open a different editor and get started. Start typing to dismiss.',
             ...keybindingLabels
         ));
@@ -371,9 +366,8 @@ class EmptyTextEditorHintContentWidget {
             const inlineChatProviders = this.chatAgentService.getActivatedAgents().filter(candidate => candidate.locations.includes(ChatAgentLocation.Editor));
             const { hintElement, ariaLabel } = !inlineChatProviders.length ? this._getHintDefault() : this._getHintInlineChat(inlineChatProviders);
             this.domNode.append(hintElement);
-            this.ariaLabel = ariaLabel.concat(( localizeWithPath(
-                _moduleId,
-                6,
+            this.ariaLabel = ariaLabel.concat(( localize(
+                10720,
                 ' Toggle {0} in settings to disable this hint.',
                 AccessibilityVerbositySettingId.EmptyEditorHint
             )));

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/cellCommands/cellCommands.js

@@ -1,7 +1,7 @@
 import { KeyMod, KeyCode, KeyChord } from 'vscode/vscode/vs/base/common/keyCodes';
 import { Mimes } from 'vscode/vscode/vs/base/common/mime';
 import { IBulkEditService, ResourceTextEdit } from 'vscode/vscode/vs/editor/browser/services/bulkEditService';
-import { localize2WithPath, localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize2, localize } from 'vscode/vscode/vs/nls';
 import { registerAction2, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { InputFocusedContext, InputFocusedContextKey } from 'vscode/vscode/vs/platform/contextkey/common/contextkeys';
@@ -17,7 +17,6 @@ import { INotificationService } from 'vscode/vscode/vs/platform/notification/com
 import { EditorContextKeys } from 'vscode/vscode/vs/editor/common/editorContextKeys';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 
-const _moduleId = "vs/workbench/contrib/notebook/browser/contrib/cellCommands/cellCommands";
 const MOVE_CELL_UP_COMMAND_ID = 'notebook.cell.moveUp';
 const MOVE_CELL_DOWN_COMMAND_ID = 'notebook.cell.moveDown';
 const COPY_CELL_UP_COMMAND_ID = 'notebook.cell.copyUp';
@@ -26,7 +25,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: MOVE_CELL_UP_COMMAND_ID,
-            title: ( localize2WithPath(_moduleId, 0, "Move Cell Up")),
+            title: ( localize2(8019, "Move Cell Up")),
             icon: moveUpIcon,
             keybinding: {
                 primary: KeyMod.Alt | KeyCode.UpArrow,
@@ -49,7 +48,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: MOVE_CELL_DOWN_COMMAND_ID,
-            title: ( localize2WithPath(_moduleId, 1, "Move Cell Down")),
+            title: ( localize2(8020, "Move Cell Down")),
             icon: moveDownIcon,
             keybinding: {
                 primary: KeyMod.Alt | KeyCode.DownArrow,
@@ -72,7 +71,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: COPY_CELL_UP_COMMAND_ID,
-            title: ( localize2WithPath(_moduleId, 2, "Copy Cell Up")),
+            title: ( localize2(8021, "Copy Cell Up")),
             keybinding: {
                 primary: KeyMod.Alt | KeyMod.Shift | KeyCode.UpArrow,
                 when: ( (ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED,  (InputFocusedContext.toNegated())))),
@@ -88,7 +87,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: COPY_CELL_DOWN_COMMAND_ID,
-            title: ( localize2WithPath(_moduleId, 3, "Copy Cell Down")),
+            title: ( localize2(8022, "Copy Cell Down")),
             keybinding: {
                 primary: KeyMod.Alt | KeyMod.Shift | KeyCode.DownArrow,
                 when: ( (ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED,  (InputFocusedContext.toNegated())))),
@@ -114,7 +113,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: SPLIT_CELL_COMMAND_ID,
-            title: ( localize2WithPath(_moduleId, 4, "Split Cell")),
+            title: ( localize2(8023, "Split Cell")),
             menu: {
                 id: MenuId.NotebookCellTitle,
                 when: ( (ContextKeyExpr.and(
@@ -184,7 +183,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: JOIN_CELL_ABOVE_COMMAND_ID,
-            title: ( localize2WithPath(_moduleId, 5, "Join With Previous Cell")),
+            title: ( localize2(8024, "Join With Previous Cell")),
             keybinding: {
                 when: NOTEBOOK_EDITOR_FOCUSED,
                 primary: KeyMod.WinCtrl | KeyMod.Alt | KeyMod.Shift | KeyCode.KeyJ,
@@ -207,7 +206,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: JOIN_CELL_BELOW_COMMAND_ID,
-            title: ( localize2WithPath(_moduleId, 6, "Join With Next Cell")),
+            title: ( localize2(8025, "Join With Next Cell")),
             keybinding: {
                 when: NOTEBOOK_EDITOR_FOCUSED,
                 primary: KeyMod.WinCtrl | KeyMod.Alt | KeyCode.KeyJ,
@@ -230,7 +229,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: JOIN_SELECTED_CELLS_COMMAND_ID,
-            title: ( localize2WithPath(_moduleId, 7, "Join Selected Cells")),
+            title: ( localize2(8026, "Join Selected Cells")),
             menu: {
                 id: MenuId.NotebookCellTitle,
                 when: ( (ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_EDITOR_EDITABLE))),
@@ -251,7 +250,7 @@ registerAction2(class ChangeCellToCodeAction extends NotebookMultiCellAction {
     constructor() {
         super({
             id: CHANGE_CELL_TO_CODE_COMMAND_ID,
-            title: ( localize2WithPath(_moduleId, 8, "Change Cell to Code")),
+            title: ( localize2(8027, "Change Cell to Code")),
             keybinding: {
                 when: ( (ContextKeyExpr.and(
                     NOTEBOOK_EDITOR_FOCUSED,
@@ -285,7 +284,7 @@ registerAction2(class ChangeCellToMarkdownAction extends NotebookMultiCellAction
     constructor() {
         super({
             id: CHANGE_CELL_TO_MARKDOWN_COMMAND_ID,
-            title: ( localize2WithPath(_moduleId, 9, "Change Cell to Markdown")),
+            title: ( localize2(8028, "Change Cell to Markdown")),
             keybinding: {
                 when: ( (ContextKeyExpr.and(
                     NOTEBOOK_EDITOR_FOCUSED,
@@ -327,7 +326,7 @@ registerAction2(class CollapseCellInputAction extends NotebookMultiCellAction {
     constructor() {
         super({
             id: COLLAPSE_CELL_INPUT_COMMAND_ID,
-            title: ( localize2WithPath(_moduleId, 10, "Collapse Cell Input")),
+            title: ( localize2(8029, "Collapse Cell Input")),
             keybinding: {
                 when: ( (ContextKeyExpr.and(
                     NOTEBOOK_CELL_LIST_FOCUSED,
@@ -355,7 +354,7 @@ registerAction2(class ExpandCellInputAction extends NotebookMultiCellAction {
     constructor() {
         super({
             id: EXPAND_CELL_INPUT_COMMAND_ID,
-            title: ( localize2WithPath(_moduleId, 11, "Expand Cell Input")),
+            title: ( localize2(8030, "Expand Cell Input")),
             keybinding: {
                 when: ( (ContextKeyExpr.and(NOTEBOOK_CELL_LIST_FOCUSED, NOTEBOOK_CELL_INPUT_COLLAPSED))),
                 primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KeyK, KeyMod.CtrlCmd | KeyCode.KeyC),
@@ -379,7 +378,7 @@ registerAction2(class CollapseCellOutputAction extends NotebookMultiCellAction {
     constructor() {
         super({
             id: COLLAPSE_CELL_OUTPUT_COMMAND_ID,
-            title: ( localize2WithPath(_moduleId, 12, "Collapse Cell Output")),
+            title: ( localize2(8031, "Collapse Cell Output")),
             keybinding: {
                 when: ( (ContextKeyExpr.and(
                     NOTEBOOK_CELL_LIST_FOCUSED,
@@ -405,7 +404,7 @@ registerAction2(class ExpandCellOuputAction extends NotebookMultiCellAction {
     constructor() {
         super({
             id: EXPAND_CELL_OUTPUT_COMMAND_ID,
-            title: ( localize2WithPath(_moduleId, 13, "Expand Cell Output")),
+            title: ( localize2(8032, "Expand Cell Output")),
             keybinding: {
                 when: ( (ContextKeyExpr.and(NOTEBOOK_CELL_LIST_FOCUSED, NOTEBOOK_CELL_OUTPUT_COLLAPSED))),
                 primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KeyK, KeyCode.KeyT),
@@ -427,9 +426,9 @@ registerAction2(class extends NotebookMultiCellAction {
         super({
             id: TOGGLE_CELL_OUTPUTS_COMMAND_ID,
             precondition: NOTEBOOK_CELL_LIST_FOCUSED,
-            title: ( localize2WithPath(_moduleId, 14, "Toggle Outputs")),
+            title: ( localize2(8033, "Toggle Outputs")),
             metadata: {
-                description: ( localizeWithPath(_moduleId, 14, "Toggle Outputs")),
+                description: ( localize(8033, "Toggle Outputs")),
                 args: cellExecutionArgs
             }
         });
@@ -454,7 +453,7 @@ registerAction2(class CollapseAllCellInputsAction extends NotebookMultiCellActio
     constructor() {
         super({
             id: COLLAPSE_ALL_CELL_INPUTS_COMMAND_ID,
-            title: ( localize2WithPath(_moduleId, 15, "Collapse All Cell Inputs")),
+            title: ( localize2(8034, "Collapse All Cell Inputs")),
             f1: true,
         });
     }
@@ -466,7 +465,7 @@ registerAction2(class ExpandAllCellInputsAction extends NotebookMultiCellAction
     constructor() {
         super({
             id: EXPAND_ALL_CELL_INPUTS_COMMAND_ID,
-            title: ( localize2WithPath(_moduleId, 16, "Expand All Cell Inputs")),
+            title: ( localize2(8035, "Expand All Cell Inputs")),
             f1: true
         });
     }
@@ -478,7 +477,7 @@ registerAction2(class CollapseAllCellOutputsAction extends NotebookMultiCellActi
     constructor() {
         super({
             id: COLLAPSE_ALL_CELL_OUTPUTS_COMMAND_ID,
-            title: ( localize2WithPath(_moduleId, 17, "Collapse All Cell Outputs")),
+            title: ( localize2(8036, "Collapse All Cell Outputs")),
             f1: true,
         });
     }
@@ -490,7 +489,7 @@ registerAction2(class ExpandAllCellOutputsAction extends NotebookMultiCellAction
     constructor() {
         super({
             id: EXPAND_ALL_CELL_OUTPUTS_COMMAND_ID,
-            title: ( localize2WithPath(_moduleId, 18, "Expand All Cell Outputs")),
+            title: ( localize2(8037, "Expand All Cell Outputs")),
             f1: true
         });
     }
@@ -502,7 +501,7 @@ registerAction2(class ToggleCellOutputScrolling extends NotebookMultiCellAction
     constructor() {
         super({
             id: TOGGLE_CELL_OUTPUT_SCROLLING,
-            title: ( localize2WithPath(_moduleId, 19, "Toggle Scroll Cell Output")),
+            title: ( localize2(8038, "Toggle Scroll Cell Output")),
             keybinding: {
                 when: ( (ContextKeyExpr.and(
                     NOTEBOOK_CELL_LIST_FOCUSED,

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/cellDiagnostics/cellDiagnosticsActions.js

@@ -2,7 +2,7 @@ import { KeyMod, KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
 import { Range } from 'vscode/vscode/vs/editor/common/core/range';
 import { CodeActionController } from 'vscode/vscode/vs/editor/contrib/codeAction/browser/codeActionController';
 import { CodeActionTriggerSource, CodeActionKind } from 'vscode/vscode/vs/editor/contrib/codeAction/common/types';
-import { localize2WithPath, localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize2, localize } from 'vscode/vscode/vs/nls';
 import { registerAction2 } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
@@ -10,13 +10,12 @@ import { NotebookCellAction, findTargetCellEditor } from 'vscode/vscode/vs/workb
 import { CodeCellViewModel } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/viewModel/codeCellViewModel';
 import { NOTEBOOK_CELL_FOCUSED, NOTEBOOK_CELL_HAS_ERROR_DIAGNOSTICS, NOTEBOOK_CELL_EDITOR_FOCUSED } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
 
-const _moduleId = "vs/workbench/contrib/notebook/browser/contrib/cellDiagnostics/cellDiagnosticsActions";
 const OPEN_CELL_FAILURE_ACTIONS_COMMAND_ID = 'notebook.cell.openFailureActions';
 registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: OPEN_CELL_FAILURE_ACTIONS_COMMAND_ID,
-            title: ( localize2WithPath(_moduleId, 0, "Show Cell Failure Actions")),
+            title: ( localize2(10722, "Show Cell Failure Actions")),
             precondition: ( (ContextKeyExpr.and(
                 NOTEBOOK_CELL_FOCUSED,
                 NOTEBOOK_CELL_HAS_ERROR_DIAGNOSTICS,
@@ -48,7 +47,7 @@ registerAction2(class extends NotebookCellAction {
                 const editor = findTargetCellEditor(context, context.cell);
                 if (editor) {
                     const controller = CodeActionController.get(editor);
-                    controller?.manualTriggerAtCurrentPosition(( localizeWithPath(_moduleId, 1, "No code actions available")), CodeActionTriggerSource.Default, { include: CodeActionKind.QuickFix });
+                    controller?.manualTriggerAtCurrentPosition(( localize(10723, "No code actions available")), CodeActionTriggerSource.Default, { include: CodeActionKind.QuickFix });
                 }
             }
         }

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/cellDiagnostics/diagnosticCellStatusBarContrib.js

@@ -5,7 +5,7 @@ import 'vscode/vscode/vs/base/common/observableInternal/derived';
 import { autorun } from 'vscode/vscode/vs/base/common/observableInternal/autorun';
 import 'vscode/vscode/vs/base/common/observableInternal/utils';
 import 'vscode/vscode/vs/base/common/cancellation';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding.service';
 import { OPEN_CELL_FAILURE_ACTIONS_COMMAND_ID } from './cellDiagnosticsActions.js';
@@ -14,7 +14,6 @@ import { registerNotebookContribution } from 'vscode/vscode/vs/workbench/contrib
 import { CodeCellViewModel } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/viewModel/codeCellViewModel';
 import { CellStatusbarAlignment } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 
-const _moduleId = "vs/workbench/contrib/notebook/browser/contrib/cellDiagnostics/diagnosticCellStatusBarContrib";
 let DiagnosticCellStatusBarContrib = class DiagnosticCellStatusBarContrib extends Disposable {
     static { this.id = 'workbench.notebook.statusBar.diagtnostic'; }
     constructor(notebookEditor, instantiationService) {
@@ -41,7 +40,7 @@ let DiagnosticCellStatusBarItem = class DiagnosticCellStatusBarItem extends Disp
         let item;
         if (error?.location) {
             const keybinding = this.keybindingService.lookupKeybinding(OPEN_CELL_FAILURE_ACTIONS_COMMAND_ID)?.getLabel();
-            const tooltip = ( localizeWithPath(_moduleId, 0, "Quick Actions {0}", `(${keybinding})`));
+            const tooltip = ( localize(10724, "Quick Actions {0}", `(${keybinding})`));
             item = {
                 text: `$(sparkle)`,
                 tooltip,

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/statusBarProviders.js

@@ -2,7 +2,7 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { ResourceMap } from 'vscode/vscode/vs/base/common/map';
 import { ILanguageService } from 'vscode/vscode/vs/editor/common/languages/language';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding.service';
@@ -16,7 +16,6 @@ import { INotebookService } from 'vscode/vscode/vs/workbench/contrib/notebook/co
 import { ILanguageDetectionService } from 'vscode/vscode/vs/workbench/services/languageDetection/common/languageDetectionWorkerService.service';
 import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 
-const _moduleId = "vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/statusBarProviders";
 let CellStatusBarLanguagePickerProvider = class CellStatusBarLanguagePickerProvider {
     constructor(_notebookService, _languageService) {
         this._notebookService = _notebookService;
@@ -40,9 +39,8 @@ let CellStatusBarLanguagePickerProvider = class CellStatusBarLanguagePickerProvi
                 displayLanguage = this._languageService.getLanguageName(displayLanguage) ?? displayLanguage;
             }
             else {
-                const searchTooltip = ( localizeWithPath(
-                    _moduleId,
-                    0,
+                const searchTooltip = ( localize(
+                    8001,
                     "Unknown cell language. Click to search for '{0}' extensions",
                     cell.language
                 ));
@@ -58,7 +56,7 @@ let CellStatusBarLanguagePickerProvider = class CellStatusBarLanguagePickerProvi
         statusBarItems.push({
             text: displayLanguage,
             command: CHANGE_CELL_LANGUAGE,
-            tooltip: ( localizeWithPath(_moduleId, 1, "Select Cell Language Mode")),
+            tooltip: ( localize(8002, "Select Cell Language Mode")),
             alignment: CellStatusbarAlignment.Right,
             priority: -Number.MAX_SAFE_INTEGER
         });
@@ -122,7 +120,7 @@ let CellStatusBarLanguageDetectionProvider = class CellStatusBarLanguageDetectio
         const items = [];
         if (cached.guess && currentLanguageId !== cached.guess) {
             const detectedName = this._languageService.getLanguageName(cached.guess) || cached.guess;
-            let tooltip = ( localizeWithPath(_moduleId, 2, "Accept Detected Language: {0}", detectedName));
+            let tooltip = ( localize(8003, "Accept Detected Language: {0}", detectedName));
             const keybinding = this._keybindingService.lookupKeybinding(DETECT_CELL_LANGUAGE);
             const label = keybinding?.getLabel();
             if (label) {

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/clipboard/notebookClipboard.js

@@ -1,5 +1,5 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-import { localizeWithPath, localize2WithPath } from 'vscode/vscode/vs/nls';
+import { localize, localize2 } from 'vscode/vscode/vs/nls';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { registerWorkbenchContribution2, WorkbenchPhase } from 'vscode/vscode/vs/workbench/common/contributions';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
@@ -24,7 +24,6 @@ import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/comma
 import { showWindowLogActionId } from 'vscode/vscode/vs/workbench/services/log/common/logConstants';
 import { getWindow, getActiveElement, isHTMLElement, isAncestor } from 'vscode/vscode/vs/base/browser/dom';
 
-const _moduleId = "vs/workbench/contrib/notebook/browser/contrib/clipboard/notebookClipboard";
 let _logging = false;
 function toggleLogging() {
     _logging = !_logging;
@@ -350,7 +349,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: COPY_CELL_COMMAND_ID,
-            title: ( localizeWithPath(_moduleId, 0, "Copy Cell")),
+            title: ( localize(7954, "Copy Cell")),
             menu: {
                 id: MenuId.NotebookCellTitle,
                 when: NOTEBOOK_EDITOR_FOCUSED,
@@ -373,7 +372,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: CUT_CELL_COMMAND_ID,
-            title: ( localizeWithPath(_moduleId, 1, "Cut Cell")),
+            title: ( localize(7955, "Cut Cell")),
             menu: {
                 id: MenuId.NotebookCellTitle,
                 when: ( (ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_CELL_EDITABLE))),
@@ -396,7 +395,7 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: PASTE_CELL_COMMAND_ID,
-            title: ( localizeWithPath(_moduleId, 2, "Paste Cell")),
+            title: ( localize(7956, "Paste Cell")),
             menu: {
                 id: MenuId.NotebookCellTitle,
                 when: ( (ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_EDITOR_EDITABLE))),
@@ -428,7 +427,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: PASTE_CELL_ABOVE_COMMAND_ID,
-            title: ( localizeWithPath(_moduleId, 3, "Paste Cell Above")),
+            title: ( localize(7957, "Paste Cell Above")),
             keybinding: {
                 when: ( (ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ContextKeyExpr.not(InputFocusedContextKey)))),
                 primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyV,
@@ -472,7 +471,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.toggleNotebookClipboardLog',
-            title: ( localize2WithPath(_moduleId, 4, 'Toggle Notebook Clipboard Troubleshooting')),
+            title: ( localize2(7958, 'Toggle Notebook Clipboard Troubleshooting')),
             category: Categories.Developer,
             f1: true
         });
@@ -489,7 +488,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: 'notebook.cell.output.selectAll',
-            title: ( localizeWithPath(_moduleId, 5, "Select All")),
+            title: ( localize(7959, "Select All")),
             keybinding: {
                 primary: KeyMod.CtrlCmd | KeyCode.KeyA,
                 when: ( (ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_OUTPUT_FOCUSED))),

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/editorStatusBar/editorStatusBar.js

@@ -1,5 +1,5 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { DisposableStore, Disposable, MutableDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
 import { ILanguageFeaturesService } from 'vscode/vscode/vs/editor/common/services/languageFeatures';
@@ -9,7 +9,7 @@ import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { registerWorkbenchContribution2, WorkbenchPhase } from 'vscode/vscode/vs/workbench/common/contributions';
 import { CENTER_ACTIVE_CELL } from '../navigation/arrow.js';
 import { SELECT_KERNEL_ID } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
-import { SELECT_NOTEBOOK_INDENTATION_ID } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/editActions';
+import { SELECT_NOTEBOOK_INDENTATION_ID } from '../../controller/editActions.js';
 import { getNotebookEditorFromEditorPane } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { NotebookCellsChangeType } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { INotebookKernelService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookKernelService.service';
@@ -19,7 +19,6 @@ import { IStatusbarService } from 'vscode/vscode/vs/workbench/services/statusbar
 import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import { ServiceCollection } from 'vscode/vscode/vs/platform/instantiation/common/serviceCollection';
 
-const _moduleId = "vs/workbench/contrib/notebook/browser/contrib/editorStatusBar/editorStatusBar";
 let ImplictKernelSelector = class ImplictKernelSelector {
     constructor(notebook, suggested, notebookKernelService, languageFeaturesService, logService) {
         const disposables = ( (new DisposableStore()));
@@ -111,19 +110,19 @@ let KernelStatus = class KernelStatus extends Disposable {
             }
             const tooltip = kernel.description ?? kernel.detail ?? kernel.label;
             this._kernelInfoElement.add(this._statusbarService.addEntry({
-                name: ( localizeWithPath(_moduleId, 0, "Notebook Kernel Info")),
+                name: ( localize(8010, "Notebook Kernel Info")),
                 text: `$(notebook-kernel-select) ${kernel.label}`,
                 ariaLabel: kernel.label,
-                tooltip: isSuggested ? ( localizeWithPath(_moduleId, 1, "{0} (suggestion)", tooltip)) : tooltip,
+                tooltip: isSuggested ? ( localize(8011, "{0} (suggestion)", tooltip)) : tooltip,
                 command: SELECT_KERNEL_ID,
             }, SELECT_KERNEL_ID, StatusbarAlignment.RIGHT, 10));
             this._kernelInfoElement.add(kernel.onDidChange(() => this._showKernelStatus(notebook)));
         }
         else {
             this._kernelInfoElement.add(this._statusbarService.addEntry({
-                name: ( localizeWithPath(_moduleId, 2, "Notebook Kernel Selection")),
-                text: ( localizeWithPath(_moduleId, 3, "Select Kernel")),
-                ariaLabel: ( localizeWithPath(_moduleId, 3, "Select Kernel")),
+                name: ( localize(8012, "Notebook Kernel Selection")),
+                text: ( localize(8013, "Select Kernel")),
+                ariaLabel: ( localize(8013, "Select Kernel")),
                 command: SELECT_KERNEL_ID,
                 kind: 'prominent'
             }, SELECT_KERNEL_ID, StatusbarAlignment.RIGHT, 10));
@@ -168,7 +167,7 @@ let ActiveCellStatus = class ActiveCellStatus extends Disposable {
             return;
         }
         const entry = {
-            name: ( localizeWithPath(_moduleId, 4, "Notebook Editor Selections")),
+            name: ( localize(8014, "Notebook Editor Selections")),
             text: newText,
             ariaLabel: newText,
             command: CENTER_ACTIVE_CELL
@@ -192,8 +191,8 @@ let ActiveCellStatus = class ActiveCellStatus extends Disposable {
         const numSelected = editor.getSelections().reduce((prev, range) => prev + (range.end - range.start), 0);
         const totalCells = editor.getLength();
         return numSelected > 1 ?
-            ( localizeWithPath(_moduleId, 5, "Cell {0} ({1} selected)", idxFocused, numSelected)) :
-            ( localizeWithPath(_moduleId, 6, "Cell {0} of {1}", idxFocused, totalCells));
+            ( localize(8015, "Cell {0} ({1} selected)", idxFocused, numSelected)) :
+            ( localize(8016, "Cell {0} of {1}", idxFocused, totalCells));
     }
 };
 ActiveCellStatus = ( (__decorate([
@@ -252,10 +251,10 @@ let NotebookIndentationStatus = class NotebookIndentationStatus extends Disposab
             return;
         }
         const entry = {
-            name: ( localizeWithPath(_moduleId, 7, "Notebook Indentation")),
+            name: ( localize(8017, "Notebook Indentation")),
             text: newText,
             ariaLabel: newText,
-            tooltip: ( localizeWithPath(_moduleId, 8, "Select Indentation")),
+            tooltip: ( localize(8018, "Select Indentation")),
             command: SELECT_NOTEBOOK_INDENTATION_ID
         };
         if (!this._accessor.value) {

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFind.js

@@ -6,7 +6,7 @@ import { ICodeEditorService } from 'vscode/vscode/vs/editor/browser/services/cod
 import { EditorOption } from 'vscode/vscode/vs/editor/common/config/editorOptions';
 import { EditorContextKeys } from 'vscode/vscode/vs/editor/common/editorContextKeys';
 import { getSelectionSearchString, StartFindAction, FindStartFocusAction, StartFindReplaceAction } from 'vscode/vscode/vs/editor/contrib/find/browser/findController';
-import { localize2WithPath } from 'vscode/vscode/vs/nls';
+import { localize2 } from 'vscode/vscode/vs/nls';
 import { registerAction2, Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
@@ -18,13 +18,12 @@ import { NotebookFindScopeType, CellUri } from 'vscode/vscode/vs/workbench/contr
 import { NOTEBOOK_EDITOR_FOCUSED, KEYBINDING_CONTEXT_NOTEBOOK_FIND_WIDGET_FOCUSED, NOTEBOOK_IS_ACTIVE_EDITOR, INTERACTIVE_WINDOW_IS_ACTIVE_EDITOR } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 
-const _moduleId = "vs/workbench/contrib/notebook/browser/contrib/find/notebookFind";
 registerNotebookContribution(NotebookFindContrib.id, NotebookFindContrib);
 registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'notebook.hideFind',
-            title: ( localize2WithPath(_moduleId, 0, 'Hide Find in Notebook')),
+            title: ( localize2(7960, 'Hide Find in Notebook')),
             keybinding: {
                 when: ( (ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, KEYBINDING_CONTEXT_NOTEBOOK_FIND_WIDGET_FOCUSED))),
                 primary: KeyCode.Escape,
@@ -47,7 +46,7 @@ registerAction2(class extends NotebookMultiCellAction {
     constructor() {
         super({
             id: 'notebook.find',
-            title: ( localize2WithPath(_moduleId, 1, 'Find in Notebook')),
+            title: ( localize2(7961, 'Find in Notebook')),
             keybinding: {
                 when: ( (ContextKeyExpr.and(
                     NOTEBOOK_EDITOR_FOCUSED,