@codingame/monaco-vscode-notebook-service-override 3.2.2 → 4.0.0

package/notebook.js

@@ -23,7 +23,7 @@ import { NotebookKernelHistoryService } from './vscode/src/vs/workbench/contrib/
 import { INotebookLoggingService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookLoggingService';
 import { NotebookLoggingService } from './vscode/src/vs/workbench/contrib/notebook/browser/services/notebookLoggingServiceImpl.js';
 import { INotebookSearchService } from 'vscode/vscode/vs/workbench/contrib/search/common/notebookSearch';
-import { NotebookSearchService } from './vscode/src/vs/workbench/contrib/search/browser/notebookSearch/notebookSearchService.js';
+import { NotebookSearchService } from 'vscode/vscode/vs/workbench/contrib/search/browser/notebookSearch/notebookSearchService';
 import './vscode/src/vs/workbench/contrib/notebook/browser/notebook.contribution.js';
 import { INotebookDocumentService, NotebookDocumentWorkbenchService } from 'vscode/vscode/vs/workbench/services/notebook/common/notebookDocumentService';
 

package/override/vs/platform/dialogs/common/dialogs.js

@@ -1,3 +1,5 @@
+export { AbstractDialogHandler, IDialogService, IFileDialogService, getFileNamesMessage } from 'vscode/vscode/vs/platform/dialogs/common/dialogs';
+
 var ConfirmResult;
 ( (function(ConfirmResult) {
     ConfirmResult[ConfirmResult["SAVE"] = 0] = "SAVE";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-notebook-service-override",
-  "version": "3.2.2",
+  "version": "4.0.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,7 +18,7 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@3.2.2"
+    "vscode": "npm:@codingame/monaco-vscode-api@4.0.0"
   },
   "exports": {
     ".": {

package/vscode/src/vs/workbench/contrib/codeEditor/browser/emptyTextEditorHint/emptyTextEditorHint.js

@@ -1,7 +1,7 @@
 import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
 import './emptyTextEditorHint.css.js';
-import { addDisposableListener, $ as $$1 } from 'vscode/vscode/vs/base/browser/dom';
-import { dispose, DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
+import { addDisposableListener, EventType, $ as $$1 } from 'vscode/vscode/vs/base/browser/dom';
+import { DisposableStore, dispose } from 'vscode/vscode/vs/base/common/lifecycle';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { ChangeLanguageAction } from 'vscode/vscode/vs/workbench/browser/parts/editor/editorStatus';
 import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands';
@@ -25,6 +25,8 @@ import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { Extensions } from 'vscode/vscode/vs/workbench/common/configuration';
 import { OUTPUT_MODE_ID, LOG_MODE_ID } from 'vscode/vscode/vs/workbench/services/output/common/output';
 import { SEARCH_RESULT_LANGUAGE_ID } from 'vscode/vscode/vs/workbench/services/search/common/search';
+import { setupCustomHover } from 'vscode/vscode/vs/base/browser/ui/hover/updatableHoverWidget';
+import { getDefaultHoverDelegate } from 'vscode/vscode/vs/base/browser/ui/hover/hoverDelegateFactory';
 
 const $ = $$1;
 ( Registry.as(Extensions.ConfigurationMigration))
@@ -190,7 +192,7 @@ class EmptyTextEditorHintContentWidget {
                 id: 'inlineChat.hintAction',
                 from: 'hint'
             });
-            void this.commandService.executeCommand(inlineChatId, { from: 'hint' });
+            this.commandService.executeCommand(inlineChatId, { from: 'hint' });
         };
         const hintHandler = {
             disposables: this.toDispose,
@@ -219,7 +221,7 @@ class EmptyTextEditorHintContentWidget {
                     const hintPart = $('a', undefined, fragment);
                     hintPart.style.fontStyle = 'italic';
                     hintPart.style.cursor = 'pointer';
-                    hintPart.onclick = handleClick;
+                    this.toDispose.add(addDisposableListener(hintPart, EventType.CLICK, handleClick));
                     return hintPart;
                 }
                 else {
@@ -229,13 +231,13 @@ class EmptyTextEditorHintContentWidget {
                 }
             }));
             hintElement.appendChild(before);
-            const label = ( new KeybindingLabel(hintElement, OS));
+            const label = hintHandler.disposables.add(( new KeybindingLabel(hintElement, OS)));
             label.set(keybindingHint);
             label.element.style.width = 'min-content';
             label.element.style.display = 'inline';
             if (this.options.clickable) {
                 label.element.style.cursor = 'pointer';
-                label.element.onclick = handleClick;
+                this.toDispose.add(addDisposableListener(label.element, EventType.CLICK, handleClick));
             }
             hintElement.appendChild(after);
             const typeToDismiss = ( localizeWithPath(
@@ -348,7 +350,7 @@ class EmptyTextEditorHintContentWidget {
             anchor.style.cursor = 'pointer';
             const id = keybindingsLookup.shift();
             const title = id && this.keybindingService.lookupKeybinding(id)?.getLabel();
-            anchor.title = title ?? '';
+            hintHandler.disposables.add(setupCustomHover(getDefaultHoverDelegate('mouse'), anchor, title ?? ''));
         }
         return { hintElement, ariaLabel };
     }

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/clipboard/notebookClipboard.js

@@ -3,7 +3,7 @@ import { localizeWithPath, localize2WithPath } from 'vscode/vscode/vs/nls';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { registerWorkbenchContribution2 } from 'vscode/vscode/vs/workbench/common/contributions';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
-import { NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_CELL_EDITABLE } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
+import { NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_CELL_EDITABLE, NOTEBOOK_OUTPUT_FOCUSED } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
 import { getNotebookEditorFromEditorPane, expandCellRangesWithHiddenCells, cellRangeToViewCells } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { CopyAction, PasteAction, CutAction } from 'vscode/vscode/vs/editor/contrib/clipboard/browser/clipboard';
 import { IClipboardService } from 'vscode/vscode/vs/platform/clipboard/common/clipboardService';
@@ -12,7 +12,7 @@ import { SelectionStateType } from 'vscode/vscode/vs/workbench/contrib/notebook/
 import { INotebookService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookService';
 import { isNative } from 'vscode/vscode/vs/base/common/platform';
 import { registerAction2, MenuId, Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
-import { NotebookCellAction, NotebookAction, NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
+import { NotebookCellAction, NotebookAction, NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT, NOTEBOOK_OUTPUT_WEBVIEW_ACTION_WEIGHT } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { InputFocusedContextKey } from 'vscode/vscode/vs/platform/contextkey/common/contextkeys';
 import { UndoCommand, RedoCommand } from 'vscode/vscode/vs/editor/browser/editorExtensions';
@@ -31,7 +31,7 @@ function _log(loggerService, str) {
         loggerService.info(`[NotebookClipboard]: ${str}`);
     }
 }
-function getFocusedWebviewDelegate(accessor) {
+function getFocusedEditor(accessor) {
     const loggerService = accessor.get(ILogService);
     const editorService = accessor.get(IEditorService);
     const editor = getNotebookEditorFromEditorPane(editorService.activeEditorPane);
@@ -47,8 +47,19 @@ function getFocusedWebviewDelegate(accessor) {
         _log(loggerService, '[Revive Webview] Notebook editor backlayer webview is not focused, bypass');
         return;
     }
-    const webview = editor.getInnerWebview();
-    _log(loggerService, '[Revive Webview] Notebook editor backlayer webview is focused');
+    const view = editor.getViewModel();
+    if (view && view.viewCells.every(cell => !cell.outputIsFocused && !cell.outputIsHovered)) {
+        return;
+    }
+    return { editor, loggerService };
+}
+function getFocusedWebviewDelegate(accessor) {
+    const result = getFocusedEditor(accessor);
+    if (!result) {
+        return;
+    }
+    const webview = result.editor.getInnerWebview();
+    _log(result.loggerService, '[Revive Webview] Notebook editor backlayer webview is focused');
     return webview;
 }
 function withWebview(accessor, f) {
@@ -59,6 +70,10 @@ function withWebview(accessor, f) {
     }
     return false;
 }
+function withEditor(accessor, f) {
+    const result = getFocusedEditor(accessor);
+    return result ? f(result.editor) : false;
+}
 const PRIORITY = 105;
 UndoCommand.addImplementation(PRIORITY, 'notebook-webview', accessor => {
     return withWebview(accessor, webview => webview.undo());
@@ -341,6 +356,7 @@ registerAction2(class extends NotebookCellAction {
                 id: MenuId.NotebookCellTitle,
                 when: NOTEBOOK_EDITOR_FOCUSED,
                 group: "1_copy" ,
+                order: 2,
             },
             keybinding: isNative ? undefined : {
                 primary: 2048  | 33 ,
@@ -367,6 +383,7 @@ registerAction2(class extends NotebookCellAction {
                 id: MenuId.NotebookCellTitle,
                 when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_CELL_EDITABLE)),
                 group: "1_copy" ,
+                order: 1,
             },
             keybinding: isNative ? undefined : {
                 when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ContextKeyExpr.not(InputFocusedContextKey))),
@@ -393,6 +410,7 @@ registerAction2(class extends NotebookAction {
                 id: MenuId.NotebookCellTitle,
                 when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_EDITOR_EDITABLE)),
                 group: "1_copy" ,
+                order: 3,
             },
             keybinding: isNative ? undefined : {
                 when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ContextKeyExpr.not(InputFocusedContextKey))),
@@ -484,5 +502,43 @@ registerAction2(class extends Action2 {
         }
     }
 });
+registerAction2(class extends NotebookCellAction {
+    constructor() {
+        super({
+            id: 'notebook.cell.output.selectAll',
+            title: ( localizeWithPath(
+                'vs/workbench/contrib/notebook/browser/contrib/clipboard/notebookClipboard',
+                'notebook.cell.output.selectAll',
+                "Select All"
+            )),
+            keybinding: {
+                primary: 2048  | 31 ,
+                when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_OUTPUT_FOCUSED)),
+                weight: NOTEBOOK_OUTPUT_WEBVIEW_ACTION_WEIGHT
+            }
+        });
+    }
+    async runWithContext(accessor, _context) {
+        withEditor(accessor, editor => {
+            if (!editor.hasEditorFocus()) {
+                return false;
+            }
+            if (editor.hasEditorFocus() && !editor.hasWebviewFocus()) {
+                return true;
+            }
+            const cell = editor.getActiveCell();
+            if (!cell || !cell.outputIsFocused || !editor.hasWebviewFocus()) {
+                return true;
+            }
+            if (cell.inputInOutputIsFocused) {
+                editor.selectInputContents(cell);
+            }
+            else {
+                editor.selectOutputContent(cell);
+            }
+            return true;
+        });
+    }
+});
 
 export { NotebookClipboardContribution, runCopyCells, runCutCells, runPasteCells };

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

@@ -8,7 +8,17 @@ import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { NotebookOverviewRulerLane } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { registerNotebookContribution } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookEditorExtensions';
 import { throttle } from 'vscode/vscode/vs/base/common/decorators';
-import { editorErrorForeground, editorWarningForeground } from 'vscode/vscode/vs/platform/theme/common/colorRegistry';
+import 'vscode/vscode/vs/platform/theme/common/colorUtils';
+import 'vscode/vscode/vs/platform/theme/common/colors/baseColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/chartsColors';
+import { editorErrorForeground, editorWarningForeground } from 'vscode/vscode/vs/platform/theme/common/colors/editorColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/inputColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/listColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/menuColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/minimapColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/miscColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/quickpickColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/searchColors';
 import { isEqual } from 'vscode/vscode/vs/base/common/resources';
 
 let MarkerListProvider = class MarkerListProvider {

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/navigation/arrow.js

@@ -9,7 +9,7 @@ import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/cont
 import { InputFocusedContextKey } from 'vscode/vscode/vs/platform/contextkey/common/contextkeys';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { InlineChatController } from 'vscode/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
-import { CTX_NOTEBOOK_CHAT_OUTER_FOCUS_POSITION } from '../../controller/chat/notebookChatContext.js';
+import { CTX_NOTEBOOK_CHAT_OUTER_FOCUS_POSITION } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/chat/notebookChatContext';
 import { NotebookCellAction, NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT, findTargetCellEditor, NotebookAction } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
 import { CellEditState } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { NOTEBOOK_EDITOR_CURSOR_BOUNDARY, CellKind } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
@@ -312,7 +312,7 @@ registerAction2(class extends NotebookCellAction {
             )),
             keybinding: [
                 {
-                    when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ( ContextKeyExpr.has(InputFocusedContextKey)), EditorContextKeys.editorTextFocus)),
+                    when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ( ContextKeyExpr.has(InputFocusedContextKey)), EditorContextKeys.editorTextFocus, ( NOTEBOOK_OUTPUT_FOCUSED.negate()))),
                     primary: 1024  | 11 ,
                     weight: NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT
                 }
@@ -356,7 +356,7 @@ registerAction2(class extends NotebookCellAction {
             )),
             keybinding: [
                 {
-                    when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ( ContextKeyExpr.has(InputFocusedContextKey)), EditorContextKeys.editorTextFocus)),
+                    when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ( ContextKeyExpr.has(InputFocusedContextKey)), EditorContextKeys.editorTextFocus, ( NOTEBOOK_OUTPUT_FOCUSED.negate()))),
                     primary: 1024  | 12 ,
                     weight: NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT
                 }

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariablesDataSource.js

@@ -47,12 +47,14 @@ class NotebookVariableDataSource {
     async getIndexedChildren(parent, kernel) {
         const childNodes = [];
         if (parent.indexedChildrenCount > variablePageSize) {
-            const indexedChildCountLimit = 100000;
-            const limit = Math.min(parent.indexedChildrenCount, indexedChildCountLimit);
-            for (let start = 0; start < limit; start += variablePageSize) {
-                let end = start + variablePageSize;
-                if (end > limit) {
-                    end = limit;
+            const nestedPageSize = Math.floor(Math.max(parent.indexedChildrenCount / variablePageSize, 100));
+            const indexedChildCountLimit = 1_000_000;
+            let start = parent.indexStart ?? 0;
+            const last = start + Math.min(parent.indexedChildrenCount, indexedChildCountLimit);
+            for (; start < last; start += nestedPageSize) {
+                let end = start + nestedPageSize;
+                if (end > last) {
+                    end = last;
                 }
                 childNodes.push({
                     kind: 'variable',
@@ -70,7 +72,7 @@ class NotebookVariableDataSource {
                 childNodes.push({
                     kind: 'variable',
                     notebook: parent.notebook,
-                    id: parent.id + `${limit + 1}`,
+                    id: parent.id + `${last + 1}`,
                     extHostId: parent.extHostId,
                     name: ( localizeWithPath(
                         'vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariablesDataSource',

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariablesTree.js

@@ -1,5 +1,6 @@
 import { append, $ as $$1 } from 'vscode/vscode/vs/base/browser/dom';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import 'vscode/vscode/vs/platform/list/browser/listService';
 import { renderExpressionValue } from 'vscode/vscode/vs/workbench/contrib/debug/browser/baseDebugView';
 
 const $ = $$1;

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariablesView.js

@@ -16,7 +16,7 @@ import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/te
 import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService';
 import { ViewPane } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPane';
 import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views';
-import { CONTEXT_VARIABLE_NAME, CONTEXT_VARIABLE_VALUE, CONTEXT_VARIABLE_TYPE, CONTEXT_VARIABLE_LANGUAGE, CONTEXT_VARIABLE_EXTENSIONID } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
+import { CONTEXT_VARIABLE_NAME, CONTEXT_VARIABLE_VALUE, CONTEXT_VARIABLE_TYPE, CONTEXT_VARIABLE_INTERFACES, CONTEXT_VARIABLE_LANGUAGE, CONTEXT_VARIABLE_EXTENSIONID } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
 import { NotebookVariableDataSource } from './notebookVariablesDataSource.js';
 import { NotebookVariablesDelegate, NotebookVariableRenderer, NotebookVariableAccessibilityProvider } from './notebookVariablesTree.js';
 import { getNotebookEditorFromEditorPane } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
@@ -66,6 +66,7 @@ let NotebookVariablesView = class NotebookVariablesView extends ViewPane {
         const element = e.element;
         const arg = {
             source: ( element.notebook.uri.toString()),
+            name: element.name,
             value: element.value,
             type: element.type,
             expression: element.expression,
@@ -77,6 +78,7 @@ let NotebookVariablesView = class NotebookVariablesView extends ViewPane {
             [CONTEXT_VARIABLE_NAME.key, element.name],
             [CONTEXT_VARIABLE_VALUE.key, element.value],
             [CONTEXT_VARIABLE_TYPE.key, element.type],
+            [CONTEXT_VARIABLE_INTERFACES.key, element.interfaces],
             [CONTEXT_VARIABLE_LANGUAGE.key, element.language],
             [CONTEXT_VARIABLE_EXTENSIONID.key, element.extensionId]
         ]);