@codingame/monaco-vscode-chat-service-override 11.1.2 → 12.0.0

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

@@ -1,8 +1,10 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { coalesce } from 'vscode/vscode/vs/base/common/arrays';
 import { AsyncIterableObject } from 'vscode/vscode/vs/base/common/async';
 import { VSBuffer } from 'vscode/vscode/vs/base/common/buffer';
 import { CancellationTokenSource } from 'vscode/vscode/vs/base/common/cancellation';
+import { CharCode } from 'vscode/vscode/vs/base/common/charCode';
 import { isCancellationError } from 'vscode/vscode/vs/base/common/errors';
 import { isEqual } from 'vscode/vscode/vs/base/common/resources';
 import { splitLines } from 'vscode/vscode/vs/base/common/strings';
@@ -16,15 +18,16 @@ import { localize } from 'vscode/vscode/vs/nls';
 import { IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs.service';
 import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
+import { ProgressLocation } from 'vscode/vscode/vs/platform/progress/common/progress';
 import { IProgressService } from 'vscode/vscode/vs/platform/progress/common/progress.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 { InlineChatController } from '@codingame/monaco-vscode-chat-interactive-notebook-search-terminal-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
-import { insertCell } from '@codingame/monaco-vscode-chat-interactive-notebook-search-common/vscode/vs/workbench/contrib/notebook/browser/controller/cellOperations';
+import { InlineChatController } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
+import { insertCell } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/controller/cellOperations';
 import { CellKind, NOTEBOOK_EDITOR_ID } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { getReferencesAsDocumentContext } from '../../common/chatCodeMapperService.js';
 import { IChatService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatService.service';
-import { isResponseVM, isRequestVM } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-search-terminal-common/vscode/vs/workbench/contrib/chat/common/chatViewModel';
+import { isResponseVM, isRequestVM } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/chatViewModel';
 
 let InsertCodeBlockOperation = class InsertCodeBlockOperation {
     constructor(editorService, textFileService, bulkEditService, codeEditorService, chatService, languageService, dialogService) {
@@ -48,7 +51,7 @@ let InsertCodeBlockOperation = class InsertCodeBlockOperation {
             }
             else {
                 this.notify(( localize(
-                    10864,
+                    4262,
                     "To insert the code block, open a code editor or notebook editor and set the cursor at the location where to insert the code block."
                 )));
             }
@@ -61,7 +64,7 @@ let InsertCodeBlockOperation = class InsertCodeBlockOperation {
     }
     async handleNotebookEditor(notebookEditor, codeBlockContext) {
         if (notebookEditor.isReadOnly) {
-            this.notify(( localize(10865, "Cannot insert the code block to read-only notebook editor.")));
+            this.notify(( localize(4263, "Cannot insert the code block to read-only notebook editor.")));
             return false;
         }
         const focusRange = notebookEditor.getFocus();
@@ -72,29 +75,29 @@ let InsertCodeBlockOperation = class InsertCodeBlockOperation {
     async handleTextEditor(codeEditor, codeBlockContext) {
         const activeModel = codeEditor.getModel();
         if (isReadOnly(activeModel, this.textFileService)) {
-            this.notify(( localize(10866, "Cannot insert the code block to read-only code editor.")));
+            this.notify(( localize(4264, "Cannot insert the code block to read-only code editor.")));
             return false;
         }
-        const range = codeEditor.getSelection() ?? ( (new Range(activeModel.getLineCount(), 1, activeModel.getLineCount(), 1)));
+        const range = codeEditor.getSelection() ?? ( new Range(activeModel.getLineCount(), 1, activeModel.getLineCount(), 1));
         const text = reindent(codeBlockContext.code, activeModel, range.startLineNumber);
-        const edits = [( (new ResourceTextEdit(activeModel.uri, { range, text })))];
+        const edits = [( new ResourceTextEdit(activeModel.uri, { range, text }))];
         await this.bulkEditService.apply(edits);
-        this.codeEditorService.listCodeEditors().find(editor => editor.getModel()?.uri.toString() === ( (activeModel.uri.toString())))?.focus();
+        this.codeEditorService.listCodeEditors().find(editor => editor.getModel()?.uri.toString() === ( activeModel.uri.toString()))?.focus();
         return true;
     }
     notify(message) {
         this.dialogService.info(message);
     }
 };
-InsertCodeBlockOperation = ( (__decorate([
-    ( (__param(0, IEditorService))),
-    ( (__param(1, ITextFileService))),
-    ( (__param(2, IBulkEditService))),
-    ( (__param(3, ICodeEditorService))),
-    ( (__param(4, IChatService))),
-    ( (__param(5, ILanguageService))),
-    ( (__param(6, IDialogService)))
-], InsertCodeBlockOperation)));
+InsertCodeBlockOperation = ( __decorate([
+    ( __param(0, IEditorService)),
+    ( __param(1, ITextFileService)),
+    ( __param(2, IBulkEditService)),
+    ( __param(3, ICodeEditorService)),
+    ( __param(4, IChatService)),
+    ( __param(5, ILanguageService)),
+    ( __param(6, IDialogService))
+], InsertCodeBlockOperation));
 let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
     constructor(editorService, textFileService, bulkEditService, codeEditorService, chatService, languageFeaturesService, progressService, languageService, fileService, dialogService, logService) {
         this.editorService = editorService;
@@ -112,7 +115,7 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
     async run(context) {
         if (this.inlineChatPreview && this.inlineChatPreview.isOpen()) {
             await this.dialogService.info(( localize(
-                10867,
+                4265,
                 "Another code change is being previewed. Please apply or discard the pending changes first."
             )));
             return;
@@ -143,7 +146,7 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
                 result = await this.handleNotebookEditor(activeNotebookEditor, context);
             }
             else {
-                this.notify(( localize(10868, "To apply this code block, open a code or notebook editor.")));
+                this.notify(( localize(4266, "To apply this code block, open a code or notebook editor.")));
             }
         }
         notifyUserAction(this.chatService, context, {
@@ -156,7 +159,7 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
     }
     async handleNotebookEditor(notebookEditor, codeBlockContext) {
         if (notebookEditor.isReadOnly) {
-            this.notify(( localize(10869, "Cannot apply code block to read-only notebook editor.")));
+            this.notify(( localize(4267, "Cannot apply code block to read-only notebook editor.")));
             return undefined;
         }
         const focusRange = notebookEditor.getFocus();
@@ -166,7 +169,7 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
     }
     async handleTextEditor(codeEditor, codeBlockContext) {
         if (isReadOnly(codeEditor.getModel(), this.textFileService)) {
-            this.notify(( localize(10870, "Cannot apply code block to read-only file.")));
+            this.notify(( localize(4268, "Cannot apply code block to read-only file.")));
             return undefined;
         }
         const result = await this.computeEdits(codeEditor, codeBlockContext);
@@ -175,7 +178,7 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
             if (!showWithPreview) {
                 await this.bulkEditService.apply(result.edits, { showPreview: true });
                 const activeModel = codeEditor.getModel();
-                this.codeEditorService.listCodeEditors().find(editor => editor.getModel()?.uri.toString() === ( (activeModel.uri.toString())))?.focus();
+                this.codeEditorService.listCodeEditors().find(editor => editor.getModel()?.uri.toString() === ( activeModel.uri.toString()))?.focus();
             }
         }
         return result;
@@ -187,13 +190,13 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
             const docRefs = [];
             collectDocumentContextFromSelections(codeEditor, docRefs);
             collectDocumentContextFromContext(codeBlockActionContext, docRefs);
-            const cancellationTokenSource = ( (new CancellationTokenSource()));
+            const cancellationTokenSource = ( new CancellationTokenSource());
             let codeMapper;
             try {
-                const result = await this.progressService.withProgress({ location: 15 , delay: 500, sticky: true, cancellable: true }, async (progress) => {
+                const result = await this.progressService.withProgress({ location: ProgressLocation.Notification, delay: 500, sticky: true, cancellable: true }, async (progress) => {
                     for (const provider of mappedEditsProviders) {
                         codeMapper = provider.displayName;
-                        progress.report({ message: ( localize(10871, "Applying code block using {0}...", codeMapper)) });
+                        progress.report({ message: ( localize(4269, "Applying code block using {0}...", codeMapper)) });
                         const mappedEdits = await provider.provideMappedEdits(activeModel, [codeBlockActionContext.code], {
                             documents: docRefs,
                             conversation: getChatConversation(codeBlockActionContext),
@@ -210,7 +213,7 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
             }
             catch (e) {
                 if (!isCancellationError(e)) {
-                    this.notify(( localize(10872, "Failed to apply code block: {0}", e.message)));
+                    this.notify(( localize(4270, "Failed to apply code block: {0}", e.message)));
                 }
             }
             finally {
@@ -226,9 +229,9 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
             return false;
         }
         const resource = firstEdit.resource;
-        const textEdits = coalesce(( (edits.map(
+        const textEdits = coalesce(( edits.map(
             edit => ResourceTextEdit.is(edit) && isEqual(resource, edit.resource) ? edit.textEdit : undefined
-        ))));
+        )));
         if (textEdits.length !== edits.length) {
             return false;
         }
@@ -236,7 +239,7 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
         if (editorToApply) {
             const inlineChatController = InlineChatController.get(editorToApply);
             if (inlineChatController) {
-                const tokenSource = ( (new CancellationTokenSource()));
+                const tokenSource = ( new CancellationTokenSource());
                 let isOpen = true;
                 const firstEdit = textEdits[0];
                 editorToApply.revealLineInCenterIfOutsideViewport(firstEdit.range.startLineNumber);
@@ -268,19 +271,19 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
         this.dialogService.info(message);
     }
 };
-ApplyCodeBlockOperation = ( (__decorate([
-    ( (__param(0, IEditorService))),
-    ( (__param(1, ITextFileService))),
-    ( (__param(2, IBulkEditService))),
-    ( (__param(3, ICodeEditorService))),
-    ( (__param(4, IChatService))),
-    ( (__param(5, ILanguageFeaturesService))),
-    ( (__param(6, IProgressService))),
-    ( (__param(7, ILanguageService))),
-    ( (__param(8, IFileService))),
-    ( (__param(9, IDialogService))),
-    ( (__param(10, ILogService)))
-], ApplyCodeBlockOperation)));
+ApplyCodeBlockOperation = ( __decorate([
+    ( __param(0, IEditorService)),
+    ( __param(1, ITextFileService)),
+    ( __param(2, IBulkEditService)),
+    ( __param(3, ICodeEditorService)),
+    ( __param(4, IChatService)),
+    ( __param(5, ILanguageFeaturesService)),
+    ( __param(6, IProgressService)),
+    ( __param(7, ILanguageService)),
+    ( __param(8, IFileService)),
+    ( __param(9, IDialogService)),
+    ( __param(10, ILogService))
+], ApplyCodeBlockOperation));
 function notifyUserAction(chatService, context, action) {
     if (isResponseVM(context.element)) {
         chatService.notifyUserAction({
@@ -369,7 +372,7 @@ function reindent(codeBlockContent, model, seletionStartLine) {
     }
     const formattingOptions = model.getFormattingOptions();
     const codeIndentLevel = computeIndentation(model.getLineContent(seletionStartLine), formattingOptions.tabSize).level;
-    const indents = ( (newContent.map(line => computeIndentation(line, formattingOptions.tabSize))));
+    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);
@@ -396,7 +399,7 @@ function computeIndentation(line, tabSize) {
     const len = line.length;
     while (i < len) {
         const chCode = line.charCodeAt(i);
-        if (chCode === 32 ) {
+        if (chCode === CharCode.Space) {
             nSpaces++;
             if (nSpaces === tabSize) {
                 level++;
@@ -404,7 +407,7 @@ function computeIndentation(line, tabSize) {
                 length = i + 1;
             }
         }
-        else if (chCode === 9 ) {
+        else if (chCode === CharCode.Tab) {
             level++;
             nSpaces = 0;
             length = i + 1;

package/vscode/src/vs/workbench/contrib/chat/browser/chat.contribution.d.ts

@@ -0,0 +1 @@
+