@codingame/monaco-vscode-api 4.5.2 → 5.0.1

package/vscode/src/vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.js

@@ -89,7 +89,7 @@ async function webviewPreloads(ctx) {
             return;
         }
         const id = lastFocusedOutput?.id;
-        if (id && (activeElement.tagName === 'INPUT' || activeElement.tagName === 'TEXTAREA')) {
+        if (id && (activeElement.tagName === 'INPUT' || activeElement.tagName === 'TEXTAREA' || activeElement.tagName === 'SELECT')) {
             postNotebookMessage('outputInputFocus', { inputFocused: true, id });
             activeElement.addEventListener('blur', () => {
                 postNotebookMessage('outputInputFocus', { inputFocused: false, id });
@@ -154,6 +154,13 @@ async function webviewPreloads(ctx) {
             postNotebookMessage('outputFocus', outputFocus);
         }
     };
+    const blurOutput = () => {
+        const selection = window.getSelection();
+        if (!selection) {
+            return;
+        }
+        selection.removeAllRanges();
+    };
     const selectOutputContents = (cellOrOutputId) => {
         const selection = window.getSelection();
         if (!selection) {
@@ -182,6 +189,10 @@ async function webviewPreloads(ctx) {
         if (!lastFocusedOutput?.id || !e.shiftKey) {
             return;
         }
+        if (e.shiftKey && (e.code === 'ArrowUp' || e.code === 'ArrowDown')) {
+            e.stopPropagation();
+            return;
+        }
         if (!(e.code === 'PageUp' || e.code === 'PageDown') && !(e.metaKey && (e.code === 'ArrowDown' || e.code === 'ArrowUp'))) {
             return;
         }
@@ -389,13 +400,13 @@ async function webviewPreloads(ctx) {
             return true;
         }
         if (node.hasAttribute('recentlyScrolled')) {
-            if (lastTimeScrolled && Date.now() - lastTimeScrolled > 300) {
-                if (!!previousDelta && deltaY < 0 && deltaY < previousDelta - 2) {
+            if (lastTimeScrolled && Date.now() - lastTimeScrolled > 400) {
+                if (!!previousDelta && deltaY < 0 && deltaY < previousDelta - 8) {
                     clearTimeout(scrollTimeout);
                     scrolledElement?.removeAttribute('recentlyScrolled');
                     return false;
                 }
-                else if (!!previousDelta && deltaY > 0 && deltaY > previousDelta + 2) {
+                else if (!!previousDelta && deltaY > 0 && deltaY > previousDelta + 8) {
                     clearTimeout(scrollTimeout);
                     scrolledElement?.removeAttribute('recentlyScrolled');
                     return false;
@@ -1110,7 +1121,7 @@ async function webviewPreloads(ctx) {
     };
     const copyOutputImage = async (outputId, altOutputId, retries = 5) => {
         if (!window.document.hasFocus() && retries > 0) {
-            setTimeout(() => { copyOutputImage(outputId, altOutputId, retries - 1); }, 20);
+            setTimeout(() => { copyOutputImage(outputId, altOutputId, retries - 1); }, 50);
             return;
         }
         try {
@@ -1268,6 +1279,9 @@ async function webviewPreloads(ctx) {
             case 'focus-output':
                 focusFirstFocusableOrContainerInOutput(event.data.cellOrOutputId, event.data.alternateId);
                 break;
+            case 'blur-output':
+                blurOutput();
+                break;
             case 'select-output-contents':
                 selectOutputContents(event.data.cellOrOutputId);
                 break;
@@ -1410,6 +1424,7 @@ async function webviewPreloads(ctx) {
                     get outputScrolling() { return currentRenderOptions.outputScrolling; },
                     get outputWordWrap() { return currentRenderOptions.outputWordWrap; },
                     get linkifyFilePaths() { return currentRenderOptions.linkifyFilePaths; },
+                    get minimalError() { return currentRenderOptions.minimalError; },
                 },
                 get onDidChangeSettings() { return settingChange.event; }
             };
@@ -2039,7 +2054,20 @@ async function webviewPreloads(ctx) {
             await outputElement.render(data.content, data.rendererId, preloadErrors, signal);
             outputElement .element.style.visibility = data.initiallyHidden ? 'hidden' : '';
             if (!!data.executionId && !!data.rendererId) {
-                postNotebookMessage('notebookPerformanceMessage', { cellId: data.cellId, executionId: data.executionId, duration: Date.now() - startTime, rendererId: data.rendererId });
+                let outputSize = undefined;
+                let mimeType = undefined;
+                if (data.content.type === 1 ) {
+                    outputSize = data.content.output.valueBytes.length;
+                    mimeType = data.content.output.mime;
+                }
+                postNotebookMessage('notebookPerformanceMessage', {
+                    cellId: data.cellId,
+                    executionId: data.executionId,
+                    duration: Date.now() - startTime,
+                    rendererId: data.rendererId,
+                    outputSize,
+                    mimeType
+                });
             }
         }
         clearOutput(outputId, rendererId) {

package/vscode/src/vs/workbench/contrib/notebook/browser/viewModel/baseCellViewModel.js

@@ -5,6 +5,7 @@ import { Range } from '../../../../../editor/common/core/range.js';
 import { Selection } from '../../../../../editor/common/core/selection.js';
 import { SearchParams } from '../../../../../editor/common/model/textModelSearch.js';
 import { writeTransientState, readTransientState } from '../../../codeEditor/browser/toggleWordWrap.js';
+import { InlineChatController } from '../../../inlineChat/browser/inlineChatController.js';
 import { CellEditState, CellFocusMode, CursorAtLineBoundary, CursorAtBoundary } from '../notebookBrowser.js';
 class BaseCellViewModel extends Disposable {
     get handle() {
@@ -191,6 +192,14 @@ class BaseCellViewModel extends Disposable {
             });
         });
         this._editorListeners.push(this._textEditor.onDidChangeCursorSelection(() => { this._onDidChangeState.fire({ selectionChanged: true }); }));
+        const inlineChatController = InlineChatController.get(this._textEditor);
+        if (inlineChatController) {
+            this._editorListeners.push(inlineChatController.onWillStartSession(() => {
+                if (this.textBuffer.getLength() === 0) {
+                    this.enableAutoLanguageDetection();
+                }
+            }));
+        }
         this._onDidChangeState.fire({ selectionChanged: true });
         this._onDidChangeEditorAttachState.fire();
     }
@@ -218,9 +227,15 @@ class BaseCellViewModel extends Disposable {
     getText() {
         return this.model.getValue();
     }
+    getAlternativeId() {
+        return this.model.alternativeId;
+    }
     getTextLength() {
         return this.model.getTextLength();
     }
+    enableAutoLanguageDetection() {
+        this.model.enableAutoLanguageDetection();
+    }
     saveViewState() {
         if (!this._textEditor) {
             return;

package/vscode/src/vs/workbench/contrib/notebook/browser/viewModel/cellEditorOptions.js

@@ -65,11 +65,13 @@ class BaseCellEditorOptions extends Disposable {
     }
     _computeEditorOptions() {
         const editorOptions = deepClone(this.configurationService.getValue('editor', { overrideIdentifier: this.language }));
-        const editorOptionsOverrideRaw = this.notebookOptions.getDisplayOptions().editorOptionsCustomizations ?? {};
+        const editorOptionsOverrideRaw = this.notebookOptions.getDisplayOptions().editorOptionsCustomizations;
         const editorOptionsOverride = {};
-        for (const key in editorOptionsOverrideRaw) {
-            if (key.indexOf('editor.') === 0) {
-                editorOptionsOverride[key.substring(7)] = editorOptionsOverrideRaw[key];
+        if (editorOptionsOverrideRaw) {
+            for (const key in editorOptionsOverrideRaw) {
+                if (key.indexOf('editor.') === 0) {
+                    editorOptionsOverride[key.substring(7)] = editorOptionsOverrideRaw[key];
+                }
             }
         }
         const computed = ( Object.freeze({

package/vscode/src/vs/workbench/contrib/notebook/browser/viewModel/notebookOutlineProviderFactory.service.js

@@ -0,0 +1,3 @@
+import { createDecorator } from '../../../../../platform/instantiation/common/instantiation.js';
+const INotebookCellOutlineProviderFactory = ( createDecorator('INotebookCellOutlineProviderFactory'));
+export { INotebookCellOutlineProviderFactory };

package/vscode/src/vs/workbench/contrib/notebook/browser/viewParts/notebookEditorStickyScroll.js

@@ -11,6 +11,8 @@ import { Delayer } from '../../../../../base/common/async.js';
 import { ThemeIcon } from '../../../../../base/common/themables.js';
 import { foldingCollapsedIcon, foldingExpandedIcon } from '../../../../../editor/contrib/folding/browser/foldingDecorations.js';
 import { FoldingController } from '../controller/foldingController.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { INotebookCellOutlineProviderFactory } from '../viewModel/notebookOutlineProviderFactory.service.js';
 var NotebookStickyScroll_1;
 class NotebookStickyLine extends Disposable {
     constructor(element, foldingIcon, header, entry, notebookEditor) {
@@ -95,13 +97,13 @@ let NotebookStickyScroll = NotebookStickyScroll_1 = class NotebookStickyScroll e
         }
         return true;
     }
-    constructor(domNode, notebookEditor, notebookOutline, notebookCellList, _contextMenuService) {
+    constructor(domNode, notebookEditor, notebookCellList, _contextMenuService, instantiationService) {
         super();
         this.domNode = domNode;
         this.notebookEditor = notebookEditor;
-        this.notebookOutline = notebookOutline;
         this.notebookCellList = notebookCellList;
         this._contextMenuService = _contextMenuService;
+        this.instantiationService = instantiationService;
         this._disposables = ( new DisposableStore());
         this.currentStickyLines = ( new Map());
         this._onDidChangeNotebookStickyScroll = this._register(( new Emitter()));
@@ -142,34 +144,34 @@ let NotebookStickyScroll = NotebookStickyScroll_1 = class NotebookStickyScroll e
             }
             else {
                 this._disposables.clear();
-                this.notebookOutline.dispose();
+                this.notebookOutlineReference?.dispose();
                 this.disposeCurrentStickyLines();
                 clearNode(this.domNode);
                 this.updateDisplay();
             }
         }
-        else if (e.stickyScrollMode && this.notebookEditor.notebookOptions.getDisplayOptions().stickyScrollEnabled) {
-            this.updateContent(computeContent(this.notebookEditor, this.notebookCellList, this.notebookOutline.entries, this.getCurrentStickyHeight()));
+        else if (e.stickyScrollMode && this.notebookEditor.notebookOptions.getDisplayOptions().stickyScrollEnabled && this.notebookOutlineReference?.object) {
+            this.updateContent(computeContent(this.notebookEditor, this.notebookCellList, this.notebookOutlineReference?.object?.entries, this.getCurrentStickyHeight()));
         }
     }
     init() {
-        this.notebookOutline.init();
-        this.updateContent(computeContent(this.notebookEditor, this.notebookCellList, this.notebookOutline.entries, this.getCurrentStickyHeight()));
-        this._disposables.add(this.notebookOutline.onDidChange(() => {
-            const recompute = computeContent(this.notebookEditor, this.notebookCellList, this.notebookOutline.entries, this.getCurrentStickyHeight());
+        const { object: notebookOutlineReference } = this.notebookOutlineReference = this.instantiationService.invokeFunction((accessor) => accessor.get(INotebookCellOutlineProviderFactory).getOrCreate(this.notebookEditor, 1 ));
+        this._register(this.notebookOutlineReference);
+        this.updateContent(computeContent(this.notebookEditor, this.notebookCellList, notebookOutlineReference.entries, this.getCurrentStickyHeight()));
+        this._disposables.add(notebookOutlineReference.onDidChange(() => {
+            const recompute = computeContent(this.notebookEditor, this.notebookCellList, notebookOutlineReference.entries, this.getCurrentStickyHeight());
             if (!this.compareStickyLineMaps(recompute, this.currentStickyLines)) {
                 this.updateContent(recompute);
             }
         }));
         this._disposables.add(this.notebookEditor.onDidAttachViewModel(() => {
-            this.notebookOutline.init();
-            this.updateContent(computeContent(this.notebookEditor, this.notebookCellList, this.notebookOutline.entries, this.getCurrentStickyHeight()));
+            this.updateContent(computeContent(this.notebookEditor, this.notebookCellList, notebookOutlineReference.entries, this.getCurrentStickyHeight()));
         }));
         this._disposables.add(this.notebookEditor.onDidScroll(() => {
             const d = ( new Delayer(100));
             d.trigger(() => {
                 d.dispose();
-                const recompute = computeContent(this.notebookEditor, this.notebookCellList, this.notebookOutline.entries, this.getCurrentStickyHeight());
+                const recompute = computeContent(this.notebookEditor, this.notebookCellList, notebookOutlineReference.entries, this.getCurrentStickyHeight());
                 if (!this.compareStickyLineMaps(recompute, this.currentStickyLines)) {
                     this.updateContent(recompute);
                 }
@@ -293,12 +295,13 @@ let NotebookStickyScroll = NotebookStickyScroll_1 = class NotebookStickyScroll e
     dispose() {
         this._disposables.dispose();
         this.disposeCurrentStickyLines();
-        this.notebookOutline.dispose();
+        this.notebookOutlineReference?.dispose();
         super.dispose();
     }
 };
 NotebookStickyScroll = NotebookStickyScroll_1 = ( __decorate([
-    ( __param(4, IContextMenuService))
+    ( __param(3, IContextMenuService)),
+    ( __param(4, IInstantiationService))
 ], NotebookStickyScroll));
 function computeContent(notebookEditor, notebookCellList, notebookOutlineEntries, renderedStickyHeight) {
     const editorScrollTop = notebookEditor.scrollTop - renderedStickyHeight;

package/vscode/src/vs/workbench/contrib/notebook/browser/viewParts/notebookEditorToolbar.js

@@ -229,7 +229,8 @@ let NotebookEditorWorkbenchToolbar = class NotebookEditorWorkbenchToolbar extend
         this._updateStrategy();
         const context = {
             ui: true,
-            notebookEditor: this.notebookEditor
+            notebookEditor: this.notebookEditor,
+            source: 'notebookToolbar'
         };
         const actionProvider = (action, options) => {
             if (action.id === SELECT_KERNEL_ID) {

package/vscode/src/vs/workbench/contrib/notebook/common/model/notebookCellTextModel.js

@@ -7,6 +7,7 @@ import { PieceTreeTextBuffer } from '../../../../../editor/common/model/pieceTre
 import { PieceTreeTextBufferBuilder } from '../../../../../editor/common/model/pieceTreeTextBuffer/pieceTreeTextBufferBuilder.js';
 import { PLAINTEXT_LANGUAGE_ID } from '../../../../../editor/common/languages/modesRegistry.js';
 import { NotebookCellOutputTextModel } from './notebookCellOutputTextModel.js';
+import { ThrottledDelayer } from '../../../../../base/common/async.js';
 class NotebookCellTextModel extends Disposable {
     get outputs() {
         return this._outputs;
@@ -41,21 +42,8 @@ class NotebookCellTextModel extends Disposable {
             && this._textModel.getLanguageId() === this._languageService.getLanguageIdByLanguageName(this.language)) {
             return;
         }
-        const newLanguageId = this._languageService.getLanguageIdByLanguageName(newLanguage);
-        if (newLanguageId === null) {
-            return;
-        }
-        if (this._textModel) {
-            const languageId = this._languageService.createById(newLanguageId);
-            this._textModel.setLanguage(languageId.languageId);
-        }
-        if (this._language === newLanguage) {
-            return;
-        }
-        this._language = newLanguage;
-        this._hash = null;
-        this._onDidChangeLanguage.fire(newLanguage);
-        this._onDidChangeContent.fire('language');
+        this._hasLanguageSetExplicitly = true;
+        this._setLanguageInternal(newLanguage);
     }
     get mime() {
         return this._mime;
@@ -83,6 +71,7 @@ class NotebookCellTextModel extends Disposable {
             if (!this._textModel) {
                 this._onDidChangeContent.fire('content');
             }
+            this.autoDetectLanguage();
         }));
         return this._textBuffer;
     }
@@ -122,7 +111,9 @@ class NotebookCellTextModel extends Disposable {
             this.language = newLanguage;
         }
     }
-    constructor(uri, handle, _source, _language, _mime, cellKind, outputs, metadata, internalMetadata, collapseState, transientOptions, _languageService) {
+    static { this.AUTO_DETECT_LANGUAGE_THROTTLE_DELAY = 600; }
+    get hasLanguageSetExplicitly() { return this._hasLanguageSetExplicitly; }
+    constructor(uri, handle, _source, _language, _mime, cellKind, outputs, metadata, internalMetadata, collapseState, transientOptions, _languageService, _languageDetectionService = undefined) {
         super();
         this.uri = uri;
         this.handle = handle;
@@ -133,6 +124,7 @@ class NotebookCellTextModel extends Disposable {
         this.collapseState = collapseState;
         this.transientOptions = transientOptions;
         this._languageService = _languageService;
+        this._languageDetectionService = _languageDetectionService;
         this._onDidChangeOutputs = this._register(( new Emitter()));
         this.onDidChangeOutputs = this._onDidChangeOutputs.event;
         this._onDidChangeOutputItems = this._register(( new Emitter()));
@@ -151,10 +143,54 @@ class NotebookCellTextModel extends Disposable {
         this._alternativeId = 1;
         this._textModelDisposables = this._register(( new DisposableStore()));
         this._textModel = undefined;
+        this.autoDetectLanguageThrottler = this._register(( new ThrottledDelayer(NotebookCellTextModel.AUTO_DETECT_LANGUAGE_THROTTLE_DELAY)));
+        this._autoLanguageDetectionEnabled = false;
+        this._hasLanguageSetExplicitly = false;
         this._outputs = ( outputs.map(op => ( new NotebookCellOutputTextModel(op))));
         this._metadata = metadata ?? {};
         this._internalMetadata = internalMetadata ?? {};
     }
+    enableAutoLanguageDetection() {
+        this._autoLanguageDetectionEnabled = true;
+        this.autoDetectLanguage();
+    }
+    async autoDetectLanguage() {
+        if (this._autoLanguageDetectionEnabled) {
+            this.autoDetectLanguageThrottler.trigger(() => this._doAutoDetectLanguage());
+        }
+    }
+    async _doAutoDetectLanguage() {
+        if (this.hasLanguageSetExplicitly) {
+            return;
+        }
+        const newLanguage = await this._languageDetectionService?.detectLanguage(this.uri);
+        if (!newLanguage) {
+            return;
+        }
+        if (this._textModel
+            && this._textModel.getLanguageId() === this._languageService.getLanguageIdByLanguageName(newLanguage)
+            && this._textModel.getLanguageId() === this._languageService.getLanguageIdByLanguageName(this.language)) {
+            return;
+        }
+        this._setLanguageInternal(newLanguage);
+    }
+    _setLanguageInternal(newLanguage) {
+        const newLanguageId = this._languageService.getLanguageIdByLanguageName(newLanguage);
+        if (newLanguageId === null) {
+            return;
+        }
+        if (this._textModel) {
+            const languageId = this._languageService.createById(newLanguageId);
+            this._textModel.setLanguage(languageId.languageId);
+        }
+        if (this._language === newLanguage) {
+            return;
+        }
+        this._language = newLanguage;
+        this._hash = null;
+        this._onDidChangeLanguage.fire(newLanguage);
+        this._onDidChangeContent.fire('language');
+    }
     resetTextBuffer(textBuffer) {
         this._textBuffer = textBuffer;
     }

package/vscode/src/vs/workbench/contrib/notebook/common/notebookCommon.js

@@ -262,6 +262,7 @@ const NotebookSetting = {
     outputScrolling: 'notebook.output.scrolling',
     textOutputLineLimit: 'notebook.output.textLineLimit',
     LinkifyOutputFilePaths: 'notebook.output.linkifyFilePaths',
+    minimalErrorRendering: 'notebook.output.minimalErrorRendering',
     formatOnSave: 'notebook.formatOnSave.enabled',
     insertFinalNewline: 'notebook.insertFinalNewline',
     formatOnCellExecution: 'notebook.formatOnCellExecution',
@@ -283,11 +284,12 @@ const NotebookSetting = {
     outlineShowCodeCellSymbols: 'notebook.outline.showCodeCellSymbols',
     breadcrumbsShowCodeCells: 'notebook.breadcrumbs.showCodeCells',
     scrollToRevealCell: 'notebook.scrolling.revealNextCellOnExecute',
-    anchorToFocusedCell: 'notebook.scrolling.experimental.anchorToFocusedCell',
     cellChat: 'notebook.experimental.cellChat',
+    cellGenerate: 'notebook.experimental.generate',
     notebookVariablesView: 'notebook.experimental.variablesView',
     InteractiveWindowPromptToSave: 'interactiveWindow.promptToSaveOnClose',
     cellFailureDiagnostics: 'notebook.cellFailureDiagnostics',
+    outputBackupSizeLimit: 'notebook.backup.sizeLimit',
 };
 class NotebookWorkingCopyTypeIdentifier {
     static { this._prefix = 'notebook/'; }

package/vscode/src/vs/workbench/contrib/notebook/common/notebookContextKeys.js

@@ -8,7 +8,7 @@ const INTERACTIVE_WINDOW_IS_ACTIVE_EDITOR = ( ContextKeyExpr.equals('activeEdito
 const NOTEBOOK_EDITOR_FOCUSED = ( new RawContextKey('notebookEditorFocused', false));
 const NOTEBOOK_CELL_LIST_FOCUSED = ( new RawContextKey('notebookCellListFocused', false));
 const NOTEBOOK_OUTPUT_FOCUSED = ( new RawContextKey('notebookOutputFocused', false));
-const NOTEBOOK_OUPTUT_INPUT_FOCUSED = ( new RawContextKey('notebookOutputInputFocused', false));
+const NOTEBOOK_OUTPUT_INPUT_FOCUSED = ( new RawContextKey('notebookOutputInputFocused', false));
 const NOTEBOOK_EDITOR_EDITABLE = ( new RawContextKey('notebookEditable', true));
 const NOTEBOOK_HAS_RUNNING_CELL = ( new RawContextKey('notebookHasRunningCell', false));
 const NOTEBOOK_HAS_SOMETHING_RUNNING = ( new RawContextKey('notebookHasSomethingRunning', false));
@@ -38,4 +38,4 @@ const NOTEBOOK_KERNEL_SELECTED = ( new RawContextKey('notebookKernelSelected', f
 const NOTEBOOK_INTERRUPTIBLE_KERNEL = ( new RawContextKey('notebookInterruptibleKernel', false));
 const NOTEBOOK_MISSING_KERNEL_EXTENSION = ( new RawContextKey('notebookMissingKernelExtension', false));
 const NOTEBOOK_HAS_OUTPUTS = ( new RawContextKey('notebookHasOutputs', false));
-export { HAS_OPENED_NOTEBOOK, INTERACTIVE_WINDOW_IS_ACTIVE_EDITOR, InteractiveWindowOpen, KEYBINDING_CONTEXT_NOTEBOOK_FIND_WIDGET_FOCUSED, NOTEBOOK_CELL_EDITABLE, NOTEBOOK_CELL_EDITOR_FOCUSED, NOTEBOOK_CELL_EXECUTING, NOTEBOOK_CELL_EXECUTION_STATE, NOTEBOOK_CELL_FOCUSED, NOTEBOOK_CELL_GENERATED_BY_CHAT, NOTEBOOK_CELL_HAS_ERROR_DIAGNOSTICS, NOTEBOOK_CELL_HAS_OUTPUTS, NOTEBOOK_CELL_INPUT_COLLAPSED, NOTEBOOK_CELL_LINE_NUMBERS, NOTEBOOK_CELL_LIST_FOCUSED, NOTEBOOK_CELL_MARKDOWN_EDIT_MODE, NOTEBOOK_CELL_OUTPUT_COLLAPSED, NOTEBOOK_CELL_RESOURCE, NOTEBOOK_CELL_TOOLBAR_LOCATION, NOTEBOOK_CELL_TYPE, NOTEBOOK_CURSOR_NAVIGATION_MODE, NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_HAS_OUTPUTS, NOTEBOOK_HAS_RUNNING_CELL, NOTEBOOK_HAS_SOMETHING_RUNNING, NOTEBOOK_INTERRUPTIBLE_KERNEL, NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_KERNEL, NOTEBOOK_KERNEL_COUNT, NOTEBOOK_KERNEL_SELECTED, NOTEBOOK_KERNEL_SOURCE_COUNT, NOTEBOOK_LAST_CELL_FAILED, NOTEBOOK_MISSING_KERNEL_EXTENSION, NOTEBOOK_OUPTUT_INPUT_FOCUSED, NOTEBOOK_OUTPUT_FOCUSED, NOTEBOOK_USE_CONSOLIDATED_OUTPUT_BUTTON, NOTEBOOK_VIEW_TYPE };
+export { HAS_OPENED_NOTEBOOK, INTERACTIVE_WINDOW_IS_ACTIVE_EDITOR, InteractiveWindowOpen, KEYBINDING_CONTEXT_NOTEBOOK_FIND_WIDGET_FOCUSED, NOTEBOOK_CELL_EDITABLE, NOTEBOOK_CELL_EDITOR_FOCUSED, NOTEBOOK_CELL_EXECUTING, NOTEBOOK_CELL_EXECUTION_STATE, NOTEBOOK_CELL_FOCUSED, NOTEBOOK_CELL_GENERATED_BY_CHAT, NOTEBOOK_CELL_HAS_ERROR_DIAGNOSTICS, NOTEBOOK_CELL_HAS_OUTPUTS, NOTEBOOK_CELL_INPUT_COLLAPSED, NOTEBOOK_CELL_LINE_NUMBERS, NOTEBOOK_CELL_LIST_FOCUSED, NOTEBOOK_CELL_MARKDOWN_EDIT_MODE, NOTEBOOK_CELL_OUTPUT_COLLAPSED, NOTEBOOK_CELL_RESOURCE, NOTEBOOK_CELL_TOOLBAR_LOCATION, NOTEBOOK_CELL_TYPE, NOTEBOOK_CURSOR_NAVIGATION_MODE, NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_HAS_OUTPUTS, NOTEBOOK_HAS_RUNNING_CELL, NOTEBOOK_HAS_SOMETHING_RUNNING, NOTEBOOK_INTERRUPTIBLE_KERNEL, NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_KERNEL, NOTEBOOK_KERNEL_COUNT, NOTEBOOK_KERNEL_SELECTED, NOTEBOOK_KERNEL_SOURCE_COUNT, NOTEBOOK_LAST_CELL_FAILED, NOTEBOOK_MISSING_KERNEL_EXTENSION, NOTEBOOK_OUTPUT_FOCUSED, NOTEBOOK_OUTPUT_INPUT_FOCUSED, NOTEBOOK_USE_CONSOLIDATED_OUTPUT_BUTTON, NOTEBOOK_VIEW_TYPE };

package/vscode/src/vs/workbench/contrib/notebook/common/notebookEditorModel.js

@@ -168,20 +168,21 @@ class NotebookFileWorkingCopyModel extends Disposable {
                 break;
             }
         }));
-        if (_notebookModel.uri.scheme === Schemas.vscodeRemote) {
+        const saveWithReducedCommunication = this._configurationService.getValue(NotebookSetting.remoteSaving);
+        if (saveWithReducedCommunication || _notebookModel.uri.scheme === Schemas.vscodeRemote) {
             this.configuration = {
                 backupDelay: 10000
             };
-            if (this._configurationService.getValue(NotebookSetting.remoteSaving)) {
-                this.save = async (options, token) => {
-                    const serializer = await this.getNotebookSerializer();
-                    if (token.isCancellationRequested) {
-                        throw ( new CancellationError());
-                    }
-                    const stat = await serializer.save(this._notebookModel.uri, this._notebookModel.versionId, options, token);
-                    return stat;
-                };
-            }
+        }
+        if (saveWithReducedCommunication) {
+            this.save = async (options, token) => {
+                const serializer = await this.getNotebookSerializer();
+                if (token.isCancellationRequested) {
+                    throw ( new CancellationError());
+                }
+                const stat = await serializer.save(this._notebookModel.uri, this._notebookModel.versionId, options, token);
+                return stat;
+            };
         }
     }
     dispose() {
@@ -191,12 +192,13 @@ class NotebookFileWorkingCopyModel extends Disposable {
     get notebookModel() {
         return this._notebookModel;
     }
-    async snapshot(token) {
+    async snapshot(context, token) {
         const serializer = await this.getNotebookSerializer();
         const data = {
             metadata: filter(this._notebookModel.metadata, key => !serializer.options.transientDocumentMetadata[key]),
             cells: [],
         };
+        let outputSize = 0;
         for (const cell of this._notebookModel.cells) {
             const cellData = {
                 cellKind: cell.cellKind,
@@ -206,6 +208,17 @@ class NotebookFileWorkingCopyModel extends Disposable {
                 outputs: [],
                 internalMetadata: cell.internalMetadata
             };
+            const outputSizeLimit = this._configurationService.getValue(NotebookSetting.outputBackupSizeLimit) * 1024;
+            if (context === 2  && outputSizeLimit > 0) {
+                cell.outputs.forEach(output => {
+                    output.outputs.forEach(item => {
+                        outputSize += item.data.byteLength;
+                    });
+                });
+                if (outputSize > outputSizeLimit) {
+                    throw ( new Error('Notebook too large to backup'));
+                }
+            }
             cellData.outputs = !serializer.options.transientOutputs ? cell.outputs : [];
             cellData.metadata = filter(cell.metadata, key => !serializer.options.transientCellMetadata[key]);
             data.cells.push(cellData);

package/vscode/src/vs/workbench/contrib/preferences/browser/preferencesWidgets.js

@@ -36,14 +36,15 @@ import { IWorkspaceContextService } from '../../../../platform/workspace/common/
 import { settingsScopeDropDownIcon, settingsEditIcon } from './preferencesIcons.js';
 import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.service.js';
 import { ILanguageService } from '../../../../editor/common/languages/language.js';
-import { setupCustomHover } from '../../../../base/browser/ui/hover/updatableHoverWidget.js';
 import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.service.js';
 const _moduleId = "vs/workbench/contrib/preferences/browser/preferencesWidgets";
 let FolderSettingsActionViewItem = class FolderSettingsActionViewItem extends BaseActionViewItem {
-    constructor(action, contextService, contextMenuService) {
+    constructor(action, contextService, contextMenuService, hoverService) {
         super(null, action);
         this.contextService = contextService;
         this.contextMenuService = contextMenuService;
+        this.hoverService = hoverService;
         this._folderSettingCounts = ( (new Map()));
         const workspace = this.contextService.getWorkspace();
         this._folder = workspace.folders.length === 1 ? workspace.folders[0] : null;
@@ -76,7 +77,7 @@ let FolderSettingsActionViewItem = class FolderSettingsActionViewItem extends Ba
             'aria-haspopup': 'true',
             'tabindex': '0'
         }, this.labelElement, this.detailsElement, this.dropDownElement);
-        this.anchorElementHover = this._register(setupCustomHover(getDefaultHoverDelegate('mouse'), this.anchorElement, ''));
+        this.anchorElementHover = this._register(this.hoverService.setupUpdatableHover(getDefaultHoverDelegate('mouse'), this.anchorElement, ''));
         this._register(addDisposableListener(this.anchorElement, EventType.MOUSE_DOWN, e => EventHelper.stop(e)));
         this._register(addDisposableListener(this.anchorElement, EventType.CLICK, e => this.onClick(e)));
         this._register(addDisposableListener(this.container, EventType.KEY_UP, e => this.onKeyUp(e)));
@@ -176,7 +177,8 @@ let FolderSettingsActionViewItem = class FolderSettingsActionViewItem extends Ba
 };
 FolderSettingsActionViewItem = ( (__decorate([
     ( (__param(1, IWorkspaceContextService))),
-    ( (__param(2, IContextMenuService)))
+    ( (__param(2, IContextMenuService))),
+    ( (__param(3, IHoverService)))
 ], FolderSettingsActionViewItem)));
 let SettingsTargetsWidget = class SettingsTargetsWidget extends Widget {
     constructor(parent, options, contextService, instantiationService, environmentService, labelService, languageService) {

package/vscode/src/vs/workbench/contrib/remote/browser/remoteExplorer.js

@@ -200,11 +200,9 @@ let AutomaticPortForwarding = class AutomaticPortForwarding extends Disposable {
         this.openerService = openerService;
         this.externalOpenerService = externalOpenerService;
         this.remoteExplorerService = remoteExplorerService;
-        this.environmentService = environmentService;
         this.contextKeyService = contextKeyService;
         this.configurationService = configurationService;
         this.debugService = debugService;
-        this.remoteAgentService = remoteAgentService;
         this.tunnelService = tunnelService;
         this.hostService = hostService;
         this.logService = logService;

package/vscode/src/vs/workbench/contrib/remote/browser/tunnelView.js

@@ -62,6 +62,7 @@ import { Codicon } from '../../../../base/common/codicons.js';
 import { defaultButtonStyles, defaultInputBoxStyles } from '../../../../platform/theme/browser/defaultStyles.js';
 import { makeAddress, forwardedPortsViewEnabled, parseAddress, TunnelCloseReason, mapHasAddressLocalhostOrAllInterfaces, TunnelSource } from '../../../services/remote/common/tunnelModel.js';
 import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.service.js';
 import Severity$1 from '../../../../base/common/severity.js';
 var TunnelPanel_1;
 const _moduleId = "vs/workbench/contrib/remote/browser/tunnelView";
@@ -715,8 +716,8 @@ let TunnelPanel = class TunnelPanel extends ViewPane {
     static { TunnelPanel_1 = this; }
     static { this.ID = TUNNEL_VIEW_ID; }
     static { this.TITLE = ( localize2WithPath(_moduleId, 25, "Ports")); }
-    constructor(viewModel, options, keybindingService, contextMenuService, contextKeyService, configurationService, instantiationService, viewDescriptorService, openerService, quickInputService, commandService, menuService, themeService, remoteExplorerService, telemetryService, tunnelService, contextViewService) {
-        super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService);
+    constructor(viewModel, options, keybindingService, contextMenuService, contextKeyService, configurationService, instantiationService, viewDescriptorService, openerService, quickInputService, commandService, menuService, themeService, remoteExplorerService, telemetryService, hoverService, tunnelService, contextViewService) {
+        super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, hoverService);
         this.viewModel = viewModel;
         this.quickInputService = quickInputService;
         this.commandService = commandService;
@@ -1022,8 +1023,9 @@ TunnelPanel = TunnelPanel_1 = ( (__decorate([
     ( (__param(12, IThemeService))),
     ( (__param(13, IRemoteExplorerService))),
     ( (__param(14, ITelemetryService))),
-    ( (__param(15, ITunnelService))),
-    ( (__param(16, IContextViewService)))
+    ( (__param(15, IHoverService))),
+    ( (__param(16, ITunnelService))),
+    ( (__param(17, IContextViewService)))
 ], TunnelPanel)));
 class TunnelPanelDescriptor {
     constructor(viewModel, environmentService) {

package/vscode/src/vs/workbench/contrib/scm/browser/dirtydiffDecorator.js

@@ -59,6 +59,9 @@ import { IAccessibilitySignalService } from '../../../../platform/accessibilityS
 import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.service.js';
 import { IQuickDiffService } from '../common/quickDiff.service.js';
 import { SwitchQuickDiffViewItem, SwitchQuickDiffBaseAction } from './dirtyDiffSwitcher.js';
+import { TextDiffEditor } from '../../../browser/parts/editor/textDiffEditor.js';
+import { TextFileEditor } from '../../files/browser/editors/textFileEditor.js';
+import { SideBySideEditor } from '../../../browser/parts/editor/sideBySideEditor.js';
 var DirtyDiffController_1, DirtyDiffDecorator_1;
 const _moduleId = "vs/workbench/contrib/scm/browser/dirtydiffDecorator";
 class DiffActionRunner extends ActionRunner {
@@ -1398,8 +1401,27 @@ let DirtyDiffWorkbenchController = class DirtyDiffWorkbenchController extends Di
         this.items.clear();
         this.enabled = false;
     }
+    getVisibleEditorControls() {
+        const controls = [];
+        const addControl = (control) => {
+            if (control) {
+                controls.push(control);
+            }
+        };
+        for (const editorPane of this.editorService.visibleEditorPanes) {
+            if (editorPane instanceof TextDiffEditor || editorPane instanceof TextFileEditor) {
+                addControl(editorPane.getControl());
+            }
+            else if (editorPane instanceof SideBySideEditor) {
+                addControl(editorPane.getPrimaryEditorPane()?.getControl());
+                addControl(editorPane.getSecondaryEditorPane()?.getControl());
+            }
+        }
+        return controls;
+    }
     onEditorsChanged() {
-        for (const editor of this.editorService.visibleTextEditorControls) {
+        const visibleControls = this.getVisibleEditorControls();
+        for (const editor of visibleControls) {
             if (isCodeEditor(editor)) {
                 const textModel = editor.getModel();
                 const controller = DirtyDiffController.get(editor);
@@ -1426,7 +1448,7 @@ let DirtyDiffWorkbenchController = class DirtyDiffWorkbenchController extends Di
         }
         for (const [uri, item] of this.items) {
             for (const editorId of ( (item.keys()))) {
-                if (!this.editorService.visibleTextEditorControls.find(editor => isCodeEditor(editor) && editor.getModel()?.uri.toString() === ( (uri.toString())) && editor.getId() === editorId)) {
+                if (!this.getVisibleEditorControls().find(editor => isCodeEditor(editor) && editor.getModel()?.uri.toString() === ( (uri.toString())) && editor.getId() === editorId)) {
                     if (( (item.has(editorId)))) {
                         const dirtyDiffItem = item.get(editorId);
                         dirtyDiffItem?.dispose();