@codingame/monaco-vscode-api 9.0.3 → 10.0.1

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

@@ -1,12 +1,11 @@
 import { ResourceTextEdit } from '../../../../../editor/browser/services/bulkEditService.js';
 import { Position } from '../../../../../editor/common/core/position.js';
 import { Range } from '../../../../../editor/common/core/range.js';
-import { EndOfLinePreference } from '../../../../../editor/common/model.js';
 import { PLAINTEXT_LANGUAGE_ID } from '../../../../../editor/common/languages/modesRegistry.js';
 import { ResourceNotebookCellEdit } from '../../../bulkEdit/browser/bulkCellEdits.js';
 import { CellEditState, expandCellRangesWithHiddenCells, CellFocusMode } from '../notebookBrowser.js';
 import { cloneNotebookCellTextModel } from '../../common/model/notebookCellTextModel.js';
-import { SelectionStateType, CellKind, CellEditType } from '../../common/notebookCommon.js';
+import { SelectionStateType, CellKind } from '../../common/notebookCommon.js';
 import { cellRangesToIndexes, cellRangeContains } from '../../common/notebookRange.js';
 import { localize } from '../../../../../nls.js';
 async function changeCellToKind(kind, context, language, mime) {
@@ -30,7 +29,7 @@ async function changeCellToKind(kind, context, language, mime) {
         }
         notebookEditor.textModel.applyEdits([
             {
-                editType: CellEditType.Replace,
+                editType: 1 ,
                 index: idx,
                 count: 1,
                 cells: [{
@@ -70,7 +69,7 @@ async function changeCellToKind(kind, context, language, mime) {
                 language = availableLanguages[0] ?? PLAINTEXT_LANGUAGE_ID;
             }
             rawEdits.push({
-                editType: CellEditType.Replace,
+                editType: 1 ,
                 index: idx,
                 count: 1,
                 cells: [{
@@ -104,7 +103,7 @@ function runDeleteAction(editor, cell) {
     const computeUndoRedo = !editor.isReadOnly || textModel.viewType === 'interactive';
     if (containingSelection) {
         const edits = ( (selections.reverse().map(selection => ({
-            editType: CellEditType.Replace, index: selection.start, count: selection.end - selection.start, cells: []
+            editType: 1 , index: selection.start, count: selection.end - selection.start, cells: []
         }))));
         const nextCellAfterContainingSelection = containingSelection.end >= editor.getLength() ? undefined : editor.cellAt(containingSelection.end);
         textModel.applyEdits(edits, true, { kind: SelectionStateType.Index, focus: editor.getFocus(), selections: editor.getSelections() }, () => {
@@ -126,7 +125,7 @@ function runDeleteAction(editor, cell) {
     else {
         const focus = editor.getFocus();
         const edits = [{
-                editType: CellEditType.Replace, index: targetCellIndex, count: 1, cells: []
+                editType: 1 , index: targetCellIndex, count: 1, cells: []
             }];
         const finalSelections = [];
         for (let i = 0; i < selections.length; i++) {
@@ -187,7 +186,7 @@ async function moveCellRange(context, direction) {
         const newFocus = cellRangeContains(range, focus) ? { start: focus.start - 1, end: focus.end - 1 } : { start: range.start - 1, end: range.start };
         textModel.applyEdits([
             {
-                editType: CellEditType.Move,
+                editType: 6 ,
                 index: indexAbove,
                 length: 1,
                 newIdx: range.end - 1
@@ -210,7 +209,7 @@ async function moveCellRange(context, direction) {
         const newFocus = cellRangeContains(range, focus) ? { start: focus.start + 1, end: focus.end + 1 } : { start: range.start + 1, end: range.start + 2 };
         textModel.applyEdits([
             {
-                editType: CellEditType.Move,
+                editType: 6 ,
                 index: indexBelow,
                 length: 1,
                 newIdx: range.start
@@ -252,7 +251,7 @@ async function copyCellRange(context, direction) {
         const selections = editor.getSelections();
         textModel.applyEdits([
             {
-                editType: CellEditType.Replace,
+                editType: 1 ,
                 index: range.end,
                 count: 0,
                 cells: ( (cellRangesToIndexes([range]).map(index => cloneNotebookCellTextModel(editor.cellAt(index).model))))
@@ -272,7 +271,7 @@ async function copyCellRange(context, direction) {
         const newSelections = context.ui ? selections : [{ start: range.start + countDelta, end: range.end + countDelta }];
         textModel.applyEdits([
             {
-                editType: CellEditType.Replace,
+                editType: 1 ,
                 index: range.end,
                 count: 0,
                 cells: ( (cellRangesToIndexes([range]).map(index => cloneNotebookCellTextModel(editor.cellAt(index).model))))
@@ -302,14 +301,14 @@ async function joinSelectedCells(bulkEditService, notificationService, context)
     const cellKind = cells[0].cellKind;
     const isSameKind = cells.every(cell => cell.cellKind === cellKind);
     if (!isSameKind) {
-        const message = ( localize(10640, "Cannot join cells of different kinds"));
+        const message = ( localize(10860, "Cannot join cells of different kinds"));
         return notificationService.warn(message);
     }
     const firstCell = cells[0];
     const insertContent = ( (cells.map(cell => cell.getText()))).join(firstCell.textBuffer.getEOL());
     const firstSelection = editor.getSelections()[0];
     edits.push(( (new ResourceNotebookCellEdit(editor.textModel.uri, {
-        editType: CellEditType.Replace,
+        editType: 1 ,
         index: firstSelection.start,
         count: firstSelection.end - firstSelection.start,
         cells: [{
@@ -323,14 +322,14 @@ async function joinSelectedCells(bulkEditService, notificationService, context)
     }))));
     for (const selection of editor.getSelections().slice(1)) {
         edits.push(( (new ResourceNotebookCellEdit(editor.textModel.uri, {
-            editType: CellEditType.Replace,
+            editType: 1 ,
             index: selection.start,
             count: selection.end - selection.start,
             cells: []
         }))));
     }
     if (edits.length) {
-        await bulkEditService.apply(edits, { quotableLabel: ( localize(10641, "Join Notebook Cells")) });
+        await bulkEditService.apply(edits, { quotableLabel: ( localize(10861, "Join Notebook Cells")) });
     }
 }
 async function joinNotebookCells(editor, range, direction, constraint) {
@@ -362,7 +361,7 @@ async function joinNotebookCells(editor, range, direction, constraint) {
                 aboveCellLastLineEndColumn + 1
             ))), text: insertContent }))),
                 ( (new ResourceNotebookCellEdit(textModel.uri, {
-                    editType: CellEditType.Replace,
+                    editType: 1 ,
                     index: range.start,
                     count: range.end - range.start,
                     cells: []
@@ -389,7 +388,7 @@ async function joinNotebookCells(editor, range, direction, constraint) {
                 cellLastLineEndColumn + 1
             ))), text: insertContent }))),
                 ( (new ResourceNotebookCellEdit(textModel.uri, {
-                    editType: CellEditType.Replace,
+                    editType: 1 ,
                     index: range.start + 1,
                     count: range.end - range.start,
                     cells: []
@@ -509,7 +508,7 @@ function computeCellLinesContents(cell, splitPoints) {
     for (let i = 1; i < rangeBoundaries.length; i++) {
         const start = rangeBoundaries[i - 1];
         const end = rangeBoundaries[i];
-        newLineModels.push(cell.textBuffer.getValueInRange(( (new Range(start.lineNumber, start.column, end.lineNumber, end.column))), EndOfLinePreference.TextDefined));
+        newLineModels.push(cell.textBuffer.getValueInRange(( (new Range(start.lineNumber, start.column, end.lineNumber, end.column))), 0 ));
     }
     return newLineModels;
 }
@@ -561,7 +560,7 @@ function insertCellAtIndex(viewModel, index, source, language, type, metadata, o
     const endSelections = { kind: SelectionStateType.Index, focus: { start: index, end: index + 1 }, selections: [{ start: index, end: index + 1 }] };
     viewModel.notebookDocument.applyEdits([
         {
-            editType: CellEditType.Replace,
+            editType: 1 ,
             index,
             count: 0,
             cells: [

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

@@ -11,12 +11,13 @@ import { IEditorService } from '../../../../services/editor/common/editorService
 import { getNotebookEditorFromEditorPane } from '../notebookBrowser.js';
 import { CellKind, CellUri } from '../../common/notebookCommon.js';
 import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
+import { INotebookEditorModelResolverService } from '../../common/notebookEditorModelResolverService.service.js';
 const COPY_OUTPUT_COMMAND_ID = 'notebook.cellOutput.copy';
 registerAction2(class ShowAllOutputsAction extends Action2 {
     constructor() {
         super({
             id: 'notebook.cellOuput.showEmptyOutputs',
-            title: ( localize(7956, "Show empty outputs")),
+            title: ( localize(8271, "Show empty outputs")),
             menu: {
                 id: MenuId.NotebookOutputToolbar,
                 when: ( (ContextKeyExpr.and(NOTEBOOK_CELL_HAS_OUTPUTS, NOTEBOOK_CELL_HAS_HIDDEN_OUTPUTS)))
@@ -41,7 +42,7 @@ registerAction2(class CopyCellOutputAction extends Action2 {
     constructor() {
         super({
             id: COPY_OUTPUT_COMMAND_ID,
-            title: ( localize(7957, "Copy Cell Output")),
+            title: ( localize(8272, "Copy Cell Output")),
             menu: {
                 id: MenuId.NotebookOutputToolbar,
                 when: NOTEBOOK_CELL_HAS_OUTPUTS
@@ -116,7 +117,7 @@ registerAction2(class OpenCellOutputInEditorAction extends Action2 {
     constructor() {
         super({
             id: OPEN_OUTPUT_COMMAND_ID,
-            title: ( localize(7958, "Open Cell Output in Text Editor")),
+            title: ( localize(8273, "Open Cell Output in Text Editor")),
             f1: false,
             category: NOTEBOOK_ACTIONS_CATEGORY,
             icon: copyIcon,
@@ -130,6 +131,7 @@ registerAction2(class OpenCellOutputInEditorAction extends Action2 {
     }
     async run(accessor, outputContext) {
         const notebookEditor = this.getNoteboookEditor(accessor.get(IEditorService), outputContext);
+        const notebookModelService = accessor.get(INotebookEditorModelResolverService);
         if (!notebookEditor) {
             return;
         }
@@ -142,7 +144,9 @@ registerAction2(class OpenCellOutputInEditorAction extends Action2 {
         }
         const openerService = accessor.get(IOpenerService);
         if (outputViewModel?.model.outputId && notebookEditor.textModel?.uri) {
-            openerService.open(CellUri.generateCellOutputUri(notebookEditor.textModel.uri, outputViewModel.model.outputId));
+            const ref = await notebookModelService.resolve(notebookEditor.textModel.uri);
+            await openerService.open(CellUri.generateCellOutputUri(notebookEditor.textModel.uri, outputViewModel.model.outputId));
+            ref.dispose();
         }
     }
 });

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

@@ -1,11 +1,11 @@
 import { localize } from '../../../../../../nls.js';
 import { MenuId } from '../../../../../../platform/actions/common/actions.js';
 import { RawContextKey } from '../../../../../../platform/contextkey/common/contextkey.js';
-const CTX_NOTEBOOK_CELL_CHAT_FOCUSED = ( (new RawContextKey('notebookCellChatFocused', false, ( localize(10733, "Whether the cell chat editor is focused")))));
-const CTX_NOTEBOOK_CHAT_HAS_ACTIVE_REQUEST = ( (new RawContextKey('notebookChatHasActiveRequest', false, ( localize(10734, "Whether the cell chat editor has an active request")))));
-const CTX_NOTEBOOK_CHAT_USER_DID_EDIT = ( (new RawContextKey('notebookChatUserDidEdit', false, ( localize(10735, "Whether the user did changes ontop of the notebook cell chat")))));
+const CTX_NOTEBOOK_CELL_CHAT_FOCUSED = ( (new RawContextKey('notebookCellChatFocused', false, ( localize(10862, "Whether the cell chat editor is focused")))));
+const CTX_NOTEBOOK_CHAT_HAS_ACTIVE_REQUEST = ( (new RawContextKey('notebookChatHasActiveRequest', false, ( localize(10863, "Whether the cell chat editor has an active request")))));
+const CTX_NOTEBOOK_CHAT_USER_DID_EDIT = ( (new RawContextKey('notebookChatUserDidEdit', false, ( localize(10864, "Whether the user did changes ontop of the notebook cell chat")))));
 const CTX_NOTEBOOK_CHAT_OUTER_FOCUS_POSITION = ( (new RawContextKey('notebookChatOuterFocusPosition', '', ( localize(
- 10736,
+ 10865,
  "Whether the focus of the notebook editor is above or below the cell chat"
 )))));
 const MENU_CELL_CHAT_INPUT = MenuId.for('cellChatInput');
@@ -13,5 +13,5 @@ const MENU_CELL_CHAT_WIDGET = MenuId.for('cellChatWidget');
 const MENU_CELL_CHAT_WIDGET_STATUS = MenuId.for('cellChatWidget.status');
 MenuId.for('cellChatWidget.feedback');
 MenuId.for('cellChatWidget.toolbar');
-const CTX_NOTEBOOK_CHAT_HAS_AGENT = ( (new RawContextKey('notebookChatAgentRegistered', false, ( localize(10737, "Whether a chat agent for notebook is registered")))));
+const CTX_NOTEBOOK_CHAT_HAS_AGENT = ( (new RawContextKey('notebookChatAgentRegistered', false, ( localize(10866, "Whether a chat agent for notebook is registered")))));
 export { CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_NOTEBOOK_CHAT_HAS_ACTIVE_REQUEST, CTX_NOTEBOOK_CHAT_HAS_AGENT, CTX_NOTEBOOK_CHAT_OUTER_FOCUS_POSITION, CTX_NOTEBOOK_CHAT_USER_DID_EDIT, MENU_CELL_CHAT_INPUT, MENU_CELL_CHAT_WIDGET, MENU_CELL_CHAT_WIDGET_STATUS };

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

@@ -20,7 +20,6 @@ import { IModelService } from '../../../../../../editor/common/services/model.js
 import { localize } from '../../../../../../nls.js';
 import { IContextKeyService } from '../../../../../../platform/contextkey/common/contextkey.service.js';
 import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
-import { StorageScope, StorageTarget } from '../../../../../../platform/storage/common/storage.js';
 import { IStorageService } from '../../../../../../platform/storage/common/storage.service.js';
 import { ChatAgentLocation } from '../../../../chat/common/chatAgents.js';
 import { IChatService } from '../../../../chat/common/chatService.service.js';
@@ -220,7 +219,7 @@ let NotebookChatController = class NotebookChatController extends Disposable {
         this._ctxUserDidEdit = CTX_NOTEBOOK_CHAT_USER_DID_EDIT.bindTo(this._contextKeyService);
         this._ctxOuterFocusPosition = CTX_NOTEBOOK_CHAT_OUTER_FOCUS_POSITION.bindTo(this._contextKeyService);
         this._registerFocusTracker();
-        NotebookChatController_1._promptHistory = JSON.parse(this._storageService.get(NotebookChatController_1._storageKey, StorageScope.PROFILE, '[]'));
+        NotebookChatController_1._promptHistory = JSON.parse(this._storageService.get(NotebookChatController_1._storageKey, 0 , '[]'));
         this._historyUpdate = (prompt) => {
             const idx = NotebookChatController_1._promptHistory.indexOf(prompt);
             if (idx >= 0) {
@@ -229,7 +228,7 @@ let NotebookChatController = class NotebookChatController extends Disposable {
             NotebookChatController_1._promptHistory.unshift(prompt);
             this._historyOffset = -1;
             this._historyCandidate = '';
-            this._storageService.store(NotebookChatController_1._storageKey, JSON.stringify(NotebookChatController_1._promptHistory), StorageScope.PROFILE, StorageTarget.USER);
+            this._storageService.store(NotebookChatController_1._storageKey, JSON.stringify(NotebookChatController_1._promptHistory), 0 , 0 );
         };
     }
     _registerFocusTracker() {
@@ -338,8 +337,8 @@ let NotebookChatController = class NotebookChatController extends Disposable {
                 }
             }
         }));
-        inlineChatWidget.placeholder = ( localize(10738, "Ask a question"));
-        inlineChatWidget.updateInfo(( localize(10739, "AI-generated code may be incorrect")));
+        inlineChatWidget.placeholder = ( localize(10867, "Ask a question"));
+        inlineChatWidget.updateInfo(( localize(10868, "AI-generated code may be incorrect")));
         widgetContainer.appendChild(inlineChatWidget.domNode);
         this._widgetDisposableStore.add(inlineChatWidget.onDidChangeInput(() => {
             this._warmupRequestCts?.dispose(true);

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

@@ -2,38 +2,20 @@ import { URI } from '../../../../../base/common/uri.js';
 import { localize, localize2 } from '../../../../../nls.js';
 import { MenuRegistry, MenuId, Action2 } from '../../../../../platform/actions/common/actions.js';
 import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
-import { KeybindingWeight } from '../../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { getNotebookEditorFromEditorPane, cellRangeToViewCells } from '../notebookBrowser.js';
-import { NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_KERNEL_COUNT, NOTEBOOK_KERNEL_SOURCE_COUNT, NOTEBOOK_IS_ACTIVE_EDITOR, INTERACTIVE_WINDOW_IS_ACTIVE_EDITOR } from '../../common/notebookContextKeys.js';
+import { NOTEBOOK_KERNEL_COUNT, NOTEBOOK_KERNEL_SOURCE_COUNT, NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_IS_ACTIVE_EDITOR, IS_COMPOSITE_NOTEBOOK } from '../../common/notebookContextKeys.js';
 import { isICellRange } from '../../common/notebookRange.js';
 import { IEditorService } from '../../../../services/editor/common/editorService.service.js';
 import { isEditorCommandsContext } from '../../../../common/editor.js';
 import { INotebookEditorService } from '../services/notebookEditorService.service.js';
 import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.service.js';
-import { MarshalledId } from '../../../../../base/common/marshallingIds.js';
 import { isEqual } from '../../../../../base/common/resources.js';
 const SELECT_KERNEL_ID = '_notebook.selectKernel';
-const NOTEBOOK_ACTIONS_CATEGORY = ( localize2(5604, 'Notebook'));
+const NOTEBOOK_ACTIONS_CATEGORY = ( localize2(5615, 'Notebook'));
 const CELL_TITLE_CELL_GROUP_ID = 'inline/cell';
 const CELL_TITLE_OUTPUT_GROUP_ID = 'inline/output';
-const NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT = KeybindingWeight.EditorContrib;
-const NOTEBOOK_OUTPUT_WEBVIEW_ACTION_WEIGHT = KeybindingWeight.WorkbenchContrib + 1;
-var CellToolbarOrder;
-( ((function(CellToolbarOrder) {
-    CellToolbarOrder[CellToolbarOrder["EditCell"] = 0] = "EditCell";
-    CellToolbarOrder[CellToolbarOrder["ExecuteAboveCells"] = 1] = "ExecuteAboveCells";
-    CellToolbarOrder[CellToolbarOrder["ExecuteCellAndBelow"] = 2] = "ExecuteCellAndBelow";
-    CellToolbarOrder[CellToolbarOrder["SaveCell"] = 3] = "SaveCell";
-    CellToolbarOrder[CellToolbarOrder["SplitCell"] = 4] = "SplitCell";
-    CellToolbarOrder[CellToolbarOrder["ClearCellOutput"] = 5] = "ClearCellOutput";
-})(CellToolbarOrder || (CellToolbarOrder = {}))));
-var CellOverflowToolbarGroups;
-( ((function(CellOverflowToolbarGroups) {
-    CellOverflowToolbarGroups["Copy"] = "1_copy";
-    CellOverflowToolbarGroups["Insert"] = "2_insert";
-    CellOverflowToolbarGroups["Edit"] = "3_edit";
-    CellOverflowToolbarGroups["Share"] = "4_share";
-})(CellOverflowToolbarGroups || (CellOverflowToolbarGroups = {}))));
+const NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT = 100 ;
+const NOTEBOOK_OUTPUT_WEBVIEW_ACTION_WEIGHT = 200  + 1;
 function getContextFromActiveEditor(editorService) {
     const editor = getNotebookEditorFromEditorPane(editorService.activeEditorPane);
     if (!editor || !editor.hasModel()) {
@@ -83,7 +65,7 @@ class NotebookAction extends Action2 {
             desc.f1 = false;
             const f1Menu = {
                 id: MenuId.CommandPalette,
-                when: ( (ContextKeyExpr.or(NOTEBOOK_IS_ACTIVE_EDITOR, INTERACTIVE_WINDOW_IS_ACTIVE_EDITOR)))
+                when: ( (ContextKeyExpr.or(NOTEBOOK_IS_ACTIVE_EDITOR, IS_COMPOSITE_NOTEBOOK)))
             };
             if (!desc.menu) {
                 desc.menu = [];
@@ -100,18 +82,13 @@ class NotebookAction extends Action2 {
         super(desc);
     }
     async run(accessor, context, ...additionalArgs) {
-        const isFromUI = !!context;
-        const from = isFromUI ? (this.isNotebookActionContext(context) ? 'notebookToolbar' : 'editorToolbar') : undefined;
+        sendEntryTelemetry(accessor, this.desc.id, context);
         if (!this.isNotebookActionContext(context)) {
             context = this.getEditorContextFromArgsOrActive(accessor, context, ...additionalArgs);
             if (!context) {
                 return;
             }
         }
-        if (from !== undefined) {
-            const telemetryService = accessor.get(ITelemetryService);
-            telemetryService.publicLog2('workbenchActionExecuted', { id: this.desc.id, from: from });
-        }
         return this.runWithContext(accessor, context);
     }
     isNotebookActionContext(context) {
@@ -146,28 +123,20 @@ class NotebookMultiCellAction extends Action2 {
     parseArgs(accessor, ...args) {
         return undefined;
     }
-    isCellToolbarContext(context) {
-        return !!context && !!context.notebookEditor && context.$mid === MarshalledId.NotebookCellActionContext;
-    }
     async run(accessor, ...additionalArgs) {
         const context = additionalArgs[0];
-        const isFromCellToolbar = this.isCellToolbarContext(context);
-        const isFromEditorToolbar = isEditorCommandsContext(context);
-        const from = isFromCellToolbar ? 'cellToolbar' : (isFromEditorToolbar ? 'editorToolbar' : 'other');
-        const telemetryService = accessor.get(ITelemetryService);
+        sendEntryTelemetry(accessor, this.desc.id, context);
+        const isFromCellToolbar = isCellToolbarContext(context);
         if (isFromCellToolbar) {
-            telemetryService.publicLog2('workbenchActionExecuted', { id: this.desc.id, from: from });
             return this.runWithContext(accessor, context);
         }
         const parsedArgs = this.parseArgs(accessor, ...additionalArgs);
         if (parsedArgs) {
-            telemetryService.publicLog2('workbenchActionExecuted', { id: this.desc.id, from: from });
             return this.runWithContext(accessor, parsedArgs);
         }
         const editor = getEditorFromArgsOrActivePane(accessor);
         if (editor) {
             const selectedCellRange = editor.getSelections().length === 0 ? [editor.getFocus()] : editor.getSelections();
-            telemetryService.publicLog2('workbenchActionExecuted', { id: this.desc.id, from: from });
             return this.runWithContext(accessor, {
                 ui: false,
                 notebookEditor: editor,
@@ -184,9 +153,8 @@ class NotebookCellAction extends NotebookAction {
         return undefined;
     }
     async run(accessor, context, ...additionalArgs) {
+        sendEntryTelemetry(accessor, this.desc.id, context);
         if (this.isCellActionContext(context)) {
-            const telemetryService = accessor.get(ITelemetryService);
-            telemetryService.publicLog2('workbenchActionExecuted', { id: this.desc.id, from: 'cellToolbar' });
             return this.runWithContext(accessor, context);
         }
         const contextFromArgs = this.getCellContextFromArgs(accessor, context, ...additionalArgs);
@@ -203,6 +171,27 @@ const executeNotebookCondition = ( (ContextKeyExpr.or(
     ContextKeyExpr.greater(NOTEBOOK_KERNEL_COUNT.key, 0),
     ContextKeyExpr.greater(NOTEBOOK_KERNEL_SOURCE_COUNT.key, 0)
 )));
+function sendEntryTelemetry(accessor, id, context) {
+    if (context) {
+        const telemetryService = accessor.get(ITelemetryService);
+        if (context.source) {
+            telemetryService.publicLog2('workbenchActionExecuted', { id: id, from: context.source });
+        }
+        else if (URI.isUri(context)) {
+            telemetryService.publicLog2('workbenchActionExecuted', { id: id, from: 'cellEditorContextMenu' });
+        }
+        else if (context && 'from' in context && context.from === 'cellContainer') {
+            telemetryService.publicLog2('workbenchActionExecuted', { id: id, from: 'cellContainer' });
+        }
+        else {
+            const from = isCellToolbarContext(context) ? 'cellToolbar' : (isEditorCommandsContext(context) ? 'editorToolbar' : 'other');
+            telemetryService.publicLog2('workbenchActionExecuted', { id: id, from: from });
+        }
+    }
+}
+function isCellToolbarContext(context) {
+    return !!context && !!context.notebookEditor && context.$mid === 13 ;
+}
 function isMultiCellArgs(arg) {
     if (arg === undefined) {
         return false;
@@ -310,19 +299,19 @@ const cellExecutionArgs = [
 ];
 MenuRegistry.appendMenuItem(MenuId.NotebookCellTitle, {
     submenu: MenuId.NotebookCellInsert,
-    title: ( localize(5605, "Insert Cell")),
-    group: CellOverflowToolbarGroups.Insert,
+    title: ( localize(5616, "Insert Cell")),
+    group: "2_insert" ,
     when: ( (NOTEBOOK_EDITOR_EDITABLE.isEqualTo(true)))
 });
 MenuRegistry.appendMenuItem(MenuId.EditorContext, {
     submenu: MenuId.NotebookCellTitle,
-    title: ( localize(5606, "Notebook Cell")),
-    group: CellOverflowToolbarGroups.Insert,
+    title: ( localize(5617, "Notebook Cell")),
+    group: "2_insert" ,
     when: NOTEBOOK_EDITOR_FOCUSED
 });
 MenuRegistry.appendMenuItem(MenuId.NotebookCellTitle, {
-    title: ( localize(5607, "Share")),
+    title: ( localize(5618, "Share")),
     submenu: MenuId.EditorContextShare,
-    group: CellOverflowToolbarGroups.Share
+    group: "4_share"
 });
-export { CELL_TITLE_CELL_GROUP_ID, CELL_TITLE_OUTPUT_GROUP_ID, CellOverflowToolbarGroups, CellToolbarOrder, NOTEBOOK_ACTIONS_CATEGORY, NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT, NOTEBOOK_OUTPUT_WEBVIEW_ACTION_WEIGHT, NotebookAction, NotebookCellAction, NotebookMultiCellAction, SELECT_KERNEL_ID, cellExecutionArgs, executeNotebookCondition, findTargetCellEditor, getContextFromActiveEditor, getContextFromUri, getEditorFromArgsOrActivePane, parseMultiCellExecutionArgs };
+export { CELL_TITLE_CELL_GROUP_ID, CELL_TITLE_OUTPUT_GROUP_ID, NOTEBOOK_ACTIONS_CATEGORY, NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT, NOTEBOOK_OUTPUT_WEBVIEW_ACTION_WEIGHT, NotebookAction, NotebookCellAction, NotebookMultiCellAction, SELECT_KERNEL_ID, cellExecutionArgs, executeNotebookCondition, findTargetCellEditor, getContextFromActiveEditor, getContextFromUri, getEditorFromArgsOrActivePane, parseMultiCellExecutionArgs };

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

@@ -1,14 +1,12 @@
 import { Disposable, DisposableStore } from '../../../../../base/common/lifecycle.js';
 import { NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_IS_ACTIVE_EDITOR } from '../../common/notebookContextKeys.js';
-import { CellFoldingState, getNotebookEditorFromEditorPane } from '../notebookBrowser.js';
+import { getNotebookEditorFromEditorPane } from '../notebookBrowser.js';
 import { FoldingModel } from '../viewModel/foldingModel.js';
 import { CellKind } from '../../common/notebookCommon.js';
 import { registerNotebookContribution } from '../notebookEditorExtensions.js';
 import { registerAction2, Action2 } from '../../../../../platform/actions/common/actions.js';
 import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
 import { InputFocusedContextKey } from '../../../../../platform/contextkey/common/contextkeys.js';
-import { KeyMod as KeyMod$1, KeyCode } from '../../../../../base/common/keyCodes.js';
-import { KeybindingWeight } from '../../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { IEditorService } from '../../../../services/editor/common/editorService.service.js';
 import { NOTEBOOK_ACTIONS_CATEGORY } from './coreActions.js';
 import { localize2, localize } from '../../../../../nls.js';
@@ -46,7 +44,7 @@ class FoldingController extends Disposable {
         this._updateEditorFoldingRanges();
     }
     setFoldingStateDown(index, state, levels) {
-        const doCollapse = state === CellFoldingState.Collapsed;
+        const doCollapse = state === 2 ;
         const region = this._foldingModel.getRegionAtLine(index + 1);
         const regions = [];
         if (region) {
@@ -58,15 +56,15 @@ class FoldingController extends Disposable {
                 regions.push(...regionsInside);
             }
         }
-        regions.forEach(r => this._foldingModel.setCollapsed(r.regionIndex, state === CellFoldingState.Collapsed));
+        regions.forEach(r => this._foldingModel.setCollapsed(r.regionIndex, state === 2 ));
         this._updateEditorFoldingRanges();
     }
     setFoldingStateUp(index, state, levels) {
         if (!this._foldingModel) {
             return;
         }
-        const regions = this._foldingModel.getAllRegionsAtLine(index + 1, (region, level) => region.isCollapsed !== (state === CellFoldingState.Collapsed) && level <= levels);
-        regions.forEach(r => this._foldingModel.setCollapsed(r.regionIndex, state === CellFoldingState.Collapsed));
+        const regions = this._foldingModel.getAllRegionsAtLine(index + 1, (region, level) => region.isCollapsed !== ((state === 2) ) && level <= levels);
+        regions.forEach(r => this._foldingModel.setCollapsed(r.regionIndex, state === 2 ));
         this._updateEditorFoldingRanges();
     }
     _updateEditorFoldingRanges() {
@@ -98,18 +96,18 @@ class FoldingController extends Disposable {
             const cellViewModel = e.target;
             const modelIndex = viewModel.getCellIndex(cellViewModel);
             const state = viewModel.getFoldingState(modelIndex);
-            if (state === CellFoldingState.None) {
+            if (state === 0 ) {
                 return;
             }
-            this.setFoldingStateUp(modelIndex, state === CellFoldingState.Collapsed ? CellFoldingState.Expanded : CellFoldingState.Collapsed, 1);
+            this.setFoldingStateUp(modelIndex, state === 2  ? 1  : 2 , 1);
             this._notebookEditor.focusElement(cellViewModel);
         }
         return;
     }
 }
 registerNotebookContribution(FoldingController.id, FoldingController);
-const NOTEBOOK_FOLD_COMMAND_LABEL = ( localize(7959, "Fold Cell"));
-const NOTEBOOK_UNFOLD_COMMAND_LABEL = ( localize2(7960, "Unfold Cell"));
+const NOTEBOOK_FOLD_COMMAND_LABEL = ( localize(8274, "Fold Cell"));
+const NOTEBOOK_UNFOLD_COMMAND_LABEL = ( localize2(8275, "Unfold Cell"));
 const FOLDING_COMMAND_ARGS = {
     args: [{
             isOptional: true,
@@ -139,17 +137,17 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'notebook.fold',
-            title: ( localize2(7959, "Fold Cell")),
+            title: ( localize2(8274, "Fold Cell")),
             category: NOTEBOOK_ACTIONS_CATEGORY,
             keybinding: {
                 when: ( (ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ContextKeyExpr.not(InputFocusedContextKey)))),
-                primary: KeyMod$1.CtrlCmd | KeyMod$1.Shift | KeyCode.BracketLeft,
+                primary: 2048  | 1024  | 92 ,
                 mac: {
-                    primary: KeyMod$1.CtrlCmd | KeyMod$1.Alt | KeyCode.BracketLeft,
-                    secondary: [KeyCode.LeftArrow],
+                    primary: 2048  | 512  | 92 ,
+                    secondary: [15 ],
                 },
-                secondary: [KeyCode.LeftArrow],
-                weight: KeybindingWeight.WorkbenchContrib
+                secondary: [15 ],
+                weight: 200
             },
             metadata: {
                 description: NOTEBOOK_FOLD_COMMAND_LABEL,
@@ -188,10 +186,10 @@ registerAction2(class extends Action2 {
                 return;
             }
             if (direction === 'up') {
-                controller.setFoldingStateUp(index, CellFoldingState.Collapsed, levels);
+                controller.setFoldingStateUp(index, 2 , levels);
             }
             else {
-                controller.setFoldingStateDown(index, CellFoldingState.Collapsed, levels);
+                controller.setFoldingStateDown(index, 2 , levels);
             }
             const viewIndex = editor.getViewModel().getNearestVisibleCellIndexUpwards(index);
             editor.focusElement(editor.cellAt(viewIndex));
@@ -206,13 +204,13 @@ registerAction2(class extends Action2 {
             category: NOTEBOOK_ACTIONS_CATEGORY,
             keybinding: {
                 when: ( (ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ContextKeyExpr.not(InputFocusedContextKey)))),
-                primary: KeyMod$1.CtrlCmd | KeyMod$1.Shift | KeyCode.BracketRight,
+                primary: 2048  | 1024  | 94 ,
                 mac: {
-                    primary: KeyMod$1.CtrlCmd | KeyMod$1.Alt | KeyCode.BracketRight,
-                    secondary: [KeyCode.RightArrow],
+                    primary: 2048  | 512  | 94 ,
+                    secondary: [17 ],
                 },
-                secondary: [KeyCode.RightArrow],
-                weight: KeybindingWeight.WorkbenchContrib
+                secondary: [17 ],
+                weight: 200
             },
             metadata: {
                 description: NOTEBOOK_UNFOLD_COMMAND_LABEL,
@@ -244,10 +242,10 @@ registerAction2(class extends Action2 {
         const controller = editor.getContribution(FoldingController.id);
         if (index !== undefined) {
             if (direction === 'up') {
-                controller.setFoldingStateUp(index, CellFoldingState.Expanded, levels);
+                controller.setFoldingStateUp(index, 1 , levels);
             }
             else {
-                controller.setFoldingStateDown(index, CellFoldingState.Expanded, levels);
+                controller.setFoldingStateDown(index, 1 , levels);
             }
         }
     }

package/vscode/src/vs/workbench/contrib/notebook/browser/diff/diffCellEditorOptions.js

@@ -6,6 +6,9 @@ const fixedEditorPadding = {
     top: 12,
     bottom: 12
 };
+function getEditorPadding(lineCount) {
+    return lineCount === 1 ? fixedEditorPaddingSingleLineCells : fixedEditorPadding;
+}
 const fixedEditorOptions = {
     padding: fixedEditorPadding,
     scrollBeyondLastLine: false,
@@ -46,4 +49,4 @@ const fixedDiffEditorOptions = {
     renderSideBySide: true,
     useInlineViewWhenSpaceIsLimited: false
 };
-export { fixedDiffEditorOptions, fixedEditorOptions, fixedEditorPadding, fixedEditorPaddingSingleLineCells };
+export { fixedDiffEditorOptions, fixedEditorOptions, getEditorPadding };