@codingame/monaco-vscode-notebook-service-override 18.4.0 → 19.0.1

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

@@ -2,14 +2,18 @@
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { $ as $$1, append } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
-import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
+import { localize2, localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/list/browser/listService';
 import { DebugExpressionRenderer } from '@codingame/monaco-vscode-88aa9a78-75f5-5aaa-89e9-bbdd580b3b5c-common/vscode/vs/workbench/contrib/debug/browser/debugExpressionRenderer';
+import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
 
 var NotebookVariableRenderer_1;
 const $ = $$1;
 const MAX_VALUE_RENDER_LENGTH_IN_VIEWLET = 1024;
+const NOTEBOOK_TITLE = ( localize2(8464, "Notebook Variables"));
+const REPL_TITLE = ( localize2(8465, "REPL Variables"));
 class NotebookVariablesDelegate {
     getHeight(element) {
         return 22;
@@ -55,12 +59,18 @@ NotebookVariableRenderer = NotebookVariableRenderer_1 = ( __decorate([
     ( __param(0, IInstantiationService))
 ], NotebookVariableRenderer));
 class NotebookVariableAccessibilityProvider {
+    constructor() {
+        this._widgetAriaLabel = observableValue('widgetAriaLabel', NOTEBOOK_TITLE.value);
+    }
     getWidgetAriaLabel() {
-        return localize(8241, "Notebook Variables");
+        return this._widgetAriaLabel;
+    }
+    updateWidgetAriaLabel(label) {
+        this._widgetAriaLabel.set(label, undefined);
     }
     getAriaLabel(element) {
-        return localize(8242, "Variable {0}, value {1}", element.name, element.value);
+        return localize(8466, "Variable {0}, value {1}", element.name, element.value);
     }
 }
 
-export { NotebookVariableAccessibilityProvider, NotebookVariableRenderer, NotebookVariablesDelegate };
+export { NOTEBOOK_TITLE, NotebookVariableAccessibilityProvider, NotebookVariableRenderer, NotebookVariablesDelegate, REPL_TITLE };

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

@@ -1,4 +1,3 @@
-import { ILocalizedString } from "@codingame/monaco-vscode-api/vscode/vs/platform/action/common/action";
 import { IMenuService } from "@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions.service";
 import { ICommandService } from "@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
@@ -32,11 +31,10 @@ export declare class NotebookVariablesView extends ViewPane {
     protected commandService: ICommandService;
     private readonly menuService;
     static readonly ID = "notebookVariablesView";
-    static readonly NOTEBOOK_TITLE: ILocalizedString;
-    static readonly REPL_TITLE: ILocalizedString;
     private tree;
     private activeNotebook;
     private readonly dataSource;
+    private readonly accessibilityProvider;
     private updateScheduler;
     constructor(options: IViewPaneOptions, editorService: IEditorService, notebookKernelService: INotebookKernelService, notebookExecutionStateService: INotebookExecutionStateService, keybindingService: IKeybindingService, contextMenuService: IContextMenuService, contextKeyService: IContextKeyService, configurationService: IConfigurationService, instantiationService: IInstantiationService, viewDescriptorService: IViewDescriptorService, openerService: IOpenerService, quickInputService: IQuickInputService, commandService: ICommandService, themeService: IThemeService, hoverService: IHoverService, menuService: IMenuService);
     protected renderBody(container: HTMLElement): void;

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

@@ -1,7 +1,6 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { RunOnceScheduler } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
-import { localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { getFlatContextMenuActions } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/browser/menuEntryActionViewItem';
 import { MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { IMenuService } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions.service';
@@ -20,19 +19,15 @@ import { ViewPane } from '@codingame/monaco-vscode-501b06ab-3f58-516b-8a1a-c29d3
 import { IViewDescriptorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/views.service';
 import { CONTEXT_VARIABLE_NAME, CONTEXT_VARIABLE_VALUE, CONTEXT_VARIABLE_TYPE, CONTEXT_VARIABLE_INTERFACES, CONTEXT_VARIABLE_LANGUAGE, CONTEXT_VARIABLE_EXTENSIONID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/debug/common/debug';
 import { NotebookVariableDataSource } from './notebookVariablesDataSource.js';
-import { NotebookVariablesDelegate, NotebookVariableRenderer, NotebookVariableAccessibilityProvider } from './notebookVariablesTree.js';
-import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-4372ad43-a220-5e78-83e6-95a9cfd64384-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { NotebookVariableAccessibilityProvider, NotebookVariablesDelegate, NotebookVariableRenderer, REPL_TITLE, NOTEBOOK_TITLE } from './notebookVariablesTree.js';
+import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { INotebookExecutionStateService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService.service';
 import { INotebookKernelService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookKernelService.service';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
-import { isCompositeNotebookEditorInput } from '@codingame/monaco-vscode-4372ad43-a220-5e78-83e6-95a9cfd64384-common/vscode/vs/workbench/contrib/notebook/common/notebookEditorInput';
+import { isCompositeNotebookEditorInput } from '@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/notebook/common/notebookEditorInput';
 
-var NotebookVariablesView_1;
 let NotebookVariablesView = class NotebookVariablesView extends ViewPane {
-    static { NotebookVariablesView_1 = this; }
     static { this.ID = 'notebookVariablesView'; }
-    static { this.NOTEBOOK_TITLE = ( localize2(8243, "Notebook Variables")); }
-    static { this.REPL_TITLE = ( localize2(8244, "REPL Variables")); }
     constructor(options, editorService, notebookKernelService, notebookExecutionStateService, keybindingService, contextMenuService, contextKeyService, configurationService, instantiationService, viewDescriptorService, openerService, quickInputService, commandService, themeService, hoverService, menuService) {
         super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, hoverService);
         this.editorService = editorService;
@@ -45,6 +40,7 @@ let NotebookVariablesView = class NotebookVariablesView extends ViewPane {
         this._register(this.notebookKernelService.onDidNotebookVariablesUpdate(this.handleVariablesChanged.bind(this)));
         this._register(this.notebookExecutionStateService.onDidChangeExecution(this.handleExecutionStateChange.bind(this)));
         this._register(this.editorService.onDidCloseEditor((e) => this.handleCloseEditor(e)));
+        this.accessibilityProvider = ( new NotebookVariableAccessibilityProvider());
         this.handleActiveEditorChange(false);
         this.dataSource = ( new NotebookVariableDataSource(this.notebookKernelService));
         this.updateScheduler = ( new RunOnceScheduler(() => this.tree?.updateChildren(), 100));
@@ -53,7 +49,7 @@ let NotebookVariablesView = class NotebookVariablesView extends ViewPane {
         super.renderBody(container);
         this.element.classList.add('debug-pane');
         this.tree = this.instantiationService.createInstance((WorkbenchAsyncDataTree), 'notebookVariablesTree', container, ( new NotebookVariablesDelegate()), [this.instantiationService.createInstance(NotebookVariableRenderer)], this.dataSource, {
-            accessibilityProvider: ( new NotebookVariableAccessibilityProvider()),
+            accessibilityProvider: this.accessibilityProvider,
             identityProvider: { getId: (e) => e.id },
         });
         this.tree.layout();
@@ -102,10 +98,12 @@ let NotebookVariablesView = class NotebookVariablesView extends ViewPane {
     setActiveNotebook(notebookDocument, editor, doUpdate = true) {
         this.activeNotebook = notebookDocument;
         if (isCompositeNotebookEditorInput(editor.input)) {
-            this.updateTitle(NotebookVariablesView_1.REPL_TITLE.value);
+            this.updateTitle(REPL_TITLE.value);
+            this.accessibilityProvider.updateWidgetAriaLabel(REPL_TITLE.value);
         }
         else {
-            this.updateTitle(NotebookVariablesView_1.NOTEBOOK_TITLE.value);
+            this.updateTitle(NOTEBOOK_TITLE.value);
+            this.accessibilityProvider.updateWidgetAriaLabel(NOTEBOOK_TITLE.value);
         }
         if (doUpdate) {
             this.tree?.setInput({ kind: 'root', notebook: notebookDocument });
@@ -162,7 +160,7 @@ let NotebookVariablesView = class NotebookVariablesView extends ViewPane {
         }
     }
 };
-NotebookVariablesView = NotebookVariablesView_1 = ( __decorate([
+NotebookVariablesView = ( __decorate([
     ( __param(1, IEditorService)),
     ( __param(2, INotebookKernelService)),
     ( __param(3, INotebookExecutionStateService)),

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/outline/notebookOutline.d.ts

@@ -7,12 +7,12 @@ import { IEditorOptions } from "@codingame/monaco-vscode-api/vscode/vs/platform/
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { IThemeService } from "@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service";
 import { IEditorPane } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor";
-import { CellFoldingState, INotebookEditorPane } from "@codingame/monaco-vscode-4372ad43-a220-5e78-83e6-95a9cfd64384-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
+import { CellFoldingState, INotebookEditorPane } from "@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
 import { NotebookEditor } from "@codingame/monaco-vscode-bc8c28cd-7a80-54a9-af1a-e6b1e7a7f34a-common/vscode/vs/workbench/contrib/notebook/browser/notebookEditor";
 import { INotebookCellOutlineDataSource } from "@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/viewModel/notebookOutlineDataSource";
 import { CellKind } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon";
 import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";
-import { IBreadcrumbsDataSource, IOutline, IOutlineCreator, IOutlineListConfig, IQuickPickDataSource, IQuickPickOutlineElement, OutlineChangeEvent, OutlineTarget } from "@codingame/monaco-vscode-0094ae09-a688-53e7-bacc-93e26f7f49db-common/vscode/vs/workbench/services/outline/browser/outline";
+import { IBreadcrumbsDataSource, IOutline, IOutlineCreator, IOutlineListConfig, IQuickPickDataSource, IQuickPickOutlineElement, OutlineChangeEvent, OutlineTarget } from "@codingame/monaco-vscode-ca445022-b812-53ca-a041-e46c7e0b13de-common/vscode/vs/workbench/services/outline/browser/outline";
 import { IOutlineService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/outline/browser/outline.service";
 import { OutlineEntry } from "@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/viewModel/OutlineEntry";
 import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/outline/notebookOutline.js

@@ -27,13 +27,13 @@ import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/quic
 import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/searchColors';
 import { IThemeService } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service';
 import { Extensions } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions';
-import { CellFoldingState, CellRevealType } from '@codingame/monaco-vscode-4372ad43-a220-5e78-83e6-95a9cfd64384-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { CellFoldingState, CellRevealType } from '@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { NotebookEditor } from '@codingame/monaco-vscode-bc8c28cd-7a80-54a9-af1a-e6b1e7a7f34a-common/vscode/vs/workbench/contrib/notebook/browser/notebookEditor';
 import { CellKind, NotebookSetting, NotebookCellsChangeType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { SIDE_GROUP } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { LifecyclePhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle';
-import { OutlineConfigKeys, OutlineTarget, OutlineConfigCollapseItemsValues } from '@codingame/monaco-vscode-0094ae09-a688-53e7-bacc-93e26f7f49db-common/vscode/vs/workbench/services/outline/browser/outline';
+import { OutlineConfigKeys, OutlineTarget, OutlineConfigCollapseItemsValues } from '@codingame/monaco-vscode-ca445022-b812-53ca-a041-e46c7e0b13de-common/vscode/vs/workbench/services/outline/browser/outline';
 import { IOutlineService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/outline/browser/outline.service';
 import { CancellationToken } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
 import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';
@@ -46,7 +46,7 @@ import { MenuEntryActionViewItem, getActionBarActions } from '@codingame/monaco-
 import { disposableTimeout, Delayer } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 import { IOutlinePane } from '@codingame/monaco-vscode-0cd5242b-7b61-5f66-ac25-ffa40baf8e8f-common/vscode/vs/workbench/contrib/outline/browser/outline';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
-import { NOTEBOOK_IS_ACTIVE_EDITOR } from '@codingame/monaco-vscode-c87fff3a-2aa9-52ab-ba4d-17e8d1e5e185-common/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
+import { NOTEBOOK_IS_ACTIVE_EDITOR } from '@codingame/monaco-vscode-3927dd53-f845-534c-9baa-1528ff3956c8-common/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
 import { NotebookOutlineConstants } from '../../viewModel/notebookOutlineEntryFactory.js';
 import { INotebookCellOutlineDataSourceFactory } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/viewModel/notebookOutlineDataSourceFactory.service';
 import { NotebookExecutionType } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService';
@@ -612,7 +612,7 @@ let NotebookCellOutline = class NotebookCellOutline {
         const notebookEditorOptions = {
             ...options,
             override: this._editor.input?.editorId,
-            cellRevealType: CellRevealType.NearTopIfOutsideViewport,
+            cellRevealType: CellRevealType.Top,
             selection: entry.position,
             viewState: undefined,
         };
@@ -728,33 +728,33 @@ const NotebookOutlineContext = {
             type: 'boolean',
             default: true,
             markdownDescription: ( localize(
-                8245,
+                8467,
                 "When enabled, notebook outline will show only markdown cells containing a header."
             ))
         },
         [NotebookSetting.outlineShowCodeCells]: {
             type: 'boolean',
             default: false,
-            markdownDescription: ( localize(8246, "When enabled, notebook outline shows code cells."))
+            markdownDescription: ( localize(8468, "When enabled, notebook outline shows code cells."))
         },
         [NotebookSetting.outlineShowCodeCellSymbols]: {
             type: 'boolean',
             default: true,
             markdownDescription: ( localize(
-                8247,
+                8469,
                 "When enabled, notebook outline shows code cell symbols. Relies on `notebook.outline.showCodeCells` being enabled."
             ))
         },
         [NotebookSetting.breadcrumbsShowCodeCells]: {
             type: 'boolean',
             default: true,
-            markdownDescription: ( localize(8248, "When enabled, notebook breadcrumbs contain code cells."))
+            markdownDescription: ( localize(8470, "When enabled, notebook breadcrumbs contain code cells."))
         },
         [NotebookSetting.gotoSymbolsAllSymbols]: {
             type: 'boolean',
             default: true,
             markdownDescription: ( localize(
-                8249,
+                8471,
                 "When enabled, the Go to Symbol Quick Pick will display full code symbols from the notebook, as well as Markdown headers."
             ))
         },
@@ -762,7 +762,7 @@ const NotebookOutlineContext = {
 });
 MenuRegistry.appendMenuItem(MenuId.ViewTitle, {
     submenu: MenuId.NotebookOutlineFilter,
-    title: ( localize(8250, "Filter Entries")),
+    title: ( localize(8472, "Filter Entries")),
     icon: Codicon.filter,
     group: 'navigation',
     order: -1,
@@ -772,7 +772,7 @@ registerAction2(class ToggleShowMarkdownHeadersOnly extends Action2 {
     constructor() {
         super({
             id: 'notebook.outline.toggleShowMarkdownHeadersOnly',
-            title: ( localize(8251, "Markdown Headers Only")),
+            title: ( localize(8473, "Markdown Headers Only")),
             f1: false,
             toggled: {
                 condition: ( ContextKeyExpr.equals('config.notebook.outline.showMarkdownHeadersOnly', true))
@@ -793,7 +793,7 @@ registerAction2(class ToggleCodeCellEntries extends Action2 {
     constructor() {
         super({
             id: 'notebook.outline.toggleCodeCells',
-            title: ( localize(8252, "Code Cells")),
+            title: ( localize(8474, "Code Cells")),
             f1: false,
             toggled: {
                 condition: ( ContextKeyExpr.equals('config.notebook.outline.showCodeCells', true))
@@ -815,7 +815,7 @@ registerAction2(class ToggleCodeCellSymbolEntries extends Action2 {
     constructor() {
         super({
             id: 'notebook.outline.toggleCodeCellSymbols',
-            title: ( localize(8253, "Code Cell Symbols")),
+            title: ( localize(8475, "Code Cell Symbols")),
             f1: false,
             toggled: {
                 condition: ( ContextKeyExpr.equals('config.notebook.outline.showCodeCellSymbols', true))

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

@@ -53,7 +53,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'notebook.setProfile',
-            title: ( localize(8254, "Set Profile"))
+            title: ( localize(8476, "Set Profile"))
         });
     }
     async run(accessor, args) {

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

@@ -9,7 +9,7 @@ import { IProgress, IProgressStep } from "@codingame/monaco-vscode-api/vscode/vs
 import { IWorkbenchContribution } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions";
 import { NotebookTextModel } from "../../../common/model/notebookTextModel.js";
 import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";
-import { IStoredFileWorkingCopy, IStoredFileWorkingCopyModel } from "@codingame/monaco-vscode-bba55be6-41a2-50cd-a3cc-8bafa35bfa89-common/vscode/vs/workbench/services/workingCopy/common/storedFileWorkingCopy";
+import { IStoredFileWorkingCopy, IStoredFileWorkingCopyModel } from "@codingame/monaco-vscode-6f931a91-88ea-5232-897f-a17ec3929ba5-common/vscode/vs/workbench/services/workingCopy/common/storedFileWorkingCopy";
 import { IStoredFileWorkingCopySaveParticipant, IStoredFileWorkingCopySaveParticipantContext } from "@codingame/monaco-vscode-base-service-override/vscode/vs/workbench/services/workingCopy/common/workingCopyFileService";
 import { IWorkingCopyFileService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/workingCopy/common/workingCopyFileService.service";
 export declare abstract class NotebookSaveParticipant implements IStoredFileWorkingCopySaveParticipant {

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

@@ -24,9 +24,9 @@ import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/regist
 import { IWorkspaceTrustManagementService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspaceTrust.service';
 import { Extensions } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions';
 import { SaveReason } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor';
-import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-4372ad43-a220-5e78-83e6-95a9cfd64384-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { NotebookSetting, CellKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
-import { NotebookFileWorkingCopyModel } from '@codingame/monaco-vscode-bba55be6-41a2-50cd-a3cc-8bafa35bfa89-common/vscode/vs/workbench/contrib/notebook/common/notebookEditorModel';
+import { NotebookFileWorkingCopyModel } from '@codingame/monaco-vscode-6f931a91-88ea-5232-897f-a17ec3929ba5-common/vscode/vs/workbench/contrib/notebook/common/notebookEditorModel';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { LifecyclePhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 import { IWorkingCopyFileService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/workingCopy/common/workingCopyFileService.service';
@@ -65,7 +65,7 @@ let FormatOnSaveParticipant = class FormatOnSaveParticipant {
         if (!enabled) {
             return undefined;
         }
-        progress.report({ message: ( localize(8255, "Formatting")) });
+        progress.report({ message: ( localize(8477, "Formatting")) });
         const notebook = workingCopy.model.notebookModel;
         const formatApplied = await this.instantiationService.invokeFunction(CodeActionParticipantUtils.checkAndRunFormatCodeAction, notebook, progress, token);
         const disposable = ( new DisposableStore());
@@ -83,7 +83,7 @@ let FormatOnSaveParticipant = class FormatOnSaveParticipant {
                     }
                     return [];
                 })));
-                await this.bulkEditService.apply( allCellEdits.flat(), { label: ( localize(8256, "Format Notebook")), code: 'undoredo.formatNotebook', });
+                await this.bulkEditService.apply( allCellEdits.flat(), { label: ( localize(8478, "Format Notebook")), code: 'undoredo.formatNotebook', });
             }
         }
         finally {
@@ -152,7 +152,7 @@ let TrimWhitespaceParticipant = class TrimWhitespaceParticipant extends Notebook
                 return ( ops.map(op => ( new ResourceTextEdit(model.uri, { ...op, text: op.text || '' }, model.getVersionId()))));
             })));
             const filteredEdits = allCellEdits.flat().filter(edit => edit !== undefined);
-            await this.bulkEditService.apply(filteredEdits, { label: ( localize(8257, "Notebook Trim Trailing Whitespace")), code: 'undoredo.notebookTrimTrailingWhitespace' });
+            await this.bulkEditService.apply(filteredEdits, { label: ( localize(8479, "Notebook Trim Trailing Whitespace")), code: 'undoredo.notebookTrimTrailingWhitespace' });
         }
         finally {
             progress.report({ increment: 100 });
@@ -229,7 +229,7 @@ let TrimFinalNewLinesParticipant = class TrimFinalNewLinesParticipant extends No
                 ));
             })));
             const filteredEdits = allCellEdits.flat().filter(edit => edit !== undefined);
-            await this.bulkEditService.apply(filteredEdits, { label: ( localize(8258, "Trim Final New Lines")), code: 'undoredo.trimFinalNewLines' });
+            await this.bulkEditService.apply(filteredEdits, { label: ( localize(8480, "Trim Final New Lines")), code: 'undoredo.trimFinalNewLines' });
         }
         finally {
             progress.report({ increment: 100 });
@@ -283,7 +283,7 @@ let InsertFinalNewLineParticipant = class InsertFinalNewLineParticipant extends
                 )), text: cell.textBuffer.getEOL() }, cell.textModel?.getVersionId()));
             })));
             const filteredEdits = allCellEdits.filter(edit => edit !== undefined);
-            await this.bulkEditService.apply(filteredEdits, { label: ( localize(8259, "Insert Final New Line")), code: 'undoredo.insertFinalNewLine' });
+            await this.bulkEditService.apply(filteredEdits, { label: ( localize(8481, "Insert Final New Line")), code: 'undoredo.insertFinalNewLine' });
             if (activeCellEditor && selections) {
                 activeCellEditor.setSelections(selections);
             }
@@ -339,7 +339,7 @@ let CodeActionOnSaveParticipant = class CodeActionOnSaveParticipant {
         const notebookCodeActionsOnSave = includedActions.filter(x => CodeActionKind.Notebook.contains(x));
         if (notebookCodeActionsOnSave.length) {
             const nbDisposable = ( new DisposableStore());
-            progress.report({ message: ( localize(8260, "Running 'Notebook' code actions")) });
+            progress.report({ message: ( localize(8482, "Running 'Notebook' code actions")) });
             try {
                 const cell = notebookModel.cells[0];
                 const ref = await this.textModelService.createModelReference(cell.uri);
@@ -371,7 +371,7 @@ let CodeActionOnSaveParticipant = class CodeActionOnSaveParticipant {
                 });
             }
             const cellDisposable = ( new DisposableStore());
-            progress.report({ message: ( localize(8261, "Running 'Cell' code actions")) });
+            progress.report({ message: ( localize(8483, "Running 'Cell' code actions")) });
             try {
                 await Promise.all(( notebookModel.cells.map(async (cell) => {
                     const ref = await this.textModelService.createModelReference(cell.uri);
@@ -411,7 +411,7 @@ class CodeActionParticipantUtils {
         const configurationService = accessor.get(IConfigurationService);
         const formatDisposable = ( new DisposableStore());
         let formatResult = false;
-        progress.report({ message: ( localize(8262, "Running 'Format' code actions")) });
+        progress.report({ message: ( localize(8484, "Running 'Format' code actions")) });
         try {
             const cell = notebookModel.cells[0];
             const ref = await textModelService.createModelReference(cell.uri);
@@ -440,7 +440,7 @@ class CodeActionParticipantUtils {
             _report() {
                 progress.report({
                     message: ( localize(
-                        8263,
+                        8485,
                         "Getting code actions from '{0}' ([configure]({1})).",
                         ( [...this._names].map(name => `'${name}'`)).join(', '),
                         'command:workbench.action.openSettings?%5B%22notebook.codeActionsOnSave%22%5D'
@@ -480,7 +480,7 @@ class CodeActionParticipantUtils {
                         logService.warn('Failed to apply code action on save, applied to multiple resources.');
                         continue;
                     }
-                    progress.report({ message: ( localize(8264, "Applying code action '{0}'.", action.action.title)) });
+                    progress.report({ message: ( localize(8486, "Applying code action '{0}'.", action.action.title)) });
                     await instantiationService.invokeFunction(applyCodeAction, action, ApplyCodeActionReason.OnSave, {}, token);
                     if (token.isCancellationRequested) {
                         return;
@@ -505,7 +505,7 @@ class CodeActionParticipantUtils {
             _report() {
                 progress.report({
                     message: ( localize(
-                        8263,
+                        8485,
                         "Getting code actions from '{0}' ([configure]({1})).",
                         ( [...this._names].map(name => `'${name}'`)).join(', '),
                         'command:workbench.action.openSettings?%5B%22notebook.defaultFormatter%22%5D'
@@ -532,7 +532,7 @@ class CodeActionParticipantUtils {
             if (!action) {
                 return false;
             }
-            progress.report({ message: ( localize(8264, "Applying code action '{0}'.", action.action.title)) });
+            progress.report({ message: ( localize(8486, "Applying code action '{0}'.", action.action.title)) });
             await instantiationService.invokeFunction(applyCodeAction, action, ApplyCodeActionReason.OnSave, {}, token);
             if (token.isCancellationRequested) {
                 return false;

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

@@ -1,5 +1,5 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
-import { INotebookEditor, INotebookEditorContribution } from "@codingame/monaco-vscode-4372ad43-a220-5e78-83e6-95a9cfd64384-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
+import { INotebookEditor, INotebookEditorContribution } from "@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
 export declare class TroubleshootController extends Disposable implements INotebookEditorContribution {
     private readonly _notebookEditor;
     static id: string;

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

@@ -3,13 +3,12 @@ import { Disposable, DisposableStore, dispose } from '@codingame/monaco-vscode-a
 import { localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { Categories } from '@codingame/monaco-vscode-api/vscode/vs/platform/action/common/actionCommonCategories';
 import { registerAction2, Action2 } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
-import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-4372ad43-a220-5e78-83e6-95a9cfd64384-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { registerNotebookContribution } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/notebookEditorExtensions';
 import { CellStatusbarAlignment } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { INotebookService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.service';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
-import '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
-import { n } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/domImpl/n';
+import { n } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 
 class TroubleshootController extends Disposable {
     static { this.id = 'workbench.notebook.troubleshoot'; }
@@ -264,7 +263,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'notebook.toggleLayoutTroubleshoot',
-            title: ( localize2(8265, "Toggle Notebook Layout Troubleshoot")),
+            title: ( localize2(8487, "Toggle Notebook Layout Troubleshoot")),
             category: Categories.Developer,
             f1: true
         });
@@ -283,7 +282,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'notebook.inspectLayout',
-            title: ( localize2(8266, "Inspect Notebook Layout")),
+            title: ( localize2(8488, "Inspect Notebook Layout")),
             category: Categories.Developer,
             f1: true
         });
@@ -304,7 +303,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'notebook.clearNotebookEdtitorTypeCache',
-            title: ( localize2(8267, "Clear Notebook Editor Type Cache")),
+            title: ( localize2(8489, "Clear Notebook Editor Type Cache")),
             category: Categories.Developer,
             f1: true
         });

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/undoRedo/notebookUndoRedo.js

@@ -4,7 +4,7 @@ import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/l
 import { registerWorkbenchContribution2, WorkbenchPhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions';
 import { CellKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
-import { getNotebookEditorFromEditorPane, CellEditState } from '@codingame/monaco-vscode-4372ad43-a220-5e78-83e6-95a9cfd64384-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { getNotebookEditorFromEditorPane, CellEditState } from '@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { UndoCommand, RedoCommand } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorExtensions';
 
 let NotebookUndoRedoContribution = class NotebookUndoRedoContribution extends Disposable {
@@ -16,7 +16,7 @@ let NotebookUndoRedoContribution = class NotebookUndoRedoContribution extends Di
         this._register(UndoCommand.addImplementation(PRIORITY, 'notebook-undo-redo', () => {
             const editor = getNotebookEditorFromEditorPane(this._editorService.activeEditorPane);
             const viewModel = editor?.getViewModel();
-            if (editor && editor.hasModel() && viewModel) {
+            if (editor && editor.hasEditorFocus() && editor.hasModel() && viewModel) {
                 return viewModel.undo().then(cellResources => {
                     if (cellResources?.length) {
                         for (let i = 0; i < editor.getLength(); i++) {
@@ -34,7 +34,7 @@ let NotebookUndoRedoContribution = class NotebookUndoRedoContribution extends Di
         this._register(RedoCommand.addImplementation(PRIORITY, 'notebook-undo-redo', () => {
             const editor = getNotebookEditorFromEditorPane(this._editorService.activeEditorPane);
             const viewModel = editor?.getViewModel();
-            if (editor && editor.hasModel() && viewModel) {
+            if (editor && editor.hasEditorFocus() && editor.hasModel() && viewModel) {
                 return viewModel.redo().then(cellResources => {
                     if (cellResources?.length) {
                         for (let i = 0; i < editor.getLength(); i++) {

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

@@ -3,11 +3,11 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import { RunOnceScheduler } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { IAccessibilityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/common/accessibility.service';
-import { CellEditState, RenderOutputType } from '@codingame/monaco-vscode-4372ad43-a220-5e78-83e6-95a9cfd64384-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { CellEditState, RenderOutputType } from '@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { registerNotebookContribution } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/notebookEditorExtensions';
 import { outputDisplayLimit } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/viewModel/codeCellViewModel';
 import { CellKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
-import { cellRangesToIndexes } from '@codingame/monaco-vscode-4372ad43-a220-5e78-83e6-95a9cfd64384-common/vscode/vs/workbench/contrib/notebook/common/notebookRange';
+import { cellRangesToIndexes } from '@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/notebook/common/notebookRange';
 import { INotebookService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.service';
 
 let NotebookViewportContribution = class NotebookViewportContribution extends Disposable {