@codingame/monaco-vscode-chat-service-override 7.1.0 → 8.0.0

package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatCodeblockActions.js

@@ -2,14 +2,14 @@ import { CancellationTokenSource } from 'vscode/vscode/vs/base/common/cancellati
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { KeyMod, KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
 import { isDiffEditor, isCodeEditor } from 'vscode/vscode/vs/editor/browser/editorBrowser';
-import { IBulkEditService, ResourceTextEdit } from 'vscode/vscode/vs/editor/browser/services/bulkEditService';
+import { ResourceTextEdit, IBulkEditService } from 'vscode/vscode/vs/editor/browser/services/bulkEditService';
 import { ICodeEditorService } from 'vscode/vscode/vs/editor/browser/services/codeEditorService';
 import { Range } from 'vscode/vscode/vs/editor/common/core/range';
 import { EditorContextKeys } from 'vscode/vscode/vs/editor/common/editorContextKeys';
 import { ILanguageService } from 'vscode/vscode/vs/editor/common/languages/language';
 import { ILanguageFeaturesService } from 'vscode/vscode/vs/editor/common/services/languageFeatures';
 import { CopyAction } from 'vscode/vscode/vs/editor/contrib/clipboard/browser/clipboard';
-import { localize2WithPath, localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize2, localize } from 'vscode/vscode/vs/nls';
 import { Action2, registerAction2, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { IClipboardService } from 'vscode/vscode/vs/platform/clipboard/common/clipboardService.service';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
@@ -33,9 +33,10 @@ import { NOTEBOOK_EDITOR_ID, CellKind } from 'vscode/vscode/vs/workbench/contrib
 import { ITerminalService, ITerminalEditorService, ITerminalGroupService } from 'vscode/vscode/vs/workbench/contrib/terminal/browser/terminal.service';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 import { ITextFileService } from 'vscode/vscode/vs/workbench/services/textfile/common/textfiles.service';
+import { splitLines } from 'vscode/vscode/vs/base/common/strings';
+import { CharCode } from 'vscode/vscode/vs/base/common/charCode';
 import Severity$1 from 'vscode/vscode/vs/base/common/severity';
 
-const _moduleId = "vs/workbench/contrib/chat/browser/actions/chatCodeblockActions";
 function isCodeBlockActionContext(thing) {
     return typeof thing === 'object' && thing !== null && 'code' in thing && 'element' in thing;
 }
@@ -65,18 +66,152 @@ class ChatCodeBlockAction extends Action2 {
         return this.runWithContext(accessor, context);
     }
 }
+class InsertCodeBlockAction extends ChatCodeBlockAction {
+    async runWithContext(accessor, context) {
+        const editorService = accessor.get(IEditorService);
+        const textFileService = accessor.get(ITextFileService);
+        if (isResponseFiltered(context)) {
+            return;
+        }
+        if (editorService.activeEditorPane?.getId() === NOTEBOOK_EDITOR_ID) {
+            return this.handleNotebookEditor(accessor, editorService.activeEditorPane.getControl(), context);
+        }
+        let activeEditorControl = editorService.activeTextEditorControl;
+        if (isDiffEditor(activeEditorControl)) {
+            activeEditorControl = activeEditorControl.getOriginalEditor().hasTextFocus() ? activeEditorControl.getOriginalEditor() : activeEditorControl.getModifiedEditor();
+        }
+        if (!isCodeEditor(activeEditorControl)) {
+            return;
+        }
+        if (!activeEditorControl.hasModel()) {
+            return;
+        }
+        const activeModelUri = activeEditorControl.getModel().uri;
+        const activeTextModel = textFileService.files.get(activeModelUri) ?? textFileService.untitled.get(activeModelUri);
+        if (!activeTextModel || activeTextModel.isReadonly()) {
+            return;
+        }
+        await this.handleTextEditor(accessor, activeEditorControl, context);
+    }
+    async handleNotebookEditor(accessor, notebookEditor, context) {
+        if (!notebookEditor.hasModel()) {
+            return;
+        }
+        if (notebookEditor.isReadOnly) {
+            return;
+        }
+        if (notebookEditor.activeCodeEditor?.hasTextFocus()) {
+            const codeEditor = notebookEditor.activeCodeEditor;
+            if (codeEditor.hasModel()) {
+                return this.handleTextEditor(accessor, codeEditor, context);
+            }
+        }
+        const languageService = accessor.get(ILanguageService);
+        const focusRange = notebookEditor.getFocus();
+        const next = Math.max(focusRange.end - 1, 0);
+        insertCell(languageService, notebookEditor, next, CellKind.Code, 'below', context.code, true);
+        this.notifyUserAction(accessor, context);
+    }
+    async computeEdits(accessor, codeEditor, codeBlockActionContext) {
+        const activeModel = codeEditor.getModel();
+        const range = codeEditor.getSelection() ?? ( (new Range(activeModel.getLineCount(), 1, activeModel.getLineCount(), 1)));
+        const text = reindent(codeBlockActionContext.code, activeModel, range.startLineNumber);
+        return [( (new ResourceTextEdit(activeModel.uri, { range, text })))];
+    }
+    async handleTextEditor(accessor, codeEditor, codeBlockActionContext) {
+        const bulkEditService = accessor.get(IBulkEditService);
+        const codeEditorService = accessor.get(ICodeEditorService);
+        this.notifyUserAction(accessor, codeBlockActionContext);
+        const activeModel = codeEditor.getModel();
+        const mappedEdits = await this.computeEdits(accessor, codeEditor, codeBlockActionContext);
+        await bulkEditService.apply(mappedEdits);
+        codeEditorService.listCodeEditors().find(editor => editor.getModel()?.uri.toString() === ( (activeModel.uri.toString())))?.focus();
+    }
+    notifyUserAction(accessor, context) {
+        if (isResponseVM(context.element)) {
+            const chatService = accessor.get(IChatService);
+            chatService.notifyUserAction({
+                agentId: context.element.agent?.id,
+                command: context.element.slashCommand?.name,
+                sessionId: context.element.sessionId,
+                requestId: context.element.requestId,
+                result: context.element.result,
+                action: {
+                    kind: 'insert',
+                    codeBlockIndex: context.codeBlockIndex,
+                    totalCharacters: context.code.length,
+                }
+            });
+        }
+    }
+}
+function reindent(codeBlockContent, model, seletionStartLine) {
+    const newContent = splitLines(codeBlockContent);
+    if (newContent.length === 0) {
+        return codeBlockContent;
+    }
+    const formattingOptions = model.getFormattingOptions();
+    const codeIndentLevel = computeIndentation(model.getLineContent(seletionStartLine), formattingOptions.tabSize).level;
+    const indents = ( (newContent.map(line => computeIndentation(line, formattingOptions.tabSize))));
+    const newContentIndentLevel = indents.reduce((min, indent, index) => {
+        if (indent.length !== newContent[index].length) {
+            return Math.min(indent.level, min);
+        }
+        return min;
+    }, Number.MAX_VALUE);
+    if (newContentIndentLevel === Number.MAX_VALUE || newContentIndentLevel === codeIndentLevel) {
+        return codeBlockContent;
+    }
+    const newLines = [];
+    for (let i = 0; i < newContent.length; i++) {
+        const { level, length } = indents[i];
+        const newLevel = Math.max(0, codeIndentLevel + level - newContentIndentLevel);
+        const newIndentation = formattingOptions.insertSpaces ? ' '.repeat(formattingOptions.tabSize * newLevel) : '\t'.repeat(newLevel);
+        newLines.push(newIndentation + newContent[i].substring(length));
+    }
+    return newLines.join('\n');
+}
+function computeIndentation(line, tabSize) {
+    let nSpaces = 0;
+    let level = 0;
+    let i = 0;
+    let length = 0;
+    const len = line.length;
+    while (i < len) {
+        const chCode = line.charCodeAt(i);
+        if (chCode === CharCode.Space) {
+            nSpaces++;
+            if (nSpaces === tabSize) {
+                level++;
+                nSpaces = 0;
+                length = i + 1;
+            }
+        }
+        else if (chCode === CharCode.Tab) {
+            level++;
+            nSpaces = 0;
+            length = i + 1;
+        }
+        else {
+            break;
+        }
+        i++;
+    }
+    return { level, length };
+}
 function registerChatCodeBlockActions() {
     registerAction2(class CopyCodeBlockAction extends Action2 {
         constructor() {
             super({
                 id: 'workbench.action.chat.copyCodeBlock',
-                title: ( localize2WithPath(_moduleId, 0, "Copy")),
+                title: ( localize2(7095, "Copy")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.copy,
                 menu: {
                     id: MenuId.ChatCodeBlock,
-                    group: 'navigation'
+                    group: 'navigation',
+                    order: 30
                 }
             });
         }
@@ -91,6 +226,7 @@ function registerChatCodeBlockActions() {
                 const chatService = accessor.get(IChatService);
                 chatService.notifyUserAction({
                     agentId: context.element.agent?.id,
+                    command: context.element.slashCommand?.name,
                     sessionId: context.element.sessionId,
                     requestId: context.element.requestId,
                     result: context.element.result,
@@ -129,6 +265,7 @@ function registerChatCodeBlockActions() {
         if (element) {
             chatService.notifyUserAction({
                 agentId: element.agent?.id,
+                command: element.slashCommand?.name,
                 sessionId: element.sessionId,
                 requestId: element.requestId,
                 result: element.result,
@@ -148,19 +285,20 @@ function registerChatCodeBlockActions() {
         }
         return false;
     });
-    registerAction2(class InsertCodeBlockAction extends ChatCodeBlockAction {
+    registerAction2(class SmartApplyInEditorAction extends InsertCodeBlockAction {
         constructor() {
             super({
-                id: 'workbench.action.chat.insertCodeBlock',
-                title: ( localize2WithPath(_moduleId, 1, "Apply in Editor")),
+                id: 'workbench.action.chat.applyInEditor',
+                title: ( localize2(7096, "Apply in Editor")),
                 precondition: CONTEXT_CHAT_ENABLED,
                 f1: true,
                 category: CHAT_CATEGORY,
-                icon: Codicon.insert,
+                icon: Codicon.sparkle,
                 menu: {
                     id: MenuId.ChatCodeBlock,
                     group: 'navigation',
-                    when: CONTEXT_IN_CHAT_SESSION
+                    when: CONTEXT_IN_CHAT_SESSION,
+                    order: 10
                 },
                 keybinding: {
                     when: ( (ContextKeyExpr.or(
@@ -173,76 +311,24 @@ function registerChatCodeBlockActions() {
                 },
             });
         }
-        async runWithContext(accessor, context) {
-            const editorService = accessor.get(IEditorService);
-            const textFileService = accessor.get(ITextFileService);
-            if (isResponseFiltered(context)) {
-                return;
-            }
-            if (editorService.activeEditorPane?.getId() === NOTEBOOK_EDITOR_ID) {
-                return this.handleNotebookEditor(accessor, editorService.activeEditorPane.getControl(), context);
-            }
-            let activeEditorControl = editorService.activeTextEditorControl;
-            if (isDiffEditor(activeEditorControl)) {
-                activeEditorControl = activeEditorControl.getOriginalEditor().hasTextFocus() ? activeEditorControl.getOriginalEditor() : activeEditorControl.getModifiedEditor();
-            }
-            if (!isCodeEditor(activeEditorControl)) {
-                return;
-            }
-            const activeModel = activeEditorControl.getModel();
-            if (!activeModel) {
-                return;
-            }
-            const activeTextModel = textFileService.files.get(activeModel.uri) ?? textFileService.untitled.get(activeModel.uri);
-            if (!activeTextModel || activeTextModel.isReadonly()) {
-                return;
-            }
-            await this.handleTextEditor(accessor, activeEditorControl, activeModel, context);
-        }
-        async handleNotebookEditor(accessor, notebookEditor, context) {
-            if (!notebookEditor.hasModel()) {
-                return;
-            }
-            if (notebookEditor.isReadOnly) {
-                return;
-            }
-            if (notebookEditor.activeCodeEditor?.hasTextFocus()) {
-                const codeEditor = notebookEditor.activeCodeEditor;
-                const textModel = codeEditor.getModel();
-                if (textModel) {
-                    return this.handleTextEditor(accessor, codeEditor, textModel, context);
-                }
-            }
-            const languageService = accessor.get(ILanguageService);
-            const focusRange = notebookEditor.getFocus();
-            const next = Math.max(focusRange.end - 1, 0);
-            insertCell(languageService, notebookEditor, next, CellKind.Code, 'below', context.code, true);
-            this.notifyUserAction(accessor, context);
-        }
-        async handleTextEditor(accessor, codeEditor, activeModel, codeBlockActionContext) {
-            this.notifyUserAction(accessor, codeBlockActionContext);
-            const bulkEditService = accessor.get(IBulkEditService);
-            const codeEditorService = accessor.get(ICodeEditorService);
+        async computeEdits(accessor, codeEditor, codeBlockActionContext) {
             const progressService = accessor.get(IProgressService);
             const notificationService = accessor.get(INotificationService);
+            const activeModel = codeEditor.getModel();
             const mappedEditsProviders = accessor.get(ILanguageFeaturesService).mappedEditsProvider.ordered(activeModel);
-            let mappedEdits = null;
             if (mappedEditsProviders.length > 0) {
                 const docRefs = [];
-                if (codeEditor.hasModel()) {
-                    const model = codeEditor.getModel();
-                    const currentDocUri = model.uri;
-                    const currentDocVersion = model.getVersionId();
-                    const selections = codeEditor.getSelections();
-                    if (selections.length > 0) {
-                        docRefs.push([
-                            {
-                                uri: currentDocUri,
-                                version: currentDocVersion,
-                                ranges: selections,
-                            }
-                        ]);
-                    }
+                const currentDocUri = activeModel.uri;
+                const currentDocVersion = activeModel.getVersionId();
+                const selections = codeEditor.getSelections();
+                if (selections.length > 0) {
+                    docRefs.push([
+                        {
+                            uri: currentDocUri,
+                            version: currentDocVersion,
+                            ranges: selections,
+                        }
+                    ]);
                 }
                 const usedDocuments = getUsedDocuments(codeBlockActionContext);
                 if (usedDocuments) {
@@ -250,61 +336,62 @@ function registerChatCodeBlockActions() {
                 }
                 const cancellationTokenSource = ( (new CancellationTokenSource()));
                 try {
-                    mappedEdits = await progressService.withProgress({ location: ProgressLocation.Notification, delay: 500, sticky: true, cancellable: true }, async (progress) => {
-                        progress.report({ message: ( localizeWithPath(_moduleId, 2, "Applying code block...")) });
+                    const edits = await progressService.withProgress({ location: ProgressLocation.Notification, delay: 500, sticky: true, cancellable: true }, async (progress) => {
                         for (const provider of mappedEditsProviders) {
+                            progress.report({ message: ( localize(7097, "Applying code block using {0}...", provider.displayName)) });
                             const mappedEdits = await provider.provideMappedEdits(activeModel, [codeBlockActionContext.code], { documents: docRefs }, cancellationTokenSource.token);
                             if (mappedEdits) {
                                 return mappedEdits;
                             }
                         }
-                        return null;
+                        return undefined;
                     }, () => cancellationTokenSource.cancel());
+                    if (edits) {
+                        return edits;
+                    }
                 }
                 catch (e) {
-                    notificationService.notify({ severity: Severity$1.Error, message: ( localizeWithPath(_moduleId, 3, "Failed to apply code block: {0}", e.message)) });
+                    notificationService.notify({ severity: Severity$1.Error, message: ( localize(7098, "Failed to apply code block: {0}", e.message)) });
                 }
                 finally {
                     cancellationTokenSource.dispose();
                 }
             }
-            if (mappedEdits) {
-                console.log('Mapped edits:', mappedEdits);
-                await bulkEditService.apply(mappedEdits);
-            }
-            else {
-                const activeSelection = codeEditor.getSelection() ?? ( (new Range(activeModel.getLineCount(), 1, activeModel.getLineCount(), 1)));
-                await bulkEditService.apply([
-                    ( (new ResourceTextEdit(activeModel.uri, {
-                        range: activeSelection,
-                        text: codeBlockActionContext.code,
-                    }))),
-                ]);
-            }
-            codeEditorService.listCodeEditors().find(editor => editor.getModel()?.uri.toString() === ( (activeModel.uri.toString())))?.focus();
+            return super.computeEdits(accessor, codeEditor, codeBlockActionContext);
         }
-        notifyUserAction(accessor, context) {
-            if (isResponseVM(context.element)) {
-                const chatService = accessor.get(IChatService);
-                chatService.notifyUserAction({
-                    agentId: context.element.agent?.id,
-                    sessionId: context.element.sessionId,
-                    requestId: context.element.requestId,
-                    result: context.element.result,
-                    action: {
-                        kind: 'insert',
-                        codeBlockIndex: context.codeBlockIndex,
-                        totalCharacters: context.code.length,
-                    }
-                });
-            }
+    });
+    registerAction2(class SmartApplyInEditorAction extends InsertCodeBlockAction {
+        constructor() {
+            super({
+                id: 'workbench.action.chat.insertCodeBlock',
+                title: ( localize2(7099, "Insert At Cursor")),
+                precondition: CONTEXT_CHAT_ENABLED,
+                f1: true,
+                category: CHAT_CATEGORY,
+                icon: Codicon.insert,
+                menu: {
+                    id: MenuId.ChatCodeBlock,
+                    group: 'navigation',
+                    when: CONTEXT_IN_CHAT_SESSION,
+                    order: 20
+                },
+                keybinding: {
+                    when: ( (ContextKeyExpr.or(
+                         (ContextKeyExpr.and(CONTEXT_IN_CHAT_SESSION,  (CONTEXT_IN_CHAT_INPUT.negate()))),
+                        accessibleViewInCodeBlock
+                    ))),
+                    primary: KeyMod.CtrlCmd | KeyCode.Enter,
+                    mac: { primary: KeyMod.WinCtrl | KeyCode.Enter },
+                    weight: KeybindingWeight.ExternalExtension + 1
+                },
+            });
         }
     });
     registerAction2(class InsertIntoNewFileAction extends ChatCodeBlockAction {
         constructor() {
             super({
                 id: 'workbench.action.chat.insertIntoNewFile',
-                title: ( localize2WithPath(_moduleId, 4, "Insert into New File")),
+                title: ( localize2(7100, "Insert into New File")),
                 precondition: CONTEXT_CHAT_ENABLED,
                 f1: true,
                 category: CHAT_CATEGORY,
@@ -312,7 +399,8 @@ function registerChatCodeBlockActions() {
                 menu: {
                     id: MenuId.ChatCodeBlock,
                     group: 'navigation',
-                    isHiddenByDefault: true
+                    isHiddenByDefault: true,
+                    order: 40,
                 }
             });
         }
@@ -326,6 +414,7 @@ function registerChatCodeBlockActions() {
             if (isResponseVM(context.element)) {
                 chatService.notifyUserAction({
                     agentId: context.element.agent?.id,
+                    command: context.element.slashCommand?.name,
                     sessionId: context.element.sessionId,
                     requestId: context.element.requestId,
                     result: context.element.result,
@@ -352,7 +441,7 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.runInTerminal',
-                title: ( localize2WithPath(_moduleId, 5, "Insert into Terminal")),
+                title: ( localize2(7101, "Insert into Terminal")),
                 precondition: CONTEXT_CHAT_ENABLED,
                 f1: true,
                 category: CHAT_CATEGORY,
@@ -410,6 +499,7 @@ function registerChatCodeBlockActions() {
             if (isResponseVM(context.element)) {
                 chatService.notifyUserAction({
                     agentId: context.element.agent?.id,
+                    command: context.element.slashCommand?.name,
                     sessionId: context.element.sessionId,
                     requestId: context.element.requestId,
                     result: context.element.result,
@@ -451,7 +541,7 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.nextCodeBlock',
-                title: ( localize2WithPath(_moduleId, 6, "Next Code Block")),
+                title: ( localize2(7102, "Next Code Block")),
                 keybinding: {
                     primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.PageDown,
                     mac: { primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.PageDown, },
@@ -471,7 +561,7 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.previousCodeBlock',
-                title: ( localize2WithPath(_moduleId, 7, "Previous Code Block")),
+                title: ( localize2(7103, "Previous Code Block")),
                 keybinding: {
                     primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.PageUp,
                     mac: { primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.PageUp, },
@@ -527,7 +617,7 @@ function registerChatCodeCompareBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.applyCompareEdits',
-                title: ( localize2WithPath(_moduleId, 8, "Apply Edits")),
+                title: ( localize2(7104, "Apply Edits")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.check,
@@ -557,7 +647,7 @@ function registerChatCodeCompareBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.discardCompareEdits',
-                title: ( localize2WithPath(_moduleId, 9, "Discard Edits")),
+                title: ( localize2(7105, "Discard Edits")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.trash,