@codingame/monaco-vscode-katex-common 25.1.0 → 25.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-katex-common",
-  "version": "25.1.0",
+  "version": "25.1.2",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - common package depending on katex",
   "keywords": [],
@@ -15,7 +15,7 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-api": "25.1.0",
+    "@codingame/monaco-vscode-api": "25.1.2",
     "katex": "0.16.27",
     "marked": "14.0.0"
   },

package/vscode/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatTextEditContentPart.d.ts

@@ -1,10 +1,15 @@
 import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
-import { Disposable, IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { Disposable, IDisposable, IReference } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { IModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service";
+import { IResolvedTextEditorModel } from "@codingame/monaco-vscode-model-service-override/vscode/vs/editor/common/services/resolverService";
+import { ITextModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service";
 import { IChatProgressRenderableResponseContent, IChatTextEditGroup } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel";
+import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service";
+import { IChatResponseViewModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatViewModel";
 import { IChatListItemRendererOptions } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat";
 import { DiffEditorPool } from "./chatContentCodePools.js";
 import { IChatContentPart, IChatContentPartRenderContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatContentParts";
-import { ICodeCompareModelService } from "./chatTextEditContentPart.service.js";
+import { ICodeCompareModelService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatTextEditContentPart.service";
 export declare class ChatTextEditContentPart extends Disposable implements IChatContentPart {
     private readonly codeCompareModelService;
     readonly domNode: HTMLElement;
@@ -16,3 +21,15 @@ export declare class ChatTextEditContentPart extends Disposable implements IChat
     hasSameContent(other: IChatProgressRenderableResponseContent): boolean;
     addDisposable(disposable: IDisposable): void;
 }
+export declare class CodeCompareModelService implements ICodeCompareModelService {
+    private readonly textModelService;
+    private readonly modelService;
+    private readonly chatService;
+    readonly _serviceBrand: undefined;
+    constructor(textModelService: ITextModelService, modelService: IModelService, chatService: IChatService);
+    createModel(element: IChatResponseViewModel, chatTextEdit: IChatTextEditGroup): Promise<IReference<{
+        originalSha1: string;
+        original: IResolvedTextEditorModel;
+        modified: IResolvedTextEditorModel;
+    }>>;
+}

package/vscode/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatTextEditContentPart.js

@@ -2,24 +2,23 @@
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { $ as $$1 } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { CancellationTokenSource } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
-import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
-import { Disposable, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
-import '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
-import '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
+import { Emitter, Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
+import { Disposable, toDisposable, RefCountedDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
+import { isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { assertType } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
-import '@codingame/monaco-vscode-api/vscode/vs/base/common/charCode';
-import '@codingame/monaco-vscode-api/vscode/vs/base/common/marshallingIds';
-import '@codingame/monaco-vscode-api/vscode/vs/base/common/path';
-import '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
-import '@codingame/monaco-vscode-api/vscode/vs/base/common/uuid';
-import '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages';
-import '@codingame/monaco-vscode-api/vscode/vs/editor/common/model/textModel';
-import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
-import '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/modelService';
+import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
+import { generateUuid } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uuid';
+import { TextEdit } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages';
+import { createTextBufferFactoryFromSnapshot } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model/textModel';
+import { IModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service';
+import { DefaultModelSHA1Computer } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/modelService';
+import { ITextModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/extensions';
+import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
 import { isResponseVM } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatViewModel';
-import { ICodeCompareModelService } from './chatTextEditContentPart.service.js';
+import { ICodeCompareModelService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatTextEditContentPart.service';
 
 const $ = $$1;
 let ChatTextEditContentPart = class ChatTextEditContentPart extends Disposable {
@@ -87,5 +86,72 @@ let ChatTextEditContentPart = class ChatTextEditContentPart extends Disposable {
 ChatTextEditContentPart = ( __decorate([
     ( __param(5, ICodeCompareModelService))
 ], ChatTextEditContentPart));
+let CodeCompareModelService = class CodeCompareModelService {
+    constructor(textModelService, modelService, chatService) {
+        this.textModelService = textModelService;
+        this.modelService = modelService;
+        this.chatService = chatService;
+    }
+    async createModel(element, chatTextEdit) {
+        const original = await this.textModelService.createModelReference(chatTextEdit.uri);
+        const modified = await this.textModelService.createModelReference((this.modelService.createModel(createTextBufferFactoryFromSnapshot(original.object.textEditorModel.createSnapshot()), { languageId: original.object.textEditorModel.getLanguageId(), onDidChange: Event.None }, ( URI.from(
+            { scheme: Schemas.vscodeChatCodeBlock, path: chatTextEdit.uri.path, query: generateUuid() }
+        )), false)).uri);
+        const d = ( new RefCountedDisposable(toDisposable(() => {
+            original.dispose();
+            modified.dispose();
+        })));
+        let originalSha1 = '';
+        if (chatTextEdit.state) {
+            originalSha1 = chatTextEdit.state.sha1;
+        }
+        else {
+            const sha1 = ( new DefaultModelSHA1Computer());
+            if (sha1.canComputeSHA1(original.object.textEditorModel)) {
+                originalSha1 = sha1.computeSHA1(original.object.textEditorModel);
+                chatTextEdit.state = { sha1: originalSha1, applied: 0 };
+            }
+        }
+        const chatModel = this.chatService.getSession(element.sessionResource);
+        const editGroups = [];
+        for (const request of chatModel.getRequests()) {
+            if (!request.response) {
+                continue;
+            }
+            for (const item of request.response.response.value) {
+                if (item.kind !== 'textEditGroup' || item.state?.applied || !isEqual(item.uri, chatTextEdit.uri)) {
+                    continue;
+                }
+                for (const group of item.edits) {
+                    const edits = ( group.map(TextEdit.asEditOperation));
+                    editGroups.push(edits);
+                }
+            }
+            if (request.response === element.model) {
+                break;
+            }
+        }
+        for (const edits of editGroups) {
+            modified.object.textEditorModel.pushEditOperations(null, edits, () => null);
+        }
+        d.acquire();
+        setTimeout(() => d.release(), 5000);
+        return {
+            object: {
+                originalSha1,
+                original: original.object,
+                modified: modified.object
+            },
+            dispose() {
+                d.release();
+            },
+        };
+    }
+};
+CodeCompareModelService = ( __decorate([
+    ( __param(0, ITextModelService)),
+    ( __param(1, IModelService)),
+    ( __param(2, IChatService))
+], CodeCompareModelService));
 
-export { ChatTextEditContentPart };
+export { ChatTextEditContentPart, CodeCompareModelService };

package/vscode/src/vs/workbench/contrib/markdown/browser/markedKatexSupport.js

@@ -100,7 +100,7 @@ class MarkedKatexSupport {
         return this.sanitizeStyles(styleString, allowedProperties);
     }
     static { this._katexPromise = ( new Lazy(async () => {
-        this._katex = (await import('katex').then(module => module.default ?? module)).default;
+        this._katex = (await import('katex')).default;
         return this._katex;
     })); }
     static getExtension(window, options = {}) {

package/vscode/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatTextEditContentPart.service.d.ts

@@ -1,13 +0,0 @@
-import { IReference } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
-import { IResolvedTextEditorModel } from "@codingame/monaco-vscode-model-service-override/vscode/vs/editor/common/services/resolverService";
-import { IChatTextEditGroup } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel";
-import { IChatResponseViewModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatViewModel";
-export declare const ICodeCompareModelService: import("@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation").ServiceIdentifier<ICodeCompareModelService>;
-export interface ICodeCompareModelService {
-    _serviceBrand: undefined;
-    createModel(response: IChatResponseViewModel, chatTextEdit: IChatTextEditGroup): Promise<IReference<{
-        originalSha1: string;
-        original: IResolvedTextEditorModel;
-        modified: IResolvedTextEditorModel;
-    }>>;
-}

package/vscode/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatTextEditContentPart.service.js

@@ -1,6 +0,0 @@
-
-import { createDecorator } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
-
-const ICodeCompareModelService = ( createDecorator('ICodeCompareModelService'));
-
-export { ICodeCompareModelService };