@codingame/monaco-vscode-notebook-service-override 9.0.2 → 10.0.0

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

@@ -26,13 +26,10 @@ import 'vscode/vscode/vs/platform/theme/common/colors/quickpickColors';
 import 'vscode/vscode/vs/platform/theme/common/colors/searchColors';
 import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService.service';
 import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
-import { CellFoldingState, CellRevealType } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { NotebookEditor } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookEditor';
 import { CellKind, NotebookSetting, NotebookCellsChangeType } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { SIDE_GROUP } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
-import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
-import { OutlineConfigKeys, OutlineTarget, OutlineConfigCollapseItemsValues } from 'vscode/vscode/vs/workbench/services/outline/browser/outline';
 import { IOutlineService } from 'vscode/vscode/vs/workbench/services/outline/browser/outline.service';
 import { CancellationToken } from 'vscode/vscode/vs/base/common/cancellation';
 import { Range } from 'vscode/vscode/vs/editor/common/core/range';
@@ -47,7 +44,6 @@ import { disposableTimeout, Delayer } from 'vscode/vscode/vs/base/common/async';
 import { IOutlinePane } from 'vscode/vscode/vs/workbench/contrib/outline/browser/outline';
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { NOTEBOOK_IS_ACTIVE_EDITOR } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
-import { NotebookOutlineConstants } from '../../viewModel/notebookOutlineEntryFactory.js';
 import { INotebookCellOutlineDataSourceFactory } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/viewModel/notebookOutlineDataSourceFactory.service';
 import { NotebookExecutionType } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService';
 import { INotebookExecutionStateService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService.service';
@@ -123,7 +119,7 @@ let NotebookOutlineRenderer = class NotebookOutlineRenderer {
         template.decoration.innerText = '';
         if (markerInfo) {
             const problem = this._configurationService.getValue('problems.visibility');
-            const useBadges = this._configurationService.getValue(OutlineConfigKeys.problemsBadges);
+            const useBadges = this._configurationService.getValue("outline.problems.badges" );
             if (!useBadges || !problem) {
                 template.decoration.classList.remove('bubble');
                 template.decoration.innerText = '';
@@ -140,7 +136,7 @@ let NotebookOutlineRenderer = class NotebookOutlineRenderer {
             if (problem === undefined) {
                 return;
             }
-            const useColors = this._configurationService.getValue(OutlineConfigKeys.problemsColors);
+            const useColors = this._configurationService.getValue("outline.problems.colors" );
             if (!useColors || !problem) {
                 template.container.style.removeProperty('--outline-element-color');
                 template.decoration.style.setProperty('--outline-element-color', color?.toString() ?? 'inherit');
@@ -149,7 +145,7 @@ let NotebookOutlineRenderer = class NotebookOutlineRenderer {
                 template.container.style.setProperty('--outline-element-color', color?.toString() ?? 'inherit');
             }
         }
-        if (this._target === OutlineTarget.OutlinePane) {
+        if (this._target === 1 ) {
             const nbCell = node.element.cell;
             const nbViewModel = this._editor?.getViewModel();
             if (!nbViewModel) {
@@ -160,7 +156,7 @@ let NotebookOutlineRenderer = class NotebookOutlineRenderer {
             const scopedContextKeyService = template.elementDisposables.add(this._contextKeyService.createScoped(template.container));
             NotebookOutlineContext.CellKind.bindTo(scopedContextKeyService).set(isCodeCell ? CellKind.Code : CellKind.Markup);
             NotebookOutlineContext.CellHasChildren.bindTo(scopedContextKeyService).set(length > 0);
-            NotebookOutlineContext.CellHasHeader.bindTo(scopedContextKeyService).set(node.element.level !== NotebookOutlineConstants.NonHeaderOutlineLevel);
+            NotebookOutlineContext.CellHasHeader.bindTo(scopedContextKeyService).set(node.element.level !== 7 );
             NotebookOutlineContext.OutlineElementTarget.bindTo(scopedContextKeyService).set(this._target);
             this.setupFolding(isCodeCell, nbViewModel, scopedContextKeyService, template, nbCell);
             const outlineEntryToolbar = template.elementDisposables.add(( (new ToolBar(template.actionMenu, this._contextMenuService, {
@@ -187,7 +183,7 @@ let NotebookOutlineRenderer = class NotebookOutlineRenderer {
         clearNode(templateData.actionMenu);
     }
     setupFolding(isCodeCell, nbViewModel, scopedContextKeyService, template, nbCell) {
-        const foldingState = isCodeCell ? CellFoldingState.None : (nbCell.foldingState);
+        const foldingState = isCodeCell ? 0  : (nbCell.foldingState);
         const foldingStateCtx = NotebookOutlineContext.CellFoldingState.bindTo(scopedContextKeyService);
         foldingStateCtx.set(foldingState);
         if (!isCodeCell) {
@@ -286,7 +282,7 @@ let NotebookQuickPickProvider = class NotebookQuickPickProvider {
         const result = [];
         const { hasFileIcons } = this._themeService.getFileIconTheme();
         const isSymbol = (element) => !!element.symbolKind;
-        const isCodeCell = (element) => (element.cell.cellKind === CellKind.Code && element.level === NotebookOutlineConstants.NonHeaderOutlineLevel);
+        const isCodeCell = (element) => ((element.cell.cellKind === CellKind.Code && element.level === 7) );
         for (let i = 0; i < bucket.length; i++) {
             const element = bucket[i];
             const nextElement = bucket[i + 1];
@@ -357,9 +353,9 @@ let NotebookOutlinePaneProvider = class NotebookOutlinePaneProvider {
         return undefined;
     }
     filterEntry(entry) {
-        if ((this.showMarkdownHeadersOnly && entry.cell.cellKind === CellKind.Markup && entry.level === NotebookOutlineConstants.NonHeaderOutlineLevel) ||
+        if (((this.showMarkdownHeadersOnly && entry.cell.cellKind === CellKind.Markup && entry.level === 7) ) ||
             (!this.showCodeCells && entry.cell.cellKind === CellKind.Code) ||
-            (!this.showCodeCellSymbols && entry.cell.cellKind === CellKind.Code && entry.level > NotebookOutlineConstants.NonHeaderOutlineLevel)
+            ((!this.showCodeCellSymbols && entry.cell.cellKind === CellKind.Code && entry.level > 7) )
         ) {
             return true;
         }
@@ -373,7 +369,7 @@ let NotebookOutlinePaneProvider = class NotebookOutlinePaneProvider {
                 if (!this.showMarkdownHeadersOnly) {
                     yield entry;
                 }
-                else if (entry.level < NotebookOutlineConstants.NonHeaderOutlineLevel) {
+                else if (entry.level < 7 ) {
                     yield entry;
                 }
             }
@@ -381,7 +377,7 @@ let NotebookOutlinePaneProvider = class NotebookOutlinePaneProvider {
                 if (this.showCodeCellSymbols) {
                     yield entry;
                 }
-                else if (entry.level === NotebookOutlineConstants.NonHeaderOutlineLevel) {
+                else if (entry.level === 7 ) {
                     yield entry;
                 }
             }
@@ -441,7 +437,7 @@ class NotebookComparator {
 let NotebookCellOutline = class NotebookCellOutline {
     get activeElement() {
         this.checkDelayer();
-        if (this._target === OutlineTarget.OutlinePane) {
+        if (this._target === 1 ) {
             return this.config.treeDataSource.getActiveEntry();
         }
         else {
@@ -483,14 +479,13 @@ let NotebookCellOutline = class NotebookCellOutline {
         this.delayerRecomputeState = this._disposables.add(( (new Delayer(300))));
         this.delayerRecomputeActive = this._disposables.add(( (new Delayer(200))));
         this.delayerRecomputeSymbols = this._disposables.add(( (new Delayer(2000))));
-        this.gotoShowCodeCellSymbols = this._configurationService.getValue(NotebookSetting.gotoSymbolsAllSymbols);
         this.outlineShowCodeCellSymbols = this._configurationService.getValue(NotebookSetting.outlineShowCodeCellSymbols);
         this.initializeOutline();
         const delegate = ( (new NotebookOutlineVirtualDelegate()));
         const renderers = [this._instantiationService.createInstance(NotebookOutlineRenderer, this._editor.getControl(), this._target)];
         const comparator = ( (new NotebookComparator()));
         const options = {
-            collapseByDefault: this._target === OutlineTarget.Breadcrumbs || (this._target === OutlineTarget.OutlinePane && this._configurationService.getValue(OutlineConfigKeys.collapseItems) === OutlineConfigCollapseItemsValues.Collapsed),
+            collapseByDefault: this._target === 2  || ((this._target === 1  && this._configurationService.getValue("outline.collapseItems" ) === "alwaysCollapse") ),
             expandOnlyOnTwistieClick: true,
             multipleSelectionSupport: false,
             accessibilityProvider: ( (new NotebookOutlineAccessibility())),
@@ -535,8 +530,7 @@ let NotebookCellOutline = class NotebookCellOutline {
             }
         }));
         this._disposables.add(this._configurationService.onDidChangeConfiguration(e => {
-            if (e.affectsConfiguration(NotebookSetting.gotoSymbolsAllSymbols) || e.affectsConfiguration(NotebookSetting.outlineShowCodeCellSymbols)) {
-                this.gotoShowCodeCellSymbols = this._configurationService.getValue(NotebookSetting.gotoSymbolsAllSymbols);
+            if (e.affectsConfiguration(NotebookSetting.outlineShowCodeCellSymbols)) {
                 this.outlineShowCodeCellSymbols = this._configurationService.getValue(NotebookSetting.outlineShowCodeCellSymbols);
                 this.computeSymbols();
             }
@@ -581,13 +575,13 @@ let NotebookCellOutline = class NotebookCellOutline {
         }));
     }
     async computeSymbols(cancelToken = CancellationToken.None) {
-        if (this._target === OutlineTarget.QuickPick && this.gotoShowCodeCellSymbols) {
-            await this._outlineDataSourceReference?.object?.computeFullSymbols(cancelToken);
-        }
-        else if (this._target === OutlineTarget.OutlinePane && this.outlineShowCodeCellSymbols) {
-            void this._outlineDataSourceReference?.object?.computeFullSymbols(cancelToken);
+        if (this._target === 1  && this.outlineShowCodeCellSymbols) {
+            void this.doComputeSymbols(cancelToken);
         }
     }
+    async doComputeSymbols(cancelToken) {
+        await this._outlineDataSourceReference?.object?.computeFullSymbols(cancelToken);
+    }
     async delayedComputeSymbols() {
         this.delayerRecomputeState.cancel();
         this.delayerRecomputeActive.cancel();
@@ -606,7 +600,7 @@ let NotebookCellOutline = class NotebookCellOutline {
         const notebookEditorOptions = {
             ...options,
             override: this._editor.input?.editorId,
-            cellRevealType: CellRevealType.NearTopIfOutsideViewport,
+            cellRevealType: 5 ,
             selection: entry.position,
             viewState: undefined,
         };
@@ -694,7 +688,11 @@ let NotebookOutlineCreator = class NotebookOutlineCreator {
         return candidate.getId() === NotebookEditor.ID;
     }
     async createOutline(editor, target, cancelToken) {
-        return this._instantiationService.createInstance(NotebookCellOutline, editor, target);
+        const outline = this._instantiationService.createInstance(NotebookCellOutline, editor, target);
+        if (target === 4 ) {
+            await outline.doComputeSymbols(cancelToken);
+        }
+        return outline;
     }
 };
 NotebookOutlineCreator = ( (__decorate([
@@ -705,10 +703,10 @@ const NotebookOutlineContext = {
     CellKind: ( (new RawContextKey('notebookCellKind', undefined))),
     CellHasChildren: ( (new RawContextKey('notebookCellHasChildren', false))),
     CellHasHeader: ( (new RawContextKey('notebookCellHasHeader', false))),
-    CellFoldingState: ( (new RawContextKey('notebookCellFoldingState', CellFoldingState.None))),
+    CellFoldingState: ( (new RawContextKey('notebookCellFoldingState', 0 ))),
     OutlineElementTarget: ( (new RawContextKey('notebookOutlineElementTarget', undefined))),
 };
-( (Registry.as(Extensions.Workbench))).registerWorkbenchContribution(NotebookOutlineCreator, LifecyclePhase.Eventually);
+( (Registry.as(Extensions.Workbench))).registerWorkbenchContribution(NotebookOutlineCreator, 4 );
 ( (Registry.as(Extensions$1.Configuration))).registerConfiguration({
     id: 'notebook',
     order: 100,
@@ -718,33 +716,33 @@ const NotebookOutlineContext = {
             type: 'boolean',
             default: true,
             markdownDescription: ( localize(
-                7998,
+                8058,
                 "When enabled, notebook outline will show only markdown cells containing a header."
             ))
         },
         [NotebookSetting.outlineShowCodeCells]: {
             type: 'boolean',
             default: false,
-            markdownDescription: ( localize(7999, "When enabled, notebook outline shows code cells."))
+            markdownDescription: ( localize(8059, "When enabled, notebook outline shows code cells."))
         },
         [NotebookSetting.outlineShowCodeCellSymbols]: {
             type: 'boolean',
             default: true,
             markdownDescription: ( localize(
-                8000,
+                8060,
                 "When enabled, notebook outline shows code cell symbols. Relies on `notebook.outline.showCodeCells` being enabled."
             ))
         },
         [NotebookSetting.breadcrumbsShowCodeCells]: {
             type: 'boolean',
             default: true,
-            markdownDescription: ( localize(8001, "When enabled, notebook breadcrumbs contain code cells."))
+            markdownDescription: ( localize(8061, "When enabled, notebook breadcrumbs contain code cells."))
         },
         [NotebookSetting.gotoSymbolsAllSymbols]: {
             type: 'boolean',
             default: true,
             markdownDescription: ( localize(
-                8002,
+                8062,
                 "When enabled, the Go to Symbol Quick Pick will display full code symbols from the notebook, as well as Markdown headers."
             ))
         },
@@ -752,7 +750,7 @@ const NotebookOutlineContext = {
 });
 MenuRegistry.appendMenuItem(MenuId.ViewTitle, {
     submenu: MenuId.NotebookOutlineFilter,
-    title: ( localize(8003, "Filter Entries")),
+    title: ( localize(8063, "Filter Entries")),
     icon: Codicon.filter,
     group: 'navigation',
     order: -1,
@@ -765,7 +763,7 @@ registerAction2(class ToggleShowMarkdownHeadersOnly extends Action2 {
     constructor() {
         super({
             id: 'notebook.outline.toggleShowMarkdownHeadersOnly',
-            title: ( localize(8004, "Markdown Headers Only")),
+            title: ( localize(8064, "Markdown Headers Only")),
             f1: false,
             toggled: {
                 condition: ( (ContextKeyExpr.equals('config.notebook.outline.showMarkdownHeadersOnly', true)))
@@ -786,7 +784,7 @@ registerAction2(class ToggleCodeCellEntries extends Action2 {
     constructor() {
         super({
             id: 'notebook.outline.toggleCodeCells',
-            title: ( localize(8005, "Code Cells")),
+            title: ( localize(8065, "Code Cells")),
             f1: false,
             toggled: {
                 condition: ( (ContextKeyExpr.equals('config.notebook.outline.showCodeCells', true)))
@@ -808,7 +806,7 @@ registerAction2(class ToggleCodeCellSymbolEntries extends Action2 {
     constructor() {
         super({
             id: 'notebook.outline.toggleCodeCellSymbols',
-            title: ( localize(8006, "Code Cell Symbols")),
+            title: ( localize(8066, "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

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

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

@@ -6,13 +6,12 @@ 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, FormattingMode } from 'vscode/vscode/vs/editor/contrib/format/browser/format';
+import { getDocumentFormattingEditsWithSelectedProvider } 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';
@@ -21,14 +20,26 @@ 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 { SaveReason } from 'vscode/vscode/vs/workbench/common/editor';
 import { getNotebookEditorFromEditorPane } from 'vscode/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 { 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';
 
+class NotebookSaveParticipant {
+    constructor(_editorService) {
+        this._editorService = _editorService;
+    }
+    canParticipate() {
+        const editor = getNotebookEditorFromEditorPane(this._editorService.activeEditorPane);
+        const controller = editor?.getContribution(NotebookMultiCursorController.id);
+        if (!controller) {
+            return true;
+        }
+        return controller.getState() !== NotebookMultiCursorState.Editing;
+    }
+}
 let FormatOnSaveParticipant = class FormatOnSaveParticipant {
     constructor(editorWorkerService, languageFeaturesService, instantiationService, textModelService, bulkEditService, configurationService) {
         this.editorWorkerService = editorWorkerService;
@@ -42,14 +53,14 @@ let FormatOnSaveParticipant = class FormatOnSaveParticipant {
         if (!workingCopy.model || !(workingCopy.model instanceof NotebookFileWorkingCopyModel)) {
             return;
         }
-        if (context.reason === SaveReason.AUTO) {
+        if (context.reason === 2 ) {
             return undefined;
         }
         const enabled = this.configurationService.getValue(NotebookSetting.formatOnSave);
         if (!enabled) {
             return undefined;
         }
-        progress.report({ message: ( localize(7973, "Formatting")) });
+        progress.report({ message: ( localize(8033, "Formatting")) });
         const notebook = workingCopy.model.notebookModel;
         const formatApplied = await this.instantiationService.invokeFunction(CodeActionParticipantUtils.checkAndRunFormatCodeAction, notebook, progress, token);
         const disposable = ( (new DisposableStore()));
@@ -59,7 +70,7 @@ let FormatOnSaveParticipant = class FormatOnSaveParticipant {
                     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, FormattingMode.Silent, token);
+                    const formatEdits = await getDocumentFormattingEditsWithSelectedProvider(this.editorWorkerService, this.languageFeaturesService, model, 2 , token);
                     const edits = [];
                     if (formatEdits) {
                         edits.push(...( (formatEdits.map(
@@ -69,7 +80,7 @@ let FormatOnSaveParticipant = class FormatOnSaveParticipant {
                     }
                     return [];
                 }))));
-                await this.bulkEditService.apply( allCellEdits.flat(), { label: ( localize(7974, "Format Notebook")), code: 'undoredo.formatNotebook', });
+                await this.bulkEditService.apply( allCellEdits.flat(), { label: ( localize(8034, "Format Notebook")), code: 'undoredo.formatNotebook', });
             }
         }
         finally {
@@ -86,8 +97,9 @@ FormatOnSaveParticipant = ( (__decorate([
     ( (__param(4, IBulkEditService))),
     ( (__param(5, IConfigurationService)))
 ], FormatOnSaveParticipant)));
-let TrimWhitespaceParticipant = class TrimWhitespaceParticipant {
+let TrimWhitespaceParticipant = class TrimWhitespaceParticipant extends NotebookSaveParticipant {
     constructor(configurationService, editorService, textModelService, bulkEditService) {
+        super(editorService);
         this.configurationService = configurationService;
         this.editorService = editorService;
         this.textModelService = textModelService;
@@ -96,8 +108,8 @@ let TrimWhitespaceParticipant = class TrimWhitespaceParticipant {
     async participate(workingCopy, context, progress, _token) {
         const trimTrailingWhitespaceOption = this.configurationService.getValue('files.trimTrailingWhitespace');
         const trimInRegexAndStrings = this.configurationService.getValue('files.trimTrailingWhitespaceInRegexAndStrings');
-        if (trimTrailingWhitespaceOption) {
-            await this.doTrimTrailingWhitespace(workingCopy, context.reason === SaveReason.AUTO, trimInRegexAndStrings, progress);
+        if (trimTrailingWhitespaceOption && this.canParticipate()) {
+            await this.doTrimTrailingWhitespace(workingCopy, context.reason === 2 , trimInRegexAndStrings, progress);
         }
     }
     async doTrimTrailingWhitespace(workingCopy, isAutoSaved, trimInRegexesAndStrings, progress) {
@@ -141,7 +153,7 @@ let TrimWhitespaceParticipant = class TrimWhitespaceParticipant {
                 );
             }))));
             const filteredEdits = allCellEdits.flat().filter(edit => edit !== undefined);
-            await this.bulkEditService.apply(filteredEdits, { label: ( localize(7975, "Notebook Trim Trailing Whitespace")), code: 'undoredo.notebookTrimTrailingWhitespace' });
+            await this.bulkEditService.apply(filteredEdits, { label: ( localize(8035, "Notebook Trim Trailing Whitespace")), code: 'undoredo.notebookTrimTrailingWhitespace' });
         }
         finally {
             progress.report({ increment: 100 });
@@ -155,15 +167,16 @@ TrimWhitespaceParticipant = ( (__decorate([
     ( (__param(2, ITextModelService))),
     ( (__param(3, IBulkEditService)))
 ], TrimWhitespaceParticipant)));
-let TrimFinalNewLinesParticipant = class TrimFinalNewLinesParticipant {
+let TrimFinalNewLinesParticipant = class TrimFinalNewLinesParticipant extends NotebookSaveParticipant {
     constructor(configurationService, editorService, bulkEditService) {
+        super(editorService);
         this.configurationService = configurationService;
         this.editorService = editorService;
         this.bulkEditService = bulkEditService;
     }
     async participate(workingCopy, context, progress, _token) {
-        if (this.configurationService.getValue('files.trimFinalNewlines')) {
-            await this.doTrimFinalNewLines(workingCopy, context.reason === SaveReason.AUTO, progress);
+        if (this.configurationService.getValue('files.trimFinalNewlines') && this.canParticipate()) {
+            await this.doTrimFinalNewLines(workingCopy, context.reason === 2 , progress);
         }
     }
     findLastNonEmptyLine(textBuffer) {
@@ -219,7 +232,7 @@ let TrimFinalNewLinesParticipant = class TrimFinalNewLinesParticipant {
                 );
             }))));
             const filteredEdits = allCellEdits.flat().filter(edit => edit !== undefined);
-            await this.bulkEditService.apply(filteredEdits, { label: ( localize(7976, "Trim Final New Lines")), code: 'undoredo.trimFinalNewLines' });
+            await this.bulkEditService.apply(filteredEdits, { label: ( localize(8036, "Trim Final New Lines")), code: 'undoredo.trimFinalNewLines' });
         }
         finally {
             progress.report({ increment: 100 });
@@ -232,15 +245,16 @@ TrimFinalNewLinesParticipant = ( (__decorate([
     ( (__param(1, IEditorService))),
     ( (__param(2, IBulkEditService)))
 ], TrimFinalNewLinesParticipant)));
-let InsertFinalNewLineParticipant = class InsertFinalNewLineParticipant {
+let InsertFinalNewLineParticipant = class InsertFinalNewLineParticipant extends NotebookSaveParticipant {
     constructor(configurationService, bulkEditService, editorService) {
+        super(editorService);
         this.configurationService = configurationService;
         this.bulkEditService = bulkEditService;
         this.editorService = editorService;
     }
     async participate(workingCopy, context, progress, _token) {
-        if (this.configurationService.getValue(NotebookSetting.insertFinalNewline)) {
-            await this.doInsertFinalNewLine(workingCopy, context.reason === SaveReason.AUTO, progress);
+        if (this.configurationService.getValue(NotebookSetting.insertFinalNewline) && this.canParticipate()) {
+            await this.doInsertFinalNewLine(workingCopy, context.reason === 2 , progress);
         }
     }
     async doInsertFinalNewLine(workingCopy, isAutoSaved, progress) {
@@ -274,7 +288,7 @@ let InsertFinalNewLineParticipant = class InsertFinalNewLineParticipant {
                 );
             }))));
             const filteredEdits = allCellEdits.filter(edit => edit !== undefined);
-            await this.bulkEditService.apply(filteredEdits, { label: ( localize(7977, "Insert Final New Line")), code: 'undoredo.insertFinalNewLine' });
+            await this.bulkEditService.apply(filteredEdits, { label: ( localize(8037, "Insert Final New Line")), code: 'undoredo.insertFinalNewLine' });
             if (activeCellEditor && selections) {
                 activeCellEditor.setSelections(selections);
             }
@@ -307,10 +321,10 @@ let CodeActionOnSaveParticipant = class CodeActionOnSaveParticipant {
             return;
         }
         let saveTrigger = '';
-        if (context.reason === SaveReason.AUTO) {
+        if (context.reason === 2 ) {
             return undefined;
         }
-        else if (context.reason === SaveReason.EXPLICIT) {
+        else if (context.reason === 1 ) {
             saveTrigger = 'explicit';
         }
         else {
@@ -330,7 +344,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(7978, "Running 'Notebook' code actions")) });
+            progress.report({ message: ( localize(8038, "Running 'Notebook' code actions")) });
             try {
                 const cell = notebookModel.cells[0];
                 const ref = await this.textModelService.createModelReference(cell.uri);
@@ -362,7 +376,7 @@ let CodeActionOnSaveParticipant = class CodeActionOnSaveParticipant {
                 });
             }
             const cellDisposable = ( (new DisposableStore()));
-            progress.report({ message: ( localize(7979, "Running 'Cell' code actions")) });
+            progress.report({ message: ( localize(8039, "Running 'Cell' code actions")) });
             try {
                 await Promise.all(( (notebookModel.cells.map(async (cell) => {
                     const ref = await this.textModelService.createModelReference(cell.uri);
@@ -402,7 +416,7 @@ class CodeActionParticipantUtils {
         const configurationService = accessor.get(IConfigurationService);
         const formatDisposable = ( (new DisposableStore()));
         let formatResult = false;
-        progress.report({ message: ( localize(7980, "Running 'Format' code actions")) });
+        progress.report({ message: ( localize(8040, "Running 'Format' code actions")) });
         try {
             const cell = notebookModel.cells[0];
             const ref = await textModelService.createModelReference(cell.uri);
@@ -431,7 +445,7 @@ class CodeActionParticipantUtils {
             _report() {
                 progress.report({
                     message: ( localize(
-                        7981,
+                        8041,
                         "Getting code actions from '{0}' ([configure]({1})).",
                         ( ([...this._names].map(name => `'${name}'`))).join(', '),
                         'command:workbench.action.openSettings?%5B%22notebook.codeActionsOnSave%22%5D'
@@ -471,7 +485,7 @@ class CodeActionParticipantUtils {
                         logService.warn('Failed to apply code action on save, applied to multiple resources.');
                         continue;
                     }
-                    progress.report({ message: ( localize(7982, "Applying code action '{0}'.", action.action.title)) });
+                    progress.report({ message: ( localize(8042, "Applying code action '{0}'.", action.action.title)) });
                     await instantiationService.invokeFunction(applyCodeAction, action, ApplyCodeActionReason.OnSave, {}, token);
                     if (token.isCancellationRequested) {
                         return;
@@ -496,7 +510,7 @@ class CodeActionParticipantUtils {
             _report() {
                 progress.report({
                     message: ( localize(
-                        7981,
+                        8041,
                         "Getting code actions from '{0}' ([configure]({1})).",
                         ( ([...this._names].map(name => `'${name}'`))).join(', '),
                         'command:workbench.action.openSettings?%5B%22notebook.defaultFormatter%22%5D'
@@ -523,7 +537,7 @@ class CodeActionParticipantUtils {
             if (!action) {
                 return false;
             }
-            progress.report({ message: ( localize(7982, "Applying code action '{0}'.", action.action.title)) });
+            progress.report({ message: ( localize(8042, "Applying code action '{0}'.", action.action.title)) });
             await instantiationService.invokeFunction(applyCodeAction, action, ApplyCodeActionReason.OnSave, {}, token);
             if (token.isCancellationRequested) {
                 return false;
@@ -540,7 +554,7 @@ class CodeActionParticipantUtils {
     }
     static getActionsToRun(model, codeActionKind, excludes, languageFeaturesService, progress, token) {
         return getCodeActions(languageFeaturesService.codeActionProvider, model, model.getFullModelRange(), {
-            type: CodeActionTriggerType.Invoke,
+            type: 1 ,
             triggerAction: CodeActionTriggerSource.OnSave,
             filter: { include: codeActionKind, excludes: excludes, includeSourceActions: true },
         }, progress, token);
@@ -572,6 +586,6 @@ SaveParticipantsContribution = ( (__decorate([
     ( (__param(1, IWorkingCopyFileService)))
 ], SaveParticipantsContribution)));
 const workbenchContributionsRegistry = ( (Registry.as(Extensions.Workbench)));
-workbenchContributionsRegistry.registerWorkbenchContribution(SaveParticipantsContribution, LifecyclePhase.Restored);
+workbenchContributionsRegistry.registerWorkbenchContribution(SaveParticipantsContribution, 3 );
 
 export { CodeActionParticipantUtils, SaveParticipantsContribution };

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

@@ -4,7 +4,6 @@ import { Categories } from 'vscode/vscode/vs/platform/action/common/actionCommon
 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 'vscode/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';
 
@@ -76,7 +75,7 @@ class TroubleshootController extends Disposable {
                 items: [
                     {
                         text: `index: ${i}`,
-                        alignment: CellStatusbarAlignment.Left,
+                        alignment: 1 ,
                         priority: Number.MAX_SAFE_INTEGER
                     }
                 ]
@@ -94,7 +93,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'notebook.toggleLayoutTroubleshoot',
-            title: ( localize2(8046, "Toggle Layout Troubleshoot")),
+            title: ( localize2(8106, "Toggle Layout Troubleshoot")),
             category: Categories.Developer,
             f1: true
         });
@@ -113,7 +112,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'notebook.inspectLayout',
-            title: ( localize2(8047, "Inspect Notebook Layout")),
+            title: ( localize2(8107, "Inspect Notebook Layout")),
             category: Categories.Developer,
             f1: true
         });
@@ -134,7 +133,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'notebook.clearNotebookEdtitorTypeCache',
-            title: ( localize2(8048, "Clear Notebook Editor Type Cache")),
+            title: ( localize2(8108, "Clear Notebook Editor Type Cache")),
             category: Categories.Developer,
             f1: true
         });

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

@@ -1,6 +1,6 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
-import { registerWorkbenchContribution2, WorkbenchPhase } from 'vscode/vscode/vs/workbench/common/contributions';
+import { registerWorkbenchContribution2 } 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';
@@ -53,4 +53,4 @@ let NotebookUndoRedoContribution = class NotebookUndoRedoContribution extends Di
 NotebookUndoRedoContribution = ( __decorate([
     ( __param(0, IEditorService))
 ], NotebookUndoRedoContribution));
-registerWorkbenchContribution2(NotebookUndoRedoContribution.ID, NotebookUndoRedoContribution, WorkbenchPhase.BlockRestore);
+registerWorkbenchContribution2(NotebookUndoRedoContribution.ID, NotebookUndoRedoContribution, 2 );

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

@@ -2,7 +2,7 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { RunOnceScheduler } from 'vscode/vscode/vs/base/common/async';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { IAccessibilityService } from 'vscode/vscode/vs/platform/accessibility/common/accessibility.service';
-import { CellEditState, RenderOutputType } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { CellEditState } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { registerNotebookContribution } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookEditorExtensions';
 import { outputDisplayLimit } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/viewModel/codeCellViewModel';
 import { CellKind } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
@@ -82,7 +82,7 @@ let NotebookViewportContribution = class NotebookViewportContribution extends Di
             if (!renderer) {
                 return;
             }
-            const result = { type: RenderOutputType.Extension, renderer, source: output, mimeType: pickedMimeTypeRenderer.mimeType };
+            const result = { type: 1 , renderer, source: output, mimeType: pickedMimeTypeRenderer.mimeType };
             this._notebookEditor.createOutput(viewCell, result, 0, true);
         }
     }