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

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

@@ -0,0 +1,208 @@
+import { localize } from 'vscode/vscode/vs/nls';
+import { DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
+import { IBulkEditService, ResourceTextEdit } from 'vscode/vscode/vs/editor/browser/services/bulkEditService';
+import { Range } from 'vscode/vscode/vs/editor/common/core/range';
+import { ITextModelService } from 'vscode/vscode/vs/editor/common/services/resolverService';
+import { Action2, registerAction2 } from 'vscode/vscode/vs/platform/actions/common/actions';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
+import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
+import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput.service';
+import { INotebookEditorService } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/services/notebookEditorService.service';
+import { NotebookSetting } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
+import { isNotebookEditorInput } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookEditorInput';
+import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
+
+class NotebookIndentUsingTabs extends Action2 {
+    static { this.ID = 'notebook.action.indentUsingTabs'; }
+    constructor() {
+        super({
+            id: NotebookIndentUsingTabs.ID,
+            title: ( localize(10686, "Indent Using Tabs")),
+            precondition: undefined,
+        });
+    }
+    run(accessor, ...args) {
+        changeNotebookIndentation(accessor, false, false);
+    }
+}
+class NotebookIndentUsingSpaces extends Action2 {
+    static { this.ID = 'notebook.action.indentUsingSpaces'; }
+    constructor() {
+        super({
+            id: NotebookIndentUsingSpaces.ID,
+            title: ( localize(10687, "Indent Using Spaces")),
+            precondition: undefined,
+        });
+    }
+    run(accessor, ...args) {
+        changeNotebookIndentation(accessor, true, false);
+    }
+}
+class NotebookChangeTabDisplaySize extends Action2 {
+    static { this.ID = 'notebook.action.changeTabDisplaySize'; }
+    constructor() {
+        super({
+            id: NotebookChangeTabDisplaySize.ID,
+            title: ( localize(10688, "Change Tab Display Size")),
+            precondition: undefined,
+        });
+    }
+    run(accessor, ...args) {
+        changeNotebookIndentation(accessor, true, true);
+    }
+}
+class NotebookIndentationToSpacesAction extends Action2 {
+    static { this.ID = 'notebook.action.convertIndentationToSpaces'; }
+    constructor() {
+        super({
+            id: NotebookIndentationToSpacesAction.ID,
+            title: ( localize(10689, "Convert Indentation to Spaces")),
+            precondition: undefined,
+        });
+    }
+    run(accessor, ...args) {
+        convertNotebookIndentation(accessor, true);
+    }
+}
+class NotebookIndentationToTabsAction extends Action2 {
+    static { this.ID = 'notebook.action.convertIndentationToTabs'; }
+    constructor() {
+        super({
+            id: NotebookIndentationToTabsAction.ID,
+            title: ( localize(10690, "Convert Indentation to Tabs")),
+            precondition: undefined,
+        });
+    }
+    run(accessor, ...args) {
+        convertNotebookIndentation(accessor, false);
+    }
+}
+function changeNotebookIndentation(accessor, insertSpaces, displaySizeOnly) {
+    const editorService = accessor.get(IEditorService);
+    const configurationService = accessor.get(IConfigurationService);
+    const notebookEditorService = accessor.get(INotebookEditorService);
+    const quickInputService = accessor.get(IQuickInputService);
+    const activeInput = editorService.activeEditorPane?.input;
+    const isNotebook = isNotebookEditorInput(activeInput);
+    if (!isNotebook) {
+        return;
+    }
+    const notebookEditor = notebookEditorService.retrieveExistingWidgetFromURI(activeInput.resource)?.value;
+    if (!notebookEditor) {
+        return;
+    }
+    const picks = ( ([1, 2, 3, 4, 5, 6, 7, 8].map(n => ({
+        id: ( (n.toString())),
+        label: ( (n.toString())),
+    }))));
+    const initialConfig = configurationService.getValue(NotebookSetting.cellEditorOptionsCustomizations);
+    const initialInsertSpaces = initialConfig['editor.insertSpaces'];
+    delete initialConfig['editor.indentSize'];
+    delete initialConfig['editor.tabSize'];
+    delete initialConfig['editor.insertSpaces'];
+    setTimeout(() => {
+        quickInputService.pick(picks, { placeHolder: ( localize(10691, "Select Tab Size for Current File")) }).then(pick => {
+            if (pick) {
+                const pickedVal = parseInt(pick.label, 10);
+                if (displaySizeOnly) {
+                    configurationService.updateValue(NotebookSetting.cellEditorOptionsCustomizations, {
+                        ...initialConfig,
+                        'editor.tabSize': pickedVal,
+                        'editor.indentSize': pickedVal,
+                        'editor.insertSpaces': initialInsertSpaces
+                    });
+                }
+                else {
+                    configurationService.updateValue(NotebookSetting.cellEditorOptionsCustomizations, {
+                        ...initialConfig,
+                        'editor.tabSize': pickedVal,
+                        'editor.indentSize': pickedVal,
+                        'editor.insertSpaces': insertSpaces
+                    });
+                }
+            }
+        });
+    }, 50 );
+}
+function convertNotebookIndentation(accessor, tabsToSpaces) {
+    const editorService = accessor.get(IEditorService);
+    const configurationService = accessor.get(IConfigurationService);
+    const logService = accessor.get(ILogService);
+    const textModelService = accessor.get(ITextModelService);
+    const notebookEditorService = accessor.get(INotebookEditorService);
+    const bulkEditService = accessor.get(IBulkEditService);
+    const activeInput = editorService.activeEditorPane?.input;
+    const isNotebook = isNotebookEditorInput(activeInput);
+    if (!isNotebook) {
+        return;
+    }
+    const notebookTextModel = notebookEditorService.retrieveExistingWidgetFromURI(activeInput.resource)?.value?.textModel;
+    if (!notebookTextModel) {
+        return;
+    }
+    const disposable = ( (new DisposableStore()));
+    try {
+        Promise.all(( (notebookTextModel.cells.map(async (cell) => {
+            const ref = await textModelService.createModelReference(cell.uri);
+            disposable.add(ref);
+            const textEditorModel = ref.object.textEditorModel;
+            const modelOpts = cell.textModel?.getOptions();
+            if (!modelOpts) {
+                return;
+            }
+            const edits = getIndentationEditOperations(textEditorModel, modelOpts.tabSize, tabsToSpaces);
+            bulkEditService.apply(edits, { label: ( localize(10692, "Convert Indentation")), code: 'undoredo.convertIndentation', });
+        })))).then(() => {
+            const initialConfig = configurationService.getValue(NotebookSetting.cellEditorOptionsCustomizations);
+            const initialIndentSize = initialConfig['editor.indentSize'];
+            const initialTabSize = initialConfig['editor.tabSize'];
+            delete initialConfig['editor.indentSize'];
+            delete initialConfig['editor.tabSize'];
+            delete initialConfig['editor.insertSpaces'];
+            configurationService.updateValue(NotebookSetting.cellEditorOptionsCustomizations, {
+                ...initialConfig,
+                'editor.tabSize': initialTabSize,
+                'editor.indentSize': initialIndentSize,
+                'editor.insertSpaces': tabsToSpaces
+            });
+            disposable.dispose();
+        });
+    }
+    catch {
+        logService.error('Failed to convert indentation to spaces for notebook cells.');
+    }
+}
+function getIndentationEditOperations(model, tabSize, tabsToSpaces) {
+    if (model.getLineCount() === 1 && model.getLineMaxColumn(1) === 1) {
+        return [];
+    }
+    let spaces = '';
+    for (let i = 0; i < tabSize; i++) {
+        spaces += ' ';
+    }
+    const spacesRegExp = ( (new RegExp(spaces, 'gi')));
+    const edits = [];
+    for (let lineNumber = 1, lineCount = model.getLineCount(); lineNumber <= lineCount; lineNumber++) {
+        let lastIndentationColumn = model.getLineFirstNonWhitespaceColumn(lineNumber);
+        if (lastIndentationColumn === 0) {
+            lastIndentationColumn = model.getLineMaxColumn(lineNumber);
+        }
+        if (lastIndentationColumn === 1) {
+            continue;
+        }
+        const originalIndentationRange = ( (new Range(lineNumber, 1, lineNumber, lastIndentationColumn)));
+        const originalIndentation = model.getValueInRange(originalIndentationRange);
+        const newIndentation = (tabsToSpaces
+            ? originalIndentation.replace(/\t/ig, spaces)
+            : originalIndentation.replace(spacesRegExp, '\t'));
+        edits.push(( (new ResourceTextEdit(model.uri, { range: originalIndentationRange, text: newIndentation }))));
+    }
+    return edits;
+}
+registerAction2(NotebookIndentUsingSpaces);
+registerAction2(NotebookIndentUsingTabs);
+registerAction2(NotebookChangeTabDisplaySize);
+registerAction2(NotebookIndentationToSpacesAction);
+registerAction2(NotebookIndentationToTabsAction);
+
+export { NotebookChangeTabDisplaySize, NotebookIndentUsingSpaces, NotebookIndentUsingTabs, NotebookIndentationToSpacesAction, NotebookIndentationToTabsAction };

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

@@ -1,4 +1,4 @@
-import { localize2WithPath, localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize2, localize } from 'vscode/vscode/vs/nls';
 import { Action2, MenuId, registerAction2 } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { NotebookOutlineContext } from '../contrib/outline/notebookOutline.js';
@@ -8,16 +8,15 @@ import { executeIcon } from 'vscode/vscode/vs/workbench/contrib/notebook/browser
 import { CellKind } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { OutlineTarget } from 'vscode/vscode/vs/workbench/services/outline/browser/outline';
 
-const _moduleId = "vs/workbench/contrib/notebook/browser/controller/sectionActions";
 class NotebookRunSingleCellInSection extends Action2 {
     constructor() {
         super({
             id: 'notebook.section.runSingleCell',
             title: {
-                ...( localize2WithPath(_moduleId, 0, "Run Cell")),
-                mnemonicTitle: ( localizeWithPath(_moduleId, 1, "&&Run Cell")),
+                ...( localize2(7888, "Run Cell")),
+                mnemonicTitle: ( localize(7889, "&&Run Cell")),
             },
-            shortTitle: ( localizeWithPath(_moduleId, 0, "Run Cell")),
+            shortTitle: ( localize(7889, "Run Cell")),
             icon: executeIcon,
             menu: [
                 {
@@ -46,10 +45,10 @@ class NotebookRunCellsInSection extends Action2 {
         super({
             id: 'notebook.section.runCells',
             title: {
-                ...( localize2WithPath(_moduleId, 2, "Run Cells In Section")),
-                mnemonicTitle: ( localizeWithPath(_moduleId, 3, "&&Run Cells In Section")),
+                ...( localize2(7890, "Run Cells In Section")),
+                mnemonicTitle: ( localize(7891, "&&Run Cells In Section")),
             },
-            shortTitle: ( localizeWithPath(_moduleId, 2, "Run Cells In Section")),
+            shortTitle: ( localize(7891, "Run Cells In Section")),
             menu: [
                 {
                     id: MenuId.NotebookStickyScrollContext,
@@ -92,10 +91,10 @@ class NotebookFoldSection extends Action2 {
         super({
             id: 'notebook.section.foldSection',
             title: {
-                ...( localize2WithPath(_moduleId, 4, "Fold Section")),
-                mnemonicTitle: ( localizeWithPath(_moduleId, 5, "&&Fold Section")),
+                ...( localize2(7892, "Fold Section")),
+                mnemonicTitle: ( localize(7893, "&&Fold Section")),
             },
-            shortTitle: ( localizeWithPath(_moduleId, 4, "Fold Section")),
+            shortTitle: ( localize(7893, "Fold Section")),
             menu: [
                 {
                     id: MenuId.NotebookOutlineActionMenu,
@@ -131,10 +130,10 @@ class NotebookExpandSection extends Action2 {
         super({
             id: 'notebook.section.expandSection',
             title: {
-                ...( localize2WithPath(_moduleId, 6, "Expand Section")),
-                mnemonicTitle: ( localizeWithPath(_moduleId, 7, "&&Expand Section")),
+                ...( localize2(7894, "Expand Section")),
+                mnemonicTitle: ( localize(7895, "&&Expand Section")),
             },
-            shortTitle: ( localizeWithPath(_moduleId, 6, "Expand Section")),
+            shortTitle: ( localize(7895, "Expand Section")),
             menu: [
                 {
                     id: MenuId.NotebookOutlineActionMenu,

package/vscode/src/vs/workbench/contrib/notebook/browser/diff/diffComponents.js

@@ -1207,11 +1207,10 @@ let ModifiedElement = class ModifiedElement extends AbstractElementRenderer {
                 inputChanged.set(false);
             }
         }));
-        const menu = this.menuService.createMenu(MenuId.NotebookDiffCellInputTitle, scopedContextKeyService);
+        const menu = this.menuService.getMenuActions(MenuId.NotebookDiffCellInputTitle, scopedContextKeyService, { shouldForwardArgs: true });
         const actions = [];
-        createAndFillInActionBarActions(menu, { shouldForwardArgs: true }, actions);
+        createAndFillInActionBarActions(menu, actions);
         this._toolbar.setActions(actions);
-        menu.dispose();
     }
     async _initializeSourceDiffEditor() {
         const originalCell = this.cell.original;

package/vscode/src/vs/workbench/contrib/notebook/browser/diff/diffElementOutputs.js

@@ -1,6 +1,6 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { $, addStandardDisposableListener, addDisposableListener, EventType, append } from 'vscode/vscode/vs/base/browser/dom';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { Disposable, DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
 import { SideBySideDiffElementViewModel } from './diffElementViewModel.js';
 import { DiffSide } from './notebookDiffEditorBrowser.js';
@@ -12,7 +12,6 @@ import { StandardKeyboardEvent } from 'vscode/vscode/vs/base/browser/keyboardEve
 import { KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
 import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput.service';
 
-const _moduleId = "vs/workbench/contrib/notebook/browser/diff/diffElementOutputs";
 class OutputElement extends Disposable {
     constructor(_notebookEditor, _notebookTextModel, _notebookService, _quickInputService, _diffElementViewModel, _diffSide, _nestedCell, _outputContainer, output) {
         super();
@@ -37,9 +36,8 @@ class OutputElement extends Disposable {
             const mimeTypePicker = $('.multi-mimetype-output');
             mimeTypePicker.classList.add(...ThemeIcon.asClassNameArray(mimetypeIcon));
             mimeTypePicker.tabIndex = 0;
-            mimeTypePicker.title = ( localizeWithPath(
-                _moduleId,
-                0,
+            mimeTypePicker.title = ( localize(
+                11533,
                 "Choose a different output mimetype, available mimetypes: {0}",
                 ( (mimeTypes.map(mimeType => mimeType.mimeType))).join(', ')
             ));
@@ -86,14 +84,13 @@ class OutputElement extends Disposable {
     }
     _renderMissingRenderer(viewModel, preferredMimeType) {
         if (!viewModel.model.outputs.length) {
-            return this._renderMessage(viewModel, ( localizeWithPath(_moduleId, 1, "Cell has no output")));
+            return this._renderMessage(viewModel, ( localize(11534, "Cell has no output")));
         }
         if (!preferredMimeType) {
             const mimeTypes = ( (viewModel.model.outputs.map(op => op.mime)));
             const mimeTypesMessage = mimeTypes.join(', ');
-            return this._renderMessage(viewModel, ( localizeWithPath(
-                _moduleId,
-                2,
+            return this._renderMessage(viewModel, ( localize(
+                11535,
                 "No renderer could be found for output. It has the following mimetypes: {0}",
                 mimeTypesMessage
             )));
@@ -122,18 +119,17 @@ class OutputElement extends Disposable {
             index: index,
             picked: index === currIndex,
             detail: this.generateRendererInfo(mimeType.rendererId),
-            description: index === currIndex ? ( localizeWithPath(_moduleId, 3, "Currently Active")) : undefined
+            description: index === currIndex ? ( localize(11536, "Currently Active")) : undefined
         }))));
         const picker = this._quickInputService.createQuickPick();
         picker.items = items;
         picker.activeItems = items.filter(item => !!item.picked);
         picker.placeholder = items.length !== mimeTypes.length
-            ? ( localizeWithPath(
-            _moduleId,
-            4,
+            ? ( localize(
+            11537,
             "Select mimetype to render for current output. Rich mimetypes are available only when the notebook is trusted"
         ))
-            : ( localizeWithPath(_moduleId, 5, "Select mimetype to render for current output"));
+            : ( localize(11538, "Select mimetype to render for current output"));
         const pick = await ( (new Promise(resolve => {
             picker.onDidAccept(() => {
                 resolve(picker.selectedItems.length === 1 ? picker.selectedItems[0].index : undefined);
@@ -163,7 +159,7 @@ class OutputElement extends Disposable {
             const displayName = renderInfo.displayName !== '' ? renderInfo.displayName : renderInfo.id;
             return `${displayName} (${renderInfo.extensionId.value})`;
         }
-        return ( localizeWithPath(_moduleId, 6, "built-in"));
+        return ( localize(11539, "built-in"));
     }
     getCellOutputCurrentIndex() {
         return this._diffElementViewModel.getNestedCellViewModel(this._diffSide).outputs.indexOf(this.output.model);

package/vscode/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffActions.js

@@ -1,5 +1,5 @@
 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, Action2, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
@@ -16,13 +16,12 @@ import { KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/ke
 import { KeyMod, KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
 import { CellEditType, NOTEBOOK_DIFF_EDITOR_ID } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 
-const _moduleId = "vs/workbench/contrib/notebook/browser/diff/notebookDiffActions";
 registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'notebook.diff.switchToText',
             icon: openAsTextIcon,
-            title: ( localize2WithPath(_moduleId, 0, 'Open Text Diff Editor')),
+            title: ( localize2(8042, 'Open Text Diff Editor')),
             precondition: ( (ActiveEditorContext.isEqualTo(NotebookTextDiffEditor.ID))),
             menu: [{
                     id: MenuId.EditorTitle,
@@ -52,7 +51,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'notebook.diff.cell.revertMetadata',
-            title: ( localizeWithPath(_moduleId, 1, "Revert Metadata")),
+            title: ( localize(8043, "Revert Metadata")),
             icon: revertIcon,
             f1: false,
             menu: {
@@ -78,7 +77,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'notebook.diff.cell.switchOutputRenderingStyleToText',
-            title: ( localizeWithPath(_moduleId, 2, "Switch Output Rendering")),
+            title: ( localize(8044, "Switch Output Rendering")),
             icon: renderOutputIcon,
             f1: false,
             menu: {
@@ -98,7 +97,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'notebook.diff.cell.revertOutputs',
-            title: ( localizeWithPath(_moduleId, 3, "Revert Outputs")),
+            title: ( localize(8045, "Revert Outputs")),
             icon: revertIcon,
             f1: false,
             menu: {
@@ -130,7 +129,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'notebook.diff.cell.revertInput',
-            title: ( localizeWithPath(_moduleId, 4, "Revert Input")),
+            title: ( localize(8046, "Revert Input")),
             icon: revertIcon,
             f1: false,
             menu: {
@@ -189,19 +188,19 @@ class ToggleRenderAction extends Action2 {
 }
 registerAction2(class extends ToggleRenderAction {
     constructor() {
-        super('notebook.diff.showOutputs', ( localize2WithPath(_moduleId, 5, 'Show Outputs Differences')), ( (ActiveEditorContext.isEqualTo(NotebookTextDiffEditor.ID))), ( (ContextKeyExpr.notEquals('config.notebook.diff.ignoreOutputs', true))), 2, true, undefined);
+        super('notebook.diff.showOutputs', ( localize2(8047, 'Show Outputs Differences')), ( (ActiveEditorContext.isEqualTo(NotebookTextDiffEditor.ID))), ( (ContextKeyExpr.notEquals('config.notebook.diff.ignoreOutputs', true))), 2, true, undefined);
     }
 });
 registerAction2(class extends ToggleRenderAction {
     constructor() {
-        super('notebook.diff.showMetadata', ( localize2WithPath(_moduleId, 6, 'Show Metadata Differences')), ( (ActiveEditorContext.isEqualTo(NotebookTextDiffEditor.ID))), ( (ContextKeyExpr.notEquals('config.notebook.diff.ignoreMetadata', true))), 1, undefined, true);
+        super('notebook.diff.showMetadata', ( localize2(8048, 'Show Metadata Differences')), ( (ActiveEditorContext.isEqualTo(NotebookTextDiffEditor.ID))), ( (ContextKeyExpr.notEquals('config.notebook.diff.ignoreMetadata', true))), 1, undefined, true);
     }
 });
 registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'notebook.diff.action.previous',
-            title: ( localizeWithPath(_moduleId, 7, "Show Previous Change")),
+            title: ( localize(8049, "Show Previous Change")),
             icon: previousChangeIcon,
             f1: false,
             keybinding: {
@@ -229,7 +228,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'notebook.diff.action.next',
-            title: ( localizeWithPath(_moduleId, 8, "Show Next Change")),
+            title: ( localize(8050, "Show Next Change")),
             icon: nextChangeIcon,
             f1: false,
             keybinding: {
@@ -261,12 +260,12 @@ registerAction2(class extends Action2 {
         'notebook.diff.ignoreMetadata': {
             type: 'boolean',
             default: false,
-            markdownDescription: ( localizeWithPath(_moduleId, 9, "Hide Metadata Differences"))
+            markdownDescription: ( localize(8051, "Hide Metadata Differences"))
         },
         'notebook.diff.ignoreOutputs': {
             type: 'boolean',
             default: false,
-            markdownDescription: ( localizeWithPath(_moduleId, 10, "Hide Outputs Differences"))
+            markdownDescription: ( localize(8052, "Hide Outputs Differences"))
         },
     }
 });

package/vscode/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditor.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 { $ as $$1, append, addStandardDisposableGenericMouseDownListener, addStandardDisposableGenericMouseUpListener, scheduleAtNextAnimationFrame } from 'vscode/vscode/vs/base/browser/dom';
 import { findLastIdx } from 'vscode/vscode/vs/base/common/arraysFind';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
@@ -45,7 +45,6 @@ import { NotebookDiffOverviewRuler } from './notebookDiffOverviewRuler.js';
 import { registerZIndex, ZIndex } from 'vscode/vscode/vs/platform/layout/browser/zIndexRegistry';
 
 var NotebookTextDiffEditor_1;
-const _moduleId = "vs/workbench/contrib/notebook/browser/diff/notebookDiffEditor";
 const $ = $$1;
 class NotebookDiffEditorSelection {
     constructor(selections) {
@@ -241,7 +240,7 @@ let NotebookTextDiffEditor = class NotebookTextDiffEditor extends EditorPane {
             accessibilityProvider: {
                 getAriaLabel() { return null; },
                 getWidgetAriaLabel() {
-                    return ( localizeWithPath(_moduleId, 0, "Notebook Text Diff"));
+                    return ( localize(7871, "Notebook Text Diff"));
                 }
             },
         });