@opensumi/ide-ai-native 3.8.1-next-1741092802.0 → 3.8.1-next-1741093151.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/browser/chat/chat-manager.service.d.ts.map +1 -1
- package/lib/browser/chat/chat-manager.service.js +4 -0
- package/lib/browser/chat/chat-manager.service.js.map +1 -1
- package/lib/browser/chat/chat.view.d.ts.map +1 -1
- package/lib/browser/chat/chat.view.js +7 -1
- package/lib/browser/chat/chat.view.js.map +1 -1
- package/lib/browser/components/chat-history.module.less +1 -0
- package/lib/browser/mcp/base-apply.service.d.ts +18 -7
- package/lib/browser/mcp/base-apply.service.d.ts.map +1 -1
- package/lib/browser/mcp/base-apply.service.js +185 -65
- package/lib/browser/mcp/base-apply.service.js.map +1 -1
- package/lib/browser/mcp/tools/components/EditFile.d.ts.map +1 -1
- package/lib/browser/mcp/tools/components/EditFile.js +15 -9
- package/lib/browser/mcp/tools/components/EditFile.js.map +1 -1
- package/lib/browser/mcp/tools/components/index.module.less +3 -0
- package/lib/browser/mcp/tools/createNewFileWithText.d.ts +1 -0
- package/lib/browser/mcp/tools/createNewFileWithText.d.ts.map +1 -1
- package/lib/browser/mcp/tools/createNewFileWithText.js +18 -11
- package/lib/browser/mcp/tools/createNewFileWithText.js.map +1 -1
- package/lib/browser/mcp/tools/handlers/EditFile.js +1 -1
- package/lib/browser/mcp/tools/handlers/EditFile.js.map +1 -1
- package/lib/browser/model/msg-history-manager.d.ts +1 -0
- package/lib/browser/model/msg-history-manager.d.ts.map +1 -1
- package/lib/browser/model/msg-history-manager.js +3 -0
- package/lib/browser/model/msg-history-manager.js.map +1 -1
- package/lib/browser/widget/inline-diff/inline-diff-manager.d.ts.map +1 -1
- package/lib/browser/widget/inline-diff/inline-diff-manager.js +68 -8
- package/lib/browser/widget/inline-diff/inline-diff-manager.js.map +1 -1
- package/lib/browser/widget/inline-diff/inline-diff-previewer.d.ts +10 -4
- package/lib/browser/widget/inline-diff/inline-diff-previewer.d.ts.map +1 -1
- package/lib/browser/widget/inline-diff/inline-diff-previewer.js +14 -3
- package/lib/browser/widget/inline-diff/inline-diff-previewer.js.map +1 -1
- package/lib/browser/widget/inline-diff/inline-diff-widget.module.less +25 -4
- package/lib/browser/widget/inline-diff/inline-diff.controller.d.ts +3 -3
- package/lib/browser/widget/inline-diff/inline-diff.controller.d.ts.map +1 -1
- package/lib/browser/widget/inline-diff/inline-diff.controller.js +10 -5
- package/lib/browser/widget/inline-diff/inline-diff.controller.js.map +1 -1
- package/lib/browser/widget/inline-stream-diff/inline-stream-diff.handler.d.ts +46 -17
- package/lib/browser/widget/inline-stream-diff/inline-stream-diff.handler.d.ts.map +1 -1
- package/lib/browser/widget/inline-stream-diff/inline-stream-diff.handler.js +110 -53
- package/lib/browser/widget/inline-stream-diff/inline-stream-diff.handler.js.map +1 -1
- package/lib/browser/widget/inline-stream-diff/live-preview.decoration.d.ts +4 -0
- package/lib/browser/widget/inline-stream-diff/live-preview.decoration.d.ts.map +1 -1
- package/lib/browser/widget/inline-stream-diff/live-preview.decoration.js +26 -1
- package/lib/browser/widget/inline-stream-diff/live-preview.decoration.js.map +1 -1
- package/lib/common/types.d.ts +1 -0
- package/lib/common/types.d.ts.map +1 -1
- package/package.json +23 -23
- package/src/browser/chat/chat-manager.service.ts +6 -0
- package/src/browser/chat/chat.view.tsx +7 -2
- package/src/browser/components/chat-history.module.less +1 -0
- package/src/browser/mcp/base-apply.service.ts +222 -67
- package/src/browser/mcp/tools/components/EditFile.tsx +16 -9
- package/src/browser/mcp/tools/components/index.module.less +3 -0
- package/src/browser/mcp/tools/createNewFileWithText.ts +20 -12
- package/src/browser/mcp/tools/handlers/EditFile.ts +1 -1
- package/src/browser/model/msg-history-manager.ts +4 -0
- package/src/browser/widget/inline-diff/inline-diff-manager.tsx +143 -21
- package/src/browser/widget/inline-diff/inline-diff-previewer.ts +25 -7
- package/src/browser/widget/inline-diff/inline-diff-widget.module.less +25 -4
- package/src/browser/widget/inline-diff/inline-diff.controller.ts +16 -8
- package/src/browser/widget/inline-stream-diff/inline-stream-diff.handler.tsx +139 -68
- package/src/browser/widget/inline-stream-diff/live-preview.decoration.tsx +30 -1
- package/src/common/types.ts +1 -0
|
@@ -8,13 +8,16 @@ const ide_core_common_1 = require("@opensumi/ide-core-common");
|
|
|
8
8
|
const ide_file_service_1 = require("@opensumi/ide-file-service");
|
|
9
9
|
const ide_workspace_1 = require("@opensumi/ide-workspace");
|
|
10
10
|
const types_1 = require("../../types");
|
|
11
|
+
const base_apply_service_1 = require("../base-apply.service");
|
|
12
|
+
const EditFile_1 = require("./components/EditFile");
|
|
11
13
|
const inputSchema = zod_1.z.object({
|
|
12
|
-
|
|
13
|
-
|
|
14
|
+
target_file: zod_1.z.string().describe('The relative path where the file should be created'),
|
|
15
|
+
code_edit: zod_1.z.string().describe('The content to write into the new file'),
|
|
14
16
|
});
|
|
15
17
|
let CreateNewFileWithTextTool = class CreateNewFileWithTextTool {
|
|
16
18
|
registerMCPServer(registry) {
|
|
17
19
|
registry.registerMCPTool(this.getToolDefinition());
|
|
20
|
+
registry.registerToolComponent('create_new_file_with_text', EditFile_1.EditFileToolComponent);
|
|
18
21
|
}
|
|
19
22
|
getToolDefinition() {
|
|
20
23
|
return {
|
|
@@ -22,13 +25,10 @@ let CreateNewFileWithTextTool = class CreateNewFileWithTextTool {
|
|
|
22
25
|
label: 'Create File',
|
|
23
26
|
description: 'Creates a new file at the specified path within the project directory and populates it with the provided text. ' +
|
|
24
27
|
'Use this tool to generate new files in your project structure. ' +
|
|
25
|
-
'Requires two parameters: ' +
|
|
26
|
-
'- pathInProject: The relative path where the file should be created ' +
|
|
27
|
-
'- text: The content to write into the new file ' +
|
|
28
28
|
'Returns one of two possible responses: ' +
|
|
29
29
|
'"ok" if the file was successfully created and populated, ' +
|
|
30
30
|
'"can\'t find project dir" if the project directory cannot be determined. ' +
|
|
31
|
-
'Note:
|
|
31
|
+
'Note: This tool creates any necessary parent directories automatically.',
|
|
32
32
|
inputSchema,
|
|
33
33
|
handler: this.handler.bind(this),
|
|
34
34
|
};
|
|
@@ -46,15 +46,18 @@ let CreateNewFileWithTextTool = class CreateNewFileWithTextTool {
|
|
|
46
46
|
}
|
|
47
47
|
// 构建完整的文件路径
|
|
48
48
|
const rootUri = ide_core_common_1.URI.parse(workspaceRoots[0].uri);
|
|
49
|
-
const fullPath = ide_core_common_1.path.join(rootUri.codeUri.fsPath, args.
|
|
49
|
+
const fullPath = ide_core_common_1.path.join(rootUri.codeUri.fsPath, args.target_file);
|
|
50
50
|
const fileUri = ide_core_common_1.URI.file(fullPath);
|
|
51
51
|
// 创建父目录
|
|
52
52
|
const parentDir = ide_core_common_1.path.dirname(fullPath);
|
|
53
53
|
const parentUri = ide_core_common_1.URI.file(parentDir);
|
|
54
54
|
await this.fileService.createFolder(parentUri.toString());
|
|
55
|
-
//
|
|
56
|
-
await this.fileService.createFile(fileUri.toString()
|
|
57
|
-
|
|
55
|
+
// 创建文件
|
|
56
|
+
await this.fileService.createFile(fileUri.toString());
|
|
57
|
+
// 使用 applyService 写入文件内容
|
|
58
|
+
const codeBlock = await this.applyService.registerCodeBlock(args.target_file, args.code_edit, args.toolCallId);
|
|
59
|
+
await this.applyService.apply(codeBlock);
|
|
60
|
+
logger.appendLine(`Successfully created file at: ${args.target_file}`);
|
|
58
61
|
return {
|
|
59
62
|
content: [{ type: 'text', text: 'ok' }],
|
|
60
63
|
};
|
|
@@ -62,7 +65,7 @@ let CreateNewFileWithTextTool = class CreateNewFileWithTextTool {
|
|
|
62
65
|
catch (error) {
|
|
63
66
|
logger.appendLine(`Error during file creation: ${error}`);
|
|
64
67
|
return {
|
|
65
|
-
content: [{ type: 'text', text:
|
|
68
|
+
content: [{ type: 'text', text: error.message }],
|
|
66
69
|
isError: true,
|
|
67
70
|
};
|
|
68
71
|
}
|
|
@@ -77,6 +80,10 @@ tslib_1.__decorate([
|
|
|
77
80
|
(0, di_1.Autowired)(ide_file_service_1.IFileServiceClient),
|
|
78
81
|
tslib_1.__metadata("design:type", Object)
|
|
79
82
|
], CreateNewFileWithTextTool.prototype, "fileService", void 0);
|
|
83
|
+
tslib_1.__decorate([
|
|
84
|
+
(0, di_1.Autowired)(base_apply_service_1.BaseApplyService),
|
|
85
|
+
tslib_1.__metadata("design:type", base_apply_service_1.BaseApplyService)
|
|
86
|
+
], CreateNewFileWithTextTool.prototype, "applyService", void 0);
|
|
80
87
|
exports.CreateNewFileWithTextTool = CreateNewFileWithTextTool = tslib_1.__decorate([
|
|
81
88
|
(0, ide_core_common_1.Domain)(types_1.MCPServerContribution)
|
|
82
89
|
], CreateNewFileWithTextTool);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createNewFileWithText.js","sourceRoot":"","sources":["../../../../src/browser/mcp/tools/createNewFileWithText.ts"],"names":[],"mappings":";;;;AAAA,6BAAwB;AAExB,qCAAyC;AACzC,+DAA8D;AAC9D,iEAAgE;AAChE,2DAA4D;AAE5D,uCAAsG;
|
|
1
|
+
{"version":3,"file":"createNewFileWithText.js","sourceRoot":"","sources":["../../../../src/browser/mcp/tools/createNewFileWithText.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,7 +12,7 @@ const base_apply_service_1 = require("../../base-apply.service");
|
|
|
12
12
|
let EditFileHandler = class EditFileHandler {
|
|
13
13
|
async handler(params, toolCallId) {
|
|
14
14
|
const { targetFile, codeEdit } = params;
|
|
15
|
-
const block = this.applyService.registerCodeBlock(targetFile, codeEdit, toolCallId);
|
|
15
|
+
const block = await this.applyService.registerCodeBlock(targetFile, codeEdit, toolCallId);
|
|
16
16
|
const blockData = await this.applyService.apply(block);
|
|
17
17
|
return blockData;
|
|
18
18
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EditFile.js","sourceRoot":"","sources":["../../../../../src/browser/mcp/tools/handlers/EditFile.ts"],"names":[],"mappings":";;;;AAAA,qCAAqD;AAErD,iEAA4D;AAE5D;;;;GAIG;AAEI,IAAM,eAAe,GAArB,MAAM,eAAe;IAI1B,KAAK,CAAC,OAAO,CAAC,MAAuE,EAAE,UAAkB;QACvG,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;QACxC,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC,UAAU,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"EditFile.js","sourceRoot":"","sources":["../../../../../src/browser/mcp/tools/handlers/EditFile.ts"],"names":[],"mappings":";;;;AAAA,qCAAqD;AAErD,iEAA4D;AAE5D;;;;GAIG;AAEI,IAAM,eAAe,GAArB,MAAM,eAAe;IAI1B,KAAK,CAAC,OAAO,CAAC,MAAuE,EAAE,UAAkB;QACvG,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;QACxC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC,UAAU,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;QAC1F,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACvD,OAAO,SAAS,CAAC;IACnB,CAAC;CACF,CAAA;AAVY,0CAAe;AAElB;IADP,IAAA,cAAS,EAAC,qCAAgB,CAAC;sCACN,qCAAgB;qDAAC;0BAF5B,eAAe;IAD3B,IAAA,eAAU,GAAE;GACA,eAAe,CAU3B"}
|
|
@@ -26,6 +26,7 @@ export declare class MsgHistoryManager extends Disposable {
|
|
|
26
26
|
updateAssistantMessage(id: string, message: Omit<IExcludeMessage, 'role'>): void;
|
|
27
27
|
setMessageAdditional(id: string, additional: Record<string, any>): void;
|
|
28
28
|
getMessageAdditional(id: string): Record<string, any>;
|
|
29
|
+
get sessionAdditionals(): Map<string, Record<string, any>>;
|
|
29
30
|
toJSON(): {
|
|
30
31
|
messages: IHistoryChatMessage[];
|
|
31
32
|
additional: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"msg-history-manager.d.ts","sourceRoot":"","sources":["../../../src/browser/model/msg-history-manager.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAW,KAAK,EAAQ,MAAM,2BAA2B,CAAC;AAE7E,OAAO,EAAE,mBAAmB,EAAE,MAAM,+CAA+C,CAAC;AAEpF,KAAK,eAAe,GAAG,IAAI,CAAC,mBAAmB,EAAE,IAAI,GAAG,OAAO,CAAC,CAAC;AAEjE,qBAAa,iBAAkB,SAAQ,UAAU;IAC/C,OAAO,CAAC,UAAU,CAA+C;IACjE,OAAO,CAAC,oBAAoB,CAA+C;IAE3E,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAwC;IACzE,SAAgB,eAAe,EAAE,KAAK,CAAC,mBAAmB,EAAE,CAAC,CAA+B;IAE5F,OAAO,CAAC,QAAQ,CAAC,0BAA0B,CAAsC;IACjF,SAAgB,yBAAyB,EAAE,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAyC;gBAElG,IAAI,CAAC,EAAE;QAAE,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QAAC,QAAQ,EAAE,mBAAmB,EAAE,CAAA;KAAE;IAQ9E,OAAO,IAAI,IAAI;IAKjB,aAAa;IAMpB,OAAO,CAAC,YAAY;IAiBpB,OAAO,KAAK,WAAW,GAEtB;IAED,OAAO,CAAC,UAAU,CAAK;IAEvB,OAAO,KAAK,WAAW,GAGtB;IAED,IAAW,kBAAkB,IAAI,MAAM,CAEtC;IAED,IAAW,aAAa,IAAI,MAAM,GAAG,SAAS,CAG7C;IAEM,WAAW,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,mBAAmB,EAAE;IAStD,cAAc,CACnB,OAAO,EAAE,QAAQ,CAAC,IAAI,CAAC,eAAe,EAAE,SAAS,GAAG,cAAc,GAAG,SAAS,GAAG,YAAY,CAAC,CAAC,GAC9F,MAAM;IAOF,mBAAmB,CAAC,OAAO,EAAE,IAAI,CAAC,eAAe,EAAE,MAAM,CAAC,GAAG,MAAM;IAOnE,sBAAsB,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,eAAe,EAAE,MAAM,CAAC;IAazE,oBAAoB,CAAC,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAehE,oBAAoB,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAI5D,MAAM;;;;;;CAMP"}
|
|
1
|
+
{"version":3,"file":"msg-history-manager.d.ts","sourceRoot":"","sources":["../../../src/browser/model/msg-history-manager.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAW,KAAK,EAAQ,MAAM,2BAA2B,CAAC;AAE7E,OAAO,EAAE,mBAAmB,EAAE,MAAM,+CAA+C,CAAC;AAEpF,KAAK,eAAe,GAAG,IAAI,CAAC,mBAAmB,EAAE,IAAI,GAAG,OAAO,CAAC,CAAC;AAEjE,qBAAa,iBAAkB,SAAQ,UAAU;IAC/C,OAAO,CAAC,UAAU,CAA+C;IACjE,OAAO,CAAC,oBAAoB,CAA+C;IAE3E,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAwC;IACzE,SAAgB,eAAe,EAAE,KAAK,CAAC,mBAAmB,EAAE,CAAC,CAA+B;IAE5F,OAAO,CAAC,QAAQ,CAAC,0BAA0B,CAAsC;IACjF,SAAgB,yBAAyB,EAAE,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAyC;gBAElG,IAAI,CAAC,EAAE;QAAE,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QAAC,QAAQ,EAAE,mBAAmB,EAAE,CAAA;KAAE;IAQ9E,OAAO,IAAI,IAAI;IAKjB,aAAa;IAMpB,OAAO,CAAC,YAAY;IAiBpB,OAAO,KAAK,WAAW,GAEtB;IAED,OAAO,CAAC,UAAU,CAAK;IAEvB,OAAO,KAAK,WAAW,GAGtB;IAED,IAAW,kBAAkB,IAAI,MAAM,CAEtC;IAED,IAAW,aAAa,IAAI,MAAM,GAAG,SAAS,CAG7C;IAEM,WAAW,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,mBAAmB,EAAE;IAStD,cAAc,CACnB,OAAO,EAAE,QAAQ,CAAC,IAAI,CAAC,eAAe,EAAE,SAAS,GAAG,cAAc,GAAG,SAAS,GAAG,YAAY,CAAC,CAAC,GAC9F,MAAM;IAOF,mBAAmB,CAAC,OAAO,EAAE,IAAI,CAAC,eAAe,EAAE,MAAM,CAAC,GAAG,MAAM;IAOnE,sBAAsB,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,eAAe,EAAE,MAAM,CAAC;IAazE,oBAAoB,CAAC,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAehE,oBAAoB,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAI5D,IAAW,kBAAkB,qCAE5B;IAED,MAAM;;;;;;CAMP"}
|
|
@@ -99,6 +99,9 @@ class MsgHistoryManager extends ide_core_common_1.Disposable {
|
|
|
99
99
|
getMessageAdditional(id) {
|
|
100
100
|
return this.messageAdditionalMap.get(id) || {};
|
|
101
101
|
}
|
|
102
|
+
get sessionAdditionals() {
|
|
103
|
+
return this.messageAdditionalMap;
|
|
104
|
+
}
|
|
102
105
|
toJSON() {
|
|
103
106
|
return {
|
|
104
107
|
messages: this.getMessages(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"msg-history-manager.js","sourceRoot":"","sources":["../../../src/browser/model/msg-history-manager.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"msg-history-manager.js","sourceRoot":"","sources":["../../../src/browser/model/msg-history-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inline-diff-manager.d.ts","sourceRoot":"","sources":["../../../../src/browser/widget/inline-diff/inline-diff-manager.tsx"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"inline-diff-manager.d.ts","sourceRoot":"","sources":["../../../../src/browser/widget/inline-diff/inline-diff-manager.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAoD,MAAM,OAAO,CAAC;AAIzE,OAAO,EAAE,SAAS,EAA0B,MAAM,sBAAsB,CAAC;AAmBzE,eAAO,MAAM,iBAAiB,EAAE,KAAK,CAAC,EAAE,CAAC;IAAE,QAAQ,EAAE,SAAS,CAAA;CAAE,CAwI/D,CAAC"}
|
|
@@ -5,23 +5,83 @@ const tslib_1 = require("tslib");
|
|
|
5
5
|
const react_1 = tslib_1.__importStar(require("react"));
|
|
6
6
|
const ide_components_1 = require("@opensumi/ide-components");
|
|
7
7
|
const ide_core_browser_1 = require("@opensumi/ide-core-browser");
|
|
8
|
+
const ide_editor_1 = require("@opensumi/ide-editor");
|
|
8
9
|
const base_apply_service_1 = require("../../mcp/base-apply.service");
|
|
9
10
|
const inline_diff_widget_module_less_1 = tslib_1.__importDefault(require("./inline-diff-widget.module.less"));
|
|
11
|
+
const IconWithPopover = (props) => (react_1.default.createElement(ide_components_1.Popover, { content: props.content, id: props.id, onClick: props.onClick },
|
|
12
|
+
react_1.default.createElement(ide_components_1.Icon, { iconClass: props.icon, className: props.disabled ? inline_diff_widget_module_less_1.default.disabled : '' })));
|
|
10
13
|
const InlineDiffManager = (props) => {
|
|
14
|
+
var _a, _b;
|
|
15
|
+
const { resource } = props;
|
|
11
16
|
const applyService = (0, ide_core_browser_1.useInjectable)(base_apply_service_1.BaseApplyService);
|
|
17
|
+
const editorService = (0, ide_core_browser_1.useInjectable)(ide_editor_1.WorkbenchEditorService);
|
|
18
|
+
const appConfig = (0, ide_core_browser_1.useInjectable)(ide_core_browser_1.AppConfig);
|
|
12
19
|
const [show, setShow] = (0, react_1.useState)(true);
|
|
20
|
+
const [changesCount, setChangesCount] = (0, react_1.useState)(0);
|
|
21
|
+
const [currentChangeIndex, setCurrentChangeIndex] = (0, react_1.useState)(0);
|
|
22
|
+
const [filePaths, setFilePaths] = (0, react_1.useState)([]);
|
|
23
|
+
const currentFilePath = (0, react_1.useMemo)(() => ide_core_browser_1.path.relative(appConfig.workspaceDir, resource.uri.path.toString()), [resource]);
|
|
13
24
|
(0, react_1.useEffect)(() => {
|
|
14
|
-
applyService.onCodeBlockUpdate((codeBlock) => {
|
|
15
|
-
|
|
25
|
+
const toDispose = applyService.onCodeBlockUpdate((codeBlock) => {
|
|
26
|
+
if (ide_core_browser_1.path.relative(appConfig.workspaceDir, props.resource.uri.path.toString()) === codeBlock.relativePath) {
|
|
27
|
+
setShow(codeBlock.status === 'pending');
|
|
28
|
+
}
|
|
29
|
+
const pendingPaths = applyService.getPendingPaths();
|
|
30
|
+
setFilePaths(pendingPaths);
|
|
16
31
|
});
|
|
32
|
+
return () => {
|
|
33
|
+
toDispose.dispose();
|
|
34
|
+
};
|
|
17
35
|
}, []);
|
|
36
|
+
// 不同编辑器是不同实例，所以不需要监听
|
|
37
|
+
const decorationModelService = (_b = (_a = applyService.currentPreviewer) === null || _a === void 0 ? void 0 : _a.getNode()) === null || _b === void 0 ? void 0 : _b.livePreviewDiffDecorationModel;
|
|
38
|
+
(0, react_1.useEffect)(() => {
|
|
39
|
+
let toDispose;
|
|
40
|
+
if (decorationModelService) {
|
|
41
|
+
setChangesCount(decorationModelService.partialEditWidgetCount);
|
|
42
|
+
toDispose = decorationModelService.onPartialEditWidgetListChange((e) => {
|
|
43
|
+
setChangesCount(e.filter((item) => item.status === 'pending').length);
|
|
44
|
+
});
|
|
45
|
+
}
|
|
46
|
+
return () => {
|
|
47
|
+
toDispose === null || toDispose === void 0 ? void 0 : toDispose.dispose();
|
|
48
|
+
};
|
|
49
|
+
}, [decorationModelService]);
|
|
50
|
+
const handleSiblingChange = (0, react_1.useCallback)((direction) => {
|
|
51
|
+
const index = decorationModelService === null || decorationModelService === void 0 ? void 0 : decorationModelService.revealSiblingChange(direction);
|
|
52
|
+
if (index !== undefined) {
|
|
53
|
+
setCurrentChangeIndex(index);
|
|
54
|
+
}
|
|
55
|
+
}, [decorationModelService]);
|
|
56
|
+
const handleSiblingFile = (0, react_1.useCallback)((direction) => {
|
|
57
|
+
const index = filePaths.indexOf(currentFilePath);
|
|
58
|
+
if (index === -1) {
|
|
59
|
+
return;
|
|
60
|
+
}
|
|
61
|
+
const uri = ide_core_browser_1.URI.file(ide_core_browser_1.path.join(appConfig.workspaceDir, filePaths[index + (direction === 'up' ? -1 : 1)]));
|
|
62
|
+
editorService.open(uri);
|
|
63
|
+
}, [currentFilePath, filePaths]);
|
|
64
|
+
const changeTip = (0, react_1.useMemo)(() => {
|
|
65
|
+
if (changesCount === 0) {
|
|
66
|
+
return '';
|
|
67
|
+
}
|
|
68
|
+
return ` ${currentChangeIndex + 1} of ${changesCount}`;
|
|
69
|
+
}, [changesCount, currentChangeIndex]);
|
|
70
|
+
const fileTip = (0, react_1.useMemo)(() => {
|
|
71
|
+
if (!currentFilePath) {
|
|
72
|
+
return '';
|
|
73
|
+
}
|
|
74
|
+
return ` ${filePaths.indexOf(currentFilePath) + 1} of ${filePaths.length}`;
|
|
75
|
+
}, [currentFilePath, filePaths]);
|
|
18
76
|
return (react_1.default.createElement("div", { className: inline_diff_widget_module_less_1.default.inlineDiffManager, style: { display: show ? 'flex' : 'none' } },
|
|
19
|
-
react_1.default.createElement(
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
77
|
+
react_1.default.createElement("div", { className: inline_diff_widget_module_less_1.default.mid },
|
|
78
|
+
react_1.default.createElement(IconWithPopover, { icon: 'codicon codicon-check', onClick: () => applyService.processAll(props.resource.uri, 'accept'), content: (0, ide_core_browser_1.localize)('aiNative.inlineDiff.acceptAll'), id: 'inline-diff-manager-accept-all' }),
|
|
79
|
+
react_1.default.createElement(IconWithPopover, { icon: 'codicon codicon-close', onClick: () => applyService.processAll(props.resource.uri, 'reject'), content: (0, ide_core_browser_1.localize)('aiNative.inlineDiff.rejectAll'), id: 'inline-diff-manager-reject-all' }),
|
|
80
|
+
react_1.default.createElement(IconWithPopover, { icon: 'codicon codicon-arrow-up', content: (0, ide_core_browser_1.localize)('aiNative.inlineDiff.up') + changeTip, id: 'inline-diff-manager-up', disabled: currentChangeIndex === 0, onClick: () => handleSiblingChange('up') }),
|
|
81
|
+
react_1.default.createElement(IconWithPopover, { icon: 'codicon codicon-arrow-down', content: (0, ide_core_browser_1.localize)('aiNative.inlineDiff.down') + changeTip, id: 'inline-diff-manager-down', disabled: currentChangeIndex === changesCount - 1, onClick: () => handleSiblingChange('down') })),
|
|
82
|
+
react_1.default.createElement("div", { className: inline_diff_widget_module_less_1.default.right },
|
|
83
|
+
react_1.default.createElement(IconWithPopover, { icon: 'codicon codicon-arrow-left', onClick: () => handleSiblingFile('up'), disabled: filePaths.length === 0 || filePaths[0] === currentFilePath, content: (0, ide_core_browser_1.localize)('aiNative.inlineDiff.left') + fileTip, id: 'inline-diff-manager-left' }),
|
|
84
|
+
react_1.default.createElement(IconWithPopover, { icon: 'codicon codicon-arrow-right', onClick: () => handleSiblingFile('down'), disabled: filePaths.length === 0 || filePaths[filePaths.length - 1] === currentFilePath, content: (0, ide_core_browser_1.localize)('aiNative.inlineDiff.right') + fileTip, id: 'inline-diff-manager-right' }))));
|
|
25
85
|
};
|
|
26
86
|
exports.InlineDiffManager = InlineDiffManager;
|
|
27
87
|
//# sourceMappingURL=inline-diff-manager.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inline-diff-manager.js","sourceRoot":"","sources":["../../../../src/browser/widget/inline-diff/inline-diff-manager.tsx"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"inline-diff-manager.js","sourceRoot":"","sources":["../../../../src/browser/widget/inline-diff/inline-diff-manager.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import { Injector } from '@opensumi/di';
|
|
2
2
|
import { Disposable, ErrorResponse, IDisposable, ReplyResponse } from '@opensumi/ide-core-common';
|
|
3
|
+
import { WorkbenchEditorService } from '@opensumi/ide-editor';
|
|
3
4
|
import { ICodeEditor, IPosition, ITextModel, Selection } from '@opensumi/ide-monaco';
|
|
4
5
|
import { EResultKind } from '../inline-chat/inline-chat.service';
|
|
5
6
|
import { AIInlineContentWidget } from '../inline-chat/inline-content-widget';
|
|
6
|
-
import {
|
|
7
|
+
import { BaseInlineStreamDiffHandler } from '../inline-stream-diff/inline-stream-diff.handler';
|
|
7
8
|
import { InlineDiffWidget } from './inline-diff-widget';
|
|
8
9
|
export interface IDiffPreviewerOptions {
|
|
9
10
|
disposeWhenEditorClosed: boolean;
|
|
@@ -15,6 +16,10 @@ export interface IDiffPreviewerOptions {
|
|
|
15
16
|
* 默认情况下，removed widget 会在 `runWhenIdle` 内被添加，如果需要立即添加，可以设置为 true
|
|
16
17
|
*/
|
|
17
18
|
renderRemovedWidgetImmediately?: boolean;
|
|
19
|
+
/**
|
|
20
|
+
* 是否为回退模式，即 setValue 内容作为 original，编辑器 getValue 内容作为 modified
|
|
21
|
+
*/
|
|
22
|
+
reverse?: boolean;
|
|
18
23
|
}
|
|
19
24
|
export interface IInlineDiffPreviewerNode extends IDisposable {
|
|
20
25
|
previewerOptions: IDiffPreviewerOptions;
|
|
@@ -23,6 +28,7 @@ export interface IInlineDiffPreviewerNode extends IDisposable {
|
|
|
23
28
|
export declare abstract class BaseInlineDiffPreviewer<N extends IInlineDiffPreviewerNode> extends Disposable {
|
|
24
29
|
protected readonly monacoEditor: ICodeEditor;
|
|
25
30
|
protected readonly injector: Injector;
|
|
31
|
+
protected readonly editorService: WorkbenchEditorService;
|
|
26
32
|
protected inlineContentWidget: AIInlineContentWidget | null;
|
|
27
33
|
protected selection: Selection;
|
|
28
34
|
protected model: ITextModel;
|
|
@@ -34,7 +40,7 @@ export declare abstract class BaseInlineDiffPreviewer<N extends IInlineDiffPrevi
|
|
|
34
40
|
mountWidget(contentWidget: AIInlineContentWidget): void;
|
|
35
41
|
layout(): void;
|
|
36
42
|
onReady(exec: () => void): IDisposable;
|
|
37
|
-
protected abstract createNode(): N;
|
|
43
|
+
protected abstract createNode(reverse?: boolean): N;
|
|
38
44
|
abstract onData(data: ReplyResponse): void;
|
|
39
45
|
abstract handleAction(action: EResultKind): void;
|
|
40
46
|
abstract getPosition(): IPosition;
|
|
@@ -84,9 +90,9 @@ export declare class SideBySideInlineDiffWidget extends BaseInlineDiffPreviewer<
|
|
|
84
90
|
onAbort(): void;
|
|
85
91
|
onEnd(): void;
|
|
86
92
|
}
|
|
87
|
-
export declare class LiveInlineDiffPreviewer extends BaseInlineDiffPreviewer<
|
|
93
|
+
export declare class LiveInlineDiffPreviewer extends BaseInlineDiffPreviewer<BaseInlineStreamDiffHandler> {
|
|
88
94
|
private listenNode;
|
|
89
|
-
createNode():
|
|
95
|
+
createNode(reverse?: boolean): BaseInlineStreamDiffHandler;
|
|
90
96
|
getPosition(): IPosition;
|
|
91
97
|
handleAction(action: EResultKind): void;
|
|
92
98
|
onLineCount(): IDisposable;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inline-diff-previewer.d.ts","sourceRoot":"","sources":["../../../../src/browser/widget/inline-diff/inline-diff-previewer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAyC,QAAQ,EAAE,MAAM,cAAc,CAAC;AAC/E,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAClG,OAAO,EAAO,WAAW,EAAE,SAAS,EAAE,UAAU,EAAY,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAYpG,OAAO,EAAE,WAAW,EAAE,MAAM,oCAAoC,CAAC;AACjE,OAAO,EAAE,qBAAqB,EAAE,MAAM,sCAAsC,CAAC;AAC7E,OAAO,
|
|
1
|
+
{"version":3,"file":"inline-diff-previewer.d.ts","sourceRoot":"","sources":["../../../../src/browser/widget/inline-diff/inline-diff-previewer.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,7 @@ exports.LiveInlineDiffPreviewer = exports.SideBySideInlineDiffWidget = exports.B
|
|
|
5
5
|
const tslib_1 = require("tslib");
|
|
6
6
|
const di_1 = require("@opensumi/di");
|
|
7
7
|
const ide_core_common_1 = require("@opensumi/ide-core-common");
|
|
8
|
+
const ide_editor_1 = require("@opensumi/ide-editor");
|
|
8
9
|
const ide_monaco_1 = require("@opensumi/ide-monaco");
|
|
9
10
|
const editor_1 = require("@opensumi/ide-monaco/lib/browser/monaco-exports/editor");
|
|
10
11
|
const strings_1 = require("@opensumi/ide-utils/lib/strings");
|
|
@@ -88,7 +89,7 @@ let BaseInlineDiffPreviewer = class BaseInlineDiffPreviewer extends ide_core_com
|
|
|
88
89
|
disposeWhenEditorClosed: true,
|
|
89
90
|
}) {
|
|
90
91
|
this.selection = selection;
|
|
91
|
-
this.node = this.createNode();
|
|
92
|
+
this.node = this.createNode(options.reverse);
|
|
92
93
|
this.node.setPreviewerOptions(options);
|
|
93
94
|
}
|
|
94
95
|
attachNode(node) {
|
|
@@ -154,6 +155,10 @@ tslib_1.__decorate([
|
|
|
154
155
|
(0, di_1.Autowired)(di_1.INJECTOR_TOKEN),
|
|
155
156
|
tslib_1.__metadata("design:type", di_1.Injector)
|
|
156
157
|
], BaseInlineDiffPreviewer.prototype, "injector", void 0);
|
|
158
|
+
tslib_1.__decorate([
|
|
159
|
+
(0, di_1.Autowired)(ide_editor_1.WorkbenchEditorService),
|
|
160
|
+
tslib_1.__metadata("design:type", ide_editor_1.WorkbenchEditorService)
|
|
161
|
+
], BaseInlineDiffPreviewer.prototype, "editorService", void 0);
|
|
157
162
|
exports.BaseInlineDiffPreviewer = BaseInlineDiffPreviewer = tslib_1.__decorate([
|
|
158
163
|
(0, di_1.Injectable)({ multiple: true }),
|
|
159
164
|
tslib_1.__metadata("design:paramtypes", [Object])
|
|
@@ -266,8 +271,14 @@ let LiveInlineDiffPreviewer = class LiveInlineDiffPreviewer extends BaseInlineDi
|
|
|
266
271
|
});
|
|
267
272
|
this.addDispose(node);
|
|
268
273
|
}
|
|
269
|
-
createNode() {
|
|
270
|
-
|
|
274
|
+
createNode(reverse) {
|
|
275
|
+
let node;
|
|
276
|
+
if (reverse) {
|
|
277
|
+
node = this.injector.get(inline_stream_diff_handler_1.ReverseInlineStreamDiffHandler, [this.monacoEditor]);
|
|
278
|
+
}
|
|
279
|
+
else {
|
|
280
|
+
node = this.injector.get(inline_stream_diff_handler_1.InlineStreamDiffHandler, [this.monacoEditor]);
|
|
281
|
+
}
|
|
271
282
|
node.initialize(this.selection);
|
|
272
283
|
this.listenNode(node);
|
|
273
284
|
return node;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inline-diff-previewer.js","sourceRoot":"","sources":["../../../../src/browser/widget/inline-diff/inline-diff-previewer.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"inline-diff-previewer.js","sourceRoot":"","sources":["../../../../src/browser/widget/inline-diff/inline-diff-previewer.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,12 +22,33 @@
|
|
|
22
22
|
|
|
23
23
|
.inlineDiffManager {
|
|
24
24
|
display: flex;
|
|
25
|
-
|
|
26
|
-
|
|
25
|
+
border-radius: 13px;
|
|
26
|
+
align-items: center;
|
|
27
27
|
position: absolute;
|
|
28
|
-
bottom:
|
|
28
|
+
bottom: 18px;
|
|
29
29
|
left: 50%;
|
|
30
30
|
transform: translateX(-50%);
|
|
31
|
-
|
|
31
|
+
overflow: hidden;
|
|
32
32
|
z-index: 999;
|
|
33
|
+
> div {
|
|
34
|
+
display: flex;
|
|
35
|
+
align-items: center;
|
|
36
|
+
}
|
|
37
|
+
.mid {
|
|
38
|
+
border-right: 1px solid var(--design-borderColor);
|
|
39
|
+
}
|
|
40
|
+
:global(.codicon) {
|
|
41
|
+
font-size: 20px;
|
|
42
|
+
padding: 6px;
|
|
43
|
+
color: var(--kt-primaryButton-foreground);
|
|
44
|
+
background-color: var(--kt-primaryButton-hoverBackground);
|
|
45
|
+
&:hover {
|
|
46
|
+
background-color: var(--kt-primaryButton-background);
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
.disabled {
|
|
51
|
+
// color: var(--kt-button-disableForeground) !important;
|
|
52
|
+
background-color: var(--kt-button-disableBackground) !important;
|
|
53
|
+
cursor: not-allowed;
|
|
33
54
|
}
|
|
@@ -4,10 +4,10 @@ import { ICodeEditor } from '@opensumi/ide-monaco';
|
|
|
4
4
|
import { BaseAIMonacoEditorController } from '../../contrib/base';
|
|
5
5
|
import { InlineChatController } from '../inline-chat/inline-chat-controller';
|
|
6
6
|
import { EResultKind } from '../inline-chat/inline-chat.service';
|
|
7
|
-
import {
|
|
7
|
+
import { BaseInlineStreamDiffHandler } from '../inline-stream-diff/inline-stream-diff.handler';
|
|
8
8
|
import { BaseInlineDiffPreviewer, IDiffPreviewerOptions } from './inline-diff-previewer';
|
|
9
9
|
import { InlineDiffWidget } from './inline-diff-widget';
|
|
10
|
-
type IInlineDiffPreviewer = BaseInlineDiffPreviewer<InlineDiffWidget |
|
|
10
|
+
type IInlineDiffPreviewer = BaseInlineDiffPreviewer<InlineDiffWidget | BaseInlineStreamDiffHandler>;
|
|
11
11
|
export declare class InlineDiffController extends BaseAIMonacoEditorController {
|
|
12
12
|
static readonly ID = "editor.contrib.ai.inline.diff";
|
|
13
13
|
static get(editor: ICodeEditor): InlineDiffController | null;
|
|
@@ -24,7 +24,7 @@ export declare class InlineDiffController extends BaseAIMonacoEditorController {
|
|
|
24
24
|
crossSelection: monaco.Selection;
|
|
25
25
|
chatResponse?: ChatResponse | InlineChatController;
|
|
26
26
|
previewerOptions?: IDiffPreviewerOptions;
|
|
27
|
-
}): BaseInlineDiffPreviewer<InlineDiffWidget |
|
|
27
|
+
}): BaseInlineDiffPreviewer<InlineDiffWidget | BaseInlineStreamDiffHandler>;
|
|
28
28
|
createDiffPreviewer(monacoEditor: monaco.ICodeEditor, selection: monaco.Selection, options?: IDiffPreviewerOptions): IInlineDiffPreviewer;
|
|
29
29
|
handleAction(action: EResultKind): void;
|
|
30
30
|
getModifyContent(): string | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inline-diff.controller.d.ts","sourceRoot":"","sources":["../../../../src/browser/widget/inline-diff/inline-diff.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,YAAY,
|
|
1
|
+
{"version":3,"file":"inline-diff.controller.d.ts","sourceRoot":"","sources":["../../../../src/browser/widget/inline-diff/inline-diff.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,YAAY,EAIZ,KAAK,EACL,WAAW,EAEZ,MAAM,2BAA2B,CAAC;AACnC,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAUnD,OAAO,EAAE,4BAA4B,EAAE,MAAM,oBAAoB,CAAC;AAElE,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAC7E,OAAO,EAAE,WAAW,EAAE,MAAM,oCAAoC,CAAC;AACjE,OAAO,EAAE,2BAA2B,EAAE,MAAM,kDAAkD,CAAC;AAE/F,OAAO,EACL,uBAAuB,EACvB,qBAAqB,EAGtB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAExD,KAAK,oBAAoB,GAAG,uBAAuB,CAAC,gBAAgB,GAAG,2BAA2B,CAAC,CAAC;AAEpG,qBAAa,oBAAqB,SAAQ,4BAA4B;IACpE,gBAAuB,EAAE,mCAAmC;WAE9C,GAAG,CAAC,MAAM,EAAE,WAAW,GAAG,oBAAoB,GAAG,IAAI;IAInE,OAAO,KAAK,iBAAiB,GAE5B;IAED,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAyB;IACzD,SAAgB,cAAc,EAAE,KAAK,CAAC,MAAM,CAAC,CAA8B;IAE3E,OAAO,CAAC,cAAc,CAAoC;IAC1D,OAAO,CAAC,gBAAgB,CAAwD;IAChF,OAAO,CAAC,cAAc,CAAwC;IAE9D,KAAK,IAAI,WAAW;IAyCpB,YAAY,IAAI,oBAAoB,GAAG,SAAS;IAIhD,OAAO,CAAC,UAAU;IAalB,qBAAqB,CACnB,YAAY,EAAE,MAAM,CAAC,WAAW,EAChC,OAAO,EAAE;QACP,cAAc,EAAE,MAAM,CAAC,SAAS,CAAC;QACjC,YAAY,CAAC,EAAE,YAAY,GAAG,oBAAoB,CAAC;QACnD,gBAAgB,CAAC,EAAE,qBAAqB,CAAC;KAC1C,GACA,uBAAuB,CAAC,gBAAgB,GAAG,2BAA2B,CAAC;IAuD1E,mBAAmB,CAAC,YAAY,EAAE,MAAM,CAAC,WAAW,EAAE,SAAS,EAAE,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,EAAE,qBAAqB;IAiClH,YAAY,CAAC,MAAM,EAAE,WAAW,GAAG,IAAI;IASvC,gBAAgB;IAShB,gBAAgB;IAShB,eAAe;CAQhB"}
|
|
@@ -69,18 +69,15 @@ class InlineDiffController extends base_1.BaseAIMonacoEditorController {
|
|
|
69
69
|
const { crossSelection, chatResponse } = options;
|
|
70
70
|
const disposable = new ide_core_common_1.Disposable();
|
|
71
71
|
const previewer = this.createDiffPreviewer(monacoEditor, crossSelection, options.previewerOptions);
|
|
72
|
-
(0, observable_1.transaction)((tx) => {
|
|
73
|
-
this.currentPreviewer.set(previewer, tx);
|
|
74
|
-
this.previewerStore.set(previewer.modelId, previewer);
|
|
75
|
-
});
|
|
76
72
|
const onFinish = () => {
|
|
77
73
|
previewer.layout();
|
|
78
74
|
disposable.dispose();
|
|
79
75
|
};
|
|
76
|
+
const previewerDisposable = new ide_core_common_1.DisposableCollection();
|
|
80
77
|
disposable.addDispose(previewer.onReady(() => {
|
|
81
78
|
if (inline_chat_controller_1.InlineChatController.is(chatResponse)) {
|
|
82
79
|
const controller = chatResponse;
|
|
83
|
-
|
|
80
|
+
previewerDisposable.pushAll([
|
|
84
81
|
controller.onData((data) => {
|
|
85
82
|
if (ide_core_common_1.ReplyResponse.is(data)) {
|
|
86
83
|
this.renderDiff(previewer, data);
|
|
@@ -106,6 +103,10 @@ class InlineDiffController extends base_1.BaseAIMonacoEditorController {
|
|
|
106
103
|
onFinish();
|
|
107
104
|
}
|
|
108
105
|
}));
|
|
106
|
+
previewer.onDispose(() => {
|
|
107
|
+
previewerDisposable.dispose();
|
|
108
|
+
});
|
|
109
|
+
disposable.addDispose(previewerDisposable);
|
|
109
110
|
previewer.layout();
|
|
110
111
|
return previewer;
|
|
111
112
|
}
|
|
@@ -124,6 +125,10 @@ class InlineDiffController extends base_1.BaseAIMonacoEditorController {
|
|
|
124
125
|
previewer.addDispose(ide_core_common_1.Disposable.create(() => {
|
|
125
126
|
this.previewerStore.delete(previewer.modelId);
|
|
126
127
|
}));
|
|
128
|
+
(0, observable_1.transaction)((tx) => {
|
|
129
|
+
this.currentPreviewer.set(previewer, tx);
|
|
130
|
+
this.previewerStore.set(previewer.modelId, previewer);
|
|
131
|
+
});
|
|
127
132
|
return previewer;
|
|
128
133
|
}
|
|
129
134
|
handleAction(action) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inline-diff.controller.js","sourceRoot":"","sources":["../../../../src/browser/widget/inline-diff/inline-diff.controller.ts"],"names":[],"mappings":";;;AAAA,iEAA+D;AAC/D,+
|
|
1
|
+
{"version":3,"file":"inline-diff.controller.js","sourceRoot":"","sources":["../../../../src/browser/widget/inline-diff/inline-diff.controller.ts"],"names":[],"mappings":"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"}
|