@codingame/monaco-vscode-notebook-service-override 11.1.2 → 12.0.1

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

@@ -1,4 +1,5 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { HierarchicalKind } from 'vscode/vscode/vs/base/common/hierarchicalKind';
 import { DisposableStore, Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { isEqual } from 'vscode/vscode/vs/base/common/resources';
@@ -6,12 +7,13 @@ import { ResourceTextEdit, IBulkEditService } from 'vscode/vscode/vs/editor/brow
 import { trimTrailingWhitespace } from 'vscode/vscode/vs/editor/common/commands/trimTrailingWhitespaceCommand';
 import { Position } from 'vscode/vscode/vs/editor/common/core/position';
 import { Range } from 'vscode/vscode/vs/editor/common/core/range';
+import { CodeActionTriggerType } from 'vscode/vscode/vs/editor/common/languages';
 import { IEditorWorkerService } from 'vscode/vscode/vs/editor/common/services/editorWorker';
 import { ILanguageFeaturesService } from 'vscode/vscode/vs/editor/common/services/languageFeatures';
 import { ITextModelService } from 'vscode/vscode/vs/editor/common/services/resolverService';
 import { applyCodeAction, ApplyCodeActionReason, getCodeActions } from 'vscode/vscode/vs/editor/contrib/codeAction/browser/codeAction';
 import { CodeActionKind, CodeActionTriggerSource } from 'vscode/vscode/vs/editor/contrib/codeAction/common/types';
-import { getDocumentFormattingEditsWithSelectedProvider } from 'vscode/vscode/vs/editor/contrib/format/browser/format';
+import { getDocumentFormattingEditsWithSelectedProvider, FormattingMode } from 'vscode/vscode/vs/editor/contrib/format/browser/format';
 import { SnippetController2 } from 'vscode/vscode/vs/editor/contrib/snippet/browser/snippetController2';
 import { localize } from 'vscode/vscode/vs/nls';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
@@ -20,10 +22,12 @@ import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { IWorkspaceTrustManagementService } from 'vscode/vscode/vs/platform/workspace/common/workspaceTrust.service';
 import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
-import { getNotebookEditorFromEditorPane } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { SaveReason } from 'vscode/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 { NotebookSetting, CellKind } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
-import { NotebookFileWorkingCopyModel } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookEditorModel';
+import { NotebookFileWorkingCopyModel } from '@codingame/monaco-vscode-99f24462-c56d-5407-83fb-2ea9dd33cc8c-common/vscode/vs/workbench/contrib/notebook/common/notebookEditorModel';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
+import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 import { IWorkingCopyFileService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyFileService.service';
 import { NotebookMultiCursorController, NotebookMultiCursorState } from '../multicursor/notebookMulticursor.js';
 
@@ -53,34 +57,32 @@ let FormatOnSaveParticipant = class FormatOnSaveParticipant {
         if (!workingCopy.model || !(workingCopy.model instanceof NotebookFileWorkingCopyModel)) {
             return;
         }
-        if (context.reason === 2 ) {
+        if (context.reason === SaveReason.AUTO) {
             return undefined;
         }
         const enabled = this.configurationService.getValue(NotebookSetting.formatOnSave);
         if (!enabled) {
             return undefined;
         }
-        progress.report({ message: ( localize(8123, "Formatting")) });
+        progress.report({ message: ( localize(7394, "Formatting")) });
         const notebook = workingCopy.model.notebookModel;
         const formatApplied = await this.instantiationService.invokeFunction(CodeActionParticipantUtils.checkAndRunFormatCodeAction, notebook, progress, token);
-        const disposable = ( (new DisposableStore()));
+        const disposable = ( new DisposableStore());
         try {
             if (!formatApplied) {
-                const allCellEdits = await Promise.all(( (notebook.cells.map(async (cell) => {
+                const allCellEdits = await Promise.all(( notebook.cells.map(async (cell) => {
                     const ref = await this.textModelService.createModelReference(cell.uri);
                     disposable.add(ref);
                     const model = ref.object.textEditorModel;
-                    const formatEdits = await getDocumentFormattingEditsWithSelectedProvider(this.editorWorkerService, this.languageFeaturesService, model, 2 , token);
+                    const formatEdits = await getDocumentFormattingEditsWithSelectedProvider(this.editorWorkerService, this.languageFeaturesService, model, FormattingMode.Silent, token);
                     const edits = [];
                     if (formatEdits) {
-                        edits.push(...( (formatEdits.map(
-                            edit => ( (new ResourceTextEdit(model.uri, edit, model.getVersionId())))
-                        ))));
+                        edits.push(...( formatEdits.map(edit => ( new ResourceTextEdit(model.uri, edit, model.getVersionId())))));
                         return edits;
                     }
                     return [];
-                }))));
-                await this.bulkEditService.apply( allCellEdits.flat(), { label: ( localize(8124, "Format Notebook")), code: 'undoredo.formatNotebook', });
+                })));
+                await this.bulkEditService.apply( allCellEdits.flat(), { label: ( localize(7395, "Format Notebook")), code: 'undoredo.formatNotebook', });
             }
         }
         finally {
@@ -89,14 +91,14 @@ let FormatOnSaveParticipant = class FormatOnSaveParticipant {
         }
     }
 };
-FormatOnSaveParticipant = ( (__decorate([
-    ( (__param(0, IEditorWorkerService))),
-    ( (__param(1, ILanguageFeaturesService))),
-    ( (__param(2, IInstantiationService))),
-    ( (__param(3, ITextModelService))),
-    ( (__param(4, IBulkEditService))),
-    ( (__param(5, IConfigurationService)))
-], FormatOnSaveParticipant)));
+FormatOnSaveParticipant = ( __decorate([
+    ( __param(0, IEditorWorkerService)),
+    ( __param(1, ILanguageFeaturesService)),
+    ( __param(2, IInstantiationService)),
+    ( __param(3, ITextModelService)),
+    ( __param(4, IBulkEditService)),
+    ( __param(5, IConfigurationService))
+], FormatOnSaveParticipant));
 let TrimWhitespaceParticipant = class TrimWhitespaceParticipant extends NotebookSaveParticipant {
     constructor(configurationService, editorService, textModelService, bulkEditService) {
         super(editorService);
@@ -109,35 +111,35 @@ let TrimWhitespaceParticipant = class TrimWhitespaceParticipant extends Notebook
         const trimTrailingWhitespaceOption = this.configurationService.getValue('files.trimTrailingWhitespace');
         const trimInRegexAndStrings = this.configurationService.getValue('files.trimTrailingWhitespaceInRegexAndStrings');
         if (trimTrailingWhitespaceOption && this.canParticipate()) {
-            await this.doTrimTrailingWhitespace(workingCopy, context.reason === 2 , trimInRegexAndStrings, progress);
+            await this.doTrimTrailingWhitespace(workingCopy, context.reason === SaveReason.AUTO, trimInRegexAndStrings, progress);
         }
     }
     async doTrimTrailingWhitespace(workingCopy, isAutoSaved, trimInRegexesAndStrings, progress) {
         if (!workingCopy.model || !(workingCopy.model instanceof NotebookFileWorkingCopyModel)) {
             return;
         }
-        const disposable = ( (new DisposableStore()));
+        const disposable = ( new DisposableStore());
         const notebook = workingCopy.model.notebookModel;
         const activeCellEditor = getActiveCellCodeEditor(this.editorService);
         let cursors = [];
         let prevSelection = [];
         try {
-            const allCellEdits = await Promise.all(( (notebook.cells.map(async (cell) => {
+            const allCellEdits = await Promise.all(( notebook.cells.map(async (cell) => {
                 if (cell.cellKind !== CellKind.Code) {
                     return [];
                 }
                 const ref = await this.textModelService.createModelReference(cell.uri);
                 disposable.add(ref);
                 const model = ref.object.textEditorModel;
-                const isActiveCell = (activeCellEditor && ( (cell.uri.toString())) === activeCellEditor.getModel()?.uri.toString());
+                const isActiveCell = (activeCellEditor && ( cell.uri.toString()) === activeCellEditor.getModel()?.uri.toString());
                 if (isActiveCell) {
                     prevSelection = activeCellEditor.getSelections() ?? [];
                     if (isAutoSaved) {
-                        cursors = ( (prevSelection.map(s => s.getPosition())));
+                        cursors = ( prevSelection.map(s => s.getPosition()));
                         const snippetsRange = SnippetController2.get(activeCellEditor)?.getSessionEnclosingRange();
                         if (snippetsRange) {
                             for (let lineNumber = snippetsRange.startLineNumber; lineNumber <= snippetsRange.endLineNumber; lineNumber++) {
-                                cursors.push(( (new Position(lineNumber, model.getLineMaxColumn(lineNumber)))));
+                                cursors.push(( new Position(lineNumber, model.getLineMaxColumn(lineNumber))));
                             }
                         }
                     }
@@ -146,14 +148,10 @@ let TrimWhitespaceParticipant = class TrimWhitespaceParticipant extends Notebook
                 if (!ops.length) {
                     return [];
                 }
-                return (
-                     (ops.map(
-                        op => ( (new ResourceTextEdit(model.uri, { ...op, text: op.text || '' }, model.getVersionId())))
-                    ))
-                );
-            }))));
+                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(8125, "Notebook Trim Trailing Whitespace")), code: 'undoredo.notebookTrimTrailingWhitespace' });
+            await this.bulkEditService.apply(filteredEdits, { label: ( localize(7396, "Notebook Trim Trailing Whitespace")), code: 'undoredo.notebookTrimTrailingWhitespace' });
         }
         finally {
             progress.report({ increment: 100 });
@@ -161,12 +159,12 @@ let TrimWhitespaceParticipant = class TrimWhitespaceParticipant extends Notebook
         }
     }
 };
-TrimWhitespaceParticipant = ( (__decorate([
-    ( (__param(0, IConfigurationService))),
-    ( (__param(1, IEditorService))),
-    ( (__param(2, ITextModelService))),
-    ( (__param(3, IBulkEditService)))
-], TrimWhitespaceParticipant)));
+TrimWhitespaceParticipant = ( __decorate([
+    ( __param(0, IConfigurationService)),
+    ( __param(1, IEditorService)),
+    ( __param(2, ITextModelService)),
+    ( __param(3, IBulkEditService))
+], TrimWhitespaceParticipant));
 let TrimFinalNewLinesParticipant = class TrimFinalNewLinesParticipant extends NotebookSaveParticipant {
     constructor(configurationService, editorService, bulkEditService) {
         super(editorService);
@@ -176,7 +174,7 @@ let TrimFinalNewLinesParticipant = class TrimFinalNewLinesParticipant extends No
     }
     async participate(workingCopy, context, progress, _token) {
         if (this.configurationService.getValue('files.trimFinalNewlines') && this.canParticipate()) {
-            await this.doTrimFinalNewLines(workingCopy, context.reason === 2 , progress);
+            await this.doTrimFinalNewLines(workingCopy, context.reason === SaveReason.AUTO, progress);
         }
     }
     findLastNonEmptyLine(textBuffer) {
@@ -192,16 +190,16 @@ let TrimFinalNewLinesParticipant = class TrimFinalNewLinesParticipant extends No
         if (!workingCopy.model || !(workingCopy.model instanceof NotebookFileWorkingCopyModel)) {
             return;
         }
-        const disposable = ( (new DisposableStore()));
+        const disposable = ( new DisposableStore());
         const notebook = workingCopy.model.notebookModel;
         const activeCellEditor = getActiveCellCodeEditor(this.editorService);
         try {
-            const allCellEdits = await Promise.all(( (notebook.cells.map(async (cell) => {
+            const allCellEdits = await Promise.all(( notebook.cells.map(async (cell) => {
                 if (cell.cellKind !== CellKind.Code) {
                     return;
                 }
                 let cannotTouchLineNumber = 0;
-                const isActiveCell = (activeCellEditor && ( (cell.uri.toString())) === activeCellEditor.getModel()?.uri.toString());
+                const isActiveCell = (activeCellEditor && ( cell.uri.toString()) === activeCellEditor.getModel()?.uri.toString());
                 if (isAutoSaved && isActiveCell) {
                     const selections = activeCellEditor.getSelections() ?? [];
                     for (const sel of selections) {
@@ -214,25 +212,23 @@ let TrimFinalNewLinesParticipant = class TrimFinalNewLinesParticipant extends No
                 if (deleteFromLineNumber > textBuffer.getLineCount()) {
                     return;
                 }
-                const deletionRange = ( (new Range(
+                const deletionRange = ( new Range(
                     deleteFromLineNumber,
                     1,
                     textBuffer.getLineCount(),
                     textBuffer.getLineLastNonWhitespaceColumn(textBuffer.getLineCount())
-                )));
+                ));
                 if (deletionRange.isEmpty()) {
                     return;
                 }
-                return (
-                     (new ResourceTextEdit(
-                        cell.uri,
-                        { range: deletionRange, text: '' },
-                        cell.textModel?.getVersionId()
-                    ))
-                );
-            }))));
+                return ( new ResourceTextEdit(
+                    cell.uri,
+                    { range: deletionRange, text: '' },
+                    cell.textModel?.getVersionId()
+                ));
+            })));
             const filteredEdits = allCellEdits.flat().filter(edit => edit !== undefined);
-            await this.bulkEditService.apply(filteredEdits, { label: ( localize(8126, "Trim Final New Lines")), code: 'undoredo.trimFinalNewLines' });
+            await this.bulkEditService.apply(filteredEdits, { label: ( localize(7397, "Trim Final New Lines")), code: 'undoredo.trimFinalNewLines' });
         }
         finally {
             progress.report({ increment: 100 });
@@ -240,11 +236,11 @@ let TrimFinalNewLinesParticipant = class TrimFinalNewLinesParticipant extends No
         }
     }
 };
-TrimFinalNewLinesParticipant = ( (__decorate([
-    ( (__param(0, IConfigurationService))),
-    ( (__param(1, IEditorService))),
-    ( (__param(2, IBulkEditService)))
-], TrimFinalNewLinesParticipant)));
+TrimFinalNewLinesParticipant = ( __decorate([
+    ( __param(0, IConfigurationService)),
+    ( __param(1, IEditorService)),
+    ( __param(2, IBulkEditService))
+], TrimFinalNewLinesParticipant));
 let InsertFinalNewLineParticipant = class InsertFinalNewLineParticipant extends NotebookSaveParticipant {
     constructor(configurationService, bulkEditService, editorService) {
         super(editorService);
@@ -254,14 +250,14 @@ let InsertFinalNewLineParticipant = class InsertFinalNewLineParticipant extends
     }
     async participate(workingCopy, context, progress, _token) {
         if (this.configurationService.getValue(NotebookSetting.insertFinalNewline) && this.canParticipate()) {
-            await this.doInsertFinalNewLine(workingCopy, context.reason === 2 , progress);
+            await this.doInsertFinalNewLine(workingCopy, context.reason === SaveReason.AUTO, progress);
         }
     }
     async doInsertFinalNewLine(workingCopy, isAutoSaved, progress) {
         if (!workingCopy.model || !(workingCopy.model instanceof NotebookFileWorkingCopyModel)) {
             return;
         }
-        const disposable = ( (new DisposableStore()));
+        const disposable = ( new DisposableStore());
         const notebook = workingCopy.model.notebookModel;
         const activeCellEditor = getActiveCellCodeEditor(this.editorService);
         let selections;
@@ -269,7 +265,7 @@ let InsertFinalNewLineParticipant = class InsertFinalNewLineParticipant extends
             selections = activeCellEditor.getSelections() ?? [];
         }
         try {
-            const allCellEdits = await Promise.all(( (notebook.cells.map(async (cell) => {
+            const allCellEdits = await Promise.all(( notebook.cells.map(async (cell) => {
                 if (cell.cellKind !== CellKind.Code) {
                     return;
                 }
@@ -278,17 +274,15 @@ let InsertFinalNewLineParticipant = class InsertFinalNewLineParticipant extends
                 if (!lineCount || lastLineIsEmptyOrWhitespace) {
                     return;
                 }
-                return (
-                     (new ResourceTextEdit(cell.uri, { range: ( (new Range(
-                        lineCount + 1,
-                        cell.textBuffer.getLineLength(lineCount),
-                        lineCount + 1,
-                        cell.textBuffer.getLineLength(lineCount)
-                    ))), text: cell.textBuffer.getEOL() }, cell.textModel?.getVersionId()))
-                );
-            }))));
+                return ( new ResourceTextEdit(cell.uri, { range: ( new Range(
+                    lineCount + 1,
+                    cell.textBuffer.getLineLength(lineCount),
+                    lineCount + 1,
+                    cell.textBuffer.getLineLength(lineCount)
+                )), text: cell.textBuffer.getEOL() }, cell.textModel?.getVersionId()));
+            })));
             const filteredEdits = allCellEdits.filter(edit => edit !== undefined);
-            await this.bulkEditService.apply(filteredEdits, { label: ( localize(8127, "Insert Final New Line")), code: 'undoredo.insertFinalNewLine' });
+            await this.bulkEditService.apply(filteredEdits, { label: ( localize(7398, "Insert Final New Line")), code: 'undoredo.insertFinalNewLine' });
             if (activeCellEditor && selections) {
                 activeCellEditor.setSelections(selections);
             }
@@ -299,11 +293,11 @@ let InsertFinalNewLineParticipant = class InsertFinalNewLineParticipant extends
         }
     }
 };
-InsertFinalNewLineParticipant = ( (__decorate([
-    ( (__param(0, IConfigurationService))),
-    ( (__param(1, IBulkEditService))),
-    ( (__param(2, IEditorService)))
-], InsertFinalNewLineParticipant)));
+InsertFinalNewLineParticipant = ( __decorate([
+    ( __param(0, IConfigurationService)),
+    ( __param(1, IBulkEditService)),
+    ( __param(2, IEditorService))
+], InsertFinalNewLineParticipant));
 let CodeActionOnSaveParticipant = class CodeActionOnSaveParticipant {
     constructor(configurationService, logService, workspaceTrustManagementService, textModelService, instantiationService) {
         this.configurationService = configurationService;
@@ -321,10 +315,10 @@ let CodeActionOnSaveParticipant = class CodeActionOnSaveParticipant {
             return;
         }
         let saveTrigger = '';
-        if (context.reason === 2 ) {
+        if (context.reason === SaveReason.AUTO) {
             return undefined;
         }
-        else if (context.reason === 1 ) {
+        else if (context.reason === SaveReason.EXPLICIT) {
             saveTrigger = 'explicit';
         }
         else {
@@ -334,7 +328,7 @@ let CodeActionOnSaveParticipant = class CodeActionOnSaveParticipant {
         const setting = this.configurationService.getValue(NotebookSetting.codeActionsOnSave);
         const settingItems = Array.isArray(setting)
             ? setting
-            : ( (Object.keys(setting))).filter(x => setting[x]);
+            : ( Object.keys(setting)).filter(x => setting[x]);
         const allCodeActions = this.createCodeActionsOnSave(settingItems);
         const excludedActions = allCodeActions
             .filter(x => setting[x.value] === 'never' || setting[x.value] === false);
@@ -343,8 +337,8 @@ let CodeActionOnSaveParticipant = class CodeActionOnSaveParticipant {
         const editorCodeActionsOnSave = includedActions.filter(x => !CodeActionKind.Notebook.contains(x));
         const notebookCodeActionsOnSave = includedActions.filter(x => CodeActionKind.Notebook.contains(x));
         if (notebookCodeActionsOnSave.length) {
-            const nbDisposable = ( (new DisposableStore()));
-            progress.report({ message: ( localize(8128, "Running 'Notebook' code actions")) });
+            const nbDisposable = ( new DisposableStore());
+            progress.report({ message: ( localize(7399, "Running 'Notebook' code actions")) });
             try {
                 const cell = notebookModel.cells[0];
                 const ref = await this.textModelService.createModelReference(cell.uri);
@@ -375,15 +369,15 @@ let CodeActionOnSaveParticipant = class CodeActionOnSaveParticipant {
                     return 0;
                 });
             }
-            const cellDisposable = ( (new DisposableStore()));
-            progress.report({ message: ( localize(8129, "Running 'Cell' code actions")) });
+            const cellDisposable = ( new DisposableStore());
+            progress.report({ message: ( localize(7400, "Running 'Cell' code actions")) });
             try {
-                await Promise.all(( (notebookModel.cells.map(async (cell) => {
+                await Promise.all(( notebookModel.cells.map(async (cell) => {
                     const ref = await this.textModelService.createModelReference(cell.uri);
                     cellDisposable.add(ref);
                     const textEditorModel = ref.object.textEditorModel;
                     await this.instantiationService.invokeFunction(CodeActionParticipantUtils.applyOnSaveGenericCodeActions, textEditorModel, editorCodeActionsOnSave, excludedActions, progress, token);
-                }))));
+                })));
             }
             catch {
                 this.logService.error('Failed to apply code action on save');
@@ -395,35 +389,35 @@ let CodeActionOnSaveParticipant = class CodeActionOnSaveParticipant {
         }
     }
     createCodeActionsOnSave(settingItems) {
-        const kinds = ( (settingItems.map(x => ( (new HierarchicalKind(x))))));
+        const kinds = ( settingItems.map(x => ( new HierarchicalKind(x))));
         return kinds.filter(kind => {
             return kinds.every(otherKind => otherKind.equals(kind) || !otherKind.contains(kind));
         });
     }
 };
-CodeActionOnSaveParticipant = ( (__decorate([
-    ( (__param(0, IConfigurationService))),
-    ( (__param(1, ILogService))),
-    ( (__param(2, IWorkspaceTrustManagementService))),
-    ( (__param(3, ITextModelService))),
-    ( (__param(4, IInstantiationService)))
-], CodeActionOnSaveParticipant)));
+CodeActionOnSaveParticipant = ( __decorate([
+    ( __param(0, IConfigurationService)),
+    ( __param(1, ILogService)),
+    ( __param(2, IWorkspaceTrustManagementService)),
+    ( __param(3, ITextModelService)),
+    ( __param(4, IInstantiationService))
+], CodeActionOnSaveParticipant));
 class CodeActionParticipantUtils {
     static async checkAndRunFormatCodeAction(accessor, notebookModel, progress, token) {
         const instantiationService = accessor.get(IInstantiationService);
         const textModelService = accessor.get(ITextModelService);
         const logService = accessor.get(ILogService);
         const configurationService = accessor.get(IConfigurationService);
-        const formatDisposable = ( (new DisposableStore()));
+        const formatDisposable = ( new DisposableStore());
         let formatResult = false;
-        progress.report({ message: ( localize(8130, "Running 'Format' code actions")) });
+        progress.report({ message: ( localize(7401, "Running 'Format' code actions")) });
         try {
             const cell = notebookModel.cells[0];
             const ref = await textModelService.createModelReference(cell.uri);
             formatDisposable.add(ref);
             const textEditorModel = ref.object.textEditorModel;
             const defaultFormatterExtId = configurationService.getValue(NotebookSetting.defaultFormatter);
-            formatResult = await instantiationService.invokeFunction(CodeActionParticipantUtils.applyOnSaveFormatCodeAction, textEditorModel, ( (new HierarchicalKind('notebook.format'))), [], defaultFormatterExtId, progress, token);
+            formatResult = await instantiationService.invokeFunction(CodeActionParticipantUtils.applyOnSaveFormatCodeAction, textEditorModel, ( new HierarchicalKind('notebook.format')), [], defaultFormatterExtId, progress, token);
         }
         catch {
             logService.error('Failed to apply notebook format action on save');
@@ -440,20 +434,20 @@ class CodeActionParticipantUtils {
         const logService = accessor.get(ILogService);
         const getActionProgress = new (class {
             constructor() {
-                this._names = ( (new Set()));
+                this._names = ( new Set());
             }
             _report() {
                 progress.report({
                     message: ( localize(
-                        8131,
+                        7402,
                         "Getting code actions from '{0}' ([configure]({1})).",
-                        ( ([...this._names].map(name => `'${name}'`))).join(', '),
+                        ( [...this._names].map(name => `'${name}'`)).join(', '),
                         'command:workbench.action.openSettings?%5B%22notebook.codeActionsOnSave%22%5D'
                     ))
                 });
             }
             report(provider) {
-                if (provider.displayName && !( (this._names.has(provider.displayName)))) {
+                if (provider.displayName && !( this._names.has(provider.displayName))) {
                     this._names.add(provider.displayName);
                     this._report();
                 }
@@ -485,7 +479,7 @@ class CodeActionParticipantUtils {
                         logService.warn('Failed to apply code action on save, applied to multiple resources.');
                         continue;
                     }
-                    progress.report({ message: ( localize(8132, "Applying code action '{0}'.", action.action.title)) });
+                    progress.report({ message: ( localize(7403, "Applying code action '{0}'.", action.action.title)) });
                     await instantiationService.invokeFunction(applyCodeAction, action, ApplyCodeActionReason.OnSave, {}, token);
                     if (token.isCancellationRequested) {
                         return;
@@ -505,20 +499,20 @@ class CodeActionParticipantUtils {
         const logService = accessor.get(ILogService);
         const getActionProgress = new (class {
             constructor() {
-                this._names = ( (new Set()));
+                this._names = ( new Set());
             }
             _report() {
                 progress.report({
                     message: ( localize(
-                        8131,
+                        7402,
                         "Getting code actions from '{0}' ([configure]({1})).",
-                        ( ([...this._names].map(name => `'${name}'`))).join(', '),
+                        ( [...this._names].map(name => `'${name}'`)).join(', '),
                         'command:workbench.action.openSettings?%5B%22notebook.defaultFormatter%22%5D'
                     ))
                 });
             }
             report(provider) {
-                if (provider.displayName && !( (this._names.has(provider.displayName)))) {
+                if (provider.displayName && !( this._names.has(provider.displayName))) {
                     this._names.add(provider.displayName);
                     this._report();
                 }
@@ -537,7 +531,7 @@ class CodeActionParticipantUtils {
             if (!action) {
                 return false;
             }
-            progress.report({ message: ( localize(8132, "Applying code action '{0}'.", action.action.title)) });
+            progress.report({ message: ( localize(7403, "Applying code action '{0}'.", action.action.title)) });
             await instantiationService.invokeFunction(applyCodeAction, action, ApplyCodeActionReason.OnSave, {}, token);
             if (token.isCancellationRequested) {
                 return false;
@@ -554,7 +548,7 @@ class CodeActionParticipantUtils {
     }
     static getActionsToRun(model, codeActionKind, excludes, languageFeaturesService, progress, token) {
         return getCodeActions(languageFeaturesService.codeActionProvider, model, model.getFullModelRange(), {
-            type: 1 ,
+            type: CodeActionTriggerType.Invoke,
             triggerAction: CodeActionTriggerSource.OnSave,
             filter: { include: codeActionKind, excludes: excludes, includeSourceActions: true },
         }, progress, token);
@@ -581,11 +575,11 @@ let SaveParticipantsContribution = class SaveParticipantsContribution extends Di
         this._register(this.workingCopyFileService.addSaveParticipant(this.instantiationService.createInstance(TrimFinalNewLinesParticipant)));
     }
 };
-SaveParticipantsContribution = ( (__decorate([
-    ( (__param(0, IInstantiationService))),
-    ( (__param(1, IWorkingCopyFileService)))
-], SaveParticipantsContribution)));
-const workbenchContributionsRegistry = ( (Registry.as(Extensions.Workbench)));
-workbenchContributionsRegistry.registerWorkbenchContribution(SaveParticipantsContribution, 3 );
+SaveParticipantsContribution = ( __decorate([
+    ( __param(0, IInstantiationService)),
+    ( __param(1, IWorkingCopyFileService))
+], SaveParticipantsContribution));
+const workbenchContributionsRegistry = ( Registry.as(Extensions.Workbench));
+workbenchContributionsRegistry.registerWorkbenchContribution(SaveParticipantsContribution, LifecyclePhase.Restored);
 
-export { CodeActionParticipantUtils, SaveParticipantsContribution };
+export { CodeActionParticipantUtils, NotebookSaveParticipant, SaveParticipantsContribution };

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

@@ -0,0 +1,17 @@
+import { Disposable } from "vscode/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";
+export declare class TroubleshootController extends Disposable implements INotebookEditorContribution {
+    private readonly _notebookEditor;
+    static id: string;
+    private readonly _localStore;
+    private _cellStateListeners;
+    private _enabled;
+    private _cellStatusItems;
+    constructor(_notebookEditor: INotebookEditor);
+    toggle(): void;
+    private _update;
+    private _log;
+    private _updateListener;
+    private _getItemsForCells;
+    dispose(): void;
+}

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

@@ -1,9 +1,11 @@
+
 import { Disposable, DisposableStore, dispose } from 'vscode/vscode/vs/base/common/lifecycle';
 import { localize2 } from 'vscode/vscode/vs/nls';
 import { Categories } from 'vscode/vscode/vs/platform/action/common/actionCommonCategories';
 import { registerAction2, Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
-import { getNotebookEditorFromEditorPane } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { registerNotebookContribution } from '@codingame/monaco-vscode-chat-interactive-notebook-search-common/vscode/vs/workbench/contrib/notebook/browser/notebookEditorExtensions';
+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-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/notebook/browser/notebookEditorExtensions';
+import { CellStatusbarAlignment } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { INotebookService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookService.service';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 
@@ -12,7 +14,7 @@ class TroubleshootController extends Disposable {
     constructor(_notebookEditor) {
         super();
         this._notebookEditor = _notebookEditor;
-        this._localStore = this._register(( (new DisposableStore())));
+        this._localStore = this._register(( new DisposableStore()));
         this._cellStateListeners = [];
         this._enabled = false;
         this._cellStatusItems = [];
@@ -52,11 +54,11 @@ class TroubleshootController extends Disposable {
         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 => {
+                const deletedCells = this._cellStateListeners.splice(start, deleted, ...( newCells.map(cell => {
                     return cell.onDidChangeLayout((e) => {
                         this._log(cell, e);
                     });
-                }))));
+                })));
                 dispose(deletedCells);
             });
         }));
@@ -75,7 +77,7 @@ class TroubleshootController extends Disposable {
                 items: [
                     {
                         text: `index: ${i}`,
-                        alignment: 1 ,
+                        alignment: CellStatusbarAlignment.Left,
                         priority: Number.MAX_SAFE_INTEGER
                     }
                 ]
@@ -93,7 +95,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'notebook.toggleLayoutTroubleshoot',
-            title: ( localize2(8196, "Toggle Layout Troubleshoot")),
+            title: ( localize2(7404, "Toggle Layout Troubleshoot")),
             category: Categories.Developer,
             f1: true
         });
@@ -112,7 +114,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'notebook.inspectLayout',
-            title: ( localize2(8197, "Inspect Notebook Layout")),
+            title: ( localize2(7405, "Inspect Notebook Layout")),
             category: Categories.Developer,
             f1: true
         });
@@ -133,7 +135,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'notebook.clearNotebookEdtitorTypeCache',
-            title: ( localize2(8198, "Clear Notebook Editor Type Cache")),
+            title: ( localize2(7406, "Clear Notebook Editor Type Cache")),
             category: Categories.Developer,
             f1: true
         });

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

@@ -0,0 +1 @@
+export {};

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

@@ -1,9 +1,10 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
-import { registerWorkbenchContribution2 } from 'vscode/vscode/vs/workbench/common/contributions';
+import { registerWorkbenchContribution2, WorkbenchPhase } from 'vscode/vscode/vs/workbench/common/contributions';
 import { CellKind } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
-import { getNotebookEditorFromEditorPane, CellEditState } from 'vscode/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 'vscode/vscode/vs/editor/browser/editorExtensions';
 
 let NotebookUndoRedoContribution = class NotebookUndoRedoContribution extends Disposable {
@@ -53,4 +54,4 @@ let NotebookUndoRedoContribution = class NotebookUndoRedoContribution extends Di
 NotebookUndoRedoContribution = ( __decorate([
     ( __param(0, IEditorService))
 ], NotebookUndoRedoContribution));
-registerWorkbenchContribution2(NotebookUndoRedoContribution.ID, NotebookUndoRedoContribution, 2 );
+registerWorkbenchContribution2(NotebookUndoRedoContribution.ID, NotebookUndoRedoContribution, WorkbenchPhase.BlockRestore);

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

@@ -0,0 +1 @@
+export {};