@codingame/monaco-vscode-notebook-service-override 25.1.2 → 26.0.0

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/cellDiagnostics/cellDiagnosticsActions.js

@@ -13,14 +13,14 @@ import { NOTEBOOK_CELL_FOCUSED, NOTEBOOK_CELL_HAS_ERROR_DIAGNOSTICS, NOTEBOOK_CE
 import { InlineChatController } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 
-const OPEN_CELL_FAILURE_ACTIONS_COMMAND_ID = 'notebook.cell.openFailureActions';
-const FIX_CELL_ERROR_COMMAND_ID = 'notebook.cell.chat.fixError';
-const EXPLAIN_CELL_ERROR_COMMAND_ID = 'notebook.cell.chat.explainError';
+const OPEN_CELL_FAILURE_ACTIONS_COMMAND_ID = "notebook.cell.openFailureActions";
+const FIX_CELL_ERROR_COMMAND_ID = "notebook.cell.chat.fixError";
+const EXPLAIN_CELL_ERROR_COMMAND_ID = "notebook.cell.chat.explainError";
 registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: OPEN_CELL_FAILURE_ACTIONS_COMMAND_ID,
-            title: ( localize2(9238, "Show Cell Failure Actions")),
+            title: ( localize2(9558, "Show Cell Failure Actions")),
             precondition: ( ContextKeyExpr.and(NOTEBOOK_CELL_FOCUSED, NOTEBOOK_CELL_HAS_ERROR_DIAGNOSTICS, ( NOTEBOOK_CELL_EDITOR_FOCUSED.toNegated()))),
             f1: true,
             keybinding: {
@@ -44,7 +44,9 @@ registerAction2(class extends NotebookCellAction {
                 const editor = findTargetCellEditor(context, context.cell);
                 if (editor) {
                     const controller = CodeActionController.get(editor);
-                    controller?.manualTriggerAtCurrentPosition(( localize(9239, "No code actions available")), CodeActionTriggerSource.Default, { include: CodeActionKind.QuickFix });
+                    controller?.manualTriggerAtCurrentPosition(( localize(9559, "No code actions available")), CodeActionTriggerSource.Default, {
+                        include: CodeActionKind.QuickFix
+                    });
                 }
             }
         }
@@ -54,7 +56,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: FIX_CELL_ERROR_COMMAND_ID,
-            title: ( localize2(9240, "Fix Cell Error")),
+            title: ( localize2(9560, "Fix Cell Error")),
             precondition: ( ContextKeyExpr.and(NOTEBOOK_CELL_FOCUSED, NOTEBOOK_CELL_HAS_ERROR_DIAGNOSTICS, ( NOTEBOOK_CELL_EDITOR_FOCUSED.toNegated()))),
             f1: true
         });
@@ -75,7 +77,11 @@ registerAction2(class extends NotebookCellAction {
                     const controller = InlineChatController.get(editor);
                     const message = error.name ? `${error.name}: ${error.message}` : error.message;
                     if (controller) {
-                        await controller.run({ message: '/fix ' + message, initialRange: location, autoSend: true });
+                        await controller.run({
+                            message: "/fix " + message,
+                            initialRange: location,
+                            autoSend: true
+                        });
                     }
                 }
             }
@@ -86,7 +92,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: EXPLAIN_CELL_ERROR_COMMAND_ID,
-            title: ( localize2(9241, "Explain Cell Error")),
+            title: ( localize2(9561, "Explain Cell Error")),
             precondition: ( ContextKeyExpr.and(NOTEBOOK_CELL_FOCUSED, NOTEBOOK_CELL_HAS_ERROR_DIAGNOSTICS, ( NOTEBOOK_CELL_EDITOR_FOCUSED.toNegated()))),
             f1: true
         });
@@ -98,7 +104,7 @@ registerAction2(class extends NotebookCellAction {
                 const widgetService = accessor.get(IChatWidgetService);
                 const chatWidget = await widgetService.revealWidget();
                 const message = error.name ? `${error.name}: ${error.message}` : error.message;
-                chatWidget?.acceptInput('@workspace /explain ' + message);
+                chatWidget?.acceptInput("@workspace /explain " + message);
             }
         }
     }

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/cellDiagnostics/diagnosticCellStatusBarContrib.js

@@ -6,7 +6,7 @@ import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { IKeybindingService } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service';
 import { OPEN_CELL_FAILURE_ACTIONS_COMMAND_ID } from './cellDiagnosticsActions.js';
-import { NotebookStatusBarController } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/executionStatusBarItemController';
+import { NotebookStatusBarController } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/executionStatusBarItemController';
 import { registerNotebookContribution } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/notebookEditorExtensions';
 import { CodeCellViewModel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/viewModel/codeCellViewModel';
 import { CellStatusbarAlignment } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
@@ -15,17 +15,18 @@ import { ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbe
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
 let DiagnosticCellStatusBarContrib = class DiagnosticCellStatusBarContrib extends Disposable {
-    static { this.id = 'workbench.notebook.statusBar.diagtnostic'; }
+    static {
+        this.id = "workbench.notebook.statusBar.diagtnostic";
+    }
     constructor(notebookEditor, instantiationService) {
         super();
-        this._register(( new NotebookStatusBarController(notebookEditor, (vm, cell) => cell instanceof CodeCellViewModel ?
-            instantiationService.createInstance(DiagnosticCellStatusBarItem, vm, cell) :
-            Disposable.None)));
+        this._register(( new NotebookStatusBarController(
+            notebookEditor,
+            (vm, cell) => cell instanceof CodeCellViewModel ? instantiationService.createInstance(DiagnosticCellStatusBarItem, vm, cell) : Disposable.None
+        )));
     }
 };
-DiagnosticCellStatusBarContrib = ( __decorate([
-    ( __param(1, IInstantiationService))
-], DiagnosticCellStatusBarContrib));
+DiagnosticCellStatusBarContrib = ( __decorate([( __param(1, IInstantiationService))], DiagnosticCellStatusBarContrib));
 registerNotebookContribution(DiagnosticCellStatusBarContrib.id, DiagnosticCellStatusBarContrib);
 let DiagnosticCellStatusBarItem = class DiagnosticCellStatusBarItem extends Disposable {
     constructor(_notebookViewModel, cell, keybindingService, chatAgentService) {
@@ -35,7 +36,9 @@ let DiagnosticCellStatusBarItem = class DiagnosticCellStatusBarItem extends Disp
         this.keybindingService = keybindingService;
         this.chatAgentService = chatAgentService;
         this._currentItemIds = [];
-        this._register(autorun((reader) => this.updateSparkleItem(reader.readObservable(cell.executionErrorDiagnostic))));
+        this._register(autorun(
+            reader => this.updateSparkleItem(reader.readObservable(cell.executionErrorDiagnostic))
+        ));
     }
     hasNotebookAgent() {
         const agents = this.chatAgentService.getAgents();
@@ -44,8 +47,7 @@ let DiagnosticCellStatusBarItem = class DiagnosticCellStatusBarItem extends Disp
     async updateSparkleItem(error) {
         let item;
         if (error?.location && this.hasNotebookAgent()) {
-            const keybinding = this.keybindingService.lookupKeybinding(OPEN_CELL_FAILURE_ACTIONS_COMMAND_ID)?.getLabel();
-            const tooltip = ( localize(9242, "Quick Actions {0}", `(${keybinding})`));
+            const tooltip = this.keybindingService.appendKeybinding(( localize(9562, "Quick Actions")), OPEN_CELL_FAILURE_ACTIONS_COMMAND_ID);
             item = {
                 text: `$(sparkle)`,
                 tooltip,
@@ -55,16 +57,19 @@ let DiagnosticCellStatusBarItem = class DiagnosticCellStatusBarItem extends Disp
             };
         }
         const items = item ? [item] : [];
-        this._currentItemIds = this._notebookViewModel.deltaCellStatusBarItems(this._currentItemIds, [{ handle: this.cell.handle, items }]);
+        this._currentItemIds = this._notebookViewModel.deltaCellStatusBarItems(this._currentItemIds, [{
+            handle: this.cell.handle,
+            items
+        }]);
     }
     dispose() {
         super.dispose();
-        this._notebookViewModel.deltaCellStatusBarItems(this._currentItemIds, [{ handle: this.cell.handle, items: [] }]);
+        this._notebookViewModel.deltaCellStatusBarItems(this._currentItemIds, [{
+            handle: this.cell.handle,
+            items: []
+        }]);
     }
 };
-DiagnosticCellStatusBarItem = ( __decorate([
-    ( __param(2, IKeybindingService)),
-    ( __param(3, IChatAgentService))
-], DiagnosticCellStatusBarItem));
+DiagnosticCellStatusBarItem = ( __decorate([( __param(2, IKeybindingService)), ( __param(3, IChatAgentService))], DiagnosticCellStatusBarItem));
 
 export { DiagnosticCellStatusBarContrib };

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/contributedStatusBarItemController.js

@@ -3,12 +3,14 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import { Throttler } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 import { CancellationTokenSource } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
 import { Disposable, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
-import { NotebookVisibleCellObserver } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/notebookVisibleCellObserver';
+import { NotebookVisibleCellObserver } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/notebookVisibleCellObserver';
 import { registerNotebookContribution } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/notebookEditorExtensions';
 import { INotebookCellStatusBarService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCellStatusBarService.service';
 
 let ContributedStatusBarItemController = class ContributedStatusBarItemController extends Disposable {
-    static { this.id = 'workbench.notebook.statusBar.contributed'; }
+    static {
+        this.id = "workbench.notebook.statusBar.contributed";
+    }
     constructor(_notebookEditor, _notebookCellStatusBarService) {
         super();
         this._notebookEditor = _notebookEditor;
@@ -17,8 +19,12 @@ let ContributedStatusBarItemController = class ContributedStatusBarItemControlle
         this._observer = this._register(( new NotebookVisibleCellObserver(this._notebookEditor)));
         this._register(this._observer.onDidChangeVisibleCells(this._updateVisibleCells, this));
         this._updateEverything();
-        this._register(this._notebookCellStatusBarService.onDidChangeProviders(this._updateEverything, this));
-        this._register(this._notebookCellStatusBarService.onDidChangeItems(this._updateEverything, this));
+        this._register(
+            this._notebookCellStatusBarService.onDidChangeProviders(this._updateEverything, this)
+        );
+        this._register(
+            this._notebookCellStatusBarService.onDidChangeItems(this._updateEverything, this)
+        );
     }
     _updateEverything() {
         const newCells = this._observer.visibleCells.filter(cell => !( this._visibleCells.has(cell.handle)));
@@ -26,7 +32,12 @@ let ContributedStatusBarItemController = class ContributedStatusBarItemControlle
         const currentCellHandles = Array.from(( this._visibleCells.keys()));
         const removedCells = currentCellHandles.filter(handle => !( visibleCellHandles.has(handle)));
         const itemsToUpdate = currentCellHandles.filter(handle => ( visibleCellHandles.has(handle)));
-        this._updateVisibleCells({ added: newCells, removed: ( removedCells.map(handle => ({ handle }))) });
+        this._updateVisibleCells({
+            added: newCells,
+            removed: ( removedCells.map(handle => ({
+                handle
+            })))
+        });
         itemsToUpdate.forEach(handle => this._visibleCells.get(handle)?.update());
     }
     _updateVisibleCells(e) {
@@ -49,9 +60,7 @@ let ContributedStatusBarItemController = class ContributedStatusBarItemControlle
         this._visibleCells.clear();
     }
 };
-ContributedStatusBarItemController = ( __decorate([
-    ( __param(1, INotebookCellStatusBarService))
-], ContributedStatusBarItemController));
+ContributedStatusBarItemController = ( __decorate([( __param(1, INotebookCellStatusBarService))], ContributedStatusBarItemController));
 class CellStatusBarHelper extends Disposable {
     constructor(_notebookViewModel, _cell, _notebookCellStatusBarService) {
         super();
@@ -92,7 +101,10 @@ class CellStatusBarHelper extends Disposable {
             return;
         }
         const items = ( itemLists.map(itemList => itemList.items)).flat();
-        const newIds = this._notebookViewModel.deltaCellStatusBarItems(this._currentItemIds, [{ handle: this._cell.handle, items }]);
+        const newIds = this._notebookViewModel.deltaCellStatusBarItems(this._currentItemIds, [{
+            handle: this._cell.handle,
+            items
+        }]);
         this._currentItemLists.forEach(itemList => itemList.dispose && itemList.dispose());
         this._currentItemLists = itemLists;
         this._currentItemIds = newIds;
@@ -101,7 +113,10 @@ class CellStatusBarHelper extends Disposable {
         super.dispose();
         this._isDisposed = true;
         this._activeToken?.dispose(true);
-        this._notebookViewModel.deltaCellStatusBarItems(this._currentItemIds, [{ handle: this._cell.handle, items: [] }]);
+        this._notebookViewModel.deltaCellStatusBarItems(this._currentItemIds, [{
+            handle: this._cell.handle,
+            items: []
+        }]);
         this._currentItemLists.forEach(itemList => itemList.dispose && itemList.dispose());
     }
 }

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/statusBarProviders.js

@@ -21,7 +21,7 @@ let CellStatusBarLanguagePickerProvider = class CellStatusBarLanguagePickerProvi
     constructor(_notebookService, _languageService) {
         this._notebookService = _notebookService;
         this._languageService = _languageService;
-        this.viewType = '*';
+        this.viewType = "*";
     }
     async provideCellStatusBarItems(uri, index, _token) {
         const doc = this._notebookService.getNotebookTextModel(uri);
@@ -32,22 +32,24 @@ let CellStatusBarLanguagePickerProvider = class CellStatusBarLanguagePickerProvi
         const statusBarItems = [];
         let displayLanguage = cell.language;
         if (cell.cellKind === CellKind.Markup) {
-            displayLanguage = 'markdown';
-        }
-        else {
+            displayLanguage = "markdown";
+        } else {
             const registeredId = this._languageService.getLanguageIdByLanguageName(cell.language);
             if (registeredId) {
                 displayLanguage = this._languageService.getLanguageName(displayLanguage) ?? displayLanguage;
-            }
-            else {
+            } else {
                 const searchTooltip = ( localize(
-                    9250,
+                    9570,
                     "Unknown cell language. Click to search for '{0}' extensions",
                     cell.language
                 ));
                 statusBarItems.push({
                     text: `$(dialog-warning)`,
-                    command: { id: 'workbench.extensions.search', arguments: [`@tag:${cell.language}`], title: 'Search Extensions' },
+                    command: {
+                        id: "workbench.extensions.search",
+                        arguments: [`@tag:${cell.language}`],
+                        title: "Search Extensions"
+                    },
                     tooltip: searchTooltip,
                     alignment: CellStatusbarAlignment.Right,
                     priority: -Number.MAX_SAFE_INTEGER + 1
@@ -57,7 +59,7 @@ let CellStatusBarLanguagePickerProvider = class CellStatusBarLanguagePickerProvi
         statusBarItems.push({
             text: displayLanguage,
             command: CHANGE_CELL_LANGUAGE,
-            tooltip: ( localize(9251, "Select Cell Language Mode")),
+            tooltip: ( localize(9571, "Select Cell Language Mode")),
             alignment: CellStatusbarAlignment.Right,
             priority: -Number.MAX_SAFE_INTEGER
         });
@@ -66,19 +68,23 @@ let CellStatusBarLanguagePickerProvider = class CellStatusBarLanguagePickerProvi
         };
     }
 };
-CellStatusBarLanguagePickerProvider = ( __decorate([
-    ( __param(0, INotebookService)),
-    ( __param(1, ILanguageService))
-], CellStatusBarLanguagePickerProvider));
+CellStatusBarLanguagePickerProvider = ( __decorate([( __param(0, INotebookService)), ( __param(1, ILanguageService))], CellStatusBarLanguagePickerProvider));
 let CellStatusBarLanguageDetectionProvider = class CellStatusBarLanguageDetectionProvider {
-    constructor(_notebookService, _notebookKernelService, _languageService, _configurationService, _languageDetectionService, _keybindingService) {
+    constructor(
+        _notebookService,
+        _notebookKernelService,
+        _languageService,
+        _configurationService,
+        _languageDetectionService,
+        _keybindingService
+    ) {
         this._notebookService = _notebookService;
         this._notebookKernelService = _notebookKernelService;
         this._languageService = _languageService;
         this._configurationService = _configurationService;
         this._languageDetectionService = _languageDetectionService;
         this._keybindingService = _keybindingService;
-        this.viewType = '*';
+        this.viewType = "*";
         this.cache = ( new ResourceMap());
     }
     async provideCellStatusBarItems(uri, index, token) {
@@ -87,8 +93,8 @@ let CellStatusBarLanguageDetectionProvider = class CellStatusBarLanguageDetectio
         if (!cell) {
             return;
         }
-        const enablementConfig = this._configurationService.getValue('workbench.editor.languageDetectionHints');
-        const enabled = typeof enablementConfig === 'object' && enablementConfig?.notebookEditors;
+        const enablementConfig = this._configurationService.getValue("workbench.editor.languageDetectionHints");
+        const enabled = typeof enablementConfig === "object" && enablementConfig?.notebookEditors;
         if (!enabled) {
             return;
         }
@@ -97,14 +103,12 @@ let CellStatusBarLanguageDetectionProvider = class CellStatusBarLanguageDetectio
         if (!contentVersion) {
             return;
         }
-        const currentLanguageId = cell.cellKind === CellKind.Markup ?
-            'markdown' :
-            (this._languageService.getLanguageIdByLanguageName(cell.language) || cell.language);
+        const currentLanguageId = cell.cellKind === CellKind.Markup ? "markdown" : (this._languageService.getLanguageIdByLanguageName(cell.language) || cell.language);
         if (!( this.cache.has(cellUri))) {
             this.cache.set(cellUri, {
                 cellLanguage: currentLanguageId,
                 updateTimestamp: 0,
-                contentVersion: 1,
+                contentVersion: 1
             });
         }
         const cached = this.cache.get(cellUri);
@@ -114,52 +118,41 @@ let CellStatusBarLanguageDetectionProvider = class CellStatusBarLanguageDetectio
             cached.contentVersion = contentVersion;
             const kernel = this._notebookKernelService.getSelectedOrSuggestedKernel(doc);
             if (kernel) {
-                const supportedLangs = [...kernel.supportedLanguages, 'markdown'];
+                const supportedLangs = [...kernel.supportedLanguages, "markdown"];
                 cached.guess = await this._languageDetectionService.detectLanguage(cell.uri, supportedLangs);
             }
         }
         const items = [];
         if (cached.guess && currentLanguageId !== cached.guess) {
             const detectedName = this._languageService.getLanguageName(cached.guess) || cached.guess;
-            let tooltip = ( localize(9252, "Accept Detected Language: {0}", detectedName));
-            const keybinding = this._keybindingService.lookupKeybinding(DETECT_CELL_LANGUAGE);
-            const label = keybinding?.getLabel();
-            if (label) {
-                tooltip += ` (${label})`;
-            }
+            const tooltip = this._keybindingService.appendKeybinding(( localize(9572, "Accept Detected Language: {0}", detectedName)), DETECT_CELL_LANGUAGE);
             items.push({
-                text: '$(lightbulb-autofix)',
+                text: "$(lightbulb-autofix)",
                 command: DETECT_CELL_LANGUAGE,
                 tooltip,
                 alignment: CellStatusbarAlignment.Right,
                 priority: -Number.MAX_SAFE_INTEGER + 1
             });
         }
-        return { items };
+        return {
+            items
+        };
     }
 };
-CellStatusBarLanguageDetectionProvider = ( __decorate([
-    ( __param(0, INotebookService)),
-    ( __param(1, INotebookKernelService)),
-    ( __param(2, ILanguageService)),
-    ( __param(3, IConfigurationService)),
-    ( __param(4, ILanguageDetectionService)),
-    ( __param(5, IKeybindingService))
-], CellStatusBarLanguageDetectionProvider));
+CellStatusBarLanguageDetectionProvider = ( __decorate([( __param(0, INotebookService)), ( __param(1, INotebookKernelService)), ( __param(2, ILanguageService)), ( __param(3, IConfigurationService)), ( __param(4, ILanguageDetectionService)), ( __param(5, IKeybindingService))], CellStatusBarLanguageDetectionProvider));
 let BuiltinCellStatusBarProviders = class BuiltinCellStatusBarProviders extends Disposable {
     constructor(instantiationService, notebookCellStatusBarService) {
         super();
         const builtinProviders = [
             CellStatusBarLanguagePickerProvider,
-            CellStatusBarLanguageDetectionProvider,
+            CellStatusBarLanguageDetectionProvider
         ];
         builtinProviders.forEach(p => {
-            this._register(notebookCellStatusBarService.registerCellStatusBarItemProvider(instantiationService.createInstance(p)));
+            this._register(
+                notebookCellStatusBarService.registerCellStatusBarItemProvider(instantiationService.createInstance(p))
+            );
         });
     }
 };
-BuiltinCellStatusBarProviders = ( __decorate([
-    ( __param(0, IInstantiationService)),
-    ( __param(1, INotebookCellStatusBarService))
-], BuiltinCellStatusBarProviders));
+BuiltinCellStatusBarProviders = ( __decorate([( __param(0, IInstantiationService)), ( __param(1, INotebookCellStatusBarService))], BuiltinCellStatusBarProviders));
 ( Registry.as(Extensions.Workbench)).registerWorkbenchContribution(BuiltinCellStatusBarProviders, LifecyclePhase.Restored);