@codingame/monaco-vscode-notebook-service-override 7.1.0 → 7.1.1

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

@@ -1,7 +1,7 @@
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { KeyCode, KeyMod, KeyChord } from 'vscode/vscode/vs/base/common/keyCodes';
 import { EditorContextKeys } from 'vscode/vscode/vs/editor/common/editorContextKeys';
-import { localize2WithPath, localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize2, localize } from 'vscode/vscode/vs/nls';
 import { CONTEXT_ACCESSIBILITY_MODE_ENABLED } from 'vscode/vscode/vs/platform/accessibility/common/accessibility';
 import { registerAction2, MenuId, MenuRegistry } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
@@ -18,12 +18,11 @@ import { CellEditState } from 'vscode/vscode/vs/workbench/contrib/notebook/brows
 import { CellKind, NOTEBOOK_EDITOR_CURSOR_BOUNDARY, NotebookSetting } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { NOTEBOOK_CELL_EDITOR_FOCUSED, NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_CELL_GENERATED_BY_CHAT } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
 
-const _moduleId = "vs/workbench/contrib/notebook/browser/controller/chat/cellChatActions";
 registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.accept',
-            title: ( localize2WithPath(_moduleId, 0, "Make Request")),
+            title: ( localize2(10693, "Make Request")),
             icon: Codicon.send,
             keybinding: {
                 when: ( (ContextKeyExpr.and(
@@ -51,7 +50,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.arrowOutUp',
-            title: ( localizeWithPath(_moduleId, 1, 'Cursor Up')),
+            title: ( localize(10694, 'Cursor Up')),
             keybinding: {
                 when: ( (ContextKeyExpr.and(
                     CTX_NOTEBOOK_CELL_CHAT_FOCUSED,
@@ -86,7 +85,7 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.arrowOutDown',
-            title: ( localizeWithPath(_moduleId, 2, 'Cursor Down')),
+            title: ( localize(10695, 'Cursor Down')),
             keybinding: {
                 when: ( (ContextKeyExpr.and(
                     CTX_NOTEBOOK_CELL_CHAT_FOCUSED,
@@ -109,7 +108,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: 'notebook.cell.focusChatWidget',
-            title: ( localizeWithPath(_moduleId, 3, 'Focus Chat Widget')),
+            title: ( localize(10696, 'Focus Chat Widget')),
             keybinding: {
                 when: ( (ContextKeyExpr.and(
                     NOTEBOOK_EDITOR_FOCUSED,
@@ -137,7 +136,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: 'notebook.cell.focusNextChatWidget',
-            title: ( localizeWithPath(_moduleId, 4, 'Focus Next Cell Chat Widget')),
+            title: ( localize(10697, 'Focus Next Cell Chat Widget')),
             keybinding: {
                 when: ( (ContextKeyExpr.and(
                     NOTEBOOK_EDITOR_FOCUSED,
@@ -165,7 +164,7 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.stop',
-            title: ( localize2WithPath(_moduleId, 5, "Stop Request")),
+            title: ( localize2(10698, "Stop Request")),
             icon: Codicon.debugStop,
             menu: {
                 id: MENU_CELL_CHAT_INPUT,
@@ -184,7 +183,7 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.close',
-            title: ( localize2WithPath(_moduleId, 6, "Close Chat")),
+            title: ( localize2(10699, "Close Chat")),
             icon: Codicon.close,
             menu: {
                 id: MENU_CELL_CHAT_WIDGET,
@@ -202,10 +201,10 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.acceptChanges',
-            title: ( localize2WithPath(_moduleId, 7, "Accept Changes")),
-            shortTitle: ( localizeWithPath(_moduleId, 8, 'Accept')),
+            title: ( localize2(10700, "Accept Changes")),
+            shortTitle: ( localize(10701, 'Accept')),
             icon: Codicon.check,
-            tooltip: ( localizeWithPath(_moduleId, 9, 'Accept Changes')),
+            tooltip: ( localize(10702, 'Accept Changes')),
             keybinding: [
                 {
                     when: ( (ContextKeyExpr.and(
@@ -256,7 +255,7 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.discard',
-            title: ( localizeWithPath(_moduleId, 10, 'Discard')),
+            title: ( localize(10703, 'Discard')),
             icon: Codicon.discard,
             keybinding: {
                 when: ( (ContextKeyExpr.and(
@@ -306,12 +305,12 @@ registerAction2(class extends NotebookAction {
         super({
             id: 'notebook.cell.chat.start',
             title: {
-                value: '$(sparkle) ' + ( localizeWithPath(_moduleId, 11, "Generate")),
+                value: '$(sparkle) ' + ( localize(10704, "Generate")),
                 original: '$(sparkle) Generate',
             },
-            tooltip: ( localizeWithPath(_moduleId, 12, "Start Chat to Generate Code")),
+            tooltip: ( localize(10705, "Start Chat to Generate Code")),
             metadata: {
-                description: ( localizeWithPath(_moduleId, 12, "Start Chat to Generate Code")),
+                description: ( localize(10705, "Start Chat to Generate Code")),
                 args: [
                     {
                         name: 'args',
@@ -409,10 +408,10 @@ registerAction2(class extends NotebookAction {
         super({
             id: 'notebook.cell.chat.startAtTop',
             title: {
-                value: '$(sparkle) ' + ( localizeWithPath(_moduleId, 11, "Generate")),
+                value: '$(sparkle) ' + ( localize(10705, "Generate")),
                 original: '$(sparkle) Generate',
             },
-            tooltip: ( localizeWithPath(_moduleId, 12, "Start Chat to Generate Code")),
+            tooltip: ( localize(10705, "Start Chat to Generate Code")),
             f1: false,
             menu: [
                 {
@@ -439,8 +438,8 @@ MenuRegistry.appendMenuItem(MenuId.NotebookToolbar, {
     command: {
         id: 'notebook.cell.chat.start',
         icon: Codicon.sparkle,
-        title: ( localizeWithPath(_moduleId, 13, "Generate")),
-        tooltip: ( localizeWithPath(_moduleId, 14, "Start Chat to Generate Code"))
+        title: ( localize(10706, "Generate")),
+        tooltip: ( localize(10707, "Start Chat to Generate Code"))
     },
     order: -10,
     group: 'navigation/add',
@@ -459,7 +458,7 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.focus',
-            title: ( localizeWithPath(_moduleId, 15, 'Focus Chat')),
+            title: ( localize(10708, 'Focus Chat')),
             keybinding: [
                 {
                     when: ( (ContextKeyExpr.and(
@@ -491,7 +490,7 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.focusNextCell',
-            title: ( localizeWithPath(_moduleId, 16, 'Focus Next Cell')),
+            title: ( localize(10709, 'Focus Next Cell')),
             keybinding: [
                 {
                     when: ( (ContextKeyExpr.and(CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_INLINE_CHAT_FOCUSED))),
@@ -510,7 +509,7 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.focusPreviousCell',
-            title: ( localizeWithPath(_moduleId, 17, 'Focus Previous Cell')),
+            title: ( localize(10710, 'Focus Previous Cell')),
             keybinding: [
                 {
                     when: ( (ContextKeyExpr.and(CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_INLINE_CHAT_FOCUSED))),
@@ -529,7 +528,7 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.previousFromHistory',
-            title: ( localize2WithPath(_moduleId, 18, "Previous From History")),
+            title: ( localize2(10711, "Previous From History")),
             precondition: ( (ContextKeyExpr.and(CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_INLINE_CHAT_FOCUSED))),
             keybinding: {
                 when: ( (ContextKeyExpr.and(CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_INLINE_CHAT_FOCUSED))),
@@ -547,7 +546,7 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.nextFromHistory',
-            title: ( localize2WithPath(_moduleId, 19, "Next From History")),
+            title: ( localize2(10712, "Next From History")),
             precondition: ( (ContextKeyExpr.and(CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_INLINE_CHAT_FOCUSED))),
             keybinding: {
                 when: ( (ContextKeyExpr.and(CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_INLINE_CHAT_FOCUSED))),
@@ -565,7 +564,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.restore',
-            title: ( localize2WithPath(_moduleId, 20, "Generate")),
+            title: ( localize2(10713, "Generate")),
             icon: Codicon.sparkle,
             menu: {
                 id: MenuId.NotebookCellTitle,

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

@@ -4,28 +4,13 @@ import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/
 import { registerWorkbenchContribution2, WorkbenchPhase } from 'vscode/vscode/vs/workbench/common/contributions';
 import { ChatAgentLocation } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents';
 import { IChatAgentService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
-import { IChatVariablesService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatVariables.service';
 import './cellChatActions.js';
 import { CTX_NOTEBOOK_CHAT_HAS_AGENT } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/chat/notebookChatContext';
-import { NotebookChatController } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/chat/notebookChatController';
-import { INotebookEditorService } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/services/notebookEditorService.service';
 
 let NotebookChatContribution = class NotebookChatContribution extends Disposable {
     static { this.ID = 'workbench.contrib.notebookChatContribution'; }
-    constructor(_chatVariableService, _notebookEditorService, contextKeyService, chatAgentService) {
+    constructor(contextKeyService, chatAgentService) {
         super();
-        this._chatVariableService = _chatVariableService;
-        this._notebookEditorService = _notebookEditorService;
-        this._register(this._chatVariableService.registerVariable({ id: '_notebookChatInput', name: '_notebookChatInput', description: '', hidden: true }, async (_message, _arg, model) => {
-            const editors = this._notebookEditorService.listNotebookEditors();
-            for (const editor of editors) {
-                const chatController = editor.getContribution(NotebookChatController.id);
-                if (chatController?.hasSession(model)) {
-                    return chatController.getSessionInputUri();
-                }
-            }
-            return undefined;
-        }));
         this._ctxHasProvider = CTX_NOTEBOOK_CHAT_HAS_AGENT.bindTo(contextKeyService);
         const updateNotebookAgentStatus = () => {
             const hasNotebookAgent = Boolean(chatAgentService.getDefaultAgent(ChatAgentLocation.Notebook));
@@ -36,9 +21,7 @@ let NotebookChatContribution = class NotebookChatContribution extends Disposable
     }
 };
 NotebookChatContribution = ( __decorate([
-    ( __param(0, IChatVariablesService)),
-    ( __param(1, INotebookEditorService)),
-    ( __param(2, IContextKeyService)),
-    ( __param(3, IChatAgentService))
+    ( __param(0, IContextKeyService)),
+    ( __param(1, IChatAgentService))
 ], NotebookChatContribution));
 registerWorkbenchContribution2(NotebookChatContribution.ID, NotebookChatContribution, WorkbenchPhase.BlockRestore);