@codingame/monaco-vscode-api 4.5.1 → 5.0.0

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindWidget.js

@@ -8,15 +8,16 @@ import { MATCHES_LIMIT } from '../../../../../../editor/contrib/find/browser/fin
 import { FindReplaceState } from '../../../../../../editor/contrib/find/browser/findState.js';
 import { NLS_NO_RESULTS, NLS_MATCHES_LOCATION } from '../../../../../../editor/contrib/find/browser/findWidget.js';
 import { localizeWithPath } from '../../../../../../nls.js';
-import { IMenuService } from '../../../../../../platform/actions/common/actions.service.js';
 import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.service.js';
 import { IContextKeyService } from '../../../../../../platform/contextkey/common/contextkey.service.js';
 import { IContextViewService, IContextMenuService } from '../../../../../../platform/contextview/browser/contextView.service.js';
+import { IHoverService } from '../../../../../../platform/hover/browser/hover.service.js';
 import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
 import { FindModel } from './findModel.js';
 import { SimpleFindReplaceWidget } from './notebookFindReplaceWidget.js';
 import { CellEditState } from '../../notebookBrowser.js';
 import { KEYBINDING_CONTEXT_NOTEBOOK_FIND_WIDGET_FOCUSED } from '../../../common/notebookContextKeys.js';
+const _moduleId = "vs/workbench/contrib/notebook/browser/contrib/find/notebookFindWidget";
 const FIND_HIDE_TRANSITION = 'find-hide-transition';
 const FIND_SHOW_TRANSITION = 'find-show-transition';
 let MAX_MATCHES_COUNT_WIDTH = 69;
@@ -27,9 +28,9 @@ let NotebookFindContrib = class NotebookFindContrib extends Disposable {
         super();
         this.notebookEditor = notebookEditor;
         this.instantiationService = instantiationService;
-        this.widget = ( new Lazy(
+        this.widget = ( (new Lazy(
             () => this._register(this.instantiationService.createInstance(NotebookFindWidget, this.notebookEditor))
-        ));
+        )));
     }
     show(initialInput, options) {
         return this.widget.value.show(initialInput, options);
@@ -41,15 +42,15 @@ let NotebookFindContrib = class NotebookFindContrib extends Disposable {
         return this.widget.value.replace(searchString);
     }
 };
-NotebookFindContrib = ( __decorate([
-    ( __param(1, IInstantiationService))
-], NotebookFindContrib));
+NotebookFindContrib = ( (__decorate([
+    ( (__param(1, IInstantiationService)))
+], NotebookFindContrib)));
 let NotebookFindWidget = class NotebookFindWidget extends SimpleFindReplaceWidget {
-    constructor(_notebookEditor, contextViewService, contextKeyService, configurationService, contextMenuService, menuService, instantiationService) {
-        super(contextViewService, contextKeyService, configurationService, contextMenuService, instantiationService, ( new FindReplaceState()), _notebookEditor);
+    constructor(_notebookEditor, contextViewService, contextKeyService, configurationService, contextMenuService, hoverService, instantiationService) {
+        super(contextViewService, contextKeyService, configurationService, contextMenuService, instantiationService, hoverService, ( (new FindReplaceState())), _notebookEditor);
         this._showTimeout = null;
         this._hideTimeout = null;
-        this._findModel = ( new FindModel(this._notebookEditor, this._state, this._configurationService));
+        this._findModel = ( (new FindModel(this._notebookEditor, this._state, this._configurationService)));
         append(this._notebookEditor.getDomNode(), this.getDomNode());
         this._findWidgetFocused = KEYBINDING_CONTEXT_NOTEBOOK_FIND_WIDGET_FOCUSED.bindTo(contextKeyService);
         this._register(this._findInput.onKeyDown((e) => this._onFindInputKeyDown(e)));
@@ -275,27 +276,10 @@ let NotebookFindWidget = class NotebookFindWidget extends SimpleFindReplaceWidge
     _getAriaLabel(label, currentMatch, searchString) {
         if (label === NLS_NO_RESULTS) {
             return searchString === ''
-                ? ( localizeWithPath(
-                'vs/workbench/contrib/notebook/browser/contrib/find/notebookFindWidget',
-                'ariaSearchNoResultEmpty',
-                "{0} found",
-                label
-            ))
-                : ( localizeWithPath(
-                'vs/workbench/contrib/notebook/browser/contrib/find/notebookFindWidget',
-                'ariaSearchNoResult',
-                "{0} found for '{1}'",
-                label,
-                searchString
-            ));
+                ? ( localizeWithPath(_moduleId, 0, "{0} found", label))
+                : ( localizeWithPath(_moduleId, 1, "{0} found for '{1}'", label, searchString));
         }
-        return ( localizeWithPath(
-            'vs/workbench/contrib/notebook/browser/contrib/find/notebookFindWidget',
-            'ariaSearchNoResultWithLineNumNoCurrentMatch',
-            "{0} found for '{1}'",
-            label,
-            searchString
-        ));
+        return ( localizeWithPath(_moduleId, 2, "{0} found for '{1}'", label, searchString));
     }
     dispose() {
         this._notebookEditor?.removeClassName(FIND_SHOW_TRANSITION);
@@ -304,12 +288,12 @@ let NotebookFindWidget = class NotebookFindWidget extends SimpleFindReplaceWidge
         super.dispose();
     }
 };
-NotebookFindWidget = ( __decorate([
-    ( __param(1, IContextViewService)),
-    ( __param(2, IContextKeyService)),
-    ( __param(3, IConfigurationService)),
-    ( __param(4, IContextMenuService)),
-    ( __param(5, IMenuService)),
-    ( __param(6, IInstantiationService))
-], NotebookFindWidget));
+NotebookFindWidget = ( (__decorate([
+    ( (__param(1, IContextViewService))),
+    ( (__param(2, IContextKeyService))),
+    ( (__param(3, IConfigurationService))),
+    ( (__param(4, IContextMenuService))),
+    ( (__param(5, IHoverService))),
+    ( (__param(6, IInstantiationService)))
+], NotebookFindWidget)));
 export { NotebookFindContrib };

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

@@ -8,6 +8,7 @@ import { cloneNotebookCellTextModel } from '../../common/model/notebookCellTextM
 import { SelectionStateType, CellKind } from '../../common/notebookCommon.js';
 import { cellRangesToIndexes, cellRangeContains } from '../../common/notebookRange.js';
 import { localizeWithPath } from '../../../../../nls.js';
+const _moduleId = "vs/workbench/contrib/notebook/browser/controller/cellOperations";
 async function changeCellToKind(kind, context, language, mime) {
     const { notebookEditor } = context;
     if (!notebookEditor.hasModel()) {
@@ -102,9 +103,9 @@ function runDeleteAction(editor, cell) {
     const containingSelection = selections.find(selection => selection.start <= targetCellIndex && targetCellIndex < selection.end);
     const computeUndoRedo = !editor.isReadOnly || textModel.viewType === 'interactive';
     if (containingSelection) {
-        const edits = ( selections.reverse().map(selection => ({
+        const edits = ( (selections.reverse().map(selection => ({
             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() }, () => {
             if (nextCellAfterContainingSelection) {
@@ -247,7 +248,7 @@ async function copyCellRange(context, direction) {
                 editType: 1 ,
                 index: range.end,
                 count: 0,
-                cells: ( cellRangesToIndexes([range]).map(index => cloneNotebookCellTextModel(editor.cellAt(index).model)))
+                cells: ( (cellRangesToIndexes([range]).map(index => cloneNotebookCellTextModel(editor.cellAt(index).model))))
             }
         ], true, {
             kind: SelectionStateType.Index,
@@ -258,7 +259,7 @@ async function copyCellRange(context, direction) {
     else {
         const focus = editor.getFocus();
         const selections = editor.getSelections();
-        const newCells = ( cellRangesToIndexes([range]).map(index => cloneNotebookCellTextModel(editor.cellAt(index).model)));
+        const newCells = ( (cellRangesToIndexes([range]).map(index => cloneNotebookCellTextModel(editor.cellAt(index).model))));
         const countDelta = newCells.length;
         const newFocus = context.ui ? focus : { start: focus.start + countDelta, end: focus.end + countDelta };
         const newSelections = context.ui ? selections : [{ start: range.start + countDelta, end: range.end + countDelta }];
@@ -267,7 +268,7 @@ async function copyCellRange(context, direction) {
                 editType: 1 ,
                 index: range.end,
                 count: 0,
-                cells: ( cellRangesToIndexes([range]).map(index => cloneNotebookCellTextModel(editor.cellAt(index).model)))
+                cells: ( (cellRangesToIndexes([range]).map(index => cloneNotebookCellTextModel(editor.cellAt(index).model))))
             }
         ], true, {
             kind: SelectionStateType.Index,
@@ -294,17 +295,13 @@ async function joinSelectedCells(bulkEditService, notificationService, context)
     const cellKind = cells[0].cellKind;
     const isSameKind = cells.every(cell => cell.cellKind === cellKind);
     if (!isSameKind) {
-        const message = ( localizeWithPath(
-            'vs/workbench/contrib/notebook/browser/controller/cellOperations',
-            'notebookActions.joinSelectedCells',
-            "Cannot join cells of different kinds"
-        ));
+        const message = ( localizeWithPath(_moduleId, 0, "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 insertContent = ( (cells.map(cell => cell.getText()))).join(firstCell.textBuffer.getEOL());
     const firstSelection = editor.getSelections()[0];
-    edits.push(( new ResourceNotebookCellEdit(editor.textModel.uri, {
+    edits.push(( (new ResourceNotebookCellEdit(editor.textModel.uri, {
         editType: 1 ,
         index: firstSelection.start,
         count: firstSelection.end - firstSelection.start,
@@ -316,21 +313,17 @@ async function joinSelectedCells(bulkEditService, notificationService, context)
                 outputs: firstCell.model.outputs,
                 metadata: firstCell.metadata,
             }]
-    })));
+    }))));
     for (const selection of editor.getSelections().slice(1)) {
-        edits.push(( new ResourceNotebookCellEdit(editor.textModel.uri, {
+        edits.push(( (new ResourceNotebookCellEdit(editor.textModel.uri, {
             editType: 1 ,
             index: selection.start,
             count: selection.end - selection.start,
             cells: []
-        })));
+        }))));
     }
     if (edits.length) {
-        await bulkEditService.apply(edits, { quotableLabel: ( localizeWithPath(
-            'vs/workbench/contrib/notebook/browser/controller/cellOperations',
-            'notebookActions.joinSelectedCells.label',
-            "Join Notebook Cells"
-        )) });
+        await bulkEditService.apply(edits, { quotableLabel: ( localizeWithPath(_moduleId, 1, "Join Notebook Cells")) });
     }
 }
 async function joinNotebookCells(editor, range, direction, constraint) {
@@ -359,23 +352,23 @@ async function joinNotebookCells(editor, range, direction, constraint) {
         if (constraint && above.cellKind !== constraint) {
             return null;
         }
-        const insertContent = ( cells.map(cell => (cell.textBuffer.getEOL() ?? '') + cell.getText())).join('');
+        const insertContent = ( (cells.map(cell => (cell.textBuffer.getEOL() ?? '') + cell.getText()))).join('');
         const aboveCellLineCount = above.textBuffer.getLineCount();
         const aboveCellLastLineEndColumn = above.textBuffer.getLineLength(aboveCellLineCount);
         return {
             edits: [
-                ( new ResourceTextEdit(above.uri, { range: ( new Range(
-                    aboveCellLineCount,
-                    aboveCellLastLineEndColumn + 1,
-                    aboveCellLineCount,
-                    aboveCellLastLineEndColumn + 1
-                )), text: insertContent })),
-                ( new ResourceNotebookCellEdit(textModel.uri, {
+                ( (new ResourceTextEdit(above.uri, { range: ( (new Range(
+                aboveCellLineCount,
+                aboveCellLastLineEndColumn + 1,
+                aboveCellLineCount,
+                aboveCellLastLineEndColumn + 1
+            ))), text: insertContent }))),
+                ( (new ResourceNotebookCellEdit(textModel.uri, {
                     editType: 1 ,
                     index: range.start,
                     count: range.end - range.start,
                     cells: []
-                }))
+                })))
             ],
             cell: above,
             endFocus: { start: range.start - 1, end: range.start },
@@ -389,23 +382,23 @@ async function joinNotebookCells(editor, range, direction, constraint) {
         }
         const cell = cells[0];
         const restCells = [...cells.slice(1), below];
-        const insertContent = ( restCells.map(cl => (cl.textBuffer.getEOL() ?? '') + cl.getText())).join('');
+        const insertContent = ( (restCells.map(cl => (cl.textBuffer.getEOL() ?? '') + cl.getText()))).join('');
         const cellLineCount = cell.textBuffer.getLineCount();
         const cellLastLineEndColumn = cell.textBuffer.getLineLength(cellLineCount);
         return {
             edits: [
-                ( new ResourceTextEdit(cell.uri, { range: ( new Range(
-                    cellLineCount,
-                    cellLastLineEndColumn + 1,
-                    cellLineCount,
-                    cellLastLineEndColumn + 1
-                )), text: insertContent })),
-                ( new ResourceNotebookCellEdit(textModel.uri, {
+                ( (new ResourceTextEdit(cell.uri, { range: ( (new Range(
+                cellLineCount,
+                cellLastLineEndColumn + 1,
+                cellLineCount,
+                cellLastLineEndColumn + 1
+            ))), text: insertContent }))),
+                ( (new ResourceNotebookCellEdit(textModel.uri, {
                     editType: 1 ,
                     index: range.start + 1,
                     count: range.end - range.start,
                     cells: []
-                }))
+                })))
             ],
             cell,
             endFocus: { start: range.start, end: range.start + 1 },
@@ -474,7 +467,7 @@ async function joinCellsWithSurrounds(bulkEditService, context, direction) {
         cells.forEach(cell => {
             cell.updateEditState(CellEditState.Editing, 'joinCellsWithSurrounds');
         });
-        viewModel.updateSelectionsState({ kind: SelectionStateType.Handle, primary: cell.handle, selections: ( cells.map(cell => cell.handle)) });
+        viewModel.updateSelectionsState({ kind: SelectionStateType.Handle, primary: cell.handle, selections: ( (cells.map(cell => cell.handle))) });
         editor.revealCellRangeInView(editor.getFocus());
         const newFocusedCell = editor.cellAt(editor.getFocus().start);
         if (focusMode === CellFocusMode.Editor && newFocusedCell) {
@@ -495,15 +488,15 @@ function _splitPointsToBoundaries(splitPoints, textBuffer) {
     });
     for (let sp of splitPoints) {
         if (getLineLen(sp.lineNumber) + 1 === sp.column && sp.column !== 1  && sp.lineNumber < lineCnt) {
-            sp = ( new Position(sp.lineNumber + 1, 1));
+            sp = ( (new Position(sp.lineNumber + 1, 1)));
         }
         _pushIfAbsent(boundaries, sp);
     }
     if (boundaries.length === 0) {
         return null;
     }
-    const modelStart = ( new Position(1, 1));
-    const modelEnd = ( new Position(lineCnt, getLineLen(lineCnt) + 1));
+    const modelStart = ( (new Position(1, 1)));
+    const modelEnd = ( (new Position(lineCnt, getLineLen(lineCnt) + 1)));
     return [modelStart, ...boundaries, modelEnd];
 }
 function _pushIfAbsent(positions, p) {
@@ -521,7 +514,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)), 0 ));
+        newLineModels.push(cell.textBuffer.getValueInRange(( (new Range(start.lineNumber, start.column, end.lineNumber, end.column))), 0 ));
     }
     return newLineModels;
 }

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

@@ -9,16 +9,13 @@ import { copyCellOutput } from '../contrib/clipboard/cellOutputClipboard.js';
 import { IEditorService } from '../../../../services/editor/common/editorService.service.js';
 import { getNotebookEditorFromEditorPane } from '../notebookBrowser.js';
 import { CellKind } from '../../common/notebookCommon.js';
+const _moduleId = "vs/workbench/contrib/notebook/browser/controller/cellOutputActions";
 const COPY_OUTPUT_COMMAND_ID = 'notebook.cellOutput.copy';
 registerAction2(class CopyCellOutputAction extends Action2 {
     constructor() {
         super({
             id: COPY_OUTPUT_COMMAND_ID,
-            title: ( localizeWithPath(
-                'vs/workbench/contrib/notebook/browser/controller/cellOutputActions',
-                'notebookActions.copyOutput',
-                "Copy Cell Output"
-            )),
+            title: ( localizeWithPath(_moduleId, 0, "Copy Cell Output")),
             menu: {
                 id: MenuId.NotebookOutputToolbar,
                 when: NOTEBOOK_CELL_HAS_OUTPUTS
@@ -27,9 +24,14 @@ registerAction2(class CopyCellOutputAction extends Action2 {
             icon: copyIcon,
         });
     }
+    getNoteboookEditor(editorService, outputContext) {
+        if (outputContext && 'notebookEditor' in outputContext) {
+            return outputContext.notebookEditor;
+        }
+        return getNotebookEditorFromEditorPane(editorService.activeEditorPane);
+    }
     async run(accessor, outputContext) {
-        const editorService = accessor.get(IEditorService);
-        const notebookEditor = getNotebookEditorFromEditorPane(editorService.activeEditorPane);
+        const notebookEditor = this.getNoteboookEditor(accessor.get(IEditorService), outputContext);
         if (!notebookEditor) {
             return;
         }

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

@@ -1,26 +1,19 @@
 import { localizeWithPath } 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, ( localizeWithPath(
- 'vs/workbench/contrib/notebook/browser/controller/chat/notebookChatContext',
- 'notebookCellChatFocused',
- "Whether the cell chat editor is focused"
-))));
-const CTX_NOTEBOOK_CHAT_HAS_ACTIVE_REQUEST = ( new RawContextKey('notebookChatHasActiveRequest', false, ( localizeWithPath(
- 'vs/workbench/contrib/notebook/browser/controller/chat/notebookChatContext',
- 'notebookChatHasActiveRequest',
- "Whether the cell chat editor has an active request"
-))));
-const CTX_NOTEBOOK_CHAT_USER_DID_EDIT = ( new RawContextKey('notebookChatUserDidEdit', false, ( localizeWithPath(
- 'vs/workbench/contrib/notebook/browser/controller/chat/notebookChatContext',
- 'notebookChatUserDidEdit',
+const _moduleId = "vs/workbench/contrib/notebook/browser/controller/chat/notebookChatContext";
+const CTX_NOTEBOOK_CELL_CHAT_FOCUSED = ( (new RawContextKey('notebookCellChatFocused', false, ( localizeWithPath(_moduleId, 0, "Whether the cell chat editor is focused")))));
+const CTX_NOTEBOOK_CHAT_HAS_ACTIVE_REQUEST = ( (new RawContextKey('notebookChatHasActiveRequest', false, ( localizeWithPath(_moduleId, 1, "Whether the cell chat editor has an active request")))));
+const CTX_NOTEBOOK_CHAT_USER_DID_EDIT = ( (new RawContextKey('notebookChatUserDidEdit', false, ( localizeWithPath(
+ _moduleId,
+ 2,
  "Whether the user did changes ontop of the notebook cell chat"
-))));
-const CTX_NOTEBOOK_CHAT_OUTER_FOCUS_POSITION = ( new RawContextKey('notebookChatOuterFocusPosition', '', ( localizeWithPath(
- 'vs/workbench/contrib/notebook/browser/controller/chat/notebookChatContext',
- 'notebookChatOuterFocusPosition',
+)))));
+const CTX_NOTEBOOK_CHAT_OUTER_FOCUS_POSITION = ( (new RawContextKey('notebookChatOuterFocusPosition', '', ( localizeWithPath(
+ _moduleId,
+ 3,
  "Whether the focus of the notebook editor is above or below the cell chat"
-))));
+)))));
 const MENU_CELL_CHAT_INPUT = MenuId.for('cellChatInput');
 const MENU_CELL_CHAT_WIDGET = MenuId.for('cellChatWidget');
 const MENU_CELL_CHAT_WIDGET_STATUS = MenuId.for('cellChatWidget.status');