@codingame/monaco-vscode-notebook-service-override 19.1.3 → 20.0.0

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

@@ -12,8 +12,8 @@ import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/com
 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"));
+const NOTEBOOK_TITLE = ( localize2(8621, "Notebook Variables"));
+const REPL_TITLE = ( localize2(8622, "REPL Variables"));
 class NotebookVariablesDelegate {
     getHeight(element) {
         return 22;
@@ -69,7 +69,7 @@ class NotebookVariableAccessibilityProvider {
         this._widgetAriaLabel.set(label, undefined);
     }
     getAriaLabel(element) {
-        return localize(8466, "Variable {0}, value {1}", element.name, element.value);
+        return localize(8623, "Variable {0}, value {1}", element.name, element.value);
     }
 }
 

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

@@ -20,11 +20,11 @@ import { IViewDescriptorService } from '@codingame/monaco-vscode-api/vscode/vs/w
 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 { 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 { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-670aae94-7f88-54d7-90ea-6fcbef423557-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-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/notebook/common/notebookEditorInput';
+import { isCompositeNotebookEditorInput } from '@codingame/monaco-vscode-670aae94-7f88-54d7-90ea-6fcbef423557-common/vscode/vs/workbench/contrib/notebook/common/notebookEditorInput';
 
 let NotebookVariablesView = class NotebookVariablesView extends ViewPane {
     static { this.ID = 'notebookVariablesView'; }

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-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 { CellFoldingState, INotebookEditorPane } from "@codingame/monaco-vscode-670aae94-7f88-54d7-90ea-6fcbef423557-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
+import { NotebookEditor } from "@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-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-ca445022-b812-53ca-a041-e46c7e0b13de-common/vscode/vs/workbench/services/outline/browser/outline";
+import { IBreadcrumbsDataSource, IOutline, IOutlineCreator, IOutlineListConfig, IQuickPickDataSource, IQuickPickOutlineElement, OutlineChangeEvent, OutlineTarget } from "@codingame/monaco-vscode-622c0cca-d5fa-59b6-b730-0715afcf93ee-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-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 { CellFoldingState, CellRevealType } from '@codingame/monaco-vscode-670aae94-7f88-54d7-90ea-6fcbef423557-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { NotebookEditor } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-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-ca445022-b812-53ca-a041-e46c7e0b13de-common/vscode/vs/workbench/services/outline/browser/outline';
+import { OutlineConfigKeys, OutlineTarget, OutlineConfigCollapseItemsValues } from '@codingame/monaco-vscode-622c0cca-d5fa-59b6-b730-0715afcf93ee-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-3927dd53-f845-534c-9baa-1528ff3956c8-common/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
+import { NOTEBOOK_IS_ACTIVE_EDITOR } from '@codingame/monaco-vscode-eda30bac-0984-5b42-9362-c68996b85232-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';
@@ -728,33 +728,33 @@ const NotebookOutlineContext = {
             type: 'boolean',
             default: true,
             markdownDescription: ( localize(
-                8467,
+                8624,
                 "When enabled, notebook outline will show only markdown cells containing a header."
             ))
         },
         [NotebookSetting.outlineShowCodeCells]: {
             type: 'boolean',
             default: false,
-            markdownDescription: ( localize(8468, "When enabled, notebook outline shows code cells."))
+            markdownDescription: ( localize(8625, "When enabled, notebook outline shows code cells."))
         },
         [NotebookSetting.outlineShowCodeCellSymbols]: {
             type: 'boolean',
             default: true,
             markdownDescription: ( localize(
-                8469,
+                8626,
                 "When enabled, notebook outline shows code cell symbols. Relies on `notebook.outline.showCodeCells` being enabled."
             ))
         },
         [NotebookSetting.breadcrumbsShowCodeCells]: {
             type: 'boolean',
             default: true,
-            markdownDescription: ( localize(8470, "When enabled, notebook breadcrumbs contain code cells."))
+            markdownDescription: ( localize(8627, "When enabled, notebook breadcrumbs contain code cells."))
         },
         [NotebookSetting.gotoSymbolsAllSymbols]: {
             type: 'boolean',
             default: true,
             markdownDescription: ( localize(
-                8471,
+                8628,
                 "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(8472, "Filter Entries")),
+    title: ( localize(8629, "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(8473, "Markdown Headers Only")),
+            title: ( localize(8630, "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(8474, "Code Cells")),
+            title: ( localize(8631, "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(8475, "Code Cell Symbols")),
+            title: ( localize(8632, "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(8476, "Set Profile"))
+            title: ( localize(8633, "Set Profile"))
         });
     }
     async run(accessor, args) {

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

@@ -24,7 +24,7 @@ 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-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-670aae94-7f88-54d7-90ea-6fcbef423557-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-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';
@@ -65,7 +65,7 @@ let FormatOnSaveParticipant = class FormatOnSaveParticipant {
         if (!enabled) {
             return undefined;
         }
-        progress.report({ message: ( localize(8477, "Formatting")) });
+        progress.report({ message: ( localize(8634, "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(8478, "Format Notebook")), code: 'undoredo.formatNotebook', });
+                await this.bulkEditService.apply( allCellEdits.flat(), { label: ( localize(8635, "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(8479, "Notebook Trim Trailing Whitespace")), code: 'undoredo.notebookTrimTrailingWhitespace' });
+            await this.bulkEditService.apply(filteredEdits, { label: ( localize(8636, "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(8480, "Trim Final New Lines")), code: 'undoredo.trimFinalNewLines' });
+            await this.bulkEditService.apply(filteredEdits, { label: ( localize(8637, "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(8481, "Insert Final New Line")), code: 'undoredo.insertFinalNewLine' });
+            await this.bulkEditService.apply(filteredEdits, { label: ( localize(8638, "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(8482, "Running 'Notebook' code actions")) });
+            progress.report({ message: ( localize(8639, "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(8483, "Running 'Cell' code actions")) });
+            progress.report({ message: ( localize(8640, "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(8484, "Running 'Format' code actions")) });
+        progress.report({ message: ( localize(8641, "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(
-                        8485,
+                        8642,
                         "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(8486, "Applying code action '{0}'.", action.action.title)) });
+                    progress.report({ message: ( localize(8643, "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(
-                        8485,
+                        8642,
                         "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(8486, "Applying code action '{0}'.", action.action.title)) });
+            progress.report({ message: ( localize(8643, "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,13 +1,12 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
-import { INotebookEditor, INotebookEditorContribution } from "@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
+import { INotebookEditor, INotebookEditorContribution } from "@codingame/monaco-vscode-670aae94-7f88-54d7-90ea-6fcbef423557-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
 export declare class TroubleshootController extends Disposable implements INotebookEditorContribution {
     private readonly _notebookEditor;
     static id: string;
     private readonly _localStore;
-    private _cellStateListeners;
+    private _cellDisposables;
     private _enabled;
     private _cellStatusItems;
-    private _cellOverlayIds;
     private _notebookOverlayDomNode;
     constructor(_notebookEditor: INotebookEditor);
     toggle(): void;
@@ -16,7 +15,6 @@ export declare class TroubleshootController extends Disposable implements INoteb
     private _createCellOverlays;
     private _createNotebookOverlay;
     private _createCellOverlay;
-    private _removeCellOverlays;
     private _removeNotebookOverlay;
     private _updateListener;
     private _getItemsForCells;

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

@@ -1,9 +1,9 @@
 
-import { Disposable, DisposableStore, dispose } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { Disposable, DisposableStore, toDisposable, dispose } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 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-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-670aae94-7f88-54d7-90ea-6fcbef423557-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';
@@ -16,10 +16,9 @@ class TroubleshootController extends Disposable {
         super();
         this._notebookEditor = _notebookEditor;
         this._localStore = this._register(( new DisposableStore()));
-        this._cellStateListeners = [];
+        this._cellDisposables = [];
         this._enabled = false;
         this._cellStatusItems = [];
-        this._cellOverlayIds = [];
         this._register(this._notebookEditor.onDidChangeModel(() => {
             this._update();
         }));
@@ -31,14 +30,14 @@ class TroubleshootController extends Disposable {
     }
     _update() {
         this._localStore.clear();
-        this._cellStateListeners.forEach(listener => listener.dispose());
-        this._removeCellOverlays();
+        this._cellDisposables.forEach(d => d.dispose());
+        this._cellDisposables = [];
         this._removeNotebookOverlay();
         if (!this._notebookEditor.hasModel()) {
             return;
         }
-        this._updateListener();
         if (this._enabled) {
+            this._updateListener();
             this._createNotebookOverlay();
             this._createCellOverlays();
         }
@@ -148,9 +147,16 @@ class TroubleshootController extends Disposable {
         topLine.style.height = '2px';
         topLine.style.backgroundColor = 'rgba(255, 0, 0, 0.7)';
         overlayContainer.appendChild(topLine);
-        const cellTop = this._notebookEditor.getAbsoluteTopOfElement(cell);
+        const getLayoutInfo = () => {
+            const eol = cell.textBuffer.getEOL() === '\n' ? 'LF' : 'CRLF';
+            let scrollTop = '';
+            if (cell.layoutInfo.layoutState > 0) {
+                scrollTop = `| AbsoluteTopOfElement: ${this._notebookEditor.getAbsoluteTopOfElement(cell)}px`;
+            }
+            return `cell #${index} (handle: ${cell.handle}) ${scrollTop} | EOL: ${eol}`;
+        };
         const label = createElement('div');
-        label.textContent = `cell #${index} (handle: ${cell.handle}) | AbsoluteTopOfElement: ${cellTop}px`;
+        label.textContent = getLayoutInfo();
         label.style.position = 'absolute';
         label.style.top = '0px';
         label.style.right = '10px';
@@ -172,32 +178,36 @@ class TroubleshootController extends Disposable {
             });
         });
         if (overlayId) {
-            this._cellOverlayIds.push(overlayId);
             const updateLayout = () => {
-                const scrollTop = this._notebookEditor.getAbsoluteTopOfElement(cell);
-                label.textContent = `cell #${index} (handle: ${cell.handle}) | AbsoluteTopOfElement: ${scrollTop}px`;
+                label.textContent = getLayoutInfo();
                 if (overlayId) {
                     this._notebookEditor.changeCellOverlays((accessor) => {
                         accessor.layoutOverlay(overlayId);
                     });
                 }
             };
-            this._localStore.add(cell.onDidChangeLayout((e) => {
+            const disposables = this._cellDisposables[index];
+            disposables.add(cell.onDidChangeLayout((e) => {
                 updateLayout();
             }));
-            this._localStore.add(this._notebookEditor.onDidChangeLayout(() => {
+            disposables.add(cell.textBuffer.onDidChangeContent(() => {
                 updateLayout();
             }));
-        }
-    }
-    _removeCellOverlays() {
-        if (this._cellOverlayIds.length > 0) {
-            this._notebookEditor.changeCellOverlays((accessor) => {
-                for (const id of this._cellOverlayIds) {
-                    accessor.removeOverlay(id);
-                }
-            });
-            this._cellOverlayIds = [];
+            if (cell.textModel) {
+                disposables.add(cell.textModel.onDidChangeContent(() => {
+                    updateLayout();
+                }));
+            }
+            disposables.add(this._notebookEditor.onDidChangeLayout(() => {
+                updateLayout();
+            }));
+            disposables.add(toDisposable(() => {
+                this._notebookEditor.changeCellOverlays((accessor) => {
+                    if (overlayId) {
+                        accessor.removeOverlay(overlayId);
+                    }
+                });
+            }));
         }
     }
     _removeNotebookOverlay() {
@@ -212,20 +222,31 @@ class TroubleshootController extends Disposable {
         }
         for (let i = 0; i < this._notebookEditor.getLength(); i++) {
             const cell = this._notebookEditor.cellAt(i);
-            this._cellStateListeners.push(cell.onDidChangeLayout(e => {
+            const disposableStore = ( new DisposableStore());
+            this._cellDisposables.push(disposableStore);
+            disposableStore.add(cell.onDidChangeLayout(e => {
                 this._log(cell, e);
             }));
         }
         this._localStore.add(this._notebookEditor.onDidChangeViewCells(e => {
             [...e.splices].reverse().forEach(splice => {
                 const [start, deleted, newCells] = splice;
-                const deletedCells = this._cellStateListeners.splice(start, deleted, ...( newCells.map(cell => {
-                    return cell.onDidChangeLayout((e) => {
+                const deletedCells = this._cellDisposables.splice(start, deleted, ...( newCells.map(cell => {
+                    const disposableStore = ( new DisposableStore());
+                    disposableStore.add(cell.onDidChangeLayout(e => {
                         this._log(cell, e);
-                    });
+                    }));
+                    return disposableStore;
                 })));
                 dispose(deletedCells);
             });
+            const addedCells = e.splices.reduce((acc, [, , newCells]) => [...acc, ...newCells], []);
+            for (let i = 0; i < addedCells.length; i++) {
+                const cellIndex = this._notebookEditor.getCellIndex(addedCells[i]);
+                if (cellIndex !== undefined) {
+                    this._createCellOverlay(addedCells[i], cellIndex);
+                }
+            }
         }));
         const vm = this._notebookEditor.getViewModel();
         let items = [];
@@ -251,8 +272,7 @@ class TroubleshootController extends Disposable {
         return items;
     }
     dispose() {
-        dispose(this._cellStateListeners);
-        this._removeCellOverlays();
+        dispose(this._cellDisposables);
         this._removeNotebookOverlay();
         this._localStore.clear();
         super.dispose();
@@ -263,7 +283,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'notebook.toggleLayoutTroubleshoot',
-            title: ( localize2(8487, "Toggle Notebook Layout Troubleshoot")),
+            title: ( localize2(8644, "Toggle Notebook Layout Troubleshoot")),
             category: Categories.Developer,
             f1: true
         });
@@ -282,7 +302,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'notebook.inspectLayout',
-            title: ( localize2(8488, "Inspect Notebook Layout")),
+            title: ( localize2(8645, "Inspect Notebook Layout")),
             category: Categories.Developer,
             f1: true
         });
@@ -303,7 +323,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'notebook.clearNotebookEdtitorTypeCache',
-            title: ( localize2(8489, "Clear Notebook Editor Type Cache")),
+            title: ( localize2(8646, "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-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { getNotebookEditorFromEditorPane, CellEditState } from '@codingame/monaco-vscode-670aae94-7f88-54d7-90ea-6fcbef423557-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 {

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-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { CellEditState, RenderOutputType } from '@codingame/monaco-vscode-670aae94-7f88-54d7-90ea-6fcbef423557-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-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/notebook/common/notebookRange';
+import { cellRangesToIndexes } from '@codingame/monaco-vscode-670aae94-7f88-54d7-90ea-6fcbef423557-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 {