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

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/format/formatting.js

@@ -1,5 +1,5 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-import { localize2WithPath, localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize2, localize } from 'vscode/vscode/vs/nls';
 import { CancellationToken } from 'vscode/vscode/vs/base/common/cancellation';
 import { KeyMod, KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
 import { DisposableStore, Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
@@ -28,12 +28,11 @@ import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
 import { INotebookService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookService.service';
 import { CodeActionParticipantUtils } from '../saveParticipants/saveParticipants.js';
 
-const _moduleId = "vs/workbench/contrib/notebook/browser/contrib/format/formatting";
 registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'notebook.format',
-            title: ( localize2WithPath(_moduleId, 0, 'Format Notebook')),
+            title: ( localize2(7962, 'Format Notebook')),
             category: NOTEBOOK_ACTIONS_CATEGORY,
             precondition: ( (ContextKeyExpr.and(NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_EDITOR_EDITABLE))),
             keybinding: {
@@ -84,7 +83,7 @@ registerAction2(class extends Action2 {
                     }
                     return [];
                 }))));
-                await bulkEditService.apply( allCellEdits.flat(), { label: ( localizeWithPath(_moduleId, 1, "Format Notebook")), code: 'undoredo.formatNotebook', });
+                await bulkEditService.apply( allCellEdits.flat(), { label: ( localize(7963, "Format Notebook")), code: 'undoredo.formatNotebook', });
             }
         }
         finally {
@@ -96,7 +95,7 @@ registerEditorAction(class FormatCellAction extends EditorAction {
     constructor() {
         super({
             id: 'notebook.formatCell',
-            label: ( localizeWithPath(_moduleId, 2, "Format Cell")),
+            label: ( localize(7964, "Format Cell")),
             alias: 'Format Cell',
             precondition: ( (ContextKeyExpr.and(
                 NOTEBOOK_IS_ACTIVE_EDITOR,
@@ -168,7 +167,7 @@ let FormatOnCellExecutionParticipant = class FormatOnCellExecutionParticipant {
                 }
                 return [];
             }))));
-            await this.bulkEditService.apply( allCellEdits.flat(), { label: ( localizeWithPath(_moduleId, 3, "Format Cells")), code: 'undoredo.notebooks.onWillExecuteFormat', });
+            await this.bulkEditService.apply( allCellEdits.flat(), { label: ( localize(7965, "Format Cells")), code: 'undoredo.notebooks.onWillExecuteFormat', });
         }
         finally {
             disposable.dispose();

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/gettingStarted/notebookGettingStarted.js

@@ -1,6 +1,6 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
-import { localize2WithPath } from 'vscode/vscode/vs/nls';
+import { localize2 } from 'vscode/vscode/vs/nls';
 import { Categories } from 'vscode/vscode/vs/platform/action/common/actionCommonCategories';
 import { registerAction2, Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
@@ -18,7 +18,6 @@ import { NotebookEditorInput } from 'vscode/vscode/vs/workbench/contrib/notebook
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 
-const _moduleId = "vs/workbench/contrib/notebook/browser/contrib/gettingStarted/notebookGettingStarted";
 const hasOpenedNotebookKey = 'hasOpenedNotebook';
 const hasShownGettingStartedKey = 'hasShownNotebookGettingStarted';
 let NotebookGettingStarted = class NotebookGettingStarted extends Disposable {
@@ -66,7 +65,7 @@ registerAction2(class NotebookClearNotebookLayoutAction extends Action2 {
     constructor() {
         super({
             id: 'workbench.notebook.layout.gettingStarted',
-            title: ( localize2WithPath(_moduleId, 0, "Reset notebook getting started")),
+            title: ( localize2(7976, "Reset notebook getting started")),
             f1: true,
             precondition: ( (ContextKeyExpr.equals(`config.${NotebookSetting.openGettingStarted}`, true))),
             category: Categories.Developer,

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/layout/layoutActions.js

@@ -1,16 +1,15 @@
-import { localize2WithPath } from 'vscode/vscode/vs/nls';
+import { localize2 } from 'vscode/vscode/vs/nls';
 import { Action2, MenuId, registerAction2 } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { NOTEBOOK_ACTIONS_CATEGORY } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
 import { NotebookSetting } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 
-const _moduleId = "vs/workbench/contrib/notebook/browser/contrib/layout/layoutActions";
 const TOGGLE_CELL_TOOLBAR_POSITION = 'notebook.toggleCellToolbarPosition';
 class ToggleCellToolbarPositionAction extends Action2 {
     constructor() {
         super({
             id: TOGGLE_CELL_TOOLBAR_POSITION,
-            title: ( localize2WithPath(_moduleId, 0, 'Toggle Cell Toolbar Position')),
+            title: ( localize2(7977, 'Toggle Cell Toolbar Position')),
             menu: [{
                     id: MenuId.NotebookCellTitle,
                     group: 'View',

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/navigation/arrow.js

@@ -2,7 +2,7 @@ import { timeout } from 'vscode/vscode/vs/base/common/async';
 import { KeyCode, KeyMod } from 'vscode/vscode/vs/base/common/keyCodes';
 import { EditorExtensionsRegistry } from 'vscode/vscode/vs/editor/browser/editorExtensions';
 import { EditorContextKeys } from 'vscode/vscode/vs/editor/common/editorContextKeys';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { CONTEXT_ACCESSIBILITY_MODE_ENABLED } from 'vscode/vscode/vs/platform/accessibility/common/accessibility';
 import { registerAction2, Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { Extensions } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
@@ -17,7 +17,6 @@ import { CellEditState } from 'vscode/vscode/vs/workbench/contrib/notebook/brows
 import { NOTEBOOK_EDITOR_CURSOR_BOUNDARY, CellKind } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { NOTEBOOK_OUTPUT_INPUT_FOCUSED, NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_CELL_TYPE, NOTEBOOK_CELL_MARKDOWN_EDIT_MODE, NOTEBOOK_CURSOR_NAVIGATION_MODE, NOTEBOOK_OUTPUT_FOCUSED, NOTEBOOK_CELL_EDITOR_FOCUSED, NOTEBOOK_CELL_HAS_OUTPUTS } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
 
-const _moduleId = "vs/workbench/contrib/notebook/browser/contrib/navigation/arrow";
 const NOTEBOOK_FOCUS_TOP = 'notebook.focusTop';
 const NOTEBOOK_FOCUS_BOTTOM = 'notebook.focusBottom';
 const NOTEBOOK_FOCUS_PREVIOUS_EDITOR = 'notebook.focusPreviousEditor';
@@ -33,9 +32,8 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'notebook.cell.nullAction',
-            title: ( localizeWithPath(
-                _moduleId,
-                0,
+            title: ( localize(
+                7978,
                 "Keypresses that should be handled by the focused element in the cell output."
             )),
             keybinding: [{
@@ -58,7 +56,7 @@ registerAction2(class FocusNextCellAction extends NotebookCellAction {
     constructor() {
         super({
             id: NOTEBOOK_FOCUS_NEXT_EDITOR,
-            title: ( localizeWithPath(_moduleId, 1, 'Focus Next Cell Editor')),
+            title: ( localize(7979, 'Focus Next Cell Editor')),
             keybinding: [
                 {
                     when: ( (ContextKeyExpr.and(
@@ -133,7 +131,7 @@ registerAction2(class FocusPreviousCellAction extends NotebookCellAction {
     constructor() {
         super({
             id: NOTEBOOK_FOCUS_PREVIOUS_EDITOR,
-            title: ( localizeWithPath(_moduleId, 2, 'Focus Previous Cell Editor')),
+            title: ( localize(7980, 'Focus Previous Cell Editor')),
             keybinding: [
                 {
                     when: ( (ContextKeyExpr.and(
@@ -199,7 +197,7 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: NOTEBOOK_FOCUS_TOP,
-            title: ( localizeWithPath(_moduleId, 3, 'Focus First Cell')),
+            title: ( localize(7981, 'Focus First Cell')),
             keybinding: [
                 {
                     when: ( (ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ContextKeyExpr.not(InputFocusedContextKey)))),
@@ -231,7 +229,7 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: NOTEBOOK_FOCUS_BOTTOM,
-            title: ( localizeWithPath(_moduleId, 4, 'Focus Last Cell')),
+            title: ( localize(7982, 'Focus Last Cell')),
             keybinding: [
                 {
                     when: ( (ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ContextKeyExpr.not(InputFocusedContextKey)))),
@@ -268,7 +266,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: FOCUS_IN_OUTPUT_COMMAND_ID,
-            title: ( localizeWithPath(_moduleId, 5, 'Focus In Active Cell Output')),
+            title: ( localize(7983, 'Focus In Active Cell Output')),
             keybinding: {
                 when: ( (ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_CELL_HAS_OUTPUTS))),
                 primary: KeyMod.CtrlCmd | KeyCode.DownArrow,
@@ -287,7 +285,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: FOCUS_OUT_OUTPUT_COMMAND_ID,
-            title: ( localizeWithPath(_moduleId, 6, 'Focus Out Active Cell Output')),
+            title: ( localize(7984, 'Focus Out Active Cell Output')),
             keybinding: {
                 when: ( (ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_OUTPUT_FOCUSED))),
                 primary: KeyMod.CtrlCmd | KeyCode.UpArrow,
@@ -306,7 +304,7 @@ registerAction2(class CenterActiveCellAction extends NotebookCellAction {
     constructor() {
         super({
             id: CENTER_ACTIVE_CELL,
-            title: ( localizeWithPath(_moduleId, 7, "Center Active Cell")),
+            title: ( localize(7985, "Center Active Cell")),
             keybinding: {
                 when: NOTEBOOK_EDITOR_FOCUSED,
                 primary: KeyMod.CtrlCmd | KeyCode.KeyL,
@@ -325,7 +323,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: NOTEBOOK_CURSOR_PAGEUP_COMMAND_ID,
-            title: ( localizeWithPath(_moduleId, 8, "Cell Cursor Page Up")),
+            title: ( localize(7986, "Cell Cursor Page Up")),
             keybinding: [
                 {
                     when: ( (ContextKeyExpr.and(
@@ -347,7 +345,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: NOTEBOOK_CURSOR_PAGEUP_SELECT_COMMAND_ID,
-            title: ( localizeWithPath(_moduleId, 9, "Cell Cursor Page Up Select")),
+            title: ( localize(7987, "Cell Cursor Page Up Select")),
             keybinding: [
                 {
                     when: ( (ContextKeyExpr.and(
@@ -370,7 +368,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: NOTEBOOK_CURSOR_PAGEDOWN_COMMAND_ID,
-            title: ( localizeWithPath(_moduleId, 10, "Cell Cursor Page Down")),
+            title: ( localize(7988, "Cell Cursor Page Down")),
             keybinding: [
                 {
                     when: ( (ContextKeyExpr.and(
@@ -392,7 +390,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: NOTEBOOK_CURSOR_PAGEDOWN_SELECT_COMMAND_ID,
-            title: ( localizeWithPath(_moduleId, 11, "Cell Cursor Page Down Select")),
+            title: ( localize(7989, "Cell Cursor Page Down Select")),
             keybinding: [
                 {
                     when: ( (ContextKeyExpr.and(
@@ -425,9 +423,8 @@ function getPageSize(context) {
         'notebook.navigation.allowNavigateToSurroundingCells': {
             type: 'boolean',
             default: true,
-            markdownDescription: ( localizeWithPath(
-                _moduleId,
-                12,
+            markdownDescription: ( localize(
+                7990,
                 "When enabled cursor can navigate to the next/previous cell when the current cursor in the cell editor is at the first/last line."
             ))
         }

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

@@ -1,6 +1,6 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
-import { localize2WithPath } from 'vscode/vscode/vs/nls';
+import { localize2 } from 'vscode/vscode/vs/nls';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
 import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
@@ -17,7 +17,6 @@ import { INotebookKernelService } from 'vscode/vscode/vs/workbench/contrib/noteb
 import { INotebookService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookService.service';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 
-const _moduleId = "vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariables";
 let NotebookVariables = class NotebookVariables extends Disposable {
     constructor(contextKeyService, configurationService, editorService, notebookExecutionStateService, notebookKernelService, notebookDocumentService) {
         super();
@@ -67,7 +66,7 @@ let NotebookVariables = class NotebookVariables extends Disposable {
         if (debugViewContainer) {
             const viewsRegistry = ( (Registry.as(Extensions.ViewsRegistry)));
             const viewDescriptor = {
-                id: 'NOTEBOOK_VARIABLES', name: ( localize2WithPath(_moduleId, 0, "Notebook Variables")),
+                id: 'NOTEBOOK_VARIABLES', name: ( localize2(8055, "Notebook Variables")),
                 containerIcon: variablesViewIcon, ctorDescriptor: ( (new SyncDescriptor(NotebookVariablesView))),
                 order: 50, weight: 5, canToggleVisibility: true, canMoveView: true, collapsed: true, when: NOTEBOOK_VARIABLE_VIEW_ENABLED,
             };

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariablesDataSource.js

@@ -1,8 +1,7 @@
 import { CancellationTokenSource } from 'vscode/vscode/vs/base/common/cancellation';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { variablePageSize } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookKernelService';
 
-const _moduleId = "vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariablesDataSource";
 class NotebookVariableDataSource {
     constructor(notebookKernelService) {
         this.notebookKernelService = notebookKernelService;
@@ -75,7 +74,7 @@ class NotebookVariableDataSource {
                     notebook: parent.notebook,
                     id: parent.id + `${last + 1}`,
                     extHostId: parent.extHostId,
-                    name: ( localizeWithPath(_moduleId, 0, "Display limit reached")),
+                    name: ( localize(11396, "Display limit reached")),
                     value: '',
                     indexedChildrenCount: 0,
                     hasNamedChildren: false

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariablesTree.js

@@ -1,13 +1,12 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { $ as $$1, append } from 'vscode/vscode/vs/base/browser/dom';
 import { DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover.service';
 import 'vscode/vscode/vs/platform/list/browser/listService';
 import { renderExpressionValue } from 'vscode/vscode/vs/workbench/contrib/debug/browser/baseDebugView';
 
 var NotebookVariableRenderer_1;
-const _moduleId = "vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariablesTree";
 const $ = $$1;
 const MAX_VALUE_RENDER_LENGTH_IN_VIEWLET = 1024;
 class NotebookVariablesDelegate {
@@ -56,10 +55,10 @@ NotebookVariableRenderer = NotebookVariableRenderer_1 = ( (__decorate([
 ], NotebookVariableRenderer)));
 class NotebookVariableAccessibilityProvider {
     getWidgetAriaLabel() {
-        return ( localizeWithPath(_moduleId, 0, "Notebook Variables"));
+        return ( localize(11397, "Notebook Variables"));
     }
     getAriaLabel(element) {
-        return ( localizeWithPath(_moduleId, 1, "Variable {0}, value {1}", element.name, element.value));
+        return ( localize(11398, "Variable {0}, value {1}", element.name, element.value));
     }
 }
 

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariablesView.js

@@ -1,6 +1,6 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { RunOnceScheduler } from 'vscode/vscode/vs/base/common/async';
-import { localize2WithPath } from 'vscode/vscode/vs/nls';
+import { localize2 } from 'vscode/vscode/vs/nls';
 import { createAndFillInContextMenuActions } from 'vscode/vscode/vs/platform/actions/browser/menuEntryActionViewItem';
 import { MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { IMenuService } from 'vscode/vscode/vs/platform/actions/common/actions.service';
@@ -26,10 +26,9 @@ import { INotebookExecutionStateService } from 'vscode/vscode/vs/workbench/contr
 import { INotebookKernelService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookKernelService.service';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 
-const _moduleId = "vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariablesView";
 let NotebookVariablesView = class NotebookVariablesView extends ViewPane {
     static { this.ID = 'notebookVariablesView'; }
-    static { this.TITLE = ( localize2WithPath(_moduleId, 0, "Notebook Variables")); }
+    static { this.TITLE = ( localize2(10725, "Notebook Variables")); }
     constructor(options, editorService, notebookKernelService, notebookExecutionStateService, keybindingService, contextMenuService, contextKeyService, configurationService, instantiationService, viewDescriptorService, openerService, quickInputService, commandService, themeService, telemetryService, hoverService, menuService) {
         super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, hoverService);
         this.editorService = editorService;
@@ -81,9 +80,8 @@ let NotebookVariablesView = class NotebookVariablesView extends ViewPane {
             [CONTEXT_VARIABLE_LANGUAGE.key, element.language],
             [CONTEXT_VARIABLE_EXTENSIONID.key, element.extensionId]
         ]);
-        const menu = this.menuService.createMenu(MenuId.NotebookVariablesContext, overlayedContext);
-        createAndFillInContextMenuActions(menu, { arg, shouldForwardArgs: true }, actions);
-        menu.dispose();
+        const menu = this.menuService.getMenuActions(MenuId.NotebookVariablesContext, overlayedContext, { arg, shouldForwardArgs: true });
+        createAndFillInContextMenuActions(menu, actions);
         this.contextMenuService.showContextMenu({
             getAnchor: () => e.anchor,
             getActions: () => actions

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/outline/notebookOutline.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 { clearNode, WindowIdleValue } from 'vscode/vscode/vs/base/browser/dom';
 import { ToolBar } from 'vscode/vscode/vs/base/browser/ui/toolbar/toolbar';
 import { IconLabel } from 'vscode/vscode/vs/base/browser/ui/iconLabel/iconLabel';
@@ -53,7 +53,6 @@ import { NotebookExecutionType } from 'vscode/vscode/vs/workbench/contrib/notebo
 import { INotebookExecutionStateService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService.service';
 import { ILanguageFeaturesService } from 'vscode/vscode/vs/editor/common/services/languageFeatures';
 
-const _moduleId = "vs/workbench/contrib/notebook/browser/contrib/outline/notebookOutline";
 class NotebookOutlineTemplate {
     static { this.templateId = 'NotebookOutlineRenderer'; }
     constructor(container, iconClass, iconLabel, decoration, actionMenu, elementDisposables) {
@@ -718,37 +717,34 @@ const NotebookOutlineContext = {
         [NotebookSetting.outlineShowMarkdownHeadersOnly]: {
             type: 'boolean',
             default: true,
-            markdownDescription: ( localizeWithPath(
-                _moduleId,
-                0,
+            markdownDescription: ( localize(
+                7991,
                 "When enabled, notebook outline will show only markdown cells containing a header."
             ))
         },
         [NotebookSetting.outlineShowCodeCells]: {
             type: 'boolean',
             default: false,
-            markdownDescription: ( localizeWithPath(_moduleId, 1, "When enabled, notebook outline shows code cells."))
+            markdownDescription: ( localize(7992, "When enabled, notebook outline shows code cells."))
         },
         [NotebookSetting.outlineShowCodeCellSymbols]: {
             type: 'boolean',
             default: true,
-            markdownDescription: ( localizeWithPath(
-                _moduleId,
-                2,
+            markdownDescription: ( localize(
+                7993,
                 "When enabled, notebook outline shows code cell symbols. Relies on `notebook.outline.showCodeCells` being enabled."
             ))
         },
         [NotebookSetting.breadcrumbsShowCodeCells]: {
             type: 'boolean',
             default: true,
-            markdownDescription: ( localizeWithPath(_moduleId, 3, "When enabled, notebook breadcrumbs contain code cells."))
+            markdownDescription: ( localize(7994, "When enabled, notebook breadcrumbs contain code cells."))
         },
         [NotebookSetting.gotoSymbolsAllSymbols]: {
             type: 'boolean',
             default: true,
-            markdownDescription: ( localizeWithPath(
-                _moduleId,
-                4,
+            markdownDescription: ( localize(
+                7995,
                 "When enabled, the Go to Symbol Quick Pick will display full code symbols from the notebook, as well as Markdown headers."
             ))
         },
@@ -756,7 +752,7 @@ const NotebookOutlineContext = {
 });
 MenuRegistry.appendMenuItem(MenuId.ViewTitle, {
     submenu: MenuId.NotebookOutlineFilter,
-    title: ( localizeWithPath(_moduleId, 5, "Filter Entries")),
+    title: ( localize(7996, "Filter Entries")),
     icon: Codicon.filter,
     group: 'navigation',
     order: -1,
@@ -769,7 +765,7 @@ registerAction2(class ToggleShowMarkdownHeadersOnly extends Action2 {
     constructor() {
         super({
             id: 'notebook.outline.toggleShowMarkdownHeadersOnly',
-            title: ( localizeWithPath(_moduleId, 6, "Markdown Headers Only")),
+            title: ( localize(7997, "Markdown Headers Only")),
             f1: false,
             toggled: {
                 condition: ( (ContextKeyExpr.equals('config.notebook.outline.showMarkdownHeadersOnly', true)))
@@ -790,7 +786,7 @@ registerAction2(class ToggleCodeCellEntries extends Action2 {
     constructor() {
         super({
             id: 'notebook.outline.toggleCodeCells',
-            title: ( localizeWithPath(_moduleId, 7, "Code Cells")),
+            title: ( localize(7998, "Code Cells")),
             f1: false,
             toggled: {
                 condition: ( (ContextKeyExpr.equals('config.notebook.outline.showCodeCells', true)))
@@ -812,7 +808,7 @@ registerAction2(class ToggleCodeCellSymbolEntries extends Action2 {
     constructor() {
         super({
             id: 'notebook.outline.toggleCodeCellSymbols',
-            title: ( localizeWithPath(_moduleId, 8, "Code Cell Symbols")),
+            title: ( localize(7999, "Code Cell Symbols")),
             f1: false,
             toggled: {
                 condition: ( (ContextKeyExpr.equals('config.notebook.outline.showCodeCellSymbols', true)))

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/profile/notebookProfile.js

@@ -1,9 +1,8 @@
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { registerAction2, Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { NotebookSetting } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 
-const _moduleId = "vs/workbench/contrib/notebook/browser/contrib/profile/notebookProfile";
 var NotebookProfileType;
 ( ((function(NotebookProfileType) {
     NotebookProfileType["default"] = "default";
@@ -53,7 +52,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'notebook.setProfile',
-            title: ( localizeWithPath(_moduleId, 0, "Set Profile"))
+            title: ( localize(8000, "Set Profile"))
         });
     }
     async run(accessor, args) {

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

@@ -14,7 +14,7 @@ import { applyCodeAction, ApplyCodeActionReason, getCodeActions } from 'vscode/v
 import { CodeActionKind, CodeActionTriggerSource } from 'vscode/vscode/vs/editor/contrib/codeAction/common/types';
 import { getDocumentFormattingEditsWithSelectedProvider, FormattingMode } from 'vscode/vscode/vs/editor/contrib/format/browser/format';
 import { SnippetController2 } from 'vscode/vscode/vs/editor/contrib/snippet/browser/snippetController2';
-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 { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
@@ -29,7 +29,6 @@ import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/commo
 import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 import { IWorkingCopyFileService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyFileService.service';
 
-const _moduleId = "vs/workbench/contrib/notebook/browser/contrib/saveParticipants/saveParticipants";
 let FormatOnSaveParticipant = class FormatOnSaveParticipant {
     constructor(editorWorkerService, languageFeaturesService, instantiationService, textModelService, bulkEditService, configurationService) {
         this.editorWorkerService = editorWorkerService;
@@ -50,7 +49,7 @@ let FormatOnSaveParticipant = class FormatOnSaveParticipant {
         if (!enabled) {
             return undefined;
         }
-        progress.report({ message: ( localizeWithPath(_moduleId, 0, "Formatting")) });
+        progress.report({ message: ( localize(7966, "Formatting")) });
         const notebook = workingCopy.model.notebookModel;
         const formatApplied = await this.instantiationService.invokeFunction(CodeActionParticipantUtils.checkAndRunFormatCodeAction, notebook, progress, token);
         const disposable = ( (new DisposableStore()));
@@ -70,7 +69,7 @@ let FormatOnSaveParticipant = class FormatOnSaveParticipant {
                     }
                     return [];
                 }))));
-                await this.bulkEditService.apply( allCellEdits.flat(), { label: ( localizeWithPath(_moduleId, 1, "Format Notebook")), code: 'undoredo.formatNotebook', });
+                await this.bulkEditService.apply( allCellEdits.flat(), { label: ( localize(7967, "Format Notebook")), code: 'undoredo.formatNotebook', });
             }
         }
         finally {
@@ -142,7 +141,7 @@ let TrimWhitespaceParticipant = class TrimWhitespaceParticipant {
                 );
             }))));
             const filteredEdits = allCellEdits.flat().filter(edit => edit !== undefined);
-            await this.bulkEditService.apply(filteredEdits, { label: ( localizeWithPath(_moduleId, 2, "Notebook Trim Trailing Whitespace")), code: 'undoredo.notebookTrimTrailingWhitespace' });
+            await this.bulkEditService.apply(filteredEdits, { label: ( localize(7968, "Notebook Trim Trailing Whitespace")), code: 'undoredo.notebookTrimTrailingWhitespace' });
         }
         finally {
             progress.report({ increment: 100 });
@@ -220,7 +219,7 @@ let TrimFinalNewLinesParticipant = class TrimFinalNewLinesParticipant {
                 );
             }))));
             const filteredEdits = allCellEdits.flat().filter(edit => edit !== undefined);
-            await this.bulkEditService.apply(filteredEdits, { label: ( localizeWithPath(_moduleId, 3, "Trim Final New Lines")), code: 'undoredo.trimFinalNewLines' });
+            await this.bulkEditService.apply(filteredEdits, { label: ( localize(7969, "Trim Final New Lines")), code: 'undoredo.trimFinalNewLines' });
         }
         finally {
             progress.report({ increment: 100 });
@@ -275,7 +274,7 @@ let InsertFinalNewLineParticipant = class InsertFinalNewLineParticipant {
                 );
             }))));
             const filteredEdits = allCellEdits.filter(edit => edit !== undefined);
-            await this.bulkEditService.apply(filteredEdits, { label: ( localizeWithPath(_moduleId, 4, "Insert Final New Line")), code: 'undoredo.insertFinalNewLine' });
+            await this.bulkEditService.apply(filteredEdits, { label: ( localize(7970, "Insert Final New Line")), code: 'undoredo.insertFinalNewLine' });
             if (activeCellEditor && selections) {
                 activeCellEditor.setSelections(selections);
             }
@@ -331,7 +330,7 @@ let CodeActionOnSaveParticipant = class CodeActionOnSaveParticipant {
         const notebookCodeActionsOnSave = includedActions.filter(x => CodeActionKind.Notebook.contains(x));
         if (notebookCodeActionsOnSave.length) {
             const nbDisposable = ( (new DisposableStore()));
-            progress.report({ message: ( localizeWithPath(_moduleId, 5, "Running 'Notebook' code actions")) });
+            progress.report({ message: ( localize(7971, "Running 'Notebook' code actions")) });
             try {
                 const cell = notebookModel.cells[0];
                 const ref = await this.textModelService.createModelReference(cell.uri);
@@ -363,7 +362,7 @@ let CodeActionOnSaveParticipant = class CodeActionOnSaveParticipant {
                 });
             }
             const cellDisposable = ( (new DisposableStore()));
-            progress.report({ message: ( localizeWithPath(_moduleId, 6, "Running 'Cell' code actions")) });
+            progress.report({ message: ( localize(7972, "Running 'Cell' code actions")) });
             try {
                 await Promise.all(( (notebookModel.cells.map(async (cell) => {
                     const ref = await this.textModelService.createModelReference(cell.uri);
@@ -403,7 +402,7 @@ class CodeActionParticipantUtils {
         const configurationService = accessor.get(IConfigurationService);
         const formatDisposable = ( (new DisposableStore()));
         let formatResult = false;
-        progress.report({ message: ( localizeWithPath(_moduleId, 7, "Running 'Format' code actions")) });
+        progress.report({ message: ( localize(7973, "Running 'Format' code actions")) });
         try {
             const cell = notebookModel.cells[0];
             const ref = await textModelService.createModelReference(cell.uri);
@@ -431,9 +430,8 @@ class CodeActionParticipantUtils {
             }
             _report() {
                 progress.report({
-                    message: ( localizeWithPath(
-                        _moduleId,
-                        8,
+                    message: ( localize(
+                        7974,
                         "Getting code actions from '{0}' ([configure]({1})).",
                         ( ([...this._names].map(name => `'${name}'`))).join(', '),
                         'command:workbench.action.openSettings?%5B%22notebook.codeActionsOnSave%22%5D'
@@ -473,7 +471,7 @@ class CodeActionParticipantUtils {
                         logService.warn('Failed to apply code action on save, applied to multiple resources.');
                         continue;
                     }
-                    progress.report({ message: ( localizeWithPath(_moduleId, 9, "Applying code action '{0}'.", action.action.title)) });
+                    progress.report({ message: ( localize(7975, "Applying code action '{0}'.", action.action.title)) });
                     await instantiationService.invokeFunction(applyCodeAction, action, ApplyCodeActionReason.OnSave, {}, token);
                     if (token.isCancellationRequested) {
                         return;
@@ -497,9 +495,8 @@ class CodeActionParticipantUtils {
             }
             _report() {
                 progress.report({
-                    message: ( localizeWithPath(
-                        _moduleId,
-                        8,
+                    message: ( localize(
+                        7975,
                         "Getting code actions from '{0}' ([configure]({1})).",
                         ( ([...this._names].map(name => `'${name}'`))).join(', '),
                         'command:workbench.action.openSettings?%5B%22notebook.defaultFormatter%22%5D'
@@ -526,7 +523,7 @@ class CodeActionParticipantUtils {
             if (!action) {
                 return false;
             }
-            progress.report({ message: ( localizeWithPath(_moduleId, 9, "Applying code action '{0}'.", action.action.title)) });
+            progress.report({ message: ( localize(7975, "Applying code action '{0}'.", action.action.title)) });
             await instantiationService.invokeFunction(applyCodeAction, action, ApplyCodeActionReason.OnSave, {}, token);
             if (token.isCancellationRequested) {
                 return false;

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/troubleshoot/layout.js

@@ -1,5 +1,5 @@
 import { Disposable, DisposableStore, dispose } from 'vscode/vscode/vs/base/common/lifecycle';
-import { localize2WithPath } from 'vscode/vscode/vs/nls';
+import { localize2 } from 'vscode/vscode/vs/nls';
 import { Categories } from 'vscode/vscode/vs/platform/action/common/actionCommonCategories';
 import { registerAction2, Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { getNotebookEditorFromEditorPane } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
@@ -8,7 +8,6 @@ import { CellStatusbarAlignment } from 'vscode/vscode/vs/workbench/contrib/noteb
 import { INotebookService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookService.service';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 
-const _moduleId = "vs/workbench/contrib/notebook/browser/contrib/troubleshoot/layout";
 class TroubleshootController extends Disposable {
     static { this.id = 'workbench.notebook.troubleshoot'; }
     constructor(_notebookEditor) {
@@ -95,7 +94,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'notebook.toggleLayoutTroubleshoot',
-            title: ( localize2WithPath(_moduleId, 0, "Toggle Layout Troubleshoot")),
+            title: ( localize2(8039, "Toggle Layout Troubleshoot")),
             category: Categories.Developer,
             f1: true
         });
@@ -114,7 +113,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'notebook.inspectLayout',
-            title: ( localize2WithPath(_moduleId, 1, "Inspect Notebook Layout")),
+            title: ( localize2(8040, "Inspect Notebook Layout")),
             category: Categories.Developer,
             f1: true
         });
@@ -135,7 +134,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'notebook.clearNotebookEdtitorTypeCache',
-            title: ( localize2WithPath(_moduleId, 2, "Clear Notebook Editor Type Cache")),
+            title: ( localize2(8041, "Clear Notebook Editor Type Cache")),
             category: Categories.Developer,
             f1: true
         });