@codingame/monaco-vscode-api 36.2.7 → 37.0.0

package/vscode/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput.js

@@ -1,7 +1,7 @@
 
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { LazyStatefulPromise, raceTimeout } from '../../../../base/common/async.js';
-import { BugIndicatingError, onUnexpectedError } from '../../../../base/common/errors.js';
+import { BugIndicatingError, CancellationError, onUnexpectedError } from '../../../../base/common/errors.js';
 import { ValueWithChangeEvent, Event } from '../../../../base/common/event.js';
 import { DisposableStore, Disposable } from '../../../../base/common/lifecycle.js';
 import { parse } from '../../../../base/common/marshalling.js';
@@ -11,6 +11,7 @@ import '../../../../base/common/observableInternal/index.js';
 import { isDefined, isObject } from '../../../../base/common/types.js';
 import { URI } from '../../../../base/common/uri.js';
 import { RefCounted } from '../../../../editor/browser/widget/diffEditor/utils.js';
+import { DiffItemSource } from '../../../../editor/browser/widget/multiDiffEditor/model.js';
 import { MultiDiffEditorViewModel } from '../../../../editor/browser/widget/multiDiffEditor/multiDiffEditorViewModel.js';
 import { ITextModelService } from '../../../../editor/common/services/resolverService.service.js';
 import { ITextResourceConfigurationService } from '../../../../editor/common/services/textResourceConfiguration.service.js';
@@ -21,6 +22,7 @@ import { EditorInputCapabilities, DEFAULT_EDITOR_ASSOCIATION } from '../../../co
 import { EditorInput } from '../../../common/editor/editorInput.js';
 import { RegisteredEditorPriority } from '../../../services/editor/common/editorResolverService.js';
 import { IEditorResolverService } from '../../../services/editor/common/editorResolverService.service.js';
+import { TextFileOperationError, TextFileOperationResult } from '../../../services/textfile/common/textfiles.js';
 import { ITextFileService } from '../../../services/textfile/common/textfiles.service.js';
 import { MultiDiffEditorIcon } from './icons.contribution.js';
 import { MultiDiffEditorItem } from './multiDiffSourceResolverService.js';
@@ -35,6 +37,9 @@ import { observableValue } from '../../../../base/common/observableInternal/obse
 import { observableFromEvent } from '../../../../base/common/observableInternal/observables/observableFromEvent.js';
 
 var MultiDiffEditorInput_1;
+function isBinaryTextFileOperationError(error) {
+    return TextFileOperationError.isTextFileOperationError(error) && error.textFileOperationResult === TextFileOperationResult.FILE_IS_BINARY;
+}
 let MultiDiffEditorInput = class MultiDiffEditorInput extends EditorInput {
     static {
         MultiDiffEditorInput_1 = this;
@@ -105,12 +110,23 @@ let MultiDiffEditorInput = class MultiDiffEditorInput extends EditorInput {
         this._textFileService = _textFileService;
         this._name = "";
         this._viewModel = ( new LazyStatefulPromise(async () => {
-            const model = await this._createModel();
-            this._register(model);
-            const vm = ( new MultiDiffEditorViewModel(model, this._instantiationService));
-            this._register(vm);
-            await raceTimeout(vm.waitForDiffOr1s(), 1000);
-            return vm;
+            const store = ( new DisposableStore());
+            try {
+                const model = store.add(await this._createModel());
+                if (this._store.isDisposed) {
+                    throw ( new CancellationError());
+                }
+                const vm = store.add(( new MultiDiffEditorViewModel(model, this._instantiationService)));
+                await raceTimeout(vm.waitForDiffOr1s(), 1000);
+                if (this._store.isDisposed) {
+                    throw ( new CancellationError());
+                }
+                this._register(store);
+                return vm;
+            } catch (error) {
+                store.dispose();
+                throw error;
+            }
         }));
         this._resolvedSource = ( new ObservableLazyPromise(async () => {
             const source = this.initialResources ? {
@@ -118,7 +134,8 @@ let MultiDiffEditorInput = class MultiDiffEditorInput extends EditorInput {
             } : await this._multiDiffSourceResolverService.resolve(this.multiDiffSource);
             return {
                 source,
-                resources: source ? observableFromValueWithChangeEvent(this, source.resources) : constObservable([])
+                resources: source ? observableFromValueWithChangeEvent(this, source.resources) : constObservable([]),
+                label: source?.label ? observableFromValueWithChangeEvent(this, source.label) : undefined
             };
         }));
         this.resources = derived(
@@ -145,11 +162,12 @@ let MultiDiffEditorInput = class MultiDiffEditorInput extends EditorInput {
         };
         this._register(autorun(reader => {
             const resources = this.resources.read(reader);
-            const label = this.label ?? ( localize(12350, "Multi Diff Editor"));
+            const resolvedSource = this._resolvedSource.cachedPromiseResult.read(reader)?.data;
+            const label = resolvedSource?.label?.read(reader) ?? this.label ?? ( localize(14113, "Multi Diff Editor"));
             if (resources && resources.length === 1) {
-                this._name = ( localize(12351, "{0} (1 file)", label));
+                this._name = ( localize(14114, "{0} (1 file)", label));
             } else if (resources) {
-                this._name = ( localize(12352, "{0} ({1} files)", label, resources.length));
+                this._name = ( localize(14115, "{0} ({1} files)", label, resources.length));
             } else {
                 this._name = label;
             }
@@ -173,7 +191,7 @@ let MultiDiffEditorInput = class MultiDiffEditorInput extends EditorInput {
         if (!value) {
             return;
         }
-        const target = value.modified ?? value.original;
+        const target = (value.modified ?? value.original)?.textModel;
         if (!target) {
             return;
         }
@@ -189,27 +207,43 @@ let MultiDiffEditorInput = class MultiDiffEditorInput extends EditorInput {
             let original;
             let modified;
             const multiDiffItemStore = ( new DisposableStore());
-            try {
-                [original, modified] = await Promise.all([
-                    r.originalUri ? this._textModelService.createModelReference(r.originalUri) : undefined,
-                    r.modifiedUri ? this._textModelService.createModelReference(r.modifiedUri) : undefined
-                ]);
+            const createModelReference = async resource => resource ? this._textModelService.createModelReference(resource) : undefined;
+            const [originalResult, modifiedResult] = await Promise.allSettled([createModelReference(r.originalUri), createModelReference(r.modifiedUri)]);
+            if (originalResult.status === "fulfilled") {
+                original = originalResult.value;
                 if (original) {
                     multiDiffItemStore.add(original);
                 }
+            }
+            if (modifiedResult.status === "fulfilled") {
+                modified = modifiedResult.value;
                 if (modified) {
                     multiDiffItemStore.add(modified);
                 }
-            } catch (e) {
-                console.error(e);
-                onUnexpectedError(e);
+            }
+            if (store.isDisposed) {
+                multiDiffItemStore.dispose();
+                return undefined;
+            }
+            const errorResults = [originalResult, modifiedResult].filter(result => result.status === "rejected");
+            const errorResult = errorResults.find(result => !isBinaryTextFileOperationError(result.reason));
+            if (errorResult) {
+                multiDiffItemStore.dispose();
+                console.error(errorResult.reason);
+                onUnexpectedError(errorResult.reason);
                 return undefined;
             }
+            const isBinary = errorResults.length > 0;
+            if (isBinary) {
+                multiDiffItemStore.clear();
+                original = undefined;
+                modified = undefined;
+            }
             const uri = (r.modifiedUri ?? r.originalUri);
             const result = {
                 multiDiffEditorItem: r,
-                original: original?.object.textEditorModel,
-                modified: modified?.object.textEditorModel,
+                original: r.originalUri ? ( new DiffItemSource(r.originalUri, original?.object.textEditorModel)) : undefined,
+                modified: r.modifiedUri ? ( new DiffItemSource(r.modifiedUri, modified?.object.textEditorModel)) : undefined,
                 contextKeys: r.contextKeys,
                 get options() {
                     return {
@@ -264,6 +298,9 @@ let MultiDiffEditorInput = class MultiDiffEditorInput extends EditorInput {
         const items = this._viewModel.currentValue?.items.get();
         if (items) {
             await Promise.all(( items.map(async item => {
+                if (item.isBinary) {
+                    return;
+                }
                 const model = item.diffEditorViewModel.model;
                 const handleOriginal = model.original.uri.scheme !== Schemas.untitled && this._textFileService.isDirty(model.original.uri);
                 await Promise.all([

package/vscode/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService.d.ts

@@ -9,6 +9,7 @@ export interface IMultiDiffSourceResolver {
 }
 export interface IResolvedMultiDiffSource {
     readonly resources: IValueWithChangeEvent<readonly MultiDiffEditorItem[]>;
+    readonly label?: IValueWithChangeEvent<string>;
     readonly contextKeys?: Record<string, ContextKeyValue>;
 }
 export declare class MultiDiffEditorItem {

package/vscode/src/vs/workbench/contrib/multiDiffEditor/browser/scmMultiDiffSourceResolver.d.ts

@@ -1,6 +1,6 @@
 import { Disposable } from "../../../../base/common/lifecycle.js";
 import { URI, UriComponents } from "../../../../base/common/uri.js";
-import { IMultiDiffEditorOptions } from "../../../../editor/browser/widget/multiDiffEditor/multiDiffEditorWidgetImpl.js";
+import { IMultiDiffEditorOptions } from "../../../../editor/common/multiDiffEditor.js";
 import { Action2 } from "../../../../platform/actions/common/actions.js";
 import { IInstantiationService, ServicesAccessor } from "../../../../platform/instantiation/common/instantiation.js";
 import { IActivityService } from "../../../services/activity/common/activity.service.js";

package/vscode/src/vs/workbench/contrib/multiDiffEditor/browser/scmMultiDiffSourceResolver.js

@@ -153,9 +153,13 @@ let ScmHistoryItemResolver = class ScmHistoryItemResolver {
             historyItemParentId,
             historyItemDisplayId
         } = ScmHistoryItemResolver_1.parseUri(uri);
-        const repository = this._scmService.getRepository(repositoryId);
-        const historyProvider = repository?.provider.historyProvider.get();
-        const historyItemChanges = (await historyProvider?.provideHistoryItemChanges(historyItemId, historyItemParentId)) ?? [];
+        const repository = await waitForState(observableFromEvent(
+            this,
+            this._scmService.onDidAddRepository,
+            () => this._scmService.getRepository(repositoryId)
+        ));
+        const historyProvider = await waitForState(repository.provider.historyProvider);
+        const historyItemChanges = (await historyProvider.provideHistoryItemChanges(historyItemId, historyItemParentId)) ?? [];
         const resources = ValueWithChangeEvent.const(( historyItemChanges.map(change => {
             const goToFileEditorTitle = change.modifiedUri ? `${basename(change.modifiedUri.fsPath)} (${historyItemDisplayId ?? historyItemId})` : undefined;
             return ( new MultiDiffEditorItem(
@@ -213,7 +217,7 @@ class OpenScmGroupAction extends Action2 {
     constructor() {
         super({
             id: "_workbench.openScmMultiDiffEditor",
-            title: ( localize2(12353, "Open Changes")),
+            title: ( localize2(14116, "Open Changes")),
             f1: false
         });
     }

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/find/findModel.d.ts

@@ -15,7 +15,7 @@ export declare class CellFindMatchModel implements CellFindMatchWithIndex {
     get contentMatches(): FindMatch[];
     get webviewMatches(): CellWebviewFindMatch[];
     constructor(cell: ICellViewModel, index: number, contentMatches: FindMatch[], webviewMatches: CellWebviewFindMatch[]);
-    getMatch(index: number): FindMatch | CellWebviewFindMatch;
+    getMatch(index: number): CellWebviewFindMatch | FindMatch;
 }
 export declare class FindModel extends Disposable {
     private readonly _notebookEditor;
@@ -35,7 +35,7 @@ export declare class FindModel extends Disposable {
     ensureFindMatches(): void;
     getCurrentMatch(): {
         cell: ICellViewModel;
-        match: FindMatch | CellWebviewFindMatch;
+        match: CellWebviewFindMatch | FindMatch;
         isModelMatch: boolean;
     };
     refreshCurrentMatch(focus: {

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

@@ -50,23 +50,23 @@ import { NotebookSetting, NotebookFindScopeType } from '../../../common/notebook
 import { AnchorAlignment } from '../../../../../../base/common/layout.js';
 
 registerCss(notebookFindReplaceWidget);
-const NLS_FIND_INPUT_LABEL = ( localize(12409, "Find"));
-const NLS_FIND_INPUT_PLACEHOLDER = ( localize(12410, "Find"));
-const NLS_PREVIOUS_MATCH_BTN_LABEL = ( localize(12411, "Previous Match"));
-const NLS_NEXT_MATCH_BTN_LABEL = ( localize(12412, "Next Match"));
-const NLS_TOGGLE_SELECTION_FIND_TITLE = ( localize(12413, "Find in Selection"));
-const NLS_CLOSE_BTN_LABEL = ( localize(12414, "Close"));
-const NLS_TOGGLE_REPLACE_MODE_BTN_LABEL = ( localize(12415, "Toggle Replace"));
-const NLS_REPLACE_INPUT_LABEL = ( localize(12416, "Replace"));
-const NLS_REPLACE_INPUT_PLACEHOLDER = ( localize(12417, "Replace"));
-const NLS_REPLACE_BTN_LABEL = ( localize(12418, "Replace"));
-const NLS_REPLACE_ALL_BTN_LABEL = ( localize(12419, "Replace All"));
-registerIcon("find-filter", Codicon.filter, ( localize(12420, "Icon for Find Filter in find widget.")));
-const NOTEBOOK_FIND_FILTERS = ( localize(12421, "Find Filters"));
-const NOTEBOOK_FIND_IN_MARKUP_INPUT = ( localize(12422, "Markdown Source"));
-const NOTEBOOK_FIND_IN_MARKUP_PREVIEW = ( localize(12423, "Rendered Markdown"));
-const NOTEBOOK_FIND_IN_CODE_INPUT = ( localize(12424, "Code Cell Source"));
-const NOTEBOOK_FIND_IN_CODE_OUTPUT = ( localize(12425, "Code Cell Output"));
+const NLS_FIND_INPUT_LABEL = ( localize(14172, "Find"));
+const NLS_FIND_INPUT_PLACEHOLDER = ( localize(14173, "Find"));
+const NLS_PREVIOUS_MATCH_BTN_LABEL = ( localize(14174, "Previous Match"));
+const NLS_NEXT_MATCH_BTN_LABEL = ( localize(14175, "Next Match"));
+const NLS_TOGGLE_SELECTION_FIND_TITLE = ( localize(14176, "Find in Selection"));
+const NLS_CLOSE_BTN_LABEL = ( localize(14177, "Close"));
+const NLS_TOGGLE_REPLACE_MODE_BTN_LABEL = ( localize(14178, "Toggle Replace"));
+const NLS_REPLACE_INPUT_LABEL = ( localize(14179, "Replace"));
+const NLS_REPLACE_INPUT_PLACEHOLDER = ( localize(14180, "Replace"));
+const NLS_REPLACE_BTN_LABEL = ( localize(14181, "Replace"));
+const NLS_REPLACE_ALL_BTN_LABEL = ( localize(14182, "Replace All"));
+registerIcon("find-filter", Codicon.filter, ( localize(14183, "Icon for Find Filter in find widget.")));
+const NOTEBOOK_FIND_FILTERS = ( localize(14184, "Find Filters"));
+const NOTEBOOK_FIND_IN_MARKUP_INPUT = ( localize(14185, "Markdown Source"));
+const NOTEBOOK_FIND_IN_MARKUP_PREVIEW = ( localize(14186, "Rendered Markdown"));
+const NOTEBOOK_FIND_IN_CODE_INPUT = ( localize(14187, "Code Cell Source"));
+const NOTEBOOK_FIND_IN_CODE_OUTPUT = ( localize(14188, "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/controller/cellOutputActions.js

@@ -22,7 +22,7 @@ registerAction2(class ShowAllOutputsAction extends Action2 {
     constructor() {
         super({
             id: "notebook.cellOuput.showEmptyOutputs",
-            title: ( localize(12486, "Show Empty Outputs")),
+            title: ( localize(14249, "Show Empty Outputs")),
             menu: {
                 id: MenuId.NotebookOutputToolbar,
                 when: ( ContextKeyExpr.and(NOTEBOOK_CELL_HAS_OUTPUTS, NOTEBOOK_CELL_HAS_HIDDEN_OUTPUTS))
@@ -47,7 +47,7 @@ registerAction2(class CopyCellOutputAction extends Action2 {
     constructor() {
         super({
             id: COPY_OUTPUT_COMMAND_ID,
-            title: ( localize(12487, "Copy Cell Output")),
+            title: ( localize(14250, "Copy Cell Output")),
             menu: {
                 id: MenuId.NotebookOutputToolbar,
                 when: NOTEBOOK_CELL_HAS_OUTPUTS
@@ -130,7 +130,7 @@ registerAction2(class OpenCellOutputInEditorAction extends Action2 {
     constructor() {
         super({
             id: OPEN_OUTPUT_COMMAND_ID,
-            title: ( localize(12488, "Open Cell Output in Text Editor")),
+            title: ( localize(14251, "Open Cell Output in Text Editor")),
             f1: false,
             category: NOTEBOOK_ACTIONS_CATEGORY,
             icon: copyIcon
@@ -159,7 +159,7 @@ registerAction2(class SaveCellOutputImageAction extends Action2 {
     constructor() {
         super({
             id: SAVE_OUTPUT_IMAGE_COMMAND_ID,
-            title: ( localize(12489, "Save Image")),
+            title: ( localize(14252, "Save Image")),
             menu: {
                 id: MenuId.NotebookOutputToolbar,
                 when: ( ContextKeyExpr.regex(NOTEBOOK_CELL_OUTPUT_MIMETYPE.key, /^image\//))
@@ -207,7 +207,7 @@ registerAction2(class SaveCellOutputImageAction extends Action2 {
         const uri = await fileDialogService.showSaveDialog({
             defaultUri,
             filters: [{
-                name: ( localize(12490, "Image Files")),
+                name: ( localize(14253, "Image Files")),
                 extensions: [extension]
             }]
         });
@@ -228,7 +228,7 @@ registerAction2(class OpenCellOutputInNotebookOutputEditorAction extends Action2
     constructor() {
         super({
             id: OPEN_OUTPUT_IN_OUTPUT_PREVIEW_COMMAND_ID,
-            title: ( localize(12491, "Open in Output Preview")),
+            title: ( localize(14254, "Open in Output Preview")),
             menu: {
                 id: MenuId.NotebookOutputToolbar,
                 when: ( ContextKeyExpr.and(NOTEBOOK_CELL_HAS_OUTPUTS, ( ContextKeyExpr.equals("config.notebook.output.openInPreviewEditor.enabled", true))))

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

@@ -15,7 +15,7 @@ import { MarshalledId } from '../../../../../base/common/marshallingIds.js';
 import { isEqual } from '../../../../../base/common/resources.js';
 
 const SELECT_KERNEL_ID = "_notebook.selectKernel";
-const NOTEBOOK_ACTIONS_CATEGORY = ( localize2(12506, "Notebook"));
+const NOTEBOOK_ACTIONS_CATEGORY = ( localize2(14269, "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;
@@ -321,18 +321,18 @@ const cellExecutionArgs = [{
 }];
 MenuRegistry.appendMenuItem(MenuId.NotebookCellTitle, {
     submenu: MenuId.NotebookCellInsert,
-    title: ( localize(12507, "Insert Cell")),
+    title: ( localize(14270, "Insert Cell")),
     group: CellOverflowToolbarGroups.Insert,
     when: ( NOTEBOOK_EDITOR_EDITABLE.isEqualTo(true))
 });
 MenuRegistry.appendMenuItem(MenuId.EditorContext, {
     submenu: MenuId.NotebookCellTitle,
-    title: ( localize(12508, "Notebook Cell")),
+    title: ( localize(14271, "Notebook Cell")),
     group: CellOverflowToolbarGroups.Insert,
     when: NOTEBOOK_EDITOR_FOCUSED
 });
 MenuRegistry.appendMenuItem(MenuId.NotebookCellTitle, {
-    title: ( localize(12509, "Share")),
+    title: ( localize(14272, "Share")),
     submenu: MenuId.EditorContextShare,
     group: CellOverflowToolbarGroups.Share
 });

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

@@ -128,8 +128,8 @@ class FoldingController extends Disposable {
     }
 }
 registerNotebookContribution(FoldingController.id, FoldingController);
-const NOTEBOOK_FOLD_COMMAND_LABEL = ( localize(12549, "Fold Cell"));
-const NOTEBOOK_UNFOLD_COMMAND_LABEL = ( localize2(12550, "Unfold Cell"));
+const NOTEBOOK_FOLD_COMMAND_LABEL = ( localize(14312, "Fold Cell"));
+const NOTEBOOK_UNFOLD_COMMAND_LABEL = ( localize2(14313, "Unfold Cell"));
 const FOLDING_COMMAND_ARGS = {
     args: [{
         isOptional: true,
@@ -159,7 +159,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: "notebook.fold",
-            title: ( localize2(12549, "Fold Cell")),
+            title: ( localize2(14312, "Fold Cell")),
             category: NOTEBOOK_ACTIONS_CATEGORY,
             keybinding: {
                 when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ContextKeyExpr.not(InputFocusedContextKey))),

package/vscode/src/vs/workbench/contrib/notebook/browser/media/notebook.css

@@ -74,12 +74,6 @@
 	width: 100%;
 }
 
-.monaco-workbench .notebookOverlay > .cell-list-container > .notebook-gutter > .monaco-list > .monaco-scrollable-element > .monaco-list-rows > .monaco-list-row {
-	cursor: default;
-	overflow: visible !important;
-	width: 100%;
-}
-
 .monaco-workbench .notebookOverlay > .cell-list-container > .monaco-list > .monaco-scrollable-element > .monaco-list-rows > .monaco-list-row .cell {
 	display: flex;
 	position: relative;
@@ -308,10 +302,6 @@
 	box-shadow: inset var(--vscode-shadow-sm);
 }
 
-.monaco-workbench .notebookOverlay .monaco-list .monaco-list-row .cell-insertion-indicator-top {
-	top: -15px;
-}
-
 .monaco-workbench .notebookOverlay > .cell-list-container > .cell-list-insertion-indicator {
 	position: absolute;
 	height: 2px;
@@ -656,7 +646,6 @@
 }
 
 /** Cell status bar */
-.monaco-workbench .notebookOverlay .cell-statusbar-container .cell-language-picker:hover,
 .monaco-workbench .notebookOverlay .cell-statusbar-container .cell-status-item.cell-status-item-has-command:hover {
 	background-color: var(--vscode-notebook-cellStatusBarItemHoverBackground);
 }
@@ -686,31 +675,6 @@
 	background-color: var(--vscode-toolbar-hoverBackground);
 }
 
-/** Cell insertion/deletion */
-.monaco-workbench .notebookOverlay .monaco-list .monaco-list-row.code-cell-row.nb-cell-modified .cell-focus-indicator {
-	background-color: var(--vscode-editorGutter-modifiedBackground) !important;
-}
-
-.monaco-workbench .notebookOverlay .monaco-list .monaco-list-row.markdown-cell-row.nb-cell-modified {
-	background-color: var(--vscode-editorGutter-modifiedBackground) !important;
-}
-
-.monaco-workbench .notebookOverlay .monaco-list .monaco-list-row.code-cell-row.nb-cell-added .cell-focus-indicator {
-	background-color: var(--vscode-diffEditor-insertedTextBackground) !important;
-}
-
-.monaco-workbench .notebookOverlay .monaco-list .monaco-list-row.markdown-cell-row.nb-cell-added {
-	background-color: var(--vscode-diffEditor-insertedTextBackground) !important;
-}
-
-.monaco-workbench .notebookOverlay .monaco-list .monaco-list-row.code-cell-row.nb-cell-deleted .cell-focus-indicator {
-	background-color: var(--vscode-diffEditor-removedTextBackground) !important;
-}
-
-.monaco-workbench .notebookOverlay .monaco-list .monaco-list-row.markdown-cell-row.nb-cell-deleted {
-	background-color: var(--vscode-diffEditor-removedTextBackground) !important;
-}
-
 .monaco-workbench .notebookOverlay .codicon-debug-continue {
 	color: var(--vscode-icon-foreground) !important;
 }

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

@@ -92,18 +92,18 @@ let NotebookAccessibilityProvider = class NotebookAccessibilityProvider extends
         return this.createItemLabel(executionLabel, element.cellKind);
     }
     get widgetAriaLabelName() {
-        return this.isReplHistory ? ( localize(12721, "REPL Editor History")) : ( localize(12722, "Notebook"));
+        return this.isReplHistory ? ( localize(14484, "REPL Editor History")) : ( localize(14485, "Notebook"));
     }
     getWidgetAriaLabel() {
         const keybinding = this.keybindingService.lookupKeybinding(AccessibilityCommandId.OpenAccessibilityHelp)?.getLabel();
         if (this.configurationService.getValue(this.verbositySettingId)) {
             return keybinding ? ( localize(
-                12723,
+                14486,
                 "{0}\nUse {1} for accessibility help",
                 this.widgetAriaLabelName,
                 keybinding
             )) : ( localize(
-                12724,
+                14487,
                 "{0}\nRun the Open Accessibility Help command for more information",
                 this.widgetAriaLabelName
             ));

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

@@ -224,20 +224,20 @@ let NotebookEditor = class NotebookEditor extends EditorPane {
             checkboxChecked
         } = await this._dialogService.confirm({
             type: "warning",
-            message: ( localize(12725, "Do you trust the authors of this notebook?")),
+            message: ( localize(14488, "Do you trust the authors of this notebook?")),
             detail: ( localize(
-                12726,
+                14489,
                 "Notebooks can run code that has access to your browser session, including any signed-in accounts. Only open notebooks from authors you trust."
             )),
-            primaryButton: ( localize(12727, "Open Notebook")),
+            primaryButton: ( localize(14490, "Open Notebook")),
             checkbox: {
-                label: ( localize(12728, "Don't ask me again"))
+                label: ( localize(14491, "Don't ask me again"))
             }
         });
         if (!confirmed) {
-            throw createEditorOpenError(( localize(12729, "The notebook was not opened because its authors are not trusted.")), [toAction({
+            throw createEditorOpenError(( localize(14492, "The notebook was not opened because its authors are not trusted.")), [toAction({
                 id: "workbench.notebook.action.openAsText",
-                label: ( localize(12730, "Open As Text")),
+                label: ( localize(14493, "Open As Text")),
                 run: async () => {
                     this._editorService.openEditor({
                         resource: input.resource,
@@ -316,7 +316,7 @@ let NotebookEditor = class NotebookEditor extends EditorPane {
                 const knownProvider = this._notebookService.getViewTypeProvider(input.viewType);
                 if (!knownProvider) {
                     throw ( new Error(( localize(
-                        12731,
+                        14494,
                         "Cannot open resource with notebook editor type '{0}', please check if you have the right extension installed and enabled.",
                         input.viewType
                     ))));
@@ -324,12 +324,12 @@ let NotebookEditor = class NotebookEditor extends EditorPane {
                 await this._extensionsWorkbenchService.whenInitialized;
                 const extensionInfo = this._extensionsWorkbenchService.local.find(e => e.identifier.id === knownProvider);
                 throw createEditorOpenError(( new Error(( localize(
-                    12732,
+                    14495,
                     "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 ? ( localize(12733, "Enable extension for '{0}'", input.viewType)) : ( localize(12734, "Install extension for '{0}'", input.viewType)),
+                    label: extensionInfo ? ( localize(14496, "Enable extension for '{0}'", input.viewType)) : ( localize(14497, "Install extension for '{0}'", input.viewType)),
                     run: async () => {
                         const d = this._notebookService.onAddViewType(viewType => {
                             if (viewType === input.viewType) {
@@ -356,7 +356,7 @@ let NotebookEditor = class NotebookEditor extends EditorPane {
                     }
                 }), toAction({
                     id: "workbench.notebook.action.openAsText",
-                    label: ( localize(12730, "Open As Text")),
+                    label: ( localize(14493, "Open As Text")),
                     run: async () => {
                         const backup = await this._workingCopyBackupService.resolve({
                             resource: input.resource,
@@ -420,13 +420,13 @@ let NotebookEditor = class NotebookEditor extends EditorPane {
                 let message;
                 if (e instanceof TooLargeFileOperationError) {
                     message = ( localize(
-                        12735,
+                        14498,
                         "The notebook is not displayed in the notebook editor because it is very large ({0}).",
                         ByteSize.formatSize(e.size)
                     ));
                 } else {
                     message = ( localize(
-                        12736,
+                        14499,
                         "The notebook is not displayed in the notebook editor because it is very large."
                     ));
                 }
@@ -434,7 +434,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: ( localize(12737, "Open in Text Editor")),
+                label: ( localize(14500, "Open in Text Editor")),
                 run: async () => {
                     const activeEditorPane = this._editorService.activeEditorPane;
                     if (!activeEditorPane) {