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

package/vscode/src/vs/workbench/contrib/notebook/browser/controller/sectionActions.js

@@ -1,38 +1,38 @@
+
 import { localize2, localize } from 'vscode/vscode/vs/nls';
 import { Action2, MenuId, registerAction2 } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { NotebookOutlineContext } from '../contrib/outline/notebookOutline.js';
-import { FoldingController } from '@codingame/monaco-vscode-chat-interactive-notebook-search-common/vscode/vs/workbench/contrib/notebook/browser/controller/foldingController';
-import { executeIcon } from '@codingame/monaco-vscode-chat-interactive-notebook-search-common/vscode/vs/workbench/contrib/notebook/browser/notebookIcons';
+import { FoldingController } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/controller/foldingController';
+import { CellEditState, CellFoldingState } from '@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { executeIcon } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/notebookIcons';
 import { CellKind } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
+import { OutlineTarget } from '@codingame/monaco-vscode-d6e33d82-c101-549d-a885-0807ab3e0cfb-common/vscode/vs/workbench/services/outline/browser/outline';
+import { CellToolbarOrder, CELL_TITLE_CELL_GROUP_ID } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
+import { executeSectionCondition } from './executeActions.js';
 
 class NotebookRunSingleCellInSection extends Action2 {
     constructor() {
         super({
             id: 'notebook.section.runSingleCell',
             title: {
-                ...( localize2(8058, "Run Cell")),
-                mnemonicTitle: ( localize(8059, "&&Run Cell")),
+                ...( localize2(7526, "Run Cell")),
+                mnemonicTitle: ( localize(7527, "&&Run Cell")),
             },
-            shortTitle: ( localize(8058, "Run Cell")),
+            shortTitle: ( localize(7526, "Run Cell")),
             icon: executeIcon,
             menu: [
                 {
                     id: MenuId.NotebookOutlineActionMenu,
                     group: 'inline',
                     order: 1,
-                    when: ( (ContextKeyExpr.and(
-                         (NotebookOutlineContext.CellKind.isEqualTo(CellKind.Code)),
-                         (NotebookOutlineContext.OutlineElementTarget.isEqualTo(1 )),
-                         (NotebookOutlineContext.CellHasChildren.toNegated()),
-                         (NotebookOutlineContext.CellHasHeader.toNegated())
-                    )))
+                    when: ( ContextKeyExpr.and(( NotebookOutlineContext.CellKind.isEqualTo(CellKind.Code)), ( NotebookOutlineContext.OutlineElementTarget.isEqualTo(OutlineTarget.OutlinePane)), ( NotebookOutlineContext.CellHasChildren.toNegated()), ( NotebookOutlineContext.CellHasHeader.toNegated())))
                 }
             ]
         });
     }
     async run(_accessor, context) {
-        if (!checkSectionContext(context)) {
+        if (!checkOutlineEntryContext(context)) {
             return;
         }
         context.notebookEditor.executeNotebookCells([context.outlineEntry.cell]);
@@ -43,10 +43,11 @@ class NotebookRunCellsInSection extends Action2 {
         super({
             id: 'notebook.section.runCells',
             title: {
-                ...( localize2(8060, "Run Cells In Section")),
-                mnemonicTitle: ( localize(8061, "&&Run Cells In Section")),
+                ...( localize2(7528, "Run Cells In Section")),
+                mnemonicTitle: ( localize(7529, "&&Run Cells In Section")),
             },
-            shortTitle: ( localize(8060, "Run Cells In Section")),
+            shortTitle: ( localize(7528, "Run Cells In Section")),
+            icon: executeIcon,
             menu: [
                 {
                     id: MenuId.NotebookStickyScrollContext,
@@ -57,30 +58,45 @@ class NotebookRunCellsInSection extends Action2 {
                     id: MenuId.NotebookOutlineActionMenu,
                     group: 'inline',
                     order: 1,
-                    when: ( (ContextKeyExpr.and(
-                         (NotebookOutlineContext.CellKind.isEqualTo(CellKind.Markup)),
-                         (NotebookOutlineContext.OutlineElementTarget.isEqualTo(1 )),
-                        NotebookOutlineContext.CellHasChildren,
-                        NotebookOutlineContext.CellHasHeader
-                    )))
+                    when: ( ContextKeyExpr.and(( NotebookOutlineContext.CellKind.isEqualTo(CellKind.Markup)), ( NotebookOutlineContext.OutlineElementTarget.isEqualTo(OutlineTarget.OutlinePane)), NotebookOutlineContext.CellHasChildren, NotebookOutlineContext.CellHasHeader))
+                },
+                {
+                    id: MenuId.NotebookCellTitle,
+                    order: CellToolbarOrder.RunSection,
+                    group: CELL_TITLE_CELL_GROUP_ID,
+                    when: executeSectionCondition
                 }
             ]
         });
     }
     async run(_accessor, context) {
-        if (!checkSectionContext(context)) {
+        let cell;
+        if (checkOutlineEntryContext(context)) {
+            cell = context.outlineEntry.cell;
+        }
+        else if (checkNotebookCellContext(context)) {
+            cell = context.cell;
+        }
+        else {
             return;
         }
-        const cell = context.outlineEntry.cell;
-        const idx = context.notebookEditor.getViewModel()?.getCellIndex(cell);
-        if (idx === undefined) {
+        if (cell.getEditState() === CellEditState.Editing) {
+            const foldingController = context.notebookEditor.getContribution(FoldingController.id);
+            foldingController.recompute();
+        }
+        const cellIdx = context.notebookEditor.getViewModel()?.getCellIndex(cell);
+        if (cellIdx === undefined) {
             return;
         }
-        const length = context.notebookEditor.getViewModel()?.getFoldedLength(idx);
+        const sectionIdx = context.notebookEditor.getViewModel()?.getFoldingStartIndex(cellIdx);
+        if (sectionIdx === undefined) {
+            return;
+        }
+        const length = context.notebookEditor.getViewModel()?.getFoldedLength(sectionIdx);
         if (length === undefined) {
             return;
         }
-        const cells = context.notebookEditor.getCellsInRange({ start: idx, end: idx + length + 1 });
+        const cells = context.notebookEditor.getCellsInRange({ start: sectionIdx, end: sectionIdx + length + 1 });
         context.notebookEditor.executeNotebookCells(cells);
     }
 }
@@ -89,28 +105,22 @@ class NotebookFoldSection extends Action2 {
         super({
             id: 'notebook.section.foldSection',
             title: {
-                ...( localize2(8062, "Fold Section")),
-                mnemonicTitle: ( localize(8063, "&&Fold Section")),
+                ...( localize2(7530, "Fold Section")),
+                mnemonicTitle: ( localize(7531, "&&Fold Section")),
             },
-            shortTitle: ( localize(8062, "Fold Section")),
+            shortTitle: ( localize(7530, "Fold Section")),
             menu: [
                 {
                     id: MenuId.NotebookOutlineActionMenu,
                     group: 'notebookFolding',
                     order: 2,
-                    when: ( (ContextKeyExpr.and(
-                         (NotebookOutlineContext.CellKind.isEqualTo(CellKind.Markup)),
-                         (NotebookOutlineContext.OutlineElementTarget.isEqualTo(1 )),
-                        NotebookOutlineContext.CellHasChildren,
-                        NotebookOutlineContext.CellHasHeader,
-                         (NotebookOutlineContext.CellFoldingState.isEqualTo(1 ))
-                    )))
+                    when: ( ContextKeyExpr.and(( NotebookOutlineContext.CellKind.isEqualTo(CellKind.Markup)), ( NotebookOutlineContext.OutlineElementTarget.isEqualTo(OutlineTarget.OutlinePane)), NotebookOutlineContext.CellHasChildren, NotebookOutlineContext.CellHasHeader, ( NotebookOutlineContext.CellFoldingState.isEqualTo(CellFoldingState.Expanded))))
                 }
             ]
         });
     }
     async run(_accessor, context) {
-        if (!checkSectionContext(context)) {
+        if (!checkOutlineEntryContext(context)) {
             return;
         }
         this.toggleFoldRange(context.outlineEntry, context.notebookEditor);
@@ -119,7 +129,7 @@ class NotebookFoldSection extends Action2 {
         const foldingController = notebookEditor.getContribution(FoldingController.id);
         const index = entry.index;
         const headerLevel = entry.level;
-        const newFoldingState = 2 ;
+        const newFoldingState = CellFoldingState.Collapsed;
         foldingController.setFoldingStateDown(index, newFoldingState, headerLevel);
     }
 }
@@ -128,28 +138,22 @@ class NotebookExpandSection extends Action2 {
         super({
             id: 'notebook.section.expandSection',
             title: {
-                ...( localize2(8064, "Expand Section")),
-                mnemonicTitle: ( localize(8065, "&&Expand Section")),
+                ...( localize2(7532, "Expand Section")),
+                mnemonicTitle: ( localize(7533, "&&Expand Section")),
             },
-            shortTitle: ( localize(8064, "Expand Section")),
+            shortTitle: ( localize(7532, "Expand Section")),
             menu: [
                 {
                     id: MenuId.NotebookOutlineActionMenu,
                     group: 'notebookFolding',
                     order: 2,
-                    when: ( (ContextKeyExpr.and(
-                         (NotebookOutlineContext.CellKind.isEqualTo(CellKind.Markup)),
-                         (NotebookOutlineContext.OutlineElementTarget.isEqualTo(1 )),
-                        NotebookOutlineContext.CellHasChildren,
-                        NotebookOutlineContext.CellHasHeader,
-                         (NotebookOutlineContext.CellFoldingState.isEqualTo(2 ))
-                    )))
+                    when: ( ContextKeyExpr.and(( NotebookOutlineContext.CellKind.isEqualTo(CellKind.Markup)), ( NotebookOutlineContext.OutlineElementTarget.isEqualTo(OutlineTarget.OutlinePane)), NotebookOutlineContext.CellHasChildren, NotebookOutlineContext.CellHasHeader, ( NotebookOutlineContext.CellFoldingState.isEqualTo(CellFoldingState.Collapsed))))
                 }
             ]
         });
     }
     async run(_accessor, context) {
-        if (!checkSectionContext(context)) {
+        if (!checkOutlineEntryContext(context)) {
             return;
         }
         this.toggleFoldRange(context.outlineEntry, context.notebookEditor);
@@ -158,13 +162,16 @@ class NotebookExpandSection extends Action2 {
         const foldingController = notebookEditor.getContribution(FoldingController.id);
         const index = entry.index;
         const headerLevel = entry.level;
-        const newFoldingState = 1 ;
+        const newFoldingState = CellFoldingState.Expanded;
         foldingController.setFoldingStateDown(index, newFoldingState, headerLevel);
     }
 }
-function checkSectionContext(context) {
+function checkOutlineEntryContext(context) {
     return !!(context && context.notebookEditor && context.outlineEntry);
 }
+function checkNotebookCellContext(context) {
+    return !!(context && context.notebookEditor && context.cell);
+}
 registerAction2(NotebookRunSingleCellInSection);
 registerAction2(NotebookRunCellsInSection);
 registerAction2(NotebookFoldSection);

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

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

package/vscode/src/vs/workbench/contrib/notebook/browser/controller/variablesActions.js

@@ -1,50 +1,40 @@
+
 import { localize2 } from 'vscode/vscode/vs/nls';
 import { registerAction2, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';
-import { KERNEL_HAS_VARIABLE_PROVIDER } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
+import { KERNEL_HAS_VARIABLE_PROVIDER } from '@codingame/monaco-vscode-4a36e358-d94d-55e0-86ee-3bcd543d9d3f-common/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
 import { NOTEBOOK_VARIABLE_VIEW_ENABLED } from '../contrib/notebookVariables/notebookVariableContextKeys.js';
-import { variablesViewIcon } from '@codingame/monaco-vscode-chat-interactive-notebook-search-common/vscode/vs/workbench/contrib/notebook/browser/notebookIcons';
-import { NotebookAction } from '@codingame/monaco-vscode-chat-interactive-notebook-search-common/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
+import { variablesViewIcon } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/notebookIcons';
+import { NotebookAction } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
 
 const OPEN_VARIABLES_VIEW_COMMAND_ID = 'notebook.openVariablesView';
 registerAction2(class OpenVariablesViewAction extends NotebookAction {
     constructor() {
         super({
             id: OPEN_VARIABLES_VIEW_COMMAND_ID,
-            title: ( localize2(8110, "Variables")),
+            title: ( localize2(7534, "Variables")),
             icon: variablesViewIcon,
             menu: [
                 {
                     id: MenuId.InteractiveToolbar,
                     group: 'navigation',
-                    when: ( (ContextKeyExpr.and(
-                        KERNEL_HAS_VARIABLE_PROVIDER,
-                        (ContextKeyExpr.notEquals('jupyter.kernel.isjupyter', true)),
-                        NOTEBOOK_VARIABLE_VIEW_ENABLED
-                    )))
+                    when: ( ContextKeyExpr.and(KERNEL_HAS_VARIABLE_PROVIDER, (
+                    ContextKeyExpr.notEquals('jupyter.kernel.isjupyter', true)), NOTEBOOK_VARIABLE_VIEW_ENABLED))
                 },
                 {
                     id: MenuId.EditorTitle,
                     order: -1,
                     group: 'navigation',
-                    when: ( (ContextKeyExpr.and(
-                        KERNEL_HAS_VARIABLE_PROVIDER,
-                        (ContextKeyExpr.notEquals('jupyter.kernel.isjupyter', true)),
-                         (ContextKeyExpr.notEquals('config.notebook.globalToolbar', true)),
-                        NOTEBOOK_VARIABLE_VIEW_ENABLED
-                    )))
+                    when: ( ContextKeyExpr.and(KERNEL_HAS_VARIABLE_PROVIDER, (
+                    ContextKeyExpr.notEquals('jupyter.kernel.isjupyter', true)), ( ContextKeyExpr.notEquals('config.notebook.globalToolbar', true)), NOTEBOOK_VARIABLE_VIEW_ENABLED))
                 },
                 {
                     id: MenuId.NotebookToolbar,
                     order: -1,
                     group: 'navigation',
-                    when: ( (ContextKeyExpr.and(
-                        KERNEL_HAS_VARIABLE_PROVIDER,
-                        (ContextKeyExpr.notEquals('jupyter.kernel.isjupyter', true)),
-                         (ContextKeyExpr.equals('config.notebook.globalToolbar', true)),
-                        NOTEBOOK_VARIABLE_VIEW_ENABLED
-                    )))
+                    when: ( ContextKeyExpr.and(KERNEL_HAS_VARIABLE_PROVIDER, (
+                    ContextKeyExpr.notEquals('jupyter.kernel.isjupyter', true)), ( ContextKeyExpr.equals('config.notebook.globalToolbar', true)), NOTEBOOK_VARIABLE_VIEW_ENABLED))
                 }
             ]
         });

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

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