@opensumi/ide-ai-native 3.2.4 → 3.2.5-next-1724062137.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/ai-core.contribution.d.ts +1 -0
- package/lib/browser/ai-core.contribution.d.ts.map +1 -1
- package/lib/browser/ai-core.contribution.js +14 -25
- package/lib/browser/ai-core.contribution.js.map +1 -1
- package/lib/browser/ai-editor.contribution.d.ts +1 -0
- package/lib/browser/ai-editor.contribution.d.ts.map +1 -1
- package/lib/browser/ai-editor.contribution.js +8 -0
- package/lib/browser/ai-editor.contribution.js.map +1 -1
- package/lib/browser/chat/chat-agent.service.d.ts +1 -0
- package/lib/browser/chat/chat-agent.service.d.ts.map +1 -1
- package/lib/browser/chat/chat-agent.service.js +1 -3
- package/lib/browser/chat/chat-agent.service.js.map +1 -1
- package/lib/browser/chat/chat.view.d.ts.map +1 -1
- package/lib/browser/chat/chat.view.js +22 -4
- package/lib/browser/chat/chat.view.js.map +1 -1
- package/lib/browser/components/ChatEditor.d.ts +2 -1
- package/lib/browser/components/ChatEditor.d.ts.map +1 -1
- package/lib/browser/components/ChatEditor.js +8 -8
- package/lib/browser/components/ChatEditor.js.map +1 -1
- package/lib/browser/components/ChatMarkdown.d.ts +1 -0
- package/lib/browser/components/ChatMarkdown.d.ts.map +1 -1
- package/lib/browser/components/ChatMarkdown.js +2 -2
- package/lib/browser/components/ChatMarkdown.js.map +1 -1
- package/lib/browser/components/ChatThinking.d.ts.map +1 -1
- package/lib/browser/components/ChatThinking.js +2 -2
- package/lib/browser/components/ChatThinking.js.map +1 -1
- package/lib/browser/contextkey/ai-native.contextkey.service.d.ts +1 -0
- package/lib/browser/contextkey/ai-native.contextkey.service.d.ts.map +1 -1
- package/lib/browser/contextkey/ai-native.contextkey.service.js +1 -0
- package/lib/browser/contextkey/ai-native.contextkey.service.js.map +1 -1
- package/lib/browser/contrib/inline-completions/completeProvider.d.ts +4 -31
- package/lib/browser/contrib/inline-completions/completeProvider.d.ts.map +1 -1
- package/lib/browser/contrib/inline-completions/completeProvider.js +3 -224
- package/lib/browser/contrib/inline-completions/completeProvider.js.map +1 -1
- package/lib/browser/contrib/inline-completions/inline-completions.handler.d.ts +1 -3
- package/lib/browser/contrib/inline-completions/inline-completions.handler.d.ts.map +1 -1
- package/lib/browser/contrib/inline-completions/inline-completions.handler.js +8 -20
- package/lib/browser/contrib/inline-completions/inline-completions.handler.js.map +1 -1
- package/lib/browser/contrib/inline-completions/model/competionModel.d.ts +2 -2
- package/lib/browser/contrib/inline-completions/model/competionModel.d.ts.map +1 -1
- package/lib/browser/contrib/inline-completions/model/inlineCompletionRequestTask.d.ts +28 -0
- package/lib/browser/contrib/inline-completions/model/inlineCompletionRequestTask.d.ts.map +1 -0
- package/lib/browser/contrib/inline-completions/model/inlineCompletionRequestTask.js +210 -0
- package/lib/browser/contrib/inline-completions/model/inlineCompletionRequestTask.js.map +1 -0
- package/lib/browser/contrib/inline-completions/promptCache.d.ts +3 -2
- package/lib/browser/contrib/inline-completions/promptCache.d.ts.map +1 -1
- package/lib/browser/contrib/inline-completions/promptCache.js.map +1 -1
- package/lib/browser/contrib/inline-completions/service/ai-completions.service.d.ts +7 -6
- package/lib/browser/contrib/inline-completions/service/ai-completions.service.d.ts.map +1 -1
- package/lib/browser/contrib/inline-completions/service/ai-completions.service.js +48 -25
- package/lib/browser/contrib/inline-completions/service/ai-completions.service.js.map +1 -1
- package/lib/browser/contrib/intelligent-completions/diff-computer.d.ts +18 -0
- package/lib/browser/contrib/intelligent-completions/diff-computer.d.ts.map +1 -0
- package/lib/browser/contrib/intelligent-completions/diff-computer.js +144 -0
- package/lib/browser/contrib/intelligent-completions/diff-computer.js.map +1 -0
- package/lib/browser/contrib/intelligent-completions/intelligent-completions.contribution.d.ts +8 -0
- package/lib/browser/contrib/intelligent-completions/intelligent-completions.contribution.d.ts.map +1 -0
- package/lib/browser/contrib/intelligent-completions/intelligent-completions.contribution.js +47 -0
- package/lib/browser/contrib/intelligent-completions/intelligent-completions.contribution.js.map +1 -0
- package/lib/browser/contrib/intelligent-completions/intelligent-completions.d.ts +15 -0
- package/lib/browser/contrib/intelligent-completions/intelligent-completions.d.ts.map +1 -0
- package/lib/browser/contrib/intelligent-completions/intelligent-completions.feature.registry.d.ts +8 -0
- package/lib/browser/contrib/intelligent-completions/intelligent-completions.feature.registry.d.ts.map +1 -0
- package/lib/browser/contrib/intelligent-completions/intelligent-completions.feature.registry.js +19 -0
- package/lib/browser/contrib/intelligent-completions/intelligent-completions.feature.registry.js.map +1 -0
- package/lib/browser/contrib/intelligent-completions/intelligent-completions.handler.d.ts +20 -0
- package/lib/browser/contrib/intelligent-completions/intelligent-completions.handler.d.ts.map +1 -0
- package/lib/browser/contrib/intelligent-completions/intelligent-completions.handler.js +94 -0
- package/lib/browser/contrib/intelligent-completions/intelligent-completions.handler.js.map +1 -0
- package/lib/browser/contrib/intelligent-completions/intelligent-completions.js +3 -0
- package/lib/browser/contrib/intelligent-completions/intelligent-completions.js.map +1 -0
- package/lib/browser/contrib/intelligent-completions/multi-line.decoration.d.ts +33 -0
- package/lib/browser/contrib/intelligent-completions/multi-line.decoration.d.ts.map +1 -0
- package/lib/browser/contrib/intelligent-completions/multi-line.decoration.js +258 -0
- package/lib/browser/contrib/intelligent-completions/multi-line.decoration.js.map +1 -0
- package/lib/browser/contrib/merge-conflict/merge-conflict.feature.registry.d.ts +0 -1
- package/lib/browser/contrib/merge-conflict/merge-conflict.feature.registry.d.ts.map +1 -1
- package/lib/browser/contrib/merge-conflict/merge-conflict.feature.registry.js +0 -3
- package/lib/browser/contrib/merge-conflict/merge-conflict.feature.registry.js.map +1 -1
- package/lib/browser/contrib/rename/rename.handler.d.ts.map +1 -1
- package/lib/browser/contrib/rename/rename.handler.js +1 -0
- package/lib/browser/contrib/rename/rename.handler.js.map +1 -1
- package/lib/browser/index.d.ts.map +1 -1
- package/lib/browser/index.js +7 -0
- package/lib/browser/index.js.map +1 -1
- package/lib/browser/layout/ai-layout.d.ts.map +1 -1
- package/lib/browser/layout/ai-layout.js +4 -4
- package/lib/browser/layout/ai-layout.js.map +1 -1
- package/lib/browser/model/enhanceDecorationsCollection.d.ts +38 -4
- package/lib/browser/model/enhanceDecorationsCollection.d.ts.map +1 -1
- package/lib/browser/model/enhanceDecorationsCollection.js +44 -23
- package/lib/browser/model/enhanceDecorationsCollection.js.map +1 -1
- package/lib/browser/types.d.ts +20 -13
- package/lib/browser/types.d.ts.map +1 -1
- package/lib/browser/types.js +0 -4
- package/lib/browser/types.js.map +1 -1
- package/lib/browser/widget/inline-chat/inline-chat.handler.d.ts.map +1 -1
- package/lib/browser/widget/inline-chat/inline-chat.handler.js +31 -12
- package/lib/browser/widget/inline-chat/inline-chat.handler.js.map +1 -1
- package/lib/browser/widget/inline-chat/inline-content-widget.d.ts +5 -2
- package/lib/browser/widget/inline-chat/inline-content-widget.d.ts.map +1 -1
- package/lib/browser/widget/inline-chat/inline-content-widget.js +45 -53
- package/lib/browser/widget/inline-chat/inline-content-widget.js.map +1 -1
- package/lib/browser/widget/inline-diff/inline-diff-previewer.d.ts +20 -14
- package/lib/browser/widget/inline-diff/inline-diff-previewer.d.ts.map +1 -1
- package/lib/browser/widget/inline-diff/inline-diff-previewer.js +114 -46
- package/lib/browser/widget/inline-diff/inline-diff-previewer.js.map +1 -1
- package/lib/browser/widget/inline-diff/inline-diff-widget.d.ts +5 -2
- package/lib/browser/widget/inline-diff/inline-diff-widget.d.ts.map +1 -1
- package/lib/browser/widget/inline-diff/inline-diff-widget.js +3 -0
- package/lib/browser/widget/inline-diff/inline-diff-widget.js.map +1 -1
- package/lib/browser/widget/inline-diff/inline-diff.handler.d.ts +13 -13
- package/lib/browser/widget/inline-diff/inline-diff.handler.d.ts.map +1 -1
- package/lib/browser/widget/inline-diff/inline-diff.handler.js +71 -76
- package/lib/browser/widget/inline-diff/inline-diff.handler.js.map +1 -1
- package/lib/browser/widget/inline-input/inline-input-widget.d.ts +1 -0
- package/lib/browser/widget/inline-input/inline-input-widget.d.ts.map +1 -1
- package/lib/browser/widget/inline-input/inline-input-widget.js +1 -0
- package/lib/browser/widget/inline-input/inline-input-widget.js.map +1 -1
- package/lib/browser/widget/inline-input/inline-input.handler.js +2 -2
- package/lib/browser/widget/inline-input/inline-input.handler.js.map +1 -1
- package/lib/browser/widget/inline-stream-diff/inline-stream-diff.handler.d.ts +28 -15
- 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 +52 -31
- package/lib/browser/widget/inline-stream-diff/inline-stream-diff.handler.js.map +1 -1
- package/lib/browser/widget/inline-stream-diff/inline-stream-diff.module.less +9 -6
- package/lib/browser/widget/inline-stream-diff/live-preview-stack.d.ts +21 -0
- package/lib/browser/widget/inline-stream-diff/live-preview-stack.d.ts.map +1 -0
- package/lib/browser/widget/inline-stream-diff/live-preview-stack.js +41 -0
- package/lib/browser/widget/inline-stream-diff/live-preview-stack.js.map +1 -0
- package/lib/browser/widget/inline-stream-diff/live-preview.component.d.ts +105 -0
- package/lib/browser/widget/inline-stream-diff/live-preview.component.d.ts.map +1 -0
- package/lib/browser/widget/inline-stream-diff/live-preview.component.js +237 -0
- package/lib/browser/widget/inline-stream-diff/live-preview.component.js.map +1 -0
- package/lib/browser/widget/inline-stream-diff/live-preview.decoration.d.ts +27 -103
- 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 +185 -369
- package/lib/browser/widget/inline-stream-diff/live-preview.decoration.js.map +1 -1
- package/lib/common/index.d.ts +1 -0
- package/lib/common/index.d.ts.map +1 -1
- package/lib/common/index.js.map +1 -1
- package/package.json +19 -19
- package/src/browser/ai-core.contribution.ts +14 -28
- package/src/browser/ai-editor.contribution.ts +9 -0
- package/src/browser/chat/chat-agent.service.ts +1 -3
- package/src/browser/chat/chat.view.tsx +49 -4
- package/src/browser/components/ChatEditor.tsx +21 -7
- package/src/browser/components/ChatMarkdown.tsx +8 -2
- package/src/browser/components/ChatThinking.tsx +3 -1
- package/src/browser/contextkey/ai-native.contextkey.service.ts +3 -0
- package/src/browser/contrib/inline-completions/completeProvider.ts +7 -289
- package/src/browser/contrib/inline-completions/inline-completions.handler.ts +15 -22
- package/src/browser/contrib/inline-completions/model/competionModel.ts +3 -2
- package/src/browser/contrib/inline-completions/model/inlineCompletionRequestTask.ts +272 -0
- package/src/browser/contrib/inline-completions/promptCache.ts +3 -2
- package/src/browser/contrib/inline-completions/service/ai-completions.service.ts +55 -38
- package/src/browser/contrib/intelligent-completions/diff-computer.ts +185 -0
- package/src/browser/contrib/intelligent-completions/intelligent-completions.contribution.ts +54 -0
- package/src/browser/contrib/intelligent-completions/intelligent-completions.feature.registry.ts +17 -0
- package/src/browser/contrib/intelligent-completions/intelligent-completions.handler.ts +130 -0
- package/src/browser/contrib/intelligent-completions/intelligent-completions.ts +15 -0
- package/src/browser/contrib/intelligent-completions/multi-line.decoration.ts +325 -0
- package/src/browser/contrib/merge-conflict/merge-conflict.feature.registry.ts +0 -4
- package/src/browser/contrib/rename/rename.handler.ts +1 -0
- package/src/browser/index.ts +8 -1
- package/src/browser/layout/ai-layout.tsx +7 -1
- package/src/browser/model/enhanceDecorationsCollection.ts +71 -34
- package/src/browser/types.ts +27 -14
- package/src/browser/widget/inline-chat/inline-chat.handler.ts +34 -19
- package/src/browser/widget/inline-chat/inline-content-widget.tsx +58 -61
- package/src/browser/widget/inline-diff/inline-diff-previewer.ts +118 -61
- package/src/browser/widget/inline-diff/inline-diff-widget.tsx +8 -2
- package/src/browser/widget/inline-diff/inline-diff.handler.ts +83 -92
- package/src/browser/widget/inline-input/inline-input-widget.tsx +1 -0
- package/src/browser/widget/inline-input/inline-input.handler.ts +2 -2
- package/src/browser/widget/inline-stream-diff/inline-stream-diff.handler.tsx +98 -44
- package/src/browser/widget/inline-stream-diff/inline-stream-diff.module.less +9 -6
- package/src/browser/widget/inline-stream-diff/live-preview-stack.ts +52 -0
- package/src/browser/widget/inline-stream-diff/live-preview.component.tsx +388 -0
- package/src/browser/widget/inline-stream-diff/live-preview.decoration.tsx +243 -543
- package/src/common/index.ts +2 -0
|
@@ -0,0 +1,210 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.InlineCompletionRequestTask = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const di_1 = require("@opensumi/di");
|
|
6
|
+
const ide_core_browser_1 = require("@opensumi/ide-core-browser");
|
|
7
|
+
const command_1 = require("@opensumi/ide-core-browser/lib/ai-native/command");
|
|
8
|
+
const ide_core_common_1 = require("@opensumi/ide-core-common");
|
|
9
|
+
const ide_core_common_2 = require("@opensumi/ide-core-common");
|
|
10
|
+
const reporter_1 = require("@opensumi/ide-core-common/lib/types/ai-native/reporter");
|
|
11
|
+
const monaco = tslib_1.__importStar(require("@opensumi/ide-monaco"));
|
|
12
|
+
const promptCache_1 = require("../promptCache");
|
|
13
|
+
const provider_1 = require("../provider");
|
|
14
|
+
const ai_completions_service_1 = require("../service/ai-completions.service");
|
|
15
|
+
const makeHashSet = (str) => {
|
|
16
|
+
const set = new Set();
|
|
17
|
+
for (const char of str) {
|
|
18
|
+
set.add(char);
|
|
19
|
+
}
|
|
20
|
+
return set;
|
|
21
|
+
};
|
|
22
|
+
const removeChars = (insertText, textAfterCursor) => {
|
|
23
|
+
let result = '';
|
|
24
|
+
const aSet = makeHashSet(insertText);
|
|
25
|
+
for (const char of textAfterCursor) {
|
|
26
|
+
// 如果是空格或者 insertText 中不存在的字符,就加入到结果中
|
|
27
|
+
if (char === ' ' || !aSet.has(char)) {
|
|
28
|
+
result += char;
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
return result;
|
|
32
|
+
};
|
|
33
|
+
let InlineCompletionRequestTask = class InlineCompletionRequestTask extends ide_core_common_1.Disposable {
|
|
34
|
+
constructor(model, position, token) {
|
|
35
|
+
super();
|
|
36
|
+
this.model = model;
|
|
37
|
+
this.position = position;
|
|
38
|
+
this.token = token;
|
|
39
|
+
this._disposables = new ide_core_common_1.DisposableStore();
|
|
40
|
+
this.isEnablePromptEngineering = true;
|
|
41
|
+
this.isCancelFlag = false;
|
|
42
|
+
this.isEnablePromptEngineering = this.preferenceService.getValid(ide_core_common_1.AINativeSettingSectionsId.InlineCompletionsPromptEngineeringEnabled, this.isEnablePromptEngineering);
|
|
43
|
+
this._disposables.add(this.preferenceService.onSpecificPreferenceChange(ide_core_common_1.AINativeSettingSectionsId.InlineCompletionsPromptEngineeringEnabled, ({ newValue }) => {
|
|
44
|
+
this.isEnablePromptEngineering = newValue;
|
|
45
|
+
}));
|
|
46
|
+
}
|
|
47
|
+
async constructRequestBean(context, token) {
|
|
48
|
+
const prompt = provider_1.lineBasedPromptProcessor.processPrefix(context.prefix);
|
|
49
|
+
const suffix = provider_1.lineBasedPromptProcessor.processSuffix(context.suffix);
|
|
50
|
+
return {
|
|
51
|
+
prompt,
|
|
52
|
+
suffix,
|
|
53
|
+
sessionId: (0, ide_core_common_2.uuid)(),
|
|
54
|
+
language: context.language,
|
|
55
|
+
fileUrl: context.fileUrl,
|
|
56
|
+
workspaceDir: context.workspaceDir,
|
|
57
|
+
};
|
|
58
|
+
}
|
|
59
|
+
// 发送请求
|
|
60
|
+
async run() {
|
|
61
|
+
const { model, position, token } = this;
|
|
62
|
+
if (!model) {
|
|
63
|
+
return [];
|
|
64
|
+
}
|
|
65
|
+
if (token.isCancellationRequested) {
|
|
66
|
+
return [];
|
|
67
|
+
}
|
|
68
|
+
if (this.isCancelFlag) {
|
|
69
|
+
return [];
|
|
70
|
+
}
|
|
71
|
+
const startRange = new monaco.Range(0, 0, position.lineNumber, position.column);
|
|
72
|
+
let prefix = model.getValueInRange(startRange);
|
|
73
|
+
if (prefix === '') {
|
|
74
|
+
prefix += '\n';
|
|
75
|
+
}
|
|
76
|
+
const endRange = new monaco.Range(position.lineNumber, position.column, model.getLineCount(), Number.MAX_SAFE_INTEGER);
|
|
77
|
+
const suffix = model.getValueInRange(endRange);
|
|
78
|
+
const languageId = model.getLanguageId();
|
|
79
|
+
const context = {
|
|
80
|
+
fileUrl: model.uri.fsPath,
|
|
81
|
+
filename: model.uri.toString().split('/').pop(),
|
|
82
|
+
language: languageId,
|
|
83
|
+
prefix,
|
|
84
|
+
suffix,
|
|
85
|
+
uri: ide_core_common_1.URI.from(model.uri),
|
|
86
|
+
workspaceDir: this.appConfig.workspaceDir,
|
|
87
|
+
};
|
|
88
|
+
// 组装请求参数,向远程发起请求
|
|
89
|
+
const requestBean = await this.constructRequestBean(context, token);
|
|
90
|
+
if (this.isCancelFlag) {
|
|
91
|
+
return [];
|
|
92
|
+
}
|
|
93
|
+
this.aiCompletionsService.updateStatusBarItem('running', true);
|
|
94
|
+
const requestStartTime = Date.now();
|
|
95
|
+
let completeResult;
|
|
96
|
+
const cacheData = this.promptCache.getCache(requestBean);
|
|
97
|
+
const relationId = (cacheData === null || cacheData === void 0 ? void 0 : cacheData.relationId) || this.aiReporter.start(reporter_1.AISerivceType.Completion, { message: reporter_1.AISerivceType.Completion });
|
|
98
|
+
this.aiCompletionsService.setLastRelationId(relationId);
|
|
99
|
+
// 如果存在缓存
|
|
100
|
+
if (cacheData) {
|
|
101
|
+
completeResult = cacheData;
|
|
102
|
+
}
|
|
103
|
+
else {
|
|
104
|
+
try {
|
|
105
|
+
completeResult = await this.aiCompletionsService.complete(requestBean);
|
|
106
|
+
}
|
|
107
|
+
catch (error) {
|
|
108
|
+
this.aiCompletionsService.reporterEnd(relationId, {
|
|
109
|
+
success: false,
|
|
110
|
+
replytime: Date.now() - requestStartTime,
|
|
111
|
+
message: error.toString(),
|
|
112
|
+
});
|
|
113
|
+
this.aiCompletionsService.hideStatusBarItem();
|
|
114
|
+
return [];
|
|
115
|
+
}
|
|
116
|
+
}
|
|
117
|
+
if (!completeResult) {
|
|
118
|
+
return [];
|
|
119
|
+
}
|
|
120
|
+
return this.pushLineCompletions(completeResult, requestBean, requestStartTime, relationId);
|
|
121
|
+
}
|
|
122
|
+
/**
|
|
123
|
+
* 将补全结果推给用户并注册{@link COMMAND_ACCEPT} 事件
|
|
124
|
+
*/
|
|
125
|
+
pushLineCompletions(completeResult, requestBean, requestStartTime, relationId) {
|
|
126
|
+
var _a;
|
|
127
|
+
const { position } = this;
|
|
128
|
+
this.aiCompletionsService.setLastSessionId(requestBean.sessionId);
|
|
129
|
+
// 如果是取消直接返回
|
|
130
|
+
if (((_a = completeResult === null || completeResult === void 0 ? void 0 : completeResult.extra) === null || _a === void 0 ? void 0 : _a.isCancel) || this.token.isCancellationRequested || this.isCancelFlag) {
|
|
131
|
+
this.aiCompletionsService.reporterEnd(relationId, {
|
|
132
|
+
success: true,
|
|
133
|
+
replytime: Date.now() - requestStartTime,
|
|
134
|
+
isStop: true,
|
|
135
|
+
completionNum: 0,
|
|
136
|
+
});
|
|
137
|
+
this.aiCompletionsService.updateStatusBarItem('canceled', false);
|
|
138
|
+
return [];
|
|
139
|
+
}
|
|
140
|
+
// 返回补全结果为空直接返回
|
|
141
|
+
if (!completeResult || !completeResult.items || completeResult.items.length === 0) {
|
|
142
|
+
this.aiCompletionsService.reporterEnd(relationId, {
|
|
143
|
+
success: true,
|
|
144
|
+
replytime: Date.now() - requestStartTime,
|
|
145
|
+
completionNum: 0,
|
|
146
|
+
});
|
|
147
|
+
this.aiCompletionsService.updateStatusBarItem('no result', false);
|
|
148
|
+
return [];
|
|
149
|
+
}
|
|
150
|
+
if (completeResult.items.length > 0) {
|
|
151
|
+
this.promptCache.setCache(requestBean, Object.assign(Object.assign({}, completeResult), { relationId }));
|
|
152
|
+
}
|
|
153
|
+
this.aiCompletionsService.updateStatusBarItem('completion result: ' + completeResult.items.length, false);
|
|
154
|
+
this.dispose();
|
|
155
|
+
const result = new Array();
|
|
156
|
+
for (const codeModel of completeResult.items) {
|
|
157
|
+
const contentText = codeModel.insertText.toString();
|
|
158
|
+
const insertText = contentText.trimEnd();
|
|
159
|
+
const model = this.model;
|
|
160
|
+
const textAfterCursor = model.getValueInRange({
|
|
161
|
+
startLineNumber: position.lineNumber,
|
|
162
|
+
startColumn: position.column,
|
|
163
|
+
endLineNumber: position.lineNumber,
|
|
164
|
+
endColumn: model.getLineMaxColumn(position.lineNumber),
|
|
165
|
+
});
|
|
166
|
+
// 临时修复方案,用于解决补全后面多了几个括号的问题
|
|
167
|
+
const filteredString = removeChars(insertText, textAfterCursor);
|
|
168
|
+
this.aiCompletionsService.setLastCompletionContent(filteredString);
|
|
169
|
+
result.push(Object.assign(Object.assign({}, codeModel), { insertText: insertText + filteredString, range: new monaco.Range(position.lineNumber, position.column, position.lineNumber, position.column + insertText.length + textAfterCursor.length), sessionId: requestBean.sessionId, relationId, command: {
|
|
170
|
+
id: command_1.AI_INLINE_COMPLETION_REPORTER.id,
|
|
171
|
+
title: '',
|
|
172
|
+
arguments: [relationId, requestBean.sessionId, true, filteredString],
|
|
173
|
+
} }));
|
|
174
|
+
}
|
|
175
|
+
return result;
|
|
176
|
+
}
|
|
177
|
+
dispose() {
|
|
178
|
+
this._disposables.dispose();
|
|
179
|
+
}
|
|
180
|
+
cancelRequest() {
|
|
181
|
+
this.isCancelFlag = true;
|
|
182
|
+
this.dispose();
|
|
183
|
+
}
|
|
184
|
+
};
|
|
185
|
+
tslib_1.__decorate([
|
|
186
|
+
(0, di_1.Autowired)(reporter_1.IAIReporter),
|
|
187
|
+
tslib_1.__metadata("design:type", Object)
|
|
188
|
+
], InlineCompletionRequestTask.prototype, "aiReporter", void 0);
|
|
189
|
+
tslib_1.__decorate([
|
|
190
|
+
(0, di_1.Autowired)(promptCache_1.PromptCache),
|
|
191
|
+
tslib_1.__metadata("design:type", promptCache_1.PromptCache)
|
|
192
|
+
], InlineCompletionRequestTask.prototype, "promptCache", void 0);
|
|
193
|
+
tslib_1.__decorate([
|
|
194
|
+
(0, di_1.Autowired)(ai_completions_service_1.AICompletionsService),
|
|
195
|
+
tslib_1.__metadata("design:type", ai_completions_service_1.AICompletionsService)
|
|
196
|
+
], InlineCompletionRequestTask.prototype, "aiCompletionsService", void 0);
|
|
197
|
+
tslib_1.__decorate([
|
|
198
|
+
(0, di_1.Autowired)(ide_core_browser_1.PreferenceService),
|
|
199
|
+
tslib_1.__metadata("design:type", Object)
|
|
200
|
+
], InlineCompletionRequestTask.prototype, "preferenceService", void 0);
|
|
201
|
+
tslib_1.__decorate([
|
|
202
|
+
(0, di_1.Autowired)(ide_core_browser_1.AppConfig),
|
|
203
|
+
tslib_1.__metadata("design:type", Object)
|
|
204
|
+
], InlineCompletionRequestTask.prototype, "appConfig", void 0);
|
|
205
|
+
InlineCompletionRequestTask = tslib_1.__decorate([
|
|
206
|
+
(0, di_1.Injectable)({ multiple: true }),
|
|
207
|
+
tslib_1.__metadata("design:paramtypes", [Object, monaco.Position, Object])
|
|
208
|
+
], InlineCompletionRequestTask);
|
|
209
|
+
exports.InlineCompletionRequestTask = InlineCompletionRequestTask;
|
|
210
|
+
//# sourceMappingURL=inlineCompletionRequestTask.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"inlineCompletionRequestTask.js","sourceRoot":"","sources":["../../../../../src/browser/contrib/inline-completions/model/inlineCompletionRequestTask.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import { DisposableStore, IAICompletionOption,
|
|
1
|
+
import { DisposableStore, IAICompletionOption, IDisposable } from '@opensumi/ide-core-browser';
|
|
2
|
+
import { IIntelligentCompletionsResult } from '../intelligent-completions/intelligent-completions';
|
|
2
3
|
/**
|
|
3
4
|
* 缓存服务
|
|
4
5
|
* 1. 过期时间为 1min
|
|
@@ -12,7 +13,7 @@ export declare class PromptCache implements IDisposable {
|
|
|
12
13
|
protected calculateCacheKey(requestBean: IAICompletionOption): string;
|
|
13
14
|
protected _isCacheEnabled: boolean;
|
|
14
15
|
constructor();
|
|
15
|
-
getCache(requestBean: IAICompletionOption): (
|
|
16
|
+
getCache(requestBean: IAICompletionOption): (IIntelligentCompletionsResult<any> & {
|
|
16
17
|
relationId: string;
|
|
17
18
|
}) | null;
|
|
18
19
|
setCache(bean: IAICompletionOption, res: any): boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"promptCache.d.ts","sourceRoot":"","sources":["../../../../src/browser/contrib/inline-completions/promptCache.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,eAAe,EACf,mBAAmB,EACnB,
|
|
1
|
+
{"version":3,"file":"promptCache.d.ts","sourceRoot":"","sources":["../../../../src/browser/contrib/inline-completions/promptCache.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,eAAe,EACf,mBAAmB,EACnB,WAAW,EAGZ,MAAM,4BAA4B,CAAC;AAGpC,OAAO,EAAE,6BAA6B,EAAE,MAAM,oDAAoD,CAAC;AAEnG;;;;GAIG;AACH,qBACa,WAAY,YAAW,WAAW;IAC7C,SAAS,CAAC,YAAY,kBAAyB;IAG/C,OAAO,CAAC,oBAAoB,CAAwB;IAGpD,OAAO,CAAC,iBAAiB,CAAoB;IAE7C,OAAO,CAAC,QAAQ,CAAsG;IAEtH,SAAS,CAAC,iBAAiB,CAAC,WAAW,EAAE,mBAAmB;IAK5D,SAAS,CAAC,eAAe,UAAS;;IAiBlC,QAAQ,CAAC,WAAW,EAAE,mBAAmB;;;IAWzC,QAAQ,CAAC,IAAI,EAAE,mBAAmB,EAAE,GAAG,EAAE,GAAG;IAgB5C,OAAO,IAAI,IAAI;CAGhB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"promptCache.js","sourceRoot":"","sources":["../../../../src/browser/contrib/inline-completions/promptCache.ts"],"names":[],"mappings":";;;;AAAA,qCAAqD;AACrD,
|
|
1
|
+
{"version":3,"file":"promptCache.js","sourceRoot":"","sources":["../../../../src/browser/contrib/inline-completions/promptCache.ts"],"names":[],"mappings":";;;;AAAA,qCAAqD;AACrD,iEAOoC;AACpC,gGAAoG;AAIpG;;;;GAIG;AAEI,IAAM,WAAW,GAAjB,MAAM,WAAW;IAWZ,iBAAiB,CAAC,WAAgC;QAC1D,MAAM,OAAO,GAAG,WAAW,CAAC,MAAM,CAAC;QACnC,OAAO,IAAI,CAAC,oBAAoB,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;IACtD,CAAC;IAGD;QAhBU,iBAAY,GAAG,IAAI,kCAAe,EAAE,CAAC;QAQvC,aAAQ,GAAG,IAAI,8BAAW,CAAiE,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,IAAI,CAAC,CAAC;QAO5G,oBAAe,GAAG,KAAK,CAAC;QAEhC,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CACpD,4CAAyB,CAAC,6BAA6B,EACvD,IAAI,CACL,CAAC;QAEF,IAAI,CAAC,YAAY,CAAC,GAAG,CACnB,IAAI,CAAC,iBAAiB,CAAC,0BAA0B,CAC/C,4CAAyB,CAAC,6BAA6B,EACvD,CAAC,CAAC,EAAE,EAAE;YACJ,IAAI,CAAC,eAAe,GAAG,CAAC,CAAC,QAAQ,CAAC;QACpC,CAAC,CACF,CACF,CAAC;IACJ,CAAC;IAED,QAAQ,CAAC,WAAgC;QACvC,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE;YACzB,OAAO,IAAI,CAAC;SACb;QACD,MAAM,IAAI,GAAG,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;QACjD,IAAI,IAAI,EAAE;YACR,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC;SACxC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,QAAQ,CAAC,IAAyB,EAAE,GAAQ;QAC1C,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE;YACzB,OAAO,KAAK,CAAC;SACd;QACD,IAAI,CAAC,GAAG,EAAE;YACR,OAAO,KAAK,CAAC;SACd;QAED,MAAM,IAAI,GAAG,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;QAC1C,IAAI,IAAI,EAAE;YACR,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;YAC7B,OAAO,IAAI,CAAC;SACb;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO;QACL,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC;IAC9B,CAAC;CACF,CAAA;AA5DC;IAAC,IAAA,cAAS,EAAC,sCAAqB,CAAC;;yDACmB;AAEpD;IAAC,IAAA,cAAS,EAAC,oCAAiB,CAAC;;sDACgB;AAPlC,WAAW;IADvB,IAAA,eAAU,GAAE;;GACA,WAAW,CA+DvB;AA/DY,kCAAW"}
|
|
@@ -1,12 +1,13 @@
|
|
|
1
|
-
import { Disposable, Event, IAICompletionOption,
|
|
1
|
+
import { Disposable, Event, IAICompletionOption, IAIReportCompletionOption } from '@opensumi/ide-core-common';
|
|
2
2
|
import { CompletionRT } from '@opensumi/ide-core-common/lib/types/ai-native/reporter';
|
|
3
|
-
import
|
|
4
|
-
import { IProvideInlineCompletionsSignature } from '../../../types';
|
|
3
|
+
import { IIntelligentCompletionsResult } from '../../intelligent-completions/intelligent-completions';
|
|
5
4
|
export declare class AICompletionsService extends Disposable {
|
|
6
5
|
static readonly STATUS_ID = "ai_completion_status";
|
|
7
6
|
private readonly aiBackService;
|
|
8
7
|
private readonly statusBarService;
|
|
9
8
|
private readonly aiReporter;
|
|
9
|
+
private readonly intelligentCompletionsRegistry;
|
|
10
|
+
private readonly intelligentCompletionsHandler;
|
|
10
11
|
private readonly _onVisibleCompletion;
|
|
11
12
|
readonly onVisibleCompletion: Event<boolean>;
|
|
12
13
|
private cancelIndicator;
|
|
@@ -16,18 +17,18 @@ export declare class AICompletionsService extends Disposable {
|
|
|
16
17
|
private lastRelationId;
|
|
17
18
|
private lastRenderTime;
|
|
18
19
|
private lastCompletionUseTime;
|
|
19
|
-
private
|
|
20
|
+
private lastCompletionContent;
|
|
20
21
|
protected validCompletionThreshold: number;
|
|
21
22
|
private recordRenderTime;
|
|
22
23
|
private recordCompletionUseTime;
|
|
23
24
|
get isVisibleCompletion(): boolean;
|
|
24
|
-
complete(data: IAICompletionOption
|
|
25
|
-
setMiddlewareComplete(provideInlineCompletions: IProvideInlineCompletionsSignature): void;
|
|
25
|
+
complete(data: IAICompletionOption): Promise<IIntelligentCompletionsResult | undefined>;
|
|
26
26
|
report(data: IAIReportCompletionOption): Promise<void>;
|
|
27
27
|
reporterEnd(relationId: string, data: CompletionRT): Promise<void>;
|
|
28
28
|
setVisibleCompletion(visible: boolean): void;
|
|
29
29
|
setLastSessionId(sessionId: string): void;
|
|
30
30
|
setLastRelationId(relationId: string): void;
|
|
31
|
+
setLastCompletionContent(content: string): void;
|
|
31
32
|
cancelRequest(): Promise<void>;
|
|
32
33
|
updateStatusBarItem(content: string, isLoading: boolean): void;
|
|
33
34
|
hideStatusBarItem(): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ai-completions.service.d.ts","sourceRoot":"","sources":["../../../../../src/browser/contrib/inline-completions/service/ai-completions.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAGL,UAAU,EAEV,KAAK,EAEL,mBAAmB,
|
|
1
|
+
{"version":3,"file":"ai-completions.service.d.ts","sourceRoot":"","sources":["../../../../../src/browser/contrib/inline-completions/service/ai-completions.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAGL,UAAU,EAEV,KAAK,EAEL,mBAAmB,EAEnB,yBAAyB,EAE1B,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,YAAY,EAAe,MAAM,wDAAwD,CAAC;AAEnG,OAAO,EAAE,6BAA6B,EAAE,MAAM,uDAAuD,CAAC;AAItG,qBACa,oBAAqB,SAAQ,UAAU;IAClD,MAAM,CAAC,QAAQ,CAAC,SAAS,0BAA0B;IAGnD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAiB;IAG/C,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAoB;IAGrD,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAc;IAGzC,OAAO,CAAC,QAAQ,CAAC,8BAA8B,CAAiC;IAGhF,OAAO,CAAC,QAAQ,CAAC,6BAA6B,CAAgC;IAE9E,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAA0B;IAC/D,SAAgB,mBAAmB,EAAE,KAAK,CAAC,OAAO,CAAC,CAAmC;IAEtF,OAAO,CAAC,eAAe,CAAiC;IAExD,SAAS,CAAC,wBAAwB,UAAQ;IAE1C,OAAO,CAAC,oBAAoB,CAAS;IAErC,OAAO,CAAC,aAAa,CAAS;IAE9B,OAAO,CAAC,cAAc,CAAS;IAC/B,OAAO,CAAC,cAAc,CAAS;IAC/B,OAAO,CAAC,qBAAqB,CAAS;IAEtC,OAAO,CAAC,qBAAqB,CAAS;IAEtC,SAAS,CAAC,wBAAwB,SAAO;IAEzC,OAAO,CAAC,gBAAgB;IAIxB,OAAO,CAAC,uBAAuB;IAI/B,IAAW,mBAAmB,IAAI,OAAO,CAExC;IAEY,QAAQ,CAAC,IAAI,EAAE,mBAAmB,GAAG,OAAO,CAAC,6BAA6B,GAAG,SAAS,CAAC;IAgCvF,MAAM,CAAC,IAAI,EAAE,yBAAyB;IAoBtC,WAAW,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY;IAQxD,oBAAoB,CAAC,OAAO,EAAE,OAAO;IAoBrC,gBAAgB,CAAC,SAAS,EAAE,MAAM;IAIlC,iBAAiB,CAAC,UAAU,EAAE,MAAM;IAIpC,wBAAwB,CAAC,OAAO,EAAE,MAAM;IAIlC,aAAa;IAKnB,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO;IAUvD,iBAAiB;CAGzB"}
|
|
@@ -7,6 +7,8 @@ const di_1 = require("@opensumi/di");
|
|
|
7
7
|
const ide_core_browser_1 = require("@opensumi/ide-core-browser");
|
|
8
8
|
const ide_core_common_1 = require("@opensumi/ide-core-common");
|
|
9
9
|
const reporter_1 = require("@opensumi/ide-core-common/lib/types/ai-native/reporter");
|
|
10
|
+
const intelligent_completions_feature_registry_1 = require("../../intelligent-completions/intelligent-completions.feature.registry");
|
|
11
|
+
const intelligent_completions_handler_1 = require("../../intelligent-completions/intelligent-completions.handler");
|
|
10
12
|
let AICompletionsService = AICompletionsService_1 = class AICompletionsService extends ide_core_common_1.Disposable {
|
|
11
13
|
constructor() {
|
|
12
14
|
super(...arguments);
|
|
@@ -28,30 +30,30 @@ let AICompletionsService = AICompletionsService_1 = class AICompletionsService e
|
|
|
28
30
|
get isVisibleCompletion() {
|
|
29
31
|
return this._isVisibleCompletion;
|
|
30
32
|
}
|
|
31
|
-
async complete(data
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
33
|
+
async complete(data) {
|
|
34
|
+
var _a, _b;
|
|
35
|
+
this.isDefaultCompletionModel = true;
|
|
36
|
+
const completionStart = Date.now();
|
|
37
|
+
const provider = this.intelligentCompletionsRegistry.getProvider();
|
|
38
|
+
if (provider) {
|
|
39
|
+
return this.intelligentCompletionsHandler.fetchProvider(data);
|
|
40
|
+
}
|
|
41
|
+
// 兼容旧的 requestCompletion 接口
|
|
42
|
+
try {
|
|
43
|
+
const result = (await ((_b = (_a = this.aiBackService).requestCompletion) === null || _b === void 0 ? void 0 : _b.call(_a, data, this.cancelIndicator.token)));
|
|
44
|
+
this.recordCompletionUseTime(completionStart);
|
|
45
|
+
const { sessionId, codeModelList, isCancel } = result;
|
|
46
|
+
return {
|
|
47
|
+
items: codeModelList.map((model) => (Object.assign(Object.assign({}, model), { insertText: model.content }))),
|
|
48
|
+
extra: {
|
|
49
|
+
sessionId,
|
|
50
|
+
isCancel,
|
|
51
|
+
},
|
|
52
|
+
};
|
|
53
|
+
}
|
|
54
|
+
catch (error) {
|
|
55
|
+
return;
|
|
50
56
|
}
|
|
51
|
-
return doCompletion(data);
|
|
52
|
-
}
|
|
53
|
-
setMiddlewareComplete(provideInlineCompletions) {
|
|
54
|
-
this.lastMiddlewareInlineCompletion = provideInlineCompletions;
|
|
55
57
|
}
|
|
56
58
|
async report(data) {
|
|
57
59
|
if (!this.aiBackService.reportCompletion) {
|
|
@@ -61,7 +63,12 @@ let AICompletionsService = AICompletionsService_1 = class AICompletionsService e
|
|
|
61
63
|
data.renderingTime = Date.now() - this.lastRenderTime;
|
|
62
64
|
data.completionUseTime = this.lastCompletionUseTime;
|
|
63
65
|
this.aiBackService.reportCompletion(data);
|
|
64
|
-
this.reporterEnd(relationId, {
|
|
66
|
+
this.reporterEnd(relationId, {
|
|
67
|
+
success: true,
|
|
68
|
+
isReceive: accept,
|
|
69
|
+
renderingTime: data.renderingTime,
|
|
70
|
+
content: data.content,
|
|
71
|
+
});
|
|
65
72
|
this._isVisibleCompletion = false;
|
|
66
73
|
}
|
|
67
74
|
async reporterEnd(relationId, data) {
|
|
@@ -71,7 +78,12 @@ let AICompletionsService = AICompletionsService_1 = class AICompletionsService e
|
|
|
71
78
|
setVisibleCompletion(visible) {
|
|
72
79
|
// 如果之前是 true,现在是 false,说明并没有进行采纳
|
|
73
80
|
if (this._isVisibleCompletion === true && visible === false) {
|
|
74
|
-
this.report({
|
|
81
|
+
this.report({
|
|
82
|
+
sessionId: this.lastSessionId,
|
|
83
|
+
accept: false,
|
|
84
|
+
relationId: this.lastRelationId,
|
|
85
|
+
content: this.lastCompletionContent,
|
|
86
|
+
});
|
|
75
87
|
}
|
|
76
88
|
this._isVisibleCompletion = visible;
|
|
77
89
|
this._onVisibleCompletion.fire(visible);
|
|
@@ -85,6 +97,9 @@ let AICompletionsService = AICompletionsService_1 = class AICompletionsService e
|
|
|
85
97
|
setLastRelationId(relationId) {
|
|
86
98
|
this.lastRelationId = relationId;
|
|
87
99
|
}
|
|
100
|
+
setLastCompletionContent(content) {
|
|
101
|
+
this.lastCompletionContent = content;
|
|
102
|
+
}
|
|
88
103
|
async cancelRequest() {
|
|
89
104
|
this.cancelIndicator.cancel();
|
|
90
105
|
this.cancelIndicator = new ide_core_common_1.CancellationTokenSource();
|
|
@@ -114,6 +129,14 @@ tslib_1.__decorate([
|
|
|
114
129
|
(0, di_1.Autowired)(reporter_1.IAIReporter),
|
|
115
130
|
tslib_1.__metadata("design:type", Object)
|
|
116
131
|
], AICompletionsService.prototype, "aiReporter", void 0);
|
|
132
|
+
tslib_1.__decorate([
|
|
133
|
+
(0, di_1.Autowired)(ide_core_common_1.IntelligentCompletionsRegistryToken),
|
|
134
|
+
tslib_1.__metadata("design:type", intelligent_completions_feature_registry_1.IntelligentCompletionsRegistry)
|
|
135
|
+
], AICompletionsService.prototype, "intelligentCompletionsRegistry", void 0);
|
|
136
|
+
tslib_1.__decorate([
|
|
137
|
+
(0, di_1.Autowired)(intelligent_completions_handler_1.IntelligentCompletionsHandler),
|
|
138
|
+
tslib_1.__metadata("design:type", intelligent_completions_handler_1.IntelligentCompletionsHandler)
|
|
139
|
+
], AICompletionsService.prototype, "intelligentCompletionsHandler", void 0);
|
|
117
140
|
AICompletionsService = AICompletionsService_1 = tslib_1.__decorate([
|
|
118
141
|
(0, di_1.Injectable)()
|
|
119
142
|
], AICompletionsService);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ai-completions.service.js","sourceRoot":"","sources":["../../../../../src/browser/contrib/inline-completions/service/ai-completions.service.ts"],"names":[],"mappings":";;;;;AAAA,qCAAqD;AACrD,iEAAmF;AACnF,+
|
|
1
|
+
{"version":3,"file":"ai-completions.service.js","sourceRoot":"","sources":["../../../../../src/browser/contrib/inline-completions/service/ai-completions.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @internal
|
|
3
|
+
*/
|
|
4
|
+
export interface IDiffChangeResult {
|
|
5
|
+
added?: boolean;
|
|
6
|
+
removed?: boolean;
|
|
7
|
+
value: string;
|
|
8
|
+
}
|
|
9
|
+
interface IResultWithCount extends IDiffChangeResult {
|
|
10
|
+
count: number;
|
|
11
|
+
}
|
|
12
|
+
export declare class MultiLineDiffComputer {
|
|
13
|
+
private equals;
|
|
14
|
+
private extractCommon;
|
|
15
|
+
diff(originalContent: string, modifiedContent: string): IResultWithCount[] | undefined;
|
|
16
|
+
}
|
|
17
|
+
export {};
|
|
18
|
+
//# sourceMappingURL=diff-computer.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"diff-computer.d.ts","sourceRoot":"","sources":["../../../../src/browser/contrib/intelligent-completions/diff-computer.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;CACf;AAED,UAAU,gBAAiB,SAAQ,iBAAiB;IAClD,KAAK,EAAE,MAAM,CAAC;CACf;AAOD,qBAAa,qBAAqB;IAChC,OAAO,CAAC,MAAM;IAId,OAAO,CAAC,aAAa;IA4Bd,IAAI,CAAC,eAAe,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,GAAG,gBAAgB,EAAE,GAAG,SAAS;CAmI9F"}
|
|
@@ -0,0 +1,144 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.MultiLineDiffComputer = void 0;
|
|
4
|
+
const strings_1 = require("@opensumi/ide-utils/lib/strings");
|
|
5
|
+
class MultiLineDiffComputer {
|
|
6
|
+
equals(a, b) {
|
|
7
|
+
return a === b;
|
|
8
|
+
}
|
|
9
|
+
extractCommon(element, modified, original, diagonal) {
|
|
10
|
+
const modifiedLength = modified.length;
|
|
11
|
+
const originalLength = original.length;
|
|
12
|
+
let newPos = element.newPos;
|
|
13
|
+
let originalPos = newPos - diagonal;
|
|
14
|
+
let commonCount = 0;
|
|
15
|
+
while (newPos + 1 < modifiedLength &&
|
|
16
|
+
originalPos + 1 < originalLength &&
|
|
17
|
+
this.equals(modified[newPos + 1], original[originalPos + 1])) {
|
|
18
|
+
// 如果相等,则移动到下一个位置并计数加一
|
|
19
|
+
newPos++;
|
|
20
|
+
originalPos++;
|
|
21
|
+
commonCount++;
|
|
22
|
+
}
|
|
23
|
+
// 如果找到公共部分,则记录新位置
|
|
24
|
+
if (commonCount) {
|
|
25
|
+
element.changeResult.push({ count: commonCount, value: strings_1.empty });
|
|
26
|
+
element.newPos = newPos;
|
|
27
|
+
}
|
|
28
|
+
return originalPos;
|
|
29
|
+
}
|
|
30
|
+
diff(originalContent, modifiedContent) {
|
|
31
|
+
const cloneElement = (element) => ({
|
|
32
|
+
newPos: element.newPos,
|
|
33
|
+
changeResult: [...element.changeResult],
|
|
34
|
+
});
|
|
35
|
+
const join = (content) => content.join(strings_1.empty);
|
|
36
|
+
const processElements = (changeResult, modified, original) => {
|
|
37
|
+
const modifiedLength = changeResult.length;
|
|
38
|
+
let originalIndex = 0;
|
|
39
|
+
let modifiedIndex = 0;
|
|
40
|
+
let originalCount = 0;
|
|
41
|
+
for (; originalIndex < modifiedLength; originalIndex++) {
|
|
42
|
+
const changeItem = changeResult[originalIndex];
|
|
43
|
+
// 如果标记为删除,则从原始内容中提取对应的值
|
|
44
|
+
if (changeItem.removed) {
|
|
45
|
+
changeItem.value = join(original.slice(originalCount, originalCount + changeItem.count));
|
|
46
|
+
originalCount += changeItem.count;
|
|
47
|
+
// 如果前一个元素被标记为添加,则交换位置
|
|
48
|
+
if (originalIndex && changeResult[originalIndex - 1].added) {
|
|
49
|
+
[changeResult[originalIndex - 1], changeResult[originalIndex]] = [
|
|
50
|
+
changeResult[originalIndex],
|
|
51
|
+
changeResult[originalIndex - 1],
|
|
52
|
+
];
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
else {
|
|
56
|
+
changeItem.value = join(modified.slice(modifiedIndex, modifiedIndex + changeItem.count));
|
|
57
|
+
modifiedIndex += changeItem.count;
|
|
58
|
+
if (!changeItem.added) {
|
|
59
|
+
originalCount += changeItem.count;
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
// 如果最后一个元素是空字符串,则合并到前一个元素当中
|
|
64
|
+
if (modifiedLength > 1 &&
|
|
65
|
+
typeof changeResult[modifiedLength - 1].value === 'string' &&
|
|
66
|
+
(changeResult[modifiedLength - 1].added || changeResult[modifiedLength - 1].removed) &&
|
|
67
|
+
this.equals(strings_1.empty, changeResult[modifiedLength - 1].value)) {
|
|
68
|
+
changeResult[modifiedLength - 2].value += changeResult[modifiedLength - 1].value;
|
|
69
|
+
changeResult.pop();
|
|
70
|
+
}
|
|
71
|
+
return changeResult;
|
|
72
|
+
};
|
|
73
|
+
const tokenizeOriginal = originalContent.split(strings_1.empty).filter(Boolean);
|
|
74
|
+
const tokenizeModified = modifiedContent.split(strings_1.empty).filter(Boolean);
|
|
75
|
+
const originalLength = tokenizeOriginal.length;
|
|
76
|
+
const modifiedLength = tokenizeModified.length;
|
|
77
|
+
const maxLength = originalLength + modifiedLength;
|
|
78
|
+
const elements = [{ newPos: -1, changeResult: [] }];
|
|
79
|
+
const initialDiagonal = this.extractCommon(elements[0], tokenizeModified, tokenizeOriginal, 0);
|
|
80
|
+
const pushElement = (changeResult, added, removed) => {
|
|
81
|
+
const len = changeResult.length;
|
|
82
|
+
const latestResult = changeResult[len - 1];
|
|
83
|
+
if (len > 0 && latestResult.added === added && latestResult.removed === removed) {
|
|
84
|
+
changeResult[len - 1] = { count: latestResult.count + 1, added, removed, value: strings_1.empty };
|
|
85
|
+
}
|
|
86
|
+
else {
|
|
87
|
+
changeResult.push({ count: 1, added, removed, value: strings_1.empty });
|
|
88
|
+
}
|
|
89
|
+
};
|
|
90
|
+
let diagonal = 1;
|
|
91
|
+
// 如果初始位置加 1 大于或等于原始长度,并且初始的公共部分的位置加 1 大于或等于修改后的长度,则直接返回修改后的内容
|
|
92
|
+
if (elements[0].newPos + 1 >= originalLength && initialDiagonal + 1 >= modifiedLength) {
|
|
93
|
+
return [
|
|
94
|
+
{
|
|
95
|
+
value: join(tokenizeModified),
|
|
96
|
+
count: tokenizeModified.length,
|
|
97
|
+
},
|
|
98
|
+
];
|
|
99
|
+
}
|
|
100
|
+
const execDiff = () => {
|
|
101
|
+
for (let diagonalIndex = -diagonal; diagonalIndex <= diagonal; diagonalIndex += 2) {
|
|
102
|
+
const leftElement = elements[diagonalIndex - 1];
|
|
103
|
+
const rightElement = elements[diagonalIndex + 1];
|
|
104
|
+
let element;
|
|
105
|
+
let originalPos = (rightElement ? rightElement.newPos : 0) - diagonalIndex;
|
|
106
|
+
// 如果左边有元素,则将其标记为未知
|
|
107
|
+
if (leftElement) {
|
|
108
|
+
elements[diagonalIndex - 1] = undefined;
|
|
109
|
+
}
|
|
110
|
+
const canMoveLeft = leftElement && leftElement.newPos + 1 < modifiedLength;
|
|
111
|
+
const canMoveRight = rightElement && 0 <= originalPos && originalPos < originalLength;
|
|
112
|
+
// 如果不能向左或向右移动,则跳过
|
|
113
|
+
if (!canMoveLeft && !canMoveRight) {
|
|
114
|
+
elements[diagonalIndex] = undefined;
|
|
115
|
+
continue;
|
|
116
|
+
}
|
|
117
|
+
// 根据移动方向选择元素
|
|
118
|
+
if (!canMoveLeft || (canMoveRight && leftElement.newPos < rightElement.newPos)) {
|
|
119
|
+
element = cloneElement(rightElement);
|
|
120
|
+
pushElement(element.changeResult, undefined, true);
|
|
121
|
+
}
|
|
122
|
+
else {
|
|
123
|
+
element = leftElement;
|
|
124
|
+
element.newPos++;
|
|
125
|
+
pushElement(element.changeResult, true, undefined);
|
|
126
|
+
}
|
|
127
|
+
originalPos = this.extractCommon(element, tokenizeModified, tokenizeOriginal, diagonalIndex);
|
|
128
|
+
if (element.newPos + 1 >= modifiedLength && originalPos + 1 >= originalLength) {
|
|
129
|
+
return processElements(element.changeResult, tokenizeModified, tokenizeOriginal);
|
|
130
|
+
}
|
|
131
|
+
elements[diagonalIndex] = element;
|
|
132
|
+
}
|
|
133
|
+
diagonal++;
|
|
134
|
+
};
|
|
135
|
+
while (diagonal <= maxLength) {
|
|
136
|
+
const diffResult = execDiff();
|
|
137
|
+
if (diffResult) {
|
|
138
|
+
return diffResult;
|
|
139
|
+
}
|
|
140
|
+
}
|
|
141
|
+
}
|
|
142
|
+
}
|
|
143
|
+
exports.MultiLineDiffComputer = MultiLineDiffComputer;
|
|
144
|
+
//# sourceMappingURL=diff-computer.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"diff-computer.js","sourceRoot":"","sources":["../../../../src/browser/contrib/intelligent-completions/diff-computer.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import { KeybindingContribution, KeybindingRegistry } from '@opensumi/ide-core-browser';
|
|
2
|
+
import { CommandContribution, CommandRegistry } from '@opensumi/ide-core-common';
|
|
3
|
+
export declare class IntelligentCompletionsContribution implements KeybindingContribution, CommandContribution {
|
|
4
|
+
private readonly intelligentCompletionsHandler;
|
|
5
|
+
registerCommands(commands: CommandRegistry): void;
|
|
6
|
+
registerKeybindings(keybindings: KeybindingRegistry): void;
|
|
7
|
+
}
|
|
8
|
+
//# sourceMappingURL=intelligent-completions.contribution.d.ts.map
|