@codingame/monaco-vscode-api 7.1.0 → 7.1.1

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

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../../../../../external/tslib/tslib.es6.js';
-import { localizeWithPath } from '../../../../../../nls.js';
+import { localize } from '../../../../../../nls.js';
 import { $, trackFocus, addDisposableListener, getTotalWidth } from '../../../../../../base/browser/dom.js';
 import './notebookFindReplaceWidget.css.js';
 import { ActionBar } from '../../../../../../base/browser/ui/actionbar/actionbar.js';
@@ -44,24 +44,23 @@ import { registerThemingParticipant } from '../../../../../../platform/theme/com
 import { filterIcon } from '../../../../extensions/browser/extensionsIcons.js';
 import { NotebookFindFilters } from './findFilters.js';
 import { NotebookSetting, NotebookFindScopeType } from '../../../common/notebookCommon.js';
-const _moduleId = "vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget";
-const NLS_FIND_INPUT_LABEL = ( localizeWithPath(_moduleId, 0, "Find"));
-const NLS_FIND_INPUT_PLACEHOLDER = ( localizeWithPath(_moduleId, 1, "Find"));
-const NLS_PREVIOUS_MATCH_BTN_LABEL = ( localizeWithPath(_moduleId, 2, "Previous Match"));
-const NLS_NEXT_MATCH_BTN_LABEL = ( localizeWithPath(_moduleId, 3, "Next Match"));
-const NLS_TOGGLE_SELECTION_FIND_TITLE = ( localizeWithPath(_moduleId, 4, "Find in Selection"));
-const NLS_CLOSE_BTN_LABEL = ( localizeWithPath(_moduleId, 5, "Close"));
-const NLS_TOGGLE_REPLACE_MODE_BTN_LABEL = ( localizeWithPath(_moduleId, 6, "Toggle Replace"));
-const NLS_REPLACE_INPUT_LABEL = ( localizeWithPath(_moduleId, 7, "Replace"));
-const NLS_REPLACE_INPUT_PLACEHOLDER = ( localizeWithPath(_moduleId, 8, "Replace"));
-const NLS_REPLACE_BTN_LABEL = ( localizeWithPath(_moduleId, 9, "Replace"));
-const NLS_REPLACE_ALL_BTN_LABEL = ( localizeWithPath(_moduleId, 10, "Replace All"));
-registerIcon('find-filter', Codicon.filter, ( localizeWithPath(_moduleId, 11, 'Icon for Find Filter in find widget.')));
-const NOTEBOOK_FIND_FILTERS = ( localizeWithPath(_moduleId, 12, "Find Filters"));
-const NOTEBOOK_FIND_IN_MARKUP_INPUT = ( localizeWithPath(_moduleId, 13, "Markdown Source"));
-const NOTEBOOK_FIND_IN_MARKUP_PREVIEW = ( localizeWithPath(_moduleId, 14, "Rendered Markdown"));
-const NOTEBOOK_FIND_IN_CODE_INPUT = ( localizeWithPath(_moduleId, 15, "Code Cell Source"));
-const NOTEBOOK_FIND_IN_CODE_OUTPUT = ( localizeWithPath(_moduleId, 16, "Code Cell Output"));
+const NLS_FIND_INPUT_LABEL = ( localize(11274, "Find"));
+const NLS_FIND_INPUT_PLACEHOLDER = ( localize(11275, "Find"));
+const NLS_PREVIOUS_MATCH_BTN_LABEL = ( localize(11276, "Previous Match"));
+const NLS_NEXT_MATCH_BTN_LABEL = ( localize(11277, "Next Match"));
+const NLS_TOGGLE_SELECTION_FIND_TITLE = ( localize(11278, "Find in Selection"));
+const NLS_CLOSE_BTN_LABEL = ( localize(11279, "Close"));
+const NLS_TOGGLE_REPLACE_MODE_BTN_LABEL = ( localize(11280, "Toggle Replace"));
+const NLS_REPLACE_INPUT_LABEL = ( localize(11281, "Replace"));
+const NLS_REPLACE_INPUT_PLACEHOLDER = ( localize(11282, "Replace"));
+const NLS_REPLACE_BTN_LABEL = ( localize(11283, "Replace"));
+const NLS_REPLACE_ALL_BTN_LABEL = ( localize(11284, "Replace All"));
+registerIcon('find-filter', Codicon.filter, ( localize(11285, 'Icon for Find Filter in find widget.')));
+const NOTEBOOK_FIND_FILTERS = ( localize(11286, "Find Filters"));
+const NOTEBOOK_FIND_IN_MARKUP_INPUT = ( localize(11287, "Markdown Source"));
+const NOTEBOOK_FIND_IN_MARKUP_PREVIEW = ( localize(11288, "Rendered Markdown"));
+const NOTEBOOK_FIND_IN_CODE_INPUT = ( localize(11289, "Code Cell Source"));
+const NOTEBOOK_FIND_IN_CODE_OUTPUT = ( localize(11290, "Code Cell Output"));
 const NOTEBOOK_FIND_WIDGET_INITIAL_WIDTH = 419;
 const NOTEBOOK_FIND_WIDGET_INITIAL_HORIZONTAL_PADDING = 4;
 let NotebookFindFilterActionViewItem = class NotebookFindFilterActionViewItem extends DropdownMenuActionViewItem {

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

@@ -8,7 +8,7 @@ import { format } from '../../../../../../base/common/strings.js';
 import { MATCHES_LIMIT } from '../../../../../../editor/contrib/find/browser/findModel.js';
 import { FindReplaceState } from '../../../../../../editor/contrib/find/browser/findState.js';
 import { NLS_NO_RESULTS, NLS_MATCHES_LOCATION } from '../../../../../../editor/contrib/find/browser/findWidget.js';
-import { localizeWithPath } from '../../../../../../nls.js';
+import { localize } from '../../../../../../nls.js';
 import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.service.js';
 import { IContextKeyService } from '../../../../../../platform/contextkey/common/contextkey.service.js';
 import { IContextViewService, IContextMenuService } from '../../../../../../platform/contextview/browser/contextView.service.js';
@@ -18,7 +18,6 @@ import { FindModel } from './findModel.js';
 import { SimpleFindReplaceWidget } from './notebookFindReplaceWidget.js';
 import { CellEditState } from '../../notebookBrowser.js';
 import { KEYBINDING_CONTEXT_NOTEBOOK_FIND_WIDGET_FOCUSED } from '../../../common/notebookContextKeys.js';
-const _moduleId = "vs/workbench/contrib/notebook/browser/contrib/find/notebookFindWidget";
 const FIND_HIDE_TRANSITION = 'find-hide-transition';
 const FIND_SHOW_TRANSITION = 'find-show-transition';
 let MAX_MATCHES_COUNT_WIDTH = 69;
@@ -275,10 +274,10 @@ let NotebookFindWidget = class NotebookFindWidget extends SimpleFindReplaceWidge
     _getAriaLabel(label, currentMatch, searchString) {
         if (label === NLS_NO_RESULTS) {
             return searchString === ''
-                ? ( localizeWithPath(_moduleId, 0, "{0} found", label))
-                : ( localizeWithPath(_moduleId, 1, "{0} found for '{1}'", label, searchString));
+                ? ( localize(10122, "{0} found", label))
+                : ( localize(10123, "{0} found for '{1}'", label, searchString));
         }
-        return ( localizeWithPath(_moduleId, 2, "{0} found for '{1}'", label, searchString));
+        return ( localize(10124, "{0} found for '{1}'", label, searchString));
     }
     dispose() {
         this._notebookEditor?.removeClassName(FIND_SHOW_TRANSITION);

package/vscode/src/vs/workbench/contrib/notebook/browser/controller/cellOperations.js

@@ -8,8 +8,7 @@ import { CellEditState, expandCellRangesWithHiddenCells, CellFocusMode } from '.
 import { cloneNotebookCellTextModel } from '../../common/model/notebookCellTextModel.js';
 import { SelectionStateType, CellKind, CellEditType } from '../../common/notebookCommon.js';
 import { cellRangesToIndexes, cellRangeContains } from '../../common/notebookRange.js';
-import { localizeWithPath } from '../../../../../nls.js';
-const _moduleId = "vs/workbench/contrib/notebook/browser/controller/cellOperations";
+import { localize } from '../../../../../nls.js';
 async function changeCellToKind(kind, context, language, mime) {
     const { notebookEditor } = context;
     if (!notebookEditor.hasModel()) {
@@ -296,7 +295,7 @@ async function joinSelectedCells(bulkEditService, notificationService, context)
     const cellKind = cells[0].cellKind;
     const isSameKind = cells.every(cell => cell.cellKind === cellKind);
     if (!isSameKind) {
-        const message = ( localizeWithPath(_moduleId, 0, "Cannot join cells of different kinds"));
+        const message = ( localize(10600, "Cannot join cells of different kinds"));
         return notificationService.warn(message);
     }
     const firstCell = cells[0];
@@ -324,7 +323,7 @@ async function joinSelectedCells(bulkEditService, notificationService, context)
         }))));
     }
     if (edits.length) {
-        await bulkEditService.apply(edits, { quotableLabel: ( localizeWithPath(_moduleId, 1, "Join Notebook Cells")) });
+        await bulkEditService.apply(edits, { quotableLabel: ( localize(10601, "Join Notebook Cells")) });
     }
 }
 async function joinNotebookCells(editor, range, direction, constraint) {

package/vscode/src/vs/workbench/contrib/notebook/browser/controller/cellOutputActions.js

@@ -1,22 +1,47 @@
-import { localizeWithPath } from '../../../../../nls.js';
+import { localize } from '../../../../../nls.js';
 import { registerAction2, Action2, MenuId } from '../../../../../platform/actions/common/actions.js';
 import { IClipboardService } from '../../../../../platform/clipboard/common/clipboardService.service.js';
 import { IOpenerService } from '../../../../../platform/opener/common/opener.service.js';
 import { NOTEBOOK_ACTIONS_CATEGORY } from './coreActions.js';
-import { NOTEBOOK_CELL_HAS_OUTPUTS } from '../../common/notebookContextKeys.js';
+import { NOTEBOOK_CELL_HAS_OUTPUTS, NOTEBOOK_CELL_HAS_HIDDEN_OUTPUTS } from '../../common/notebookContextKeys.js';
 import { copyIcon } from '../notebookIcons.js';
 import { ILogService } from '../../../../../platform/log/common/log.service.js';
 import { copyCellOutput } from '../contrib/clipboard/cellOutputClipboard.js';
 import { IEditorService } from '../../../../services/editor/common/editorService.service.js';
 import { getNotebookEditorFromEditorPane } from '../notebookBrowser.js';
 import { CellKind, CellUri } from '../../common/notebookCommon.js';
-const _moduleId = "vs/workbench/contrib/notebook/browser/controller/cellOutputActions";
+import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
 const COPY_OUTPUT_COMMAND_ID = 'notebook.cellOutput.copy';
+registerAction2(class ShowAllOutputsAction extends Action2 {
+    constructor() {
+        super({
+            id: 'notebook.cellOuput.showEmptyOutputs',
+            title: ( localize(7949, "Show empty outputs")),
+            menu: {
+                id: MenuId.NotebookOutputToolbar,
+                when: ( (ContextKeyExpr.and(NOTEBOOK_CELL_HAS_OUTPUTS, NOTEBOOK_CELL_HAS_HIDDEN_OUTPUTS)))
+            },
+            f1: false,
+            category: NOTEBOOK_ACTIONS_CATEGORY
+        });
+    }
+    run(accessor, context) {
+        const cell = context.cell;
+        if (cell && cell.cellKind === CellKind.Code) {
+            for (let i = 1; i < cell.outputsViewModels.length; i++) {
+                if (!cell.outputsViewModels[i].visible.get()) {
+                    cell.outputsViewModels[i].setVisible(true, true);
+                    cell.updateOutputHeight(i, 1, 'command');
+                }
+            }
+        }
+    }
+});
 registerAction2(class CopyCellOutputAction extends Action2 {
     constructor() {
         super({
             id: COPY_OUTPUT_COMMAND_ID,
-            title: ( localizeWithPath(_moduleId, 0, "Copy Cell Output")),
+            title: ( localize(7950, "Copy Cell Output")),
             menu: {
                 id: MenuId.NotebookOutputToolbar,
                 when: NOTEBOOK_CELL_HAS_OUTPUTS
@@ -91,7 +116,7 @@ registerAction2(class OpenCellOutputInEditorAction extends Action2 {
     constructor() {
         super({
             id: OPEN_OUTPUT_COMMAND_ID,
-            title: ( localizeWithPath(_moduleId, 1, "Open Cell Output in Text Editor")),
+            title: ( localize(7951, "Open Cell Output in Text Editor")),
             f1: false,
             category: NOTEBOOK_ACTIONS_CATEGORY,
             icon: copyIcon,

package/vscode/src/vs/workbench/contrib/notebook/browser/controller/chat/notebookChatContext.js

@@ -1,17 +1,11 @@
-import { localizeWithPath } from '../../../../../../nls.js';
+import { localize } from '../../../../../../nls.js';
 import { MenuId } from '../../../../../../platform/actions/common/actions.js';
 import { RawContextKey } from '../../../../../../platform/contextkey/common/contextkey.js';
-const _moduleId = "vs/workbench/contrib/notebook/browser/controller/chat/notebookChatContext";
-const CTX_NOTEBOOK_CELL_CHAT_FOCUSED = ( (new RawContextKey('notebookCellChatFocused', false, ( localizeWithPath(_moduleId, 0, "Whether the cell chat editor is focused")))));
-const CTX_NOTEBOOK_CHAT_HAS_ACTIVE_REQUEST = ( (new RawContextKey('notebookChatHasActiveRequest', false, ( localizeWithPath(_moduleId, 1, "Whether the cell chat editor has an active request")))));
-const CTX_NOTEBOOK_CHAT_USER_DID_EDIT = ( (new RawContextKey('notebookChatUserDidEdit', false, ( localizeWithPath(
- _moduleId,
- 2,
- "Whether the user did changes ontop of the notebook cell chat"
-)))));
-const CTX_NOTEBOOK_CHAT_OUTER_FOCUS_POSITION = ( (new RawContextKey('notebookChatOuterFocusPosition', '', ( localizeWithPath(
- _moduleId,
- 3,
+const CTX_NOTEBOOK_CELL_CHAT_FOCUSED = ( (new RawContextKey('notebookCellChatFocused', false, ( localize(10679, "Whether the cell chat editor is focused")))));
+const CTX_NOTEBOOK_CHAT_HAS_ACTIVE_REQUEST = ( (new RawContextKey('notebookChatHasActiveRequest', false, ( localize(10680, "Whether the cell chat editor has an active request")))));
+const CTX_NOTEBOOK_CHAT_USER_DID_EDIT = ( (new RawContextKey('notebookChatUserDidEdit', false, ( localize(10681, "Whether the user did changes ontop of the notebook cell chat")))));
+const CTX_NOTEBOOK_CHAT_OUTER_FOCUS_POSITION = ( (new RawContextKey('notebookChatOuterFocusPosition', '', ( localize(
+ 10682,
  "Whether the focus of the notebook editor is above or below the cell chat"
 )))));
 const MENU_CELL_CHAT_INPUT = MenuId.for('cellChatInput');
@@ -19,5 +13,5 @@ const MENU_CELL_CHAT_WIDGET = MenuId.for('cellChatWidget');
 const MENU_CELL_CHAT_WIDGET_STATUS = MenuId.for('cellChatWidget.status');
 MenuId.for('cellChatWidget.feedback');
 MenuId.for('cellChatWidget.toolbar');
-const CTX_NOTEBOOK_CHAT_HAS_AGENT = ( (new RawContextKey('notebookChatAgentRegistered', false, ( localizeWithPath(_moduleId, 4, "Whether a chat agent for notebook is registered")))));
+const CTX_NOTEBOOK_CHAT_HAS_AGENT = ( (new RawContextKey('notebookChatAgentRegistered', false, ( localize(10683, "Whether a chat agent for notebook is registered")))));
 export { CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_NOTEBOOK_CHAT_HAS_ACTIVE_REQUEST, CTX_NOTEBOOK_CHAT_HAS_AGENT, CTX_NOTEBOOK_CHAT_OUTER_FOCUS_POSITION, CTX_NOTEBOOK_CHAT_USER_DID_EDIT, MENU_CELL_CHAT_INPUT, MENU_CELL_CHAT_WIDGET, MENU_CELL_CHAT_WIDGET_STATUS };

package/vscode/src/vs/workbench/contrib/notebook/browser/controller/chat/notebookChatController.js

@@ -17,7 +17,7 @@ import { TextEdit } from '../../../../../../editor/common/languages.js';
 import { ILanguageService } from '../../../../../../editor/common/languages/language.js';
 import { IEditorWorkerService } from '../../../../../../editor/common/services/editorWorker.js';
 import { IModelService } from '../../../../../../editor/common/services/model.js';
-import { localizeWithPath } from '../../../../../../nls.js';
+import { localize } from '../../../../../../nls.js';
 import { IContextKeyService } from '../../../../../../platform/contextkey/common/contextkey.service.js';
 import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
 import { StorageScope, StorageTarget } from '../../../../../../platform/storage/common/storage.js';
@@ -34,7 +34,6 @@ import { CellKind } from '../../../common/notebookCommon.js';
 import { NotebookExecutionType } from '../../../common/notebookExecutionStateService.js';
 import { INotebookExecutionStateService } from '../../../common/notebookExecutionStateService.service.js';
 var NotebookChatController_1;
-const _moduleId = "vs/workbench/contrib/notebook/browser/controller/chat/notebookChatController";
 class NotebookChatWidget extends Disposable {
     set afterModelPosition(afterModelPosition) {
         this.notebookViewZone.afterModelPosition = afterModelPosition;
@@ -313,7 +312,19 @@ let NotebookChatController = class NotebookChatController extends Disposable {
         const inputUri = notebookUri.with({ scheme: Schemas.untitled, fragment: inputBoxFragment });
         const result = this._modelService.createModel('', null, inputUri, false);
         fakeParentEditor.setModel(result);
-        const inlineChatWidget = this._widgetDisposableStore.add(this._instantiationService.createInstance(InlineChatWidget, ChatAgentLocation.Notebook, {
+        const inlineChatWidget = this._widgetDisposableStore.add(this._instantiationService.createInstance(InlineChatWidget, {
+            location: ChatAgentLocation.Notebook,
+            resolveData: () => {
+                const sessionInputUri = this.getSessionInputUri();
+                if (!sessionInputUri) {
+                    return undefined;
+                }
+                return {
+                    type: ChatAgentLocation.Notebook,
+                    sessionInputUri
+                };
+            }
+        }, {
             statusMenuId: MENU_CELL_CHAT_WIDGET_STATUS,
             chatWidgetViewOptions: {
                 rendererOptions: {
@@ -327,8 +338,8 @@ let NotebookChatController = class NotebookChatController extends Disposable {
                 }
             }
         }));
-        inlineChatWidget.placeholder = ( localizeWithPath(_moduleId, 0, "Ask a question"));
-        inlineChatWidget.updateInfo(( localizeWithPath(_moduleId, 1, "AI-generated code may be incorrect")));
+        inlineChatWidget.placeholder = ( localize(10684, "Ask a question"));
+        inlineChatWidget.updateInfo(( localize(10685, "AI-generated code may be incorrect")));
         widgetContainer.appendChild(inlineChatWidget.domNode);
         this._widgetDisposableStore.add(inlineChatWidget.onDidChangeInput(() => {
             this._warmupRequestCts?.dispose(true);
@@ -521,7 +532,6 @@ let NotebookChatController = class NotebookChatController extends Disposable {
         finally {
             store.dispose();
             this._ctxHasActiveRequest.set(false);
-            this._widget.inlineChatWidget.updateProgress(false);
             this._widget.inlineChatWidget.updateInfo('');
             this._widget.inlineChatWidget.updateToolbar(true);
         }

package/vscode/src/vs/workbench/contrib/notebook/browser/controller/coreActions.js

@@ -1,5 +1,5 @@
 import { URI } from '../../../../../base/common/uri.js';
-import { localizeWithPath, localize2WithPath } from '../../../../../nls.js';
+import { localize, localize2 } from '../../../../../nls.js';
 import { MenuRegistry, MenuId, Action2 } from '../../../../../platform/actions/common/actions.js';
 import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
 import { KeybindingWeight } from '../../../../../platform/keybinding/common/keybindingsRegistry.js';
@@ -7,13 +7,13 @@ import { getNotebookEditorFromEditorPane, cellRangeToViewCells } from '../notebo
 import { NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_KERNEL_COUNT, NOTEBOOK_KERNEL_SOURCE_COUNT, NOTEBOOK_IS_ACTIVE_EDITOR, INTERACTIVE_WINDOW_IS_ACTIVE_EDITOR } from '../../common/notebookContextKeys.js';
 import { isICellRange } from '../../common/notebookRange.js';
 import { IEditorService } from '../../../../services/editor/common/editorService.service.js';
+import { isEditorCommandsContext } from '../../../../common/editor.js';
 import { INotebookEditorService } from '../services/notebookEditorService.service.js';
 import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.service.js';
 import { MarshalledId } from '../../../../../base/common/marshallingIds.js';
 import { isEqual } from '../../../../../base/common/resources.js';
-const _moduleId = "vs/workbench/contrib/notebook/browser/controller/coreActions";
 const SELECT_KERNEL_ID = '_notebook.selectKernel';
-const NOTEBOOK_ACTIONS_CATEGORY = ( localize2WithPath(_moduleId, 0, 'Notebook'));
+const NOTEBOOK_ACTIONS_CATEGORY = ( localize2(5644, 'Notebook'));
 const CELL_TITLE_CELL_GROUP_ID = 'inline/cell';
 const CELL_TITLE_OUTPUT_GROUP_ID = 'inline/output';
 const NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT = KeybindingWeight.EditorContrib;
@@ -149,13 +149,10 @@ class NotebookMultiCellAction extends Action2 {
     isCellToolbarContext(context) {
         return !!context && !!context.notebookEditor && context.$mid === MarshalledId.NotebookCellActionContext;
     }
-    isEditorContext(context) {
-        return !!context && context.groupId !== undefined;
-    }
     async run(accessor, ...additionalArgs) {
         const context = additionalArgs[0];
         const isFromCellToolbar = this.isCellToolbarContext(context);
-        const isFromEditorToolbar = this.isEditorContext(context);
+        const isFromEditorToolbar = isEditorCommandsContext(context);
         const from = isFromCellToolbar ? 'cellToolbar' : (isFromEditorToolbar ? 'editorToolbar' : 'other');
         const telemetryService = accessor.get(ITelemetryService);
         if (isFromCellToolbar) {
@@ -169,11 +166,12 @@ class NotebookMultiCellAction extends Action2 {
         }
         const editor = getEditorFromArgsOrActivePane(accessor);
         if (editor) {
+            const selectedCellRange = editor.getSelections().length === 0 ? [editor.getFocus()] : editor.getSelections();
             telemetryService.publicLog2('workbenchActionExecuted', { id: this.desc.id, from: from });
             return this.runWithContext(accessor, {
                 ui: false,
                 notebookEditor: editor,
-                selectedCells: cellRangeToViewCells(editor, editor.getSelections())
+                selectedCells: cellRangeToViewCells(editor, selectedCellRange)
             });
         }
     }
@@ -312,18 +310,18 @@ const cellExecutionArgs = [
 ];
 MenuRegistry.appendMenuItem(MenuId.NotebookCellTitle, {
     submenu: MenuId.NotebookCellInsert,
-    title: ( localizeWithPath(_moduleId, 1, "Insert Cell")),
+    title: ( localize(5645, "Insert Cell")),
     group: CellOverflowToolbarGroups.Insert,
     when: ( (NOTEBOOK_EDITOR_EDITABLE.isEqualTo(true)))
 });
 MenuRegistry.appendMenuItem(MenuId.EditorContext, {
     submenu: MenuId.NotebookCellTitle,
-    title: ( localizeWithPath(_moduleId, 2, "Notebook Cell")),
+    title: ( localize(5646, "Notebook Cell")),
     group: CellOverflowToolbarGroups.Insert,
     when: NOTEBOOK_EDITOR_FOCUSED
 });
 MenuRegistry.appendMenuItem(MenuId.NotebookCellTitle, {
-    title: ( localizeWithPath(_moduleId, 3, "Share")),
+    title: ( localize(5647, "Share")),
     submenu: MenuId.EditorContextShare,
     group: CellOverflowToolbarGroups.Share
 });

package/vscode/src/vs/workbench/contrib/notebook/browser/controller/foldingController.js

@@ -11,8 +11,7 @@ import { KeyMod as KeyMod$1, KeyCode } from '../../../../../base/common/keyCodes
 import { KeybindingWeight } from '../../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { IEditorService } from '../../../../services/editor/common/editorService.service.js';
 import { NOTEBOOK_ACTIONS_CATEGORY } from './coreActions.js';
-import { localize2WithPath, localizeWithPath } from '../../../../../nls.js';
-const _moduleId = "vs/workbench/contrib/notebook/browser/controller/foldingController";
+import { localize2, localize } from '../../../../../nls.js';
 class FoldingController extends Disposable {
     static { this.id = 'workbench.notebook.foldingController'; }
     constructor(_notebookEditor) {
@@ -109,8 +108,8 @@ class FoldingController extends Disposable {
     }
 }
 registerNotebookContribution(FoldingController.id, FoldingController);
-const NOTEBOOK_FOLD_COMMAND_LABEL = ( localizeWithPath(_moduleId, 0, "Fold Cell"));
-const NOTEBOOK_UNFOLD_COMMAND_LABEL = ( localize2WithPath(_moduleId, 1, "Unfold Cell"));
+const NOTEBOOK_FOLD_COMMAND_LABEL = ( localize(7952, "Fold Cell"));
+const NOTEBOOK_UNFOLD_COMMAND_LABEL = ( localize2(7953, "Unfold Cell"));
 const FOLDING_COMMAND_ARGS = {
     args: [{
             isOptional: true,
@@ -140,7 +139,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'notebook.fold',
-            title: ( localize2WithPath(_moduleId, 0, "Fold Cell")),
+            title: ( localize2(7953, "Fold Cell")),
             category: NOTEBOOK_ACTIONS_CATEGORY,
             keybinding: {
                 when: ( (ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ContextKeyExpr.not(InputFocusedContextKey)))),

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

@@ -5,12 +5,11 @@ import '../../../../base/common/observableInternal/derived.js';
 import '../../../../base/common/observableInternal/autorun.js';
 import { observableFromEvent } from '../../../../base/common/observableInternal/utils.js';
 import '../../../../base/common/cancellation.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { AccessibilityVerbositySettingId } from '../../accessibility/browser/accessibilityConfiguration.js';
 import { AccessibilityCommandId } from '../../accessibility/common/accessibilityCommands.js';
 import { CellKind, NotebookCellExecutionState } from '../common/notebookCommon.js';
 import { NotebookExecutionType } from '../common/notebookExecutionStateService.js';
-const _moduleId = "vs/workbench/contrib/notebook/browser/notebookAccessibilityProvider";
 class NotebookAccessibilityProvider extends Disposable {
     constructor(notebookExecutionStateService, viewModel, keybindingService, configurationService) {
         super();
@@ -59,15 +58,14 @@ class NotebookAccessibilityProvider extends Disposable {
         const keybinding = this.keybindingService.lookupKeybinding(AccessibilityCommandId.OpenAccessibilityHelp)?.getLabel();
         if (this.configurationService.getValue(AccessibilityVerbositySettingId.Notebook)) {
             return keybinding
-                ? ( localizeWithPath(_moduleId, 0, "Notebook\nUse {0} for accessibility help", keybinding))
-                : ( localizeWithPath(
-                _moduleId,
-                1,
+                ? ( localize(10673, "Notebook\nUse {0} for accessibility help", keybinding))
+                : ( localize(
+                10674,
                 "Notebook\nRun the Open Accessibility Help command for more information",
                 keybinding
             ));
         }
-        return ( localizeWithPath(_moduleId, 2, "Notebook"));
+        return ( localize(10675, "Notebook"));
     }
     mergeEvents(last, e) {
         const viewModel = this.viewModel();

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

@@ -7,7 +7,7 @@ import { DisposableStore, MutableDisposable } from '../../../../base/common/life
 import { extname, isEqual } from '../../../../base/common/resources.js';
 import { generateUuid } from '../../../../base/common/uuid.js';
 import { ITextResourceConfigurationService } from '../../../../editor/common/services/textResourceConfiguration.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
 import { FileOperationResult, TooLargeFileOperationError, ByteSize } from '../../../../platform/files/common/files.js';
 import { IFileService } from '../../../../platform/files/common/files.service.js';
@@ -38,7 +38,6 @@ import { INotebookEditorWorkerService } from '../common/services/notebookWorkerS
 import { IPreferencesService } from '../../../services/preferences/common/preferences.service.js';
 import { StopWatch } from '../../../../base/common/stopwatch.js';
 var NotebookEditor_1;
-const _moduleId = "vs/workbench/contrib/notebook/browser/notebookEditor";
 const NOTEBOOK_EDITOR_VIEW_STATE_PREFERENCE_KEY = 'NotebookEditorViewState';
 let NotebookEditor = class NotebookEditor extends EditorPane {
     static { NotebookEditor_1 = this; }
@@ -183,25 +182,23 @@ let NotebookEditor = class NotebookEditor extends EditorPane {
             if (model === null) {
                 const knownProvider = this._notebookService.getViewTypeProvider(input.viewType);
                 if (!knownProvider) {
-                    throw ( (new Error(localizeWithPath(
-                        _moduleId,
-                        0,
+                    throw ( (new Error(localize(
+                        7863,
                         "Cannot open resource with notebook editor type '{0}', please check if you have the right extension installed and enabled.",
                         input.viewType
                     ))));
                 }
                 await this._extensionsWorkbenchService.whenInitialized;
                 const extensionInfo = this._extensionsWorkbenchService.local.find(e => e.identifier.id === knownProvider);
-                throw createEditorOpenError(( (new Error(localizeWithPath(
-                    _moduleId,
-                    1,
+                throw createEditorOpenError(( (new Error(localize(
+                    7864,
                     "Cannot open resource with notebook editor type '{0}', please check if you have the right extension installed and enabled.",
                     input.viewType
                 )))), [
                     toAction({
                         id: 'workbench.notebook.action.installOrEnableMissing', label: extensionInfo
-                            ? localizeWithPath(_moduleId, 2, "Enable extension for '{0}'", input.viewType)
-                            : localizeWithPath(_moduleId, 3, "Install extension for '{0}'", input.viewType),
+                            ? localize(7865, "Enable extension for '{0}'", input.viewType)
+                            : localize(7866, "Install extension for '{0}'", input.viewType),
                         run: async () => {
                             const d = this._notebookService.onAddViewType(viewType => {
                                 if (viewType === input.viewType) {
@@ -225,7 +222,7 @@ let NotebookEditor = class NotebookEditor extends EditorPane {
                         }
                     }),
                     toAction({
-                        id: 'workbench.notebook.action.openAsText', label: localizeWithPath(_moduleId, 4, "Open As Text"), run: async () => {
+                        id: 'workbench.notebook.action.openAsText', label: localize(7867, "Open As Text"), run: async () => {
                             const backup = await this._workingCopyBackupService.resolve({ resource: input.resource, typeId: NotebookWorkingCopyTypeIdentifier.create(input.viewType) });
                             if (backup) {
                                 const contents = await streamToBuffer(backup.value);
@@ -267,17 +264,15 @@ let NotebookEditor = class NotebookEditor extends EditorPane {
             if (e.fileOperationResult === FileOperationResult.FILE_TOO_LARGE) {
                 let message;
                 if (e instanceof TooLargeFileOperationError) {
-                    message = ( localizeWithPath(
-                        _moduleId,
-                        5,
+                    message = ( localize(
+                        7868,
                         "The notebook is not displayed in the notebook editor because it is very large ({0}).",
                         ByteSize.formatSize(e.size)
                     ));
                 }
                 else {
-                    message = ( localizeWithPath(
-                        _moduleId,
-                        6,
+                    message = ( localize(
+                        7869,
                         "The notebook is not displayed in the notebook editor because it is very large."
                     ));
                 }
@@ -285,7 +280,7 @@ let NotebookEditor = class NotebookEditor extends EditorPane {
             }
             const error = createEditorOpenError(e instanceof Error ? e : ( (new Error((e ? e.message : '')))), [
                 toAction({
-                    id: 'workbench.notebook.action.openInTextEditor', label: ( localizeWithPath(_moduleId, 7, "Open in Text Editor")), run: async () => {
+                    id: 'workbench.notebook.action.openInTextEditor', label: ( localize(7870, "Open in Text Editor")), run: async () => {
                         const activeEditorPane = this._editorService.activeEditorPane;
                         if (!activeEditorPane) {
                             return;