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

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/format/formatting.js

@@ -1,7 +1,6 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { localize2, localize } from 'vscode/vscode/vs/nls';
 import { CancellationToken } from 'vscode/vscode/vs/base/common/cancellation';
-import { KeyMod, KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
 import { DisposableStore, Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { registerEditorAction, EditorAction } from 'vscode/vscode/vs/editor/browser/editorExtensions';
 import { IBulkEditService, ResourceTextEdit } from 'vscode/vscode/vs/editor/browser/services/bulkEditService';
@@ -9,11 +8,10 @@ import { EditorContextKeys } from 'vscode/vscode/vs/editor/common/editorContextK
 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 { getDocumentFormattingEditsWithSelectedProvider, FormattingMode, formatDocumentWithSelectedProvider } from 'vscode/vscode/vs/editor/contrib/format/browser/format';
+import { getDocumentFormattingEditsWithSelectedProvider, formatDocumentWithSelectedProvider } from 'vscode/vscode/vs/editor/contrib/format/browser/format';
 import { registerAction2, Action2, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
-import { KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { Progress } from 'vscode/vscode/vs/platform/progress/common/progress';
 import { NOTEBOOK_ACTIONS_CATEGORY } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
 import { getNotebookEditorFromEditorPane } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
@@ -22,7 +20,6 @@ import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/commo
 import { INotebookExecutionService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookExecutionService.service';
 import { NotebookSetting } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
-import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
 import { INotebookService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookService.service';
@@ -32,14 +29,14 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'notebook.format',
-            title: ( localize2(7969, 'Format Notebook')),
+            title: ( localize2(8029, 'Format Notebook')),
             category: NOTEBOOK_ACTIONS_CATEGORY,
             precondition: ( (ContextKeyExpr.and(NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_EDITOR_EDITABLE))),
             keybinding: {
                 when: ( (EditorContextKeys.editorTextFocus.toNegated())),
-                primary: KeyMod.Shift | KeyMod.Alt | KeyCode.KeyF,
-                linux: { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyI },
-                weight: KeybindingWeight.WorkbenchContrib
+                primary: 1024  | 512  | 36 ,
+                linux: { primary: 2048  | 1024  | 39  },
+                weight: 200
             },
             f1: true,
             menu: {
@@ -73,7 +70,7 @@ registerAction2(class extends Action2 {
                     const ref = await textModelService.createModelReference(cell.uri);
                     disposable.add(ref);
                     const model = ref.object.textEditorModel;
-                    const formatEdits = await getDocumentFormattingEditsWithSelectedProvider(editorWorkerService, languageFeaturesService, model, FormattingMode.Explicit, CancellationToken.None);
+                    const formatEdits = await getDocumentFormattingEditsWithSelectedProvider(editorWorkerService, languageFeaturesService, model, 1 , CancellationToken.None);
                     const edits = [];
                     if (formatEdits) {
                         for (const edit of formatEdits) {
@@ -83,7 +80,7 @@ registerAction2(class extends Action2 {
                     }
                     return [];
                 }))));
-                await bulkEditService.apply( allCellEdits.flat(), { label: ( localize(7970, "Format Notebook")), code: 'undoredo.formatNotebook', });
+                await bulkEditService.apply( allCellEdits.flat(), { label: ( localize(8030, "Format Notebook")), code: 'undoredo.formatNotebook', });
             }
         }
         finally {
@@ -95,7 +92,7 @@ registerEditorAction(class FormatCellAction extends EditorAction {
     constructor() {
         super({
             id: 'notebook.formatCell',
-            label: ( localize(7971, "Format Cell")),
+            label: ( localize(8031, "Format Cell")),
             alias: 'Format Cell',
             precondition: ( (ContextKeyExpr.and(
                 NOTEBOOK_IS_ACTIVE_EDITOR,
@@ -106,9 +103,9 @@ registerEditorAction(class FormatCellAction extends EditorAction {
             ))),
             kbOpts: {
                 kbExpr: ( (ContextKeyExpr.and(EditorContextKeys.editorTextFocus))),
-                primary: KeyMod.Shift | KeyMod.Alt | KeyCode.KeyF,
-                linux: { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyI },
-                weight: KeybindingWeight.EditorContrib
+                primary: 1024  | 512  | 36 ,
+                linux: { primary: 2048  | 1024  | 39  },
+                weight: 100
             },
             contextMenuOpts: {
                 group: '1_modification',
@@ -119,7 +116,7 @@ registerEditorAction(class FormatCellAction extends EditorAction {
     async run(accessor, editor) {
         if (editor.hasModel()) {
             const instaService = accessor.get(IInstantiationService);
-            await instaService.invokeFunction(formatDocumentWithSelectedProvider, editor, FormattingMode.Explicit, Progress.None, CancellationToken.None, true);
+            await instaService.invokeFunction(formatDocumentWithSelectedProvider, editor, 1 , Progress.None, CancellationToken.None, true);
         }
     }
 });
@@ -157,7 +154,7 @@ let FormatOnCellExecutionParticipant = class FormatOnCellExecutionParticipant {
                 const ref = await this.textModelService.createModelReference(activeCell.uri);
                 disposable.add(ref);
                 const model = ref.object.textEditorModel;
-                const formatEdits = await getDocumentFormattingEditsWithSelectedProvider(this.editorWorkerService, this.languageFeaturesService, model, FormattingMode.Silent, CancellationToken.None);
+                const formatEdits = await getDocumentFormattingEditsWithSelectedProvider(this.editorWorkerService, this.languageFeaturesService, model, 2 , CancellationToken.None);
                 const edits = [];
                 if (formatEdits) {
                     edits.push(...( (formatEdits.map(
@@ -167,7 +164,7 @@ let FormatOnCellExecutionParticipant = class FormatOnCellExecutionParticipant {
                 }
                 return [];
             }))));
-            await this.bulkEditService.apply( allCellEdits.flat(), { label: ( localize(7972, "Format Cells")), code: 'undoredo.notebooks.onWillExecuteFormat', });
+            await this.bulkEditService.apply( allCellEdits.flat(), { label: ( localize(8032, "Format Cells")), code: 'undoredo.notebooks.onWillExecuteFormat', });
         }
         finally {
             disposable.dispose();
@@ -198,6 +195,6 @@ CellExecutionParticipantsContribution = ( (__decorate([
     ( (__param(1, INotebookExecutionService)))
 ], CellExecutionParticipantsContribution)));
 const workbenchContributionsRegistry = ( (Registry.as(Extensions.Workbench)));
-workbenchContributionsRegistry.registerWorkbenchContribution(CellExecutionParticipantsContribution, LifecyclePhase.Restored);
+workbenchContributionsRegistry.registerWorkbenchContribution(CellExecutionParticipantsContribution, 3 );
 
 export { CellExecutionParticipantsContribution };

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/gettingStarted/notebookGettingStarted.js

@@ -8,7 +8,6 @@ import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/c
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
-import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
 import { Memento } from 'vscode/vscode/vs/workbench/common/memento';
@@ -16,7 +15,6 @@ import { NotebookSetting } from 'vscode/vscode/vs/workbench/contrib/notebook/com
 import { HAS_OPENED_NOTEBOOK } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
 import { NotebookEditorInput } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookEditorInput';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
-import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 
 const hasOpenedNotebookKey = 'hasOpenedNotebook';
 const hasShownGettingStartedKey = 'hasShownNotebookGettingStarted';
@@ -25,7 +23,7 @@ let NotebookGettingStarted = class NotebookGettingStarted extends Disposable {
         super();
         const hasOpenedNotebook = HAS_OPENED_NOTEBOOK.bindTo(_contextKeyService);
         const memento = ( (new Memento('notebookGettingStarted2', _storageService)));
-        const storedValue = memento.getMemento(StorageScope.PROFILE, StorageTarget.USER);
+        const storedValue = memento.getMemento(0 , 0 );
         if (storedValue[hasOpenedNotebookKey]) {
             hasOpenedNotebook.set(true);
         }
@@ -60,12 +58,12 @@ NotebookGettingStarted = ( (__decorate([
     ( (__param(3, ICommandService))),
     ( (__param(4, IConfigurationService)))
 ], NotebookGettingStarted)));
-( (Registry.as(Extensions.Workbench))).registerWorkbenchContribution(NotebookGettingStarted, LifecyclePhase.Restored);
+( (Registry.as(Extensions.Workbench))).registerWorkbenchContribution(NotebookGettingStarted, 3 );
 registerAction2(class NotebookClearNotebookLayoutAction extends Action2 {
     constructor() {
         super({
             id: 'workbench.notebook.layout.gettingStarted',
-            title: ( localize2(7983, "Reset notebook getting started")),
+            title: ( localize2(8043, "Reset notebook getting started")),
             f1: true,
             precondition: ( (ContextKeyExpr.equals(`config.${NotebookSetting.openGettingStarted}`, true))),
             category: Categories.Developer,
@@ -74,7 +72,7 @@ registerAction2(class NotebookClearNotebookLayoutAction extends Action2 {
     run(accessor) {
         const storageService = accessor.get(IStorageService);
         const memento = ( (new Memento('notebookGettingStarted', storageService)));
-        const storedValue = memento.getMemento(StorageScope.PROFILE, StorageTarget.USER);
+        const storedValue = memento.getMemento(0 , 0 );
         storedValue[hasOpenedNotebookKey] = undefined;
         memento.saveMemento();
     }

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/kernelDetection/notebookKernelDetection.js

@@ -5,7 +5,6 @@ import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
 import { INotebookKernelService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookKernelService.service';
 import { INotebookLoggingService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookLoggingService.service';
 import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
-import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 
 let NotebookKernelDetection = class NotebookKernelDetection extends Disposable {
     constructor(_notebookKernelService, _extensionService, _notebookLoggingService) {
@@ -80,4 +79,4 @@ NotebookKernelDetection = ( __decorate([
     ( __param(1, IExtensionService)),
     ( __param(2, INotebookLoggingService))
 ], NotebookKernelDetection));
-( Registry.as(Extensions.Workbench)).registerWorkbenchContribution(NotebookKernelDetection, LifecyclePhase.Restored);
+( Registry.as(Extensions.Workbench)).registerWorkbenchContribution(NotebookKernelDetection, 3 );

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

@@ -9,7 +9,7 @@ class ToggleCellToolbarPositionAction extends Action2 {
     constructor() {
         super({
             id: TOGGLE_CELL_TOOLBAR_POSITION,
-            title: ( localize2(7984, 'Toggle Cell Toolbar Position')),
+            title: ( localize2(8044, 'Toggle Cell Toolbar Position')),
             menu: [{
                     id: MenuId.NotebookCellTitle,
                     group: 'View',

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/marker/markerProvider.js

@@ -1,5 +1,5 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-import { registerWorkbenchContribution2, WorkbenchPhase } from 'vscode/vscode/vs/workbench/common/contributions';
+import { registerWorkbenchContribution2 } from 'vscode/vscode/vs/workbench/common/contributions';
 import { MarkerList, IMarkerNavigationService } from 'vscode/vscode/vs/editor/contrib/gotoError/browser/markerNavigationService';
 import { CellUri } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { MarkerSeverity } from 'vscode/vscode/vs/platform/markers/common/markers';
@@ -98,5 +98,5 @@ NotebookMarkerDecorationContribution.__decorator = ( __decorate([
 NotebookMarkerDecorationContribution = ( __decorate([
     ( __param(1, IMarkerService))
 ], NotebookMarkerDecorationContribution));
-registerWorkbenchContribution2(MarkerListProvider.ID, MarkerListProvider, WorkbenchPhase.BlockRestore);
+registerWorkbenchContribution2(MarkerListProvider.ID, MarkerListProvider, 2 );
 registerNotebookContribution(NotebookMarkerDecorationContribution.id, NotebookMarkerDecorationContribution);