@codingame/monaco-vscode-notebook-service-override 37.2.0 → 37.3.1

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

@@ -6,10 +6,10 @@ import { registerAction2, Action2, MenuId } from '@codingame/monaco-vscode-api/v
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { ActiveEditorContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contextkeys';
-import { SideBySideDiffElementViewModel } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/notebook/browser/diff/diffElementViewModel';
-import { NOTEBOOK_DIFF_HAS_UNCHANGED_CELLS, NOTEBOOK_DIFF_UNCHANGED_CELLS_HIDDEN, NOTEBOOK_DIFF_ITEM_KIND, NOTEBOOK_DIFF_ITEM_DIFF_STATE, NOTEBOOK_DIFF_METADATA, NOTEBOOK_DIFF_CELL_PROPERTY, NOTEBOOK_DIFF_CELL_PROPERTY_EXPANDED, NOTEBOOK_DIFF_CELL_IGNORE_WHITESPACE_KEY, NOTEBOOK_DIFF_CELL_INPUT } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditorBrowser';
-import { NotebookTextDiffEditor } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditor';
-import { openAsTextIcon, revertIcon, renderOutputIcon, toggleWhitespace, previousChangeIcon, nextChangeIcon } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/notebook/browser/notebookIcons';
+import { SideBySideDiffElementViewModel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/diff/diffElementViewModel';
+import { NOTEBOOK_DIFF_HAS_UNCHANGED_CELLS, NOTEBOOK_DIFF_UNCHANGED_CELLS_HIDDEN, NOTEBOOK_DIFF_ITEM_KIND, NOTEBOOK_DIFF_ITEM_DIFF_STATE, NOTEBOOK_DIFF_METADATA, NOTEBOOK_DIFF_CELL_PROPERTY, NOTEBOOK_DIFF_CELL_PROPERTY_EXPANDED, NOTEBOOK_DIFF_CELL_IGNORE_WHITESPACE_KEY, NOTEBOOK_DIFF_CELL_INPUT } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditorBrowser';
+import { NotebookTextDiffEditor } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditor';
+import { openAsTextIcon, revertIcon, renderOutputIcon, toggleWhitespace, previousChangeIcon, nextChangeIcon } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/notebookIcons';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/registry/common/platform';
 import { Extensions } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configurationRegistry';
@@ -29,7 +29,7 @@ registerAction2(class extends Action2 {
         super({
             id: "notebook.diff.openFile",
             icon: Codicon.goToFile,
-            title: ( localize2(14596, "Open File")),
+            title: ( localize2(16735, "Open File")),
             precondition: ( ContextKeyExpr.or(( ActiveEditorContext.isEqualTo(NotebookTextDiffEditor.ID)), ( ActiveEditorContext.isEqualTo(NotebookMultiTextDiffEditor.ID)))),
             menu: [{
                 id: MenuId.EditorTitle,
@@ -57,7 +57,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: "notebook.diff.cell.toggleCollapseUnchangedRegions",
-            title: ( localize2(14597, "Toggle Collapse Unchanged Regions")),
+            title: ( localize2(16736, "Toggle Collapse Unchanged Regions")),
             icon: Codicon.map,
             toggled: ( ContextKeyExpr.has("config.diffEditor.hideUnchangedRegions.enabled")),
             precondition: ( ActiveEditorContext.isEqualTo(NotebookTextDiffEditor.ID)),
@@ -79,7 +79,7 @@ registerAction2(class extends Action2 {
         super({
             id: "notebook.diff.switchToText",
             icon: openAsTextIcon,
-            title: ( localize2(14598, "Open Text Diff Editor")),
+            title: ( localize2(16737, "Open Text Diff Editor")),
             precondition: ( ContextKeyExpr.or(( ActiveEditorContext.isEqualTo(NotebookTextDiffEditor.ID)), ( ActiveEditorContext.isEqualTo(NotebookMultiTextDiffEditor.ID)))),
             menu: [{
                 id: MenuId.EditorTitle,
@@ -116,7 +116,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: "notebook.diffEditor.showUnchangedCells",
-            title: ( localize2(14599, "Show Unchanged Cells")),
+            title: ( localize2(16738, "Show Unchanged Cells")),
             icon: Codicon.unfold,
             precondition: ( ContextKeyExpr.and(( ActiveEditorContext.isEqualTo(NotebookMultiTextDiffEditor.ID)), ( ContextKeyExpr.has(NOTEBOOK_DIFF_HAS_UNCHANGED_CELLS.key)))),
             menu: {
@@ -141,7 +141,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: "notebook.diffEditor.hideUnchangedCells",
-            title: ( localize2(14600, "Hide Unchanged Cells")),
+            title: ( localize2(16739, "Hide Unchanged Cells")),
             icon: Codicon.fold,
             precondition: ( ContextKeyExpr.and(( ActiveEditorContext.isEqualTo(NotebookMultiTextDiffEditor.ID)), ( ContextKeyExpr.has(NOTEBOOK_DIFF_HAS_UNCHANGED_CELLS.key)))),
             menu: {
@@ -166,7 +166,7 @@ registerAction2(class GoToFileAction extends Action2 {
     constructor() {
         super({
             id: "notebook.diffEditor.2.goToCell",
-            title: ( localize2(14601, "Go To Cell")),
+            title: ( localize2(16740, "Go To Cell")),
             icon: Codicon.goToFile,
             menu: {
                 when: ( ContextKeyExpr.and(( ActiveEditorContext.isEqualTo(NotebookMultiTextDiffEditor.ID)), ( ContextKeyExpr.equals(NOTEBOOK_DIFF_ITEM_KIND.key, "Cell")), ( ContextKeyExpr.notEquals(NOTEBOOK_DIFF_ITEM_DIFF_STATE.key, "delete")))),
@@ -195,7 +195,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: "notebook.diff.revertMetadata",
-            title: ( localize(14602, "Revert Notebook Metadata")),
+            title: ( localize(16741, "Revert Notebook Metadata")),
             icon: revertIcon,
             f1: false,
             menu: {
@@ -220,7 +220,7 @@ registerAction2(class extends Action2 {
         }], true, undefined, () => undefined, undefined, true);
     }
 });
-const revertInput = ( localize(14603, "Revert Input"));
+const revertInput = ( localize(16742, "Revert Input"));
 registerAction2(class extends Action2 {
     constructor() {
         super({
@@ -259,7 +259,7 @@ registerAction2(class extends Action2 {
         }
     }
 });
-const revertOutputs = ( localize(14604, "Revert Outputs"));
+const revertOutputs = ( localize(16743, "Revert Outputs"));
 registerAction2(class extends Action2 {
     constructor() {
         super({
@@ -297,7 +297,7 @@ registerAction2(class extends Action2 {
         }
     }
 });
-const revertMetadata = ( localize(14605, "Revert Metadata"));
+const revertMetadata = ( localize(16744, "Revert Metadata"));
 registerAction2(class extends Action2 {
     constructor() {
         super({
@@ -381,7 +381,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: "notebook.diff.cell.switchOutputRenderingStyleToText",
-            title: ( localize(14606, "Switch Output Rendering")),
+            title: ( localize(16745, "Switch Output Rendering")),
             icon: renderOutputIcon,
             f1: false,
             menu: {
@@ -401,7 +401,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: "notebook.diff.cell.revertOutputs",
-            title: ( localize(14604, "Revert Outputs")),
+            title: ( localize(16743, "Revert Outputs")),
             icon: revertIcon,
             f1: false,
             menu: {
@@ -435,7 +435,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: "notebook.toggle.diff.cell.ignoreTrimWhitespace",
-            title: ( localize(14607, "Show Leading/Trailing Whitespace Differences")),
+            title: ( localize(16746, "Show Leading/Trailing Whitespace Differences")),
             icon: toggleWhitespace,
             f1: false,
             menu: {
@@ -523,19 +523,19 @@ class ToggleRenderAction extends Action2 {
 }
 registerAction2(class extends ToggleRenderAction {
     constructor() {
-        super("notebook.diff.showOutputs", ( localize2(14608, "Show Outputs Differences")), ( ContextKeyExpr.or(( ActiveEditorContext.isEqualTo(NotebookTextDiffEditor.ID)), ( ActiveEditorContext.isEqualTo(NotebookMultiTextDiffEditor.ID)))), ( ContextKeyExpr.notEquals("config.notebook.diff.ignoreOutputs", true)), 2, true, undefined);
+        super("notebook.diff.showOutputs", ( localize2(16747, "Show Outputs Differences")), ( ContextKeyExpr.or(( ActiveEditorContext.isEqualTo(NotebookTextDiffEditor.ID)), ( ActiveEditorContext.isEqualTo(NotebookMultiTextDiffEditor.ID)))), ( ContextKeyExpr.notEquals("config.notebook.diff.ignoreOutputs", true)), 2, true, undefined);
     }
 });
 registerAction2(class extends ToggleRenderAction {
     constructor() {
-        super("notebook.diff.showMetadata", ( localize2(14609, "Show Metadata Differences")), ( ContextKeyExpr.or(( ActiveEditorContext.isEqualTo(NotebookTextDiffEditor.ID)), ( ActiveEditorContext.isEqualTo(NotebookMultiTextDiffEditor.ID)))), ( ContextKeyExpr.notEquals("config.notebook.diff.ignoreMetadata", true)), 1, undefined, true);
+        super("notebook.diff.showMetadata", ( localize2(16748, "Show Metadata Differences")), ( ContextKeyExpr.or(( ActiveEditorContext.isEqualTo(NotebookTextDiffEditor.ID)), ( ActiveEditorContext.isEqualTo(NotebookMultiTextDiffEditor.ID)))), ( ContextKeyExpr.notEquals("config.notebook.diff.ignoreMetadata", true)), 1, undefined, true);
     }
 });
 registerAction2(class extends Action2 {
     constructor() {
         super({
             id: "notebook.diff.action.previous",
-            title: ( localize(14610, "Show Previous Change")),
+            title: ( localize(16749, "Show Previous Change")),
             icon: previousChangeIcon,
             f1: false,
             keybinding: {
@@ -563,7 +563,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: "notebook.diff.action.next",
-            title: ( localize(14611, "Show Next Change")),
+            title: ( localize(16750, "Show Next Change")),
             icon: nextChangeIcon,
             f1: false,
             keybinding: {
@@ -591,7 +591,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: "notebook.diff.inline.toggle",
-            title: ( localize(14612, "Toggle Inline View")),
+            title: ( localize(16751, "Toggle Inline View")),
             menu: {
                 id: MenuId.EditorTitle,
                 group: "1_diff",
@@ -617,18 +617,18 @@ registerAction2(class extends Action2 {
         "notebook.diff.ignoreMetadata": {
             type: "boolean",
             default: false,
-            markdownDescription: ( localize(14613, "Hide Metadata Differences"))
+            markdownDescription: ( localize(16752, "Hide Metadata Differences"))
         },
         "notebook.diff.ignoreOutputs": {
             type: "boolean",
             default: false,
-            markdownDescription: ( localize(14614, "Hide Outputs Differences"))
+            markdownDescription: ( localize(16753, "Hide Outputs Differences"))
         },
         "notebook.diff.experimental.toggleInline": {
             type: "boolean",
             default: typeof product.quality === "string" && product.quality !== "stable",
             markdownDescription: ( localize(
-                14615,
+                16754,
                 "Enable the command to toggle the experimental notebook inline diff editor."
             ))
         }

package/vscode/src/vs/workbench/contrib/notebook/browser/diff/notebookMultiDiffEditor.d.ts

@@ -11,11 +11,11 @@ import { INotebookEditorWorkerService } from "@codingame/monaco-vscode-api/vscod
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { EditorPane } from "@codingame/monaco-vscode-api/vscode/vs/workbench/browser/parts/editor/editorPane";
 import { IMultiDiffEditorOptions } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/multiDiffEditor";
-import { NotebookOptions } from "@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/notebook/browser/notebookOptions";
+import { NotebookOptions } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/notebookOptions";
 import { INotebookService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.service";
 import { NotebookMultiDiffEditorInput } from "./notebookMultiDiffEditorInput.js";
 import type { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
-import { type IDiffElementViewModelBase } from "@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/notebook/browser/diff/diffElementViewModel";
+import { type IDiffElementViewModelBase } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/diff/diffElementViewModel";
 export declare class NotebookMultiTextDiffEditor extends EditorPane {
     private readonly instantiationService;
     private readonly _parentContextKeyService;

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

@@ -14,7 +14,7 @@ import { DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/com
 import { EditorPane } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/parts/editor/editorPane';
 import { NOTEBOOK_MULTI_DIFF_EDITOR_ID, CellUri } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { FontMeasurements } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/config/fontMeasurements';
-import { NotebookOptions } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/notebook/browser/notebookOptions';
+import { NotebookOptions } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/notebookOptions';
 import { INotebookService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.service';
 import { NotebookMultiDiffEditorWidgetInput } from './notebookMultiDiffEditorInput.js';
 import { MultiDiffEditorWidget } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/widget/multiDiffEditor/multiDiffEditorWidget';
@@ -24,11 +24,11 @@ import { INotebookDocumentService } from '@codingame/monaco-vscode-api/vscode/vs
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
 import { getIconClassesForLanguageId } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/getIconClasses';
-import { NotebookDiffViewModel } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/notebook/browser/diff/notebookDiffViewModel';
-import { NotebookDiffEditorEventDispatcher } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/notebook/browser/diff/eventDispatcher';
-import { NOTEBOOK_DIFF_CELLS_COLLAPSED, NOTEBOOK_DIFF_HAS_UNCHANGED_CELLS, NOTEBOOK_DIFF_UNCHANGED_CELLS_HIDDEN } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditorBrowser';
+import { NotebookDiffViewModel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/diff/notebookDiffViewModel';
+import { NotebookDiffEditorEventDispatcher } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/diff/eventDispatcher';
+import { NOTEBOOK_DIFF_CELLS_COLLAPSED, NOTEBOOK_DIFF_HAS_UNCHANGED_CELLS, NOTEBOOK_DIFF_UNCHANGED_CELLS_HIDDEN } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditorBrowser';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
-import { DiffEditorHeightCalculatorService } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/notebook/browser/diff/editorHeightCalculator';
+import { DiffEditorHeightCalculatorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/diff/editorHeightCalculator';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 import { transaction } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/transaction';
 
@@ -258,15 +258,15 @@ let WorkbenchUIElementFactory = class WorkbenchUIElementFactory {
                         const notebookDocument = uri.scheme === Schemas.vscodeNotebookCell ? that.notebookDocumentService.getNotebook(uri) : undefined;
                         const cellIndex = Schemas.vscodeNotebookCell ? that.notebookDocumentService.getNotebook(uri)?.getCellIndex(uri) : undefined;
                         if (notebookDocument && cellIndex !== undefined) {
-                            name = ( localize(14623, "Cell {0}", `${cellIndex + 1}`));
+                            name = ( localize(16762, "Cell {0}", `${cellIndex + 1}`));
                             const nb = notebookDocument ? that.notebookService.getNotebookTextModel(notebookDocument?.uri) : undefined;
                             const cellLanguage = nb && cellIndex !== undefined ? nb.cells[cellIndex].language : undefined;
                             extraClasses = cellLanguage ? getIconClassesForLanguageId(cellLanguage) : undefined;
                         }
                     } else if (uri.scheme === Schemas.vscodeNotebookCellMetadata || uri.scheme === Schemas.vscodeNotebookCellMetadataDiff) {
-                        description = ( localize(14624, "Metadata"));
+                        description = ( localize(16763, "Metadata"));
                     } else if (uri.scheme === Schemas.vscodeNotebookCellOutput || uri.scheme === Schemas.vscodeNotebookCellOutputDiff) {
-                        description = ( localize(14625, "Output"));
+                        description = ( localize(16764, "Output"));
                     }
                     label.element.setResource({
                         name,

package/vscode/src/vs/workbench/contrib/notebook/browser/diff/notebookMultiDiffEditorInput.d.ts

@@ -5,7 +5,7 @@ import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/pl
 import { MultiDiffEditorInput } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput";
 import { IResolvedMultiDiffSource, type IMultiDiffSourceResolver } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService";
 import { IMultiDiffSourceResolverService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService.service";
-import { NotebookDiffViewModel } from "@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/notebook/browser/diff/notebookDiffViewModel";
+import { NotebookDiffViewModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/diff/notebookDiffViewModel";
 import { NotebookDiffEditorInput } from "../../common/notebookDiffEditorInput.js";
 import { ITextFileService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/textfile/common/textfiles.service";
 export declare const NotebookMultiDiffEditorScheme = "multi-cell-notebook-diff-editor";