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

package/index.js

@@ -30,8 +30,8 @@ import { NotebookDocumentWorkbenchService } from '@codingame/monaco-vscode-api/v
 import { INotebookDocumentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/notebook/common/notebookDocumentService.service';
 import { INotebookOriginalCellModelFactory } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookOriginalCellModelFactory.service';
 import { INotebookOriginalModelReferenceFactory } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookOriginalModelRefFactory.service';
-import { OriginalNotebookCellModelFactory } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookOriginalCellModelFactory';
-import { NotebookOriginalModelReferenceFactory } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookOriginalModelRefFactory';
+import { OriginalNotebookCellModelFactory } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookOriginalCellModelFactory';
+import { NotebookOriginalModelReferenceFactory } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookOriginalModelRefFactory';
 import { INotebookCellOutlineDataSourceFactory } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/viewModel/notebookOutlineDataSourceFactory.service';
 import { NotebookCellOutlineDataSourceFactory } from './vscode/src/vs/workbench/contrib/notebook/browser/viewModel/notebookOutlineDataSourceFactory.js';
 import { NotebookOutlineEntryFactory } from './vscode/src/vs/workbench/contrib/notebook/browser/viewModel/notebookOutlineEntryFactory.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-notebook-service-override",
-  "version": "25.1.2",
+  "version": "26.0.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - notebook service-override",
   "keywords": [],
@@ -15,8 +15,8 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-api": "25.1.2",
-    "@codingame/monaco-vscode-katex-common": "25.1.2"
+    "@codingame/monaco-vscode-api": "26.0.0",
+    "@codingame/monaco-vscode-katex-common": "26.0.0"
   },
   "main": "index.js",
   "module": "index.js",

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

@@ -31,10 +31,18 @@ import * as emptyTextEditorHint from './emptyTextEditorHint.css';
 
 var EmptyTextEditorHintContentWidget_1;
 registerCss(emptyTextEditorHint);
-const emptyTextEditorHintSetting = 'workbench.editor.empty.hint';
+const emptyTextEditorHintSetting = "workbench.editor.empty.hint";
 let EmptyTextEditorHintContribution = class EmptyTextEditorHintContribution extends Disposable {
-    static { this.ID = 'editor.contrib.emptyTextEditorHint'; }
-    constructor(editor, configurationService, inlineChatSessionService, chatAgentService, instantiationService) {
+    static {
+        this.ID = "editor.contrib.emptyTextEditorHint";
+    }
+    constructor(
+        editor,
+        configurationService,
+        inlineChatSessionService,
+        chatAgentService,
+        instantiationService
+    ) {
         super();
         this.editor = editor;
         this.configurationService = configurationService;
@@ -46,7 +54,7 @@ let EmptyTextEditorHintContribution = class EmptyTextEditorHintContribution exte
         this._register(this.editor.onDidChangeModelContent(() => this.update()));
         this._register(this.chatAgentService.onDidChangeAgents(() => this.update()));
         this._register(this.editor.onDidChangeModelDecorations(() => this.update()));
-        this._register(this.editor.onDidChangeConfiguration((e) => {
+        this._register(this.editor.onDidChangeConfiguration(e => {
             if (e.hasChanged(EditorOption.readOnly)) {
                 this.update();
             }
@@ -61,15 +69,13 @@ let EmptyTextEditorHintContribution = class EmptyTextEditorHintContribution exte
                 this.textHintContentWidget?.dispose();
             }
         }));
-        this._register(inlineChatSessionService.onDidEndSession(e => {
-            if (this.editor === e.editor) {
-                this.update();
-            }
+        this._register(inlineChatSessionService.onDidChangeSessions(() => {
+            this.update();
         }));
     }
     shouldRenderHint() {
         const configValue = this.configurationService.getValue(emptyTextEditorHintSetting);
-        if (configValue === 'hidden') {
+        if (configValue === "hidden") {
             return false;
         }
         if (this.editor.getOption(EditorOption.readOnly)) {
@@ -80,16 +86,15 @@ let EmptyTextEditorHintContribution = class EmptyTextEditorHintContribution exte
         if (!model || languageId === OUTPUT_MODE_ID || languageId === LOG_MODE_ID || languageId === SEARCH_RESULT_LANGUAGE_ID) {
             return false;
         }
-        if (this.inlineChatSessionService.getSession(this.editor, model.uri)) {
+        if (this.inlineChatSessionService.getSessionByTextModel(model.uri)) {
             return false;
         }
         if (this.editor.getModel()?.getValueLength()) {
             return false;
         }
-        const hasConflictingDecorations = Boolean(this.editor.getLineDecorations(1)?.find((d) => d.options.beforeContentClassName
-            || d.options.afterContentClassName
-            || d.options.before?.content
-            || d.options.after?.content));
+        const hasConflictingDecorations = Boolean(this.editor.getLineDecorations(1)?.find(
+            d => d.options.beforeContentClassName || d.options.afterContentClassName || d.options.before?.content || d.options.after?.content
+        ));
         if (hasConflictingDecorations) {
             return false;
         }
@@ -101,8 +106,7 @@ let EmptyTextEditorHintContribution = class EmptyTextEditorHintContribution exte
         const shouldRenderHint = this.shouldRenderHint();
         if (shouldRenderHint && !this.textHintContentWidget) {
             this.textHintContentWidget = this.instantiationService.createInstance(EmptyTextEditorHintContentWidget, this.editor);
-        }
-        else if (!shouldRenderHint && this.textHintContentWidget) {
+        } else if (!shouldRenderHint && this.textHintContentWidget) {
             this.textHintContentWidget.dispose();
             this.textHintContentWidget = undefined;
         }
@@ -112,16 +116,23 @@ let EmptyTextEditorHintContribution = class EmptyTextEditorHintContribution exte
         this.textHintContentWidget?.dispose();
     }
 };
-EmptyTextEditorHintContribution = ( __decorate([
-    ( __param(1, IConfigurationService)),
-    ( __param(2, IInlineChatSessionService)),
-    ( __param(3, IChatAgentService)),
-    ( __param(4, IInstantiationService))
-], EmptyTextEditorHintContribution));
+EmptyTextEditorHintContribution = ( __decorate([( __param(1, IConfigurationService)), ( __param(2, IInlineChatSessionService)), ( __param(3, IChatAgentService)), ( __param(4, IInstantiationService))], EmptyTextEditorHintContribution));
 let EmptyTextEditorHintContentWidget = class EmptyTextEditorHintContentWidget extends Disposable {
-    static { EmptyTextEditorHintContentWidget_1 = this; }
-    static { this.ID = 'editor.widget.emptyHint'; }
-    constructor(editor, commandService, configurationService, keybindingService, chatAgentService, telemetryService, contextMenuService) {
+    static {
+        EmptyTextEditorHintContentWidget_1 = this;
+    }
+    static {
+        this.ID = "editor.widget.emptyHint";
+    }
+    constructor(
+        editor,
+        commandService,
+        configurationService,
+        keybindingService,
+        chatAgentService,
+        telemetryService,
+        contextMenuService
+    ) {
         super();
         this.editor = editor;
         this.commandService = commandService;
@@ -131,8 +142,8 @@ let EmptyTextEditorHintContentWidget = class EmptyTextEditorHintContentWidget ex
         this.telemetryService = telemetryService;
         this.contextMenuService = contextMenuService;
         this.isVisible = false;
-        this.ariaLabel = '';
-        this._register(this.editor.onDidChangeConfiguration((e) => {
+        this.ariaLabel = "";
+        this._register(this.editor.onDidChangeConfiguration(e => {
             if (this.domNode && e.hasChanged(EditorOption.fontInfo)) {
                 this.editor.applyFontInfo(this.domNode);
             }
@@ -150,7 +161,7 @@ let EmptyTextEditorHintContentWidget = class EmptyTextEditorHintContentWidget ex
     }
     disableHint(e) {
         const disableHint = () => {
-            this.configurationService.updateValue(emptyTextEditorHintSetting, 'hidden');
+            this.configurationService.updateValue(emptyTextEditorHintSetting, "hidden");
             this.dispose();
             this.editor.focus();
         };
@@ -159,19 +170,20 @@ let EmptyTextEditorHintContentWidget = class EmptyTextEditorHintContentWidget ex
             return;
         }
         this.contextMenuService.showContextMenu({
-            getAnchor: () => { return ( new StandardMouseEvent(getActiveWindow(), e)); },
+            getAnchor: () => {
+                return ( new StandardMouseEvent(getActiveWindow(), e));
+            },
             getActions: () => {
                 return [{
-                        id: 'workench.action.disableEmptyEditorHint',
-                        label: ( localize(6159, "Disable Empty Editor Hint")),
-                        tooltip: ( localize(6159, "Disable Empty Editor Hint")),
-                        enabled: true,
-                        class: undefined,
-                        run: () => {
-                            disableHint();
-                        }
+                    id: "workench.action.disableEmptyEditorHint",
+                    label: ( localize(6472, "Disable Empty Editor Hint")),
+                    tooltip: ( localize(6472, "Disable Empty Editor Hint")),
+                    enabled: true,
+                    class: undefined,
+                    run: () => {
+                        disableHint();
                     }
-                ];
+                }];
             }
         });
     }
@@ -181,33 +193,35 @@ let EmptyTextEditorHintContentWidget = class EmptyTextEditorHintContentWidget ex
             disposables: this._store,
             callback: (index, event) => {
                 switch (index) {
-                    case '0':
-                        hasInlineChatProvider ? askSomething(event.browserEvent) : languageOnClickOrTap(event.browserEvent);
-                        break;
-                    case '1':
-                        hasInlineChatProvider ? languageOnClickOrTap(event.browserEvent) : this.disableHint();
-                        break;
-                    case '2':
-                        this.disableHint();
-                        break;
+                case "0":
+                    hasInlineChatProvider ? askSomething(event.browserEvent) : languageOnClickOrTap(event.browserEvent);
+                    break;
+                case "1":
+                    hasInlineChatProvider ? languageOnClickOrTap(event.browserEvent) : this.disableHint();
+                    break;
+                case "2":
+                    this.disableHint();
+                    break;
                 }
             }
         };
-        const askSomethingCommandId = 'inlineChat.start';
-        const askSomething = async (e) => {
+        const askSomethingCommandId = "inlineChat.start";
+        const askSomething = async e => {
             e.stopPropagation();
-            this.telemetryService.publicLog2('workbenchActionExecuted', {
+            this.telemetryService.publicLog2("workbenchActionExecuted", {
                 id: askSomethingCommandId,
-                from: 'hint'
+                from: "hint"
+            });
+            await this.commandService.executeCommand(askSomethingCommandId, {
+                from: "hint"
             });
-            await this.commandService.executeCommand(askSomethingCommandId, { from: 'hint' });
         };
-        const languageOnClickOrTap = async (e) => {
+        const languageOnClickOrTap = async e => {
             e.stopPropagation();
             this.editor.focus();
-            this.telemetryService.publicLog2('workbenchActionExecuted', {
+            this.telemetryService.publicLog2("workbenchActionExecuted", {
                 id: ChangeLanguageAction.ID,
-                from: 'hint'
+                from: "hint"
             });
             await this.commandService.executeCommand(ChangeLanguageAction.ID);
             this.editor.focus();
@@ -215,60 +229,67 @@ let EmptyTextEditorHintContentWidget = class EmptyTextEditorHintContentWidget ex
         const keybindingsLookup = [askSomethingCommandId, ChangeLanguageAction.ID];
         const keybindingLabels = ( keybindingsLookup.map(id => this.keybindingService.lookupKeybinding(id)?.getLabel()));
         const hintMsg = (hasInlineChatProvider ? ( localize(
-            6160,
-            '[[Generate code]] ({0}), or [[select a language]] ({1}). Start typing to dismiss or [[don\'t show]] this again.',
-            keybindingLabels.at(0) ?? '',
-            keybindingLabels.at(1) ?? ''
+            6473,
+            "[[Generate code]] ({0}), or [[select a language]] ({1}). Start typing to dismiss or [[don't show]] this again.",
+            keybindingLabels.at(0) ?? "",
+            keybindingLabels.at(1) ?? ""
         )) : ( localize(
-            6161,
-            '[[Select a language]] ({0}) to get started. Start typing to dismiss or [[don\'t show]] this again.',
-            keybindingLabels.at(1) ?? ''
-        ))).replaceAll(' ()', '');
+            6474,
+            "[[Select a language]] ({0}) to get started. Start typing to dismiss or [[don't show]] this again.",
+            keybindingLabels.at(1) ?? ""
+        ))).replaceAll(" ()", "");
         const hintElement = renderFormattedText(hintMsg, {
             actionHandler: hintHandler,
-            renderCodeSegments: false,
+            renderCodeSegments: false
         });
-        hintElement.style.fontStyle = 'italic';
-        const ariaLabel = hasInlineChatProvider ?
-            ( localize(
-            6162,
-            'Execute {0} to ask a question, execute {1} to select a language and get started. Start typing to dismiss.',
+        hintElement.style.fontStyle = "italic";
+        const ariaLabel = hasInlineChatProvider ? ( localize(
+            6475,
+            "Execute {0} to ask a question, execute {1} to select a language and get started. Start typing to dismiss.",
             ...keybindingLabels
-        )) :
-            ( localize(
-            6163,
-            'Execute {0} to select a language and get started. Start typing to dismiss.',
+        )) : ( localize(
+            6476,
+            "Execute {0} to select a language and get started. Start typing to dismiss.",
             ...keybindingLabels
         ));
-        for (const anchor of hintElement.querySelectorAll('a')) {
-            anchor.style.cursor = 'pointer';
+        for (const anchor of hintElement.querySelectorAll("a")) {
+            anchor.style.cursor = "pointer";
         }
-        return { hintElement, ariaLabel };
+        return {
+            hintElement,
+            ariaLabel
+        };
     }
     getDomNode() {
         if (!this.domNode) {
-            this.domNode = $('.empty-editor-hint');
-            this.domNode.style.width = 'max-content';
-            this.domNode.style.paddingLeft = '4px';
-            const { hintElement, ariaLabel } = this.getHint();
+            this.domNode = $(".empty-editor-hint");
+            this.domNode.style.width = "max-content";
+            this.domNode.style.paddingLeft = "4px";
+            const {
+                hintElement,
+                ariaLabel
+            } = this.getHint();
             this.domNode.append(hintElement);
             this.ariaLabel = ariaLabel.concat(( localize(
-                6164,
-                ' Toggle {0} in settings to disable this hint.',
+                6477,
+                " Toggle {0} in settings to disable this hint.",
                 AccessibilityVerbositySettingId.EmptyEditorHint
             )));
-            this._register(addDisposableListener(this.domNode, 'click', () => {
+            this._register(addDisposableListener(this.domNode, "click", () => {
                 this.editor.focus();
             }));
             this.editor.applyFontInfo(this.domNode);
             const lineHeight = this.editor.getLineHeightForPosition(( new Position(1, 1)));
-            this.domNode.style.lineHeight = lineHeight + 'px';
+            this.domNode.style.lineHeight = lineHeight + "px";
         }
         return this.domNode;
     }
     getPosition() {
         return {
-            position: { lineNumber: 1, column: 1 },
+            position: {
+                lineNumber: 1,
+                column: 1
+            },
             preference: [ContentWidgetPositionPreference.EXACT]
         };
     }
@@ -277,14 +298,11 @@ let EmptyTextEditorHintContentWidget = class EmptyTextEditorHintContentWidget ex
         this.editor.removeContentWidget(this);
     }
 };
-EmptyTextEditorHintContentWidget = EmptyTextEditorHintContentWidget_1 = ( __decorate([
-    ( __param(1, ICommandService)),
-    ( __param(2, IConfigurationService)),
-    ( __param(3, IKeybindingService)),
-    ( __param(4, IChatAgentService)),
-    ( __param(5, ITelemetryService)),
-    ( __param(6, IContextMenuService))
-], EmptyTextEditorHintContentWidget));
-registerEditorContribution(EmptyTextEditorHintContribution.ID, EmptyTextEditorHintContribution, EditorContributionInstantiation.Eager);
+EmptyTextEditorHintContentWidget = EmptyTextEditorHintContentWidget_1 = ( __decorate([( __param(1, ICommandService)), ( __param(2, IConfigurationService)), ( __param(3, IKeybindingService)), ( __param(4, IChatAgentService)), ( __param(5, ITelemetryService)), ( __param(6, IContextMenuService))], EmptyTextEditorHintContentWidget));
+registerEditorContribution(
+    EmptyTextEditorHintContribution.ID,
+    EmptyTextEditorHintContribution,
+    EditorContributionInstantiation.Eager
+);
 
 export { EmptyTextEditorHintContribution, emptyTextEditorHintSetting };