@opensumi/ide-ai-native 3.2.5 → 3.2.6-next-1724809247.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 +12 -23
- 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.module.less +1 -0
- package/lib/browser/chat/chat.view.d.ts.map +1 -1
- package/lib/browser/chat/chat.view.js +21 -3
- package/lib/browser/chat/chat.view.js.map +1 -1
- package/lib/browser/components/ChatEditor.d.ts.map +1 -1
- package/lib/browser/components/ChatEditor.js +2 -2
- package/lib/browser/components/ChatEditor.js.map +1 -1
- package/lib/browser/components/ChatMarkdown.js +1 -1
- 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 +209 -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 +5 -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 +33 -23
- 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/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/layout/layout.module.less +0 -9
- 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 +18 -10
- 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 +16 -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 +98 -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 +11 -2
- package/lib/browser/widget/inline-diff/inline-diff-widget.js.map +1 -1
- package/lib/browser/widget/inline-diff/inline-diff.handler.d.ts +12 -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 +69 -77
- 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 +56 -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 +186 -370
- 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 +12 -26
- package/src/browser/ai-editor.contribution.ts +9 -0
- package/src/browser/chat/chat-agent.service.ts +1 -3
- package/src/browser/chat/chat.module.less +1 -0
- package/src/browser/chat/chat.view.tsx +48 -3
- package/src/browser/components/ChatEditor.tsx +14 -2
- package/src/browser/components/ChatMarkdown.tsx +1 -1
- 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 +270 -0
- package/src/browser/contrib/inline-completions/promptCache.ts +3 -2
- package/src/browser/contrib/inline-completions/service/ai-completions.service.ts +37 -36
- 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/index.ts +8 -1
- package/src/browser/layout/ai-layout.tsx +7 -1
- package/src/browser/layout/layout.module.less +0 -9
- 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 +20 -16
- package/src/browser/widget/inline-chat/inline-content-widget.tsx +58 -61
- package/src/browser/widget/inline-diff/inline-diff-previewer.ts +102 -62
- package/src/browser/widget/inline-diff/inline-diff-widget.tsx +36 -5
- package/src/browser/widget/inline-diff/inline-diff.handler.ts +82 -94
- 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 +108 -45
- 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 +244 -544
- package/src/common/index.ts +2 -0
|
@@ -1,39 +1,12 @@
|
|
|
1
1
|
import { WithEventBus } from '@opensumi/ide-core-common';
|
|
2
|
-
import { IAICompletionOption, IAICompletionResultModel } from '@opensumi/ide-core-common/lib/types/ai-native';
|
|
3
2
|
import { IEditor } from '@opensumi/ide-editor';
|
|
4
3
|
import * as monaco from '@opensumi/ide-monaco';
|
|
5
|
-
import {
|
|
6
|
-
import { ICompletionContext } from './types';
|
|
7
|
-
export declare class CompletionRequestTask {
|
|
8
|
-
model: monaco.editor.ITextModel;
|
|
9
|
-
position: monaco.Position;
|
|
10
|
-
token: monaco.CancellationToken;
|
|
11
|
-
_isManual: boolean;
|
|
12
|
-
private _disposables;
|
|
13
|
-
private aiReporter;
|
|
14
|
-
private readonly injector;
|
|
15
|
-
private promptCache;
|
|
16
|
-
private aiCompletionsService;
|
|
17
|
-
private readonly preferenceService;
|
|
18
|
-
private appConfig;
|
|
19
|
-
isCancelFlag: boolean;
|
|
20
|
-
private isEnablePromptEngineering;
|
|
21
|
-
constructor(model: monaco.editor.ITextModel, position: monaco.Position, token: monaco.CancellationToken, _isManual: boolean);
|
|
22
|
-
constructRequestBean(context: ICompletionContext, token: monaco.CancellationToken): Promise<IAICompletionOption>;
|
|
23
|
-
run(): Promise<InlineCompletionItem[]>;
|
|
24
|
-
/**
|
|
25
|
-
* 将补全结果推给用户并注册{@link COMMAND_ACCEPT} 事件
|
|
26
|
-
* @param codeModelList
|
|
27
|
-
*/
|
|
28
|
-
pushResultAndRegist(rs: IAICompletionResultModel, position: monaco.Position, relationId: string): Array<InlineCompletionItem>;
|
|
29
|
-
dispose(): void;
|
|
30
|
-
cancelRequest(): void;
|
|
31
|
-
}
|
|
4
|
+
import { InlineCompletionRequestTask } from './model/inlineCompletionRequestTask';
|
|
32
5
|
declare class ReqStack {
|
|
33
|
-
queue:
|
|
6
|
+
queue: InlineCompletionRequestTask[];
|
|
34
7
|
constructor();
|
|
35
|
-
addReq(reqRequest:
|
|
36
|
-
runReq(): Promise<InlineCompletionItem[]> | undefined;
|
|
8
|
+
addReq(reqRequest: InlineCompletionRequestTask): void;
|
|
9
|
+
runReq(): Promise<import("./model/competionModel").InlineCompletionItem[]> | undefined;
|
|
37
10
|
cancelReq(): void;
|
|
38
11
|
}
|
|
39
12
|
export declare class AIInlineCompletionsProvider extends WithEventBus {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"completeProvider.d.ts","sourceRoot":"","sources":["../../../../src/browser/contrib/inline-completions/completeProvider.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"completeProvider.d.ts","sourceRoot":"","sources":["../../../../src/browser/contrib/inline-completions/completeProvider.ts"],"names":[],"mappings":"AAEA,OAAO,EAA6B,YAAY,EAA2B,MAAM,2BAA2B,CAAC;AAC7G,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAC/C,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAC;AAG/C,OAAO,EAAE,2BAA2B,EAAE,MAAM,qCAAqC,CAAC;AAUlF,cAAM,QAAQ;IACZ,KAAK,EAAE,2BAA2B,EAAE,CAAC;;IAIrC,MAAM,CAAC,UAAU,EAAE,2BAA2B;IAG9C,MAAM;IAON,SAAS;CASV;AAED,qBACa,2BAA4B,SAAQ,YAAY;IAE3D,OAAO,CAAC,oBAAoB,CAAuB;IAGnD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAW;IAGpC,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAoB;IAEtD;;OAEG;IACH,QAAQ,EAAE,OAAO,CAAC;IAElB,UAAU,EAAE,OAAO,CAAC;IACpB,QAAQ,EAAE,QAAQ,CAAC;IACnB,4BAA4B,EAAE,MAAM,CAAC;;IAoB9B,WAAW,CAAC,MAAM,EAAE,OAAO,GAAG,IAAI;IAMzC,aAAa;IAOb;;;;;;;OAOG;IACG,4BAA4B,CAChC,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,UAAU,EAC/B,QAAQ,EAAE,MAAM,CAAC,QAAQ,EACzB,OAAO,EAAE,MAAM,CAAC,SAAS,CAAC,uBAAuB,EACjD,KAAK,EAAE,MAAM,CAAC,iBAAiB;IAuDjC,cAAc,CAAC,GAAG,EAAE,OAAO;CAG5B"}
|
|
@@ -1,16 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.AIInlineCompletionsProvider =
|
|
3
|
+
exports.AIInlineCompletionsProvider = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const di_1 = require("@opensumi/di");
|
|
6
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
7
|
const ide_core_common_1 = require("@opensumi/ide-core-common");
|
|
9
|
-
const reporter_1 = require("@opensumi/ide-core-common/lib/types/ai-native/reporter");
|
|
10
8
|
const monaco = tslib_1.__importStar(require("@opensumi/ide-monaco"));
|
|
11
|
-
const
|
|
12
|
-
const promptCache_1 = require("./promptCache");
|
|
13
|
-
const provider_1 = require("./provider");
|
|
9
|
+
const inlineCompletionRequestTask_1 = require("./model/inlineCompletionRequestTask");
|
|
14
10
|
const ai_completions_service_1 = require("./service/ai-completions.service");
|
|
15
11
|
// 用来缓存最近一次的补全结果
|
|
16
12
|
const inlineCompletionCache = {
|
|
@@ -18,223 +14,6 @@ const inlineCompletionCache = {
|
|
|
18
14
|
column: -1,
|
|
19
15
|
last: null,
|
|
20
16
|
};
|
|
21
|
-
const makeHashSet = (str) => {
|
|
22
|
-
const set = new Set();
|
|
23
|
-
for (const char of str) {
|
|
24
|
-
set.add(char);
|
|
25
|
-
}
|
|
26
|
-
return set;
|
|
27
|
-
};
|
|
28
|
-
const removeChars = (insertText, textAfterCursor) => {
|
|
29
|
-
let result = '';
|
|
30
|
-
const aSet = makeHashSet(insertText);
|
|
31
|
-
for (const char of textAfterCursor) {
|
|
32
|
-
// 如果是空格或者 insertText 中不存在的字符,就加入到结果中
|
|
33
|
-
if (char === ' ' || !aSet.has(char)) {
|
|
34
|
-
result += char;
|
|
35
|
-
}
|
|
36
|
-
}
|
|
37
|
-
return result;
|
|
38
|
-
};
|
|
39
|
-
let CompletionRequestTask = class CompletionRequestTask {
|
|
40
|
-
constructor(model, position, token, _isManual) {
|
|
41
|
-
this.model = model;
|
|
42
|
-
this.position = position;
|
|
43
|
-
this.token = token;
|
|
44
|
-
this._isManual = _isManual;
|
|
45
|
-
this._disposables = new ide_core_common_1.DisposableStore();
|
|
46
|
-
this.isEnablePromptEngineering = true;
|
|
47
|
-
this.isCancelFlag = false;
|
|
48
|
-
this.isEnablePromptEngineering = this.preferenceService.getValid(ide_core_common_1.AINativeSettingSectionsId.InlineCompletionsPromptEngineeringEnabled, this.isEnablePromptEngineering);
|
|
49
|
-
this._disposables.add(this.preferenceService.onSpecificPreferenceChange(ide_core_common_1.AINativeSettingSectionsId.InlineCompletionsPromptEngineeringEnabled, ({ newValue }) => {
|
|
50
|
-
this.isEnablePromptEngineering = newValue;
|
|
51
|
-
}));
|
|
52
|
-
}
|
|
53
|
-
async constructRequestBean(context, token) {
|
|
54
|
-
if (this.isEnablePromptEngineering) {
|
|
55
|
-
const prompt = await (0, provider_1.getPrefixPrompt)(context, constants_1.DEFAULT_COMPLECTION_MODEL, this.injector, token);
|
|
56
|
-
const suffix = await (0, provider_1.getSuffixPrompt)(context, constants_1.DEFAULT_COMPLECTION_MODEL, this.injector, token);
|
|
57
|
-
return {
|
|
58
|
-
prompt,
|
|
59
|
-
suffix,
|
|
60
|
-
sessionId: (0, ide_core_common_1.uuid)(),
|
|
61
|
-
language: context.language,
|
|
62
|
-
fileUrl: context.fileUrl,
|
|
63
|
-
workspaceDir: context.workspaceDir,
|
|
64
|
-
};
|
|
65
|
-
}
|
|
66
|
-
const prompt = provider_1.lineBasedPromptProcessor.processPrefix(context.prefix);
|
|
67
|
-
const suffix = provider_1.lineBasedPromptProcessor.processSuffix(context.suffix);
|
|
68
|
-
return {
|
|
69
|
-
prompt,
|
|
70
|
-
suffix,
|
|
71
|
-
sessionId: (0, ide_core_common_1.uuid)(),
|
|
72
|
-
language: context.language,
|
|
73
|
-
fileUrl: context.fileUrl,
|
|
74
|
-
workspaceDir: context.workspaceDir,
|
|
75
|
-
};
|
|
76
|
-
}
|
|
77
|
-
// 发送请求
|
|
78
|
-
async run() {
|
|
79
|
-
const { model, position, token } = this;
|
|
80
|
-
if (!model) {
|
|
81
|
-
return [];
|
|
82
|
-
}
|
|
83
|
-
if (token.isCancellationRequested) {
|
|
84
|
-
return [];
|
|
85
|
-
}
|
|
86
|
-
if (this.isCancelFlag) {
|
|
87
|
-
return [];
|
|
88
|
-
}
|
|
89
|
-
const startRange = new monaco.Range(0, 0, position.lineNumber, position.column);
|
|
90
|
-
let prefix = model.getValueInRange(startRange);
|
|
91
|
-
if (prefix === '') {
|
|
92
|
-
prefix += '\n';
|
|
93
|
-
}
|
|
94
|
-
const endRange = new monaco.Range(position.lineNumber, position.column, model.getLineCount(), Number.MAX_SAFE_INTEGER);
|
|
95
|
-
const suffix = model.getValueInRange(endRange);
|
|
96
|
-
const languageId = model.getLanguageId();
|
|
97
|
-
const context = {
|
|
98
|
-
fileUrl: model.uri.fsPath,
|
|
99
|
-
filename: model.uri.toString().split('/').pop(),
|
|
100
|
-
language: languageId,
|
|
101
|
-
prefix,
|
|
102
|
-
suffix,
|
|
103
|
-
uri: ide_core_common_1.URI.from(model.uri),
|
|
104
|
-
workspaceDir: this.appConfig.workspaceDir,
|
|
105
|
-
};
|
|
106
|
-
// 组装请求参数,向远程发起请求
|
|
107
|
-
const requestBean = await this.constructRequestBean(context, token);
|
|
108
|
-
if (this.isCancelFlag) {
|
|
109
|
-
return [];
|
|
110
|
-
}
|
|
111
|
-
this.aiCompletionsService.updateStatusBarItem('running', true);
|
|
112
|
-
const requestStartTime = Date.now();
|
|
113
|
-
let rs;
|
|
114
|
-
const cacheData = this.promptCache.getCache(requestBean);
|
|
115
|
-
const relationId = (cacheData === null || cacheData === void 0 ? void 0 : cacheData.relationId) || this.aiReporter.start(reporter_1.AISerivceType.Completion, { message: reporter_1.AISerivceType.Completion });
|
|
116
|
-
this.aiCompletionsService.setLastRelationId(relationId);
|
|
117
|
-
// 如果存在缓存
|
|
118
|
-
if (cacheData) {
|
|
119
|
-
rs = cacheData;
|
|
120
|
-
}
|
|
121
|
-
else {
|
|
122
|
-
try {
|
|
123
|
-
rs = await this.aiCompletionsService.complete(requestBean, model, position, token);
|
|
124
|
-
}
|
|
125
|
-
catch (error) {
|
|
126
|
-
this.aiCompletionsService.reporterEnd(relationId, {
|
|
127
|
-
success: false,
|
|
128
|
-
replytime: Date.now() - requestStartTime,
|
|
129
|
-
message: error.toString(),
|
|
130
|
-
});
|
|
131
|
-
this.aiCompletionsService.hideStatusBarItem();
|
|
132
|
-
return [];
|
|
133
|
-
}
|
|
134
|
-
}
|
|
135
|
-
if (!(rs && rs.sessionId)) {
|
|
136
|
-
this.aiCompletionsService.reporterEnd(relationId, { success: false, replytime: Date.now() - requestStartTime });
|
|
137
|
-
this.aiCompletionsService.hideStatusBarItem();
|
|
138
|
-
return [];
|
|
139
|
-
}
|
|
140
|
-
this.aiCompletionsService.setLastSessionId(rs.sessionId);
|
|
141
|
-
// 如果是取消直接返回
|
|
142
|
-
if ((rs && rs.isCancel) || token.isCancellationRequested || this.isCancelFlag) {
|
|
143
|
-
this.aiCompletionsService.reporterEnd(relationId, {
|
|
144
|
-
success: true,
|
|
145
|
-
replytime: Date.now() - requestStartTime,
|
|
146
|
-
isStop: true,
|
|
147
|
-
completionNum: 0,
|
|
148
|
-
});
|
|
149
|
-
this.aiCompletionsService.updateStatusBarItem('canceled', false);
|
|
150
|
-
return [];
|
|
151
|
-
}
|
|
152
|
-
// 返回补全结果为空直接返回
|
|
153
|
-
if (!rs || !rs.codeModelList || rs.codeModelList.length === 0) {
|
|
154
|
-
this.aiCompletionsService.reporterEnd(relationId, {
|
|
155
|
-
success: true,
|
|
156
|
-
replytime: Date.now() - requestStartTime,
|
|
157
|
-
completionNum: 0,
|
|
158
|
-
});
|
|
159
|
-
this.aiCompletionsService.updateStatusBarItem('no result', false);
|
|
160
|
-
return [];
|
|
161
|
-
}
|
|
162
|
-
if (rs.codeModelList.length > 0) {
|
|
163
|
-
this.promptCache.setCache(requestBean, Object.assign(Object.assign({}, rs), { relationId }));
|
|
164
|
-
}
|
|
165
|
-
this.aiCompletionsService.updateStatusBarItem('completion result: ' + rs.codeModelList.length, false);
|
|
166
|
-
this.dispose();
|
|
167
|
-
return this.pushResultAndRegist(rs, position, relationId);
|
|
168
|
-
}
|
|
169
|
-
/**
|
|
170
|
-
* 将补全结果推给用户并注册{@link COMMAND_ACCEPT} 事件
|
|
171
|
-
* @param codeModelList
|
|
172
|
-
*/
|
|
173
|
-
pushResultAndRegist(rs, position, relationId) {
|
|
174
|
-
const result = new Array();
|
|
175
|
-
for (const codeModel of rs.codeModelList) {
|
|
176
|
-
const contentText = codeModel.content;
|
|
177
|
-
const insertText = contentText.trimEnd();
|
|
178
|
-
const model = this.model;
|
|
179
|
-
const textAfterCursor = model.getValueInRange({
|
|
180
|
-
startLineNumber: position.lineNumber,
|
|
181
|
-
startColumn: position.column,
|
|
182
|
-
endLineNumber: position.lineNumber,
|
|
183
|
-
endColumn: model.getLineMaxColumn(position.lineNumber),
|
|
184
|
-
});
|
|
185
|
-
// 临时修复方案,用于解决补全后面多了几个括号的问题
|
|
186
|
-
const filteredString = removeChars(insertText, textAfterCursor);
|
|
187
|
-
result.push({
|
|
188
|
-
insertText: insertText + filteredString,
|
|
189
|
-
range: new monaco.Range(position.lineNumber, position.column, position.lineNumber, position.column + insertText.length + textAfterCursor.length),
|
|
190
|
-
sessionId: rs.sessionId,
|
|
191
|
-
relationId,
|
|
192
|
-
command: {
|
|
193
|
-
id: command_1.AI_INLINE_COMPLETION_REPORTER.id,
|
|
194
|
-
title: '',
|
|
195
|
-
arguments: [relationId, rs.sessionId, true],
|
|
196
|
-
},
|
|
197
|
-
});
|
|
198
|
-
}
|
|
199
|
-
return result;
|
|
200
|
-
}
|
|
201
|
-
dispose() {
|
|
202
|
-
this._disposables.dispose();
|
|
203
|
-
}
|
|
204
|
-
cancelRequest() {
|
|
205
|
-
this.isCancelFlag = true;
|
|
206
|
-
this.dispose();
|
|
207
|
-
}
|
|
208
|
-
};
|
|
209
|
-
tslib_1.__decorate([
|
|
210
|
-
(0, di_1.Autowired)(reporter_1.IAIReporter),
|
|
211
|
-
tslib_1.__metadata("design:type", Object)
|
|
212
|
-
], CompletionRequestTask.prototype, "aiReporter", void 0);
|
|
213
|
-
tslib_1.__decorate([
|
|
214
|
-
(0, di_1.Autowired)(di_1.INJECTOR_TOKEN),
|
|
215
|
-
tslib_1.__metadata("design:type", di_1.Injector)
|
|
216
|
-
], CompletionRequestTask.prototype, "injector", void 0);
|
|
217
|
-
tslib_1.__decorate([
|
|
218
|
-
(0, di_1.Autowired)(promptCache_1.PromptCache),
|
|
219
|
-
tslib_1.__metadata("design:type", promptCache_1.PromptCache)
|
|
220
|
-
], CompletionRequestTask.prototype, "promptCache", void 0);
|
|
221
|
-
tslib_1.__decorate([
|
|
222
|
-
(0, di_1.Autowired)(ai_completions_service_1.AICompletionsService),
|
|
223
|
-
tslib_1.__metadata("design:type", ai_completions_service_1.AICompletionsService)
|
|
224
|
-
], CompletionRequestTask.prototype, "aiCompletionsService", void 0);
|
|
225
|
-
tslib_1.__decorate([
|
|
226
|
-
(0, di_1.Autowired)(ide_core_browser_1.PreferenceService),
|
|
227
|
-
tslib_1.__metadata("design:type", Object)
|
|
228
|
-
], CompletionRequestTask.prototype, "preferenceService", void 0);
|
|
229
|
-
tslib_1.__decorate([
|
|
230
|
-
(0, di_1.Autowired)(ide_core_browser_1.AppConfig),
|
|
231
|
-
tslib_1.__metadata("design:type", Object)
|
|
232
|
-
], CompletionRequestTask.prototype, "appConfig", void 0);
|
|
233
|
-
CompletionRequestTask = tslib_1.__decorate([
|
|
234
|
-
(0, di_1.Injectable)({ multiple: true }),
|
|
235
|
-
tslib_1.__metadata("design:paramtypes", [Object, monaco.Position, Object, Boolean])
|
|
236
|
-
], CompletionRequestTask);
|
|
237
|
-
exports.CompletionRequestTask = CompletionRequestTask;
|
|
238
17
|
class ReqStack {
|
|
239
18
|
constructor() {
|
|
240
19
|
this.queue = [];
|
|
@@ -307,7 +86,7 @@ let AIInlineCompletionsProvider = class AIInlineCompletionsProvider extends ide_
|
|
|
307
86
|
// 重置防止不触发自动补全事件
|
|
308
87
|
this.updateIsManual(false);
|
|
309
88
|
// 放入队列
|
|
310
|
-
const requestImp = this.injector.get(
|
|
89
|
+
const requestImp = this.injector.get(inlineCompletionRequestTask_1.InlineCompletionRequestTask, [model, position, token]);
|
|
311
90
|
this.reqStack.addReq(requestImp);
|
|
312
91
|
// 如果是自动补全需要 debounce
|
|
313
92
|
if (!_isManual) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"completeProvider.js","sourceRoot":"","sources":["../../../../src/browser/contrib/inline-completions/completeProvider.ts"],"names":[],"mappings":";;;;AAAA,qCAA+E;AAC/E,iEAA0E;AAC1E,8EAAiG;AACjG,+DAQmC;AAEnC,qFAAoG;AAEpG,qEAA+C;AAE/C,2CAAwD;AAExD,+CAA4C;AAC5C,yCAAwF;AACxF,6EAAwE;AAGxE,gBAAgB;AAChB,MAAM,qBAAqB,GAA2B;IACpD,IAAI,EAAE,CAAC,CAAC;IACR,MAAM,EAAE,CAAC,CAAC;IACV,IAAI,EAAE,IAAI;CACX,CAAC;AAEF,MAAM,WAAW,GAAG,CAAC,GAAW,EAAE,EAAE;IAClC,MAAM,GAAG,GAAG,IAAI,GAAG,EAAU,CAAC;IAC9B,KAAK,MAAM,IAAI,IAAI,GAAG,EAAE;QACtB,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;KACf;IACD,OAAO,GAAG,CAAC;AACb,CAAC,CAAC;AAEF,MAAM,WAAW,GAAG,CAAC,UAAkB,EAAE,eAAuB,EAAE,EAAE;IAClE,IAAI,MAAM,GAAG,EAAE,CAAC;IAChB,MAAM,IAAI,GAAG,WAAW,CAAC,UAAU,CAAC,CAAC;IACrC,KAAK,MAAM,IAAI,IAAI,eAAe,EAAE;QAClC,qCAAqC;QACrC,IAAI,IAAI,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;YACnC,MAAM,IAAI,IAAI,CAAC;SAChB;KACF;IACD,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAGK,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IAyBhC,YACS,KAA+B,EAC/B,QAAyB,EACzB,KAA+B,EAC/B,SAAkB;QAHlB,UAAK,GAAL,KAAK,CAA0B;QAC/B,aAAQ,GAAR,QAAQ,CAAiB;QACzB,UAAK,GAAL,KAAK,CAA0B;QAC/B,cAAS,GAAT,SAAS,CAAS;QA5BnB,iBAAY,GAAG,IAAI,iCAAe,EAAE,CAAC;QAsBrC,8BAAyB,GAAG,IAAI,CAAC;QAQvC,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;QAE1B,IAAI,CAAC,yBAAyB,GAAG,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAC9D,2CAAyB,CAAC,yCAAyC,EACnE,IAAI,CAAC,yBAAyB,CAC/B,CAAC;QAEF,IAAI,CAAC,YAAY,CAAC,GAAG,CACnB,IAAI,CAAC,iBAAiB,CAAC,0BAA0B,CAC/C,2CAAyB,CAAC,yCAAyC,EACnE,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE;YACf,IAAI,CAAC,yBAAyB,GAAG,QAAQ,CAAC;QAC5C,CAAC,CACF,CACF,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,oBAAoB,CACxB,OAA2B,EAC3B,KAA+B;QAE/B,IAAI,IAAI,CAAC,yBAAyB,EAAE;YAClC,MAAM,MAAM,GAAG,MAAM,IAAA,0BAAe,EAAC,OAAO,EAAE,qCAAyB,EAAE,IAAI,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;YAC/F,MAAM,MAAM,GAAG,MAAM,IAAA,0BAAe,EAAC,OAAO,EAAE,qCAAyB,EAAE,IAAI,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;YAE/F,OAAO;gBACL,MAAM;gBACN,MAAM;gBACN,SAAS,EAAE,IAAA,sBAAI,GAAE;gBACjB,QAAQ,EAAE,OAAO,CAAC,QAAQ;gBAC1B,OAAO,EAAE,OAAO,CAAC,OAAO;gBACxB,YAAY,EAAE,OAAO,CAAC,YAAY;aACnC,CAAC;SACH;QAED,MAAM,MAAM,GAAG,mCAAwB,CAAC,aAAa,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACtE,MAAM,MAAM,GAAG,mCAAwB,CAAC,aAAa,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACtE,OAAO;YACL,MAAM;YACN,MAAM;YACN,SAAS,EAAE,IAAA,sBAAI,GAAE;YACjB,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,YAAY,EAAE,OAAO,CAAC,YAAY;SACnC,CAAC;IACJ,CAAC;IAED,OAAO;IACP,KAAK,CAAC,GAAG;QACP,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;QACxC,IAAI,CAAC,KAAK,EAAE;YACV,OAAO,EAAE,CAAC;SACX;QACD,IAAI,KAAK,CAAC,uBAAuB,EAAE;YACjC,OAAO,EAAE,CAAC;SACX;QAED,IAAI,IAAI,CAAC,YAAY,EAAE;YACrB,OAAO,EAAE,CAAC;SACX;QAED,MAAM,UAAU,GAAG,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,EAAE,QAAQ,CAAC,UAAU,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;QAChF,IAAI,MAAM,GAAG,KAAK,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;QAC/C,IAAI,MAAM,KAAK,EAAE,EAAE;YACjB,MAAM,IAAI,IAAI,CAAC;SAChB;QAED,MAAM,QAAQ,GAAG,IAAI,MAAM,CAAC,KAAK,CAC/B,QAAQ,CAAC,UAAU,EACnB,QAAQ,CAAC,MAAM,EACf,KAAK,CAAC,YAAY,EAAE,EACpB,MAAM,CAAC,gBAAgB,CACxB,CAAC;QAEF,MAAM,MAAM,GAAG,KAAK,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;QAE/C,MAAM,UAAU,GAAG,KAAK,CAAC,aAAa,EAAE,CAAC;QACzC,MAAM,OAAO,GAAuB;YAClC,OAAO,EAAE,KAAK,CAAC,GAAG,CAAC,MAAM;YACzB,QAAQ,EAAE,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAG;YAChD,QAAQ,EAAE,UAAU;YACpB,MAAM;YACN,MAAM;YACN,GAAG,EAAE,qBAAG,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC;YACxB,YAAY,EAAE,IAAI,CAAC,SAAS,CAAC,YAAY;SAC1C,CAAC;QAEF,iBAAiB;QACjB,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QACpE,IAAI,IAAI,CAAC,YAAY,EAAE;YACrB,OAAO,EAAE,CAAC;SACX;QAED,IAAI,CAAC,oBAAoB,CAAC,mBAAmB,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;QAC/D,MAAM,gBAAgB,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAEpC,IAAI,EAAmC,CAAC;QACxC,MAAM,SAAS,GAAG,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;QACzD,MAAM,UAAU,GACd,CAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,UAAU,KAAI,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,wBAAa,CAAC,UAAU,EAAE,EAAE,OAAO,EAAE,wBAAa,CAAC,UAAU,EAAE,CAAC,CAAC;QAElH,IAAI,CAAC,oBAAoB,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;QACxD,SAAS;QACT,IAAI,SAAS,EAAE;YACb,EAAE,GAAG,SAAS,CAAC;SAChB;aAAM;YACL,IAAI;gBACF,EAAE,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,QAAQ,CAAC,WAAW,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;aACpF;YAAC,OAAO,KAAK,EAAE;gBACd,IAAI,CAAC,oBAAoB,CAAC,WAAW,CAAC,UAAU,EAAE;oBAChD,OAAO,EAAE,KAAK;oBACd,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,gBAAgB;oBACxC,OAAO,EAAE,KAAK,CAAC,QAAQ,EAAE;iBAC1B,CAAC,CAAC;gBACH,IAAI,CAAC,oBAAoB,CAAC,iBAAiB,EAAE,CAAC;gBAC9C,OAAO,EAAE,CAAC;aACX;SACF;QAED,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,SAAS,CAAC,EAAE;YACzB,IAAI,CAAC,oBAAoB,CAAC,WAAW,CAAC,UAAU,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,gBAAgB,EAAE,CAAC,CAAC;YAChH,IAAI,CAAC,oBAAoB,CAAC,iBAAiB,EAAE,CAAC;YAC9C,OAAO,EAAE,CAAC;SACX;QAED,IAAI,CAAC,oBAAoB,CAAC,gBAAgB,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC;QAEzD,YAAY;QACZ,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC,QAAQ,CAAC,IAAI,KAAK,CAAC,uBAAuB,IAAI,IAAI,CAAC,YAAY,EAAE;YAC7E,IAAI,CAAC,oBAAoB,CAAC,WAAW,CAAC,UAAU,EAAE;gBAChD,OAAO,EAAE,IAAI;gBACb,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,gBAAgB;gBACxC,MAAM,EAAE,IAAI;gBACZ,aAAa,EAAE,CAAC;aACjB,CAAC,CAAC;YACH,IAAI,CAAC,oBAAoB,CAAC,mBAAmB,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;YACjE,OAAO,EAAE,CAAC;SACX;QAED,eAAe;QACf,IAAI,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC,aAAa,IAAI,EAAE,CAAC,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE;YAC7D,IAAI,CAAC,oBAAoB,CAAC,WAAW,CAAC,UAAU,EAAE;gBAChD,OAAO,EAAE,IAAI;gBACb,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,gBAAgB;gBACxC,aAAa,EAAE,CAAC;aACjB,CAAC,CAAC;YACH,IAAI,CAAC,oBAAoB,CAAC,mBAAmB,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;YAClE,OAAO,EAAE,CAAC;SACX;QAED,IAAI,EAAE,CAAC,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE;YAC/B,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,WAAW,kCAAO,EAAE,KAAE,UAAU,IAAG,CAAC;SAC/D;QAED,IAAI,CAAC,oBAAoB,CAAC,mBAAmB,CAAC,qBAAqB,GAAG,EAAE,CAAC,aAAa,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QAEtG,IAAI,CAAC,OAAO,EAAE,CAAC;QACf,OAAO,IAAI,CAAC,mBAAmB,CAAC,EAAE,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;IAC5D,CAAC;IACD;;;OAGG;IACH,mBAAmB,CACjB,EAA4B,EAC5B,QAAyB,EACzB,UAAkB;QAElB,MAAM,MAAM,GAAG,IAAI,KAAK,EAAwB,CAAC;QACjD,KAAK,MAAM,SAAS,IAAI,EAAE,CAAC,aAAa,EAAE;YACxC,MAAM,WAAW,GAAG,SAAS,CAAC,OAAO,CAAC;YAEtC,MAAM,UAAU,GAAG,WAAW,CAAC,OAAO,EAAE,CAAC;YAEzC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;YAEzB,MAAM,eAAe,GAAG,KAAK,CAAC,eAAe,CAAC;gBAC5C,eAAe,EAAE,QAAQ,CAAC,UAAU;gBACpC,WAAW,EAAE,QAAQ,CAAC,MAAM;gBAC5B,aAAa,EAAE,QAAQ,CAAC,UAAU;gBAClC,SAAS,EAAE,KAAK,CAAC,gBAAgB,CAAC,QAAQ,CAAC,UAAU,CAAC;aACvD,CAAC,CAAC;YAEH,2BAA2B;YAC3B,MAAM,cAAc,GAAG,WAAW,CAAC,UAAU,EAAE,eAAe,CAAC,CAAC;YAEhE,MAAM,CAAC,IAAI,CAAC;gBACV,UAAU,EAAE,UAAU,GAAG,cAAc;gBACvC,KAAK,EAAE,IAAI,MAAM,CAAC,KAAK,CACrB,QAAQ,CAAC,UAAU,EACnB,QAAQ,CAAC,MAAM,EACf,QAAQ,CAAC,UAAU,EACnB,QAAQ,CAAC,MAAM,GAAG,UAAU,CAAC,MAAM,GAAG,eAAe,CAAC,MAAM,CAC7D;gBACD,SAAS,EAAE,EAAE,CAAC,SAAS;gBACvB,UAAU;gBACV,OAAO,EAAE;oBACP,EAAE,EAAE,uCAA6B,CAAC,EAAE;oBACpC,KAAK,EAAE,EAAE;oBACT,SAAS,EAAE,CAAC,UAAU,EAAE,EAAE,CAAC,SAAS,EAAE,IAAI,CAAC;iBAC5C;aACF,CAAC,CAAC;SACJ;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,OAAO;QACL,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC;IAC9B,CAAC;IAED,aAAa;QACX,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;QACzB,IAAI,CAAC,OAAO,EAAE,CAAC;IACjB,CAAC;CACF,CAAA;AAlPC;IAAC,IAAA,cAAS,EAAC,sBAAW,CAAC;;yDACS;AAEhC;IAAC,IAAA,cAAS,EAAC,mBAAc,CAAC;sCACC,aAAQ;uDAAC;AAEpC;IAAC,IAAA,cAAS,EAAC,yBAAW,CAAC;sCACF,yBAAW;0DAAC;AAEjC;IAAC,IAAA,cAAS,EAAC,6CAAoB,CAAC;sCACF,6CAAoB;mEAAC;AAEnD;IAAC,IAAA,cAAS,EAAC,oCAAiB,CAAC;;gEACyB;AAEtD;IAAC,IAAA,cAAS,EAAC,4BAAS,CAAC;;wDACQ;AAnBlB,qBAAqB;IADjC,IAAA,eAAU,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;qDA4BV,MAAM,CAAC,QAAQ;GA3BvB,qBAAqB,CAqPjC;AArPY,sDAAqB;AAuPlC,MAAM,QAAQ;IAEZ;QACE,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC;IAClB,CAAC;IACD,MAAM,CAAC,UAAiC;QACtC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAC9B,CAAC;IACD,MAAM;QACJ,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;YAC3B,OAAO;SACR;QACD,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,EAAG,CAAC;QAC7B,OAAO,EAAE,CAAC,GAAG,EAAE,CAAC;IAClB,CAAC;IACD,SAAS;QACP,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;YAC3B,OAAO;SACR;QACD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YAC1B,IAAI,CAAC,aAAa,EAAE,CAAC;QACvB,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC;IAClB,CAAC;CACF;AAGM,IAAM,2BAA2B,GAAjC,MAAM,2BAA4B,SAAQ,8BAAY;IAmB3D;QACE,KAAK,EAAE,CAAC;QAER,IAAI,CAAC,4BAA4B,GAAG,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CACjE,2CAAyB,CAAC,6BAA6B,EACvD,GAAG,CACJ,CAAC;QAEF,IAAI,CAAC,UAAU,CACb,IAAI,CAAC,iBAAiB,CAAC,0BAA0B,CAC/C,2CAAyB,CAAC,6BAA6B,EACvD,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE;YACf,IAAI,CAAC,4BAA4B,GAAG,QAAQ,CAAC;QAC/C,CAAC,CACF,CACF,CAAC;IACJ,CAAC;IAEM,WAAW,CAAC,MAAe;QAChC,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;QACtB,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;QACxB,IAAI,CAAC,QAAQ,GAAG,IAAI,QAAQ,EAAE,CAAC;IACjC,CAAC;IAED,aAAa;QACX,IAAI,CAAC,oBAAoB,CAAC,aAAa,EAAE,CAAC;QAC1C,IAAI,IAAI,CAAC,QAAQ,EAAE;YACjB,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,CAAC;SAC3B;IACH,CAAC;IAED;;;;;;;OAOG;IACH,KAAK,CAAC,4BAA4B,CAChC,KAA+B,EAC/B,QAAyB,EACzB,OAAiD,EACjD,KAA+B;QAE/B,oDAAoD;QACpD,IAAI,OAAO,CAAC,WAAW,KAAK,MAAM,CAAC,2BAA2B,CAAC,SAAS,EAAE;YACxE,IACE,qBAAqB,CAAC,MAAM,KAAK,QAAQ,CAAC,MAAM;gBAChD,qBAAqB,CAAC,IAAI,KAAK,QAAQ,CAAC,UAAU;gBAClD,qBAAqB,CAAC,IAAI,KAAK,SAAS,EACxC;gBACA,qBAAqB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;gBAClC,qBAAqB,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC;gBAChC,OAAO,qBAAqB,CAAC,IAAI,CAAC;aACnC;SACF;QAED,IAAI,CAAC,aAAa,EAAE,CAAC;QACrB,IAAI,CAAC,oBAAoB,CAAC,iBAAiB,EAAE,CAAC;QAE9C,4BAA4B;QAC5B,MAAM,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC;QAChC,IAAI,IAAI,CAAC,UAAU,IAAI,CAAC,SAAS,EAAE;YACjC,OAAO,SAAS,CAAC;SAClB;QAED,gBAAgB;QAChB,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;QAE3B,OAAO;QACP,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,qBAAqB,EAAE,CAAC,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC;QAEjG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QAEjC,qBAAqB;QACrB,IAAI,CAAC,SAAS,EAAE;YACd,MAAM,IAAA,kCAAgB,EAAC,IAAA,uBAAK,EAAC,IAAI,CAAC,4BAA4B,CAAC,EAAE,KAAK,CAAC,CAAC;SACzE;QAED,UAAU;QACV,IAAI,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,uBAAuB,EAAE;YAClC,OAAO,SAAS,CAAC;SAClB;QAED,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;QAC1C,IAAI,CAAC,IAAI,EAAE;YACT,OAAO,SAAS,CAAC;SAClB;QAED,qBAAqB,CAAC,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC;QAC/C,qBAAqB,CAAC,IAAI,GAAG,QAAQ,CAAC,UAAU,CAAC;QACjD,qBAAqB,CAAC,IAAI,GAAG;YAC3B,KAAK,EAAE,IAAI;SACZ,CAAC;QACF,OAAO,qBAAqB,CAAC,IAAI,CAAC;IACpC,CAAC;IAED,cAAc,CAAC,GAAY;QACzB,IAAI,CAAC,QAAQ,GAAG,GAAG,CAAC;IACtB,CAAC;CACF,CAAA;AAvHC;IAAC,IAAA,cAAS,EAAC,6CAAoB,CAAC;sCACF,6CAAoB;yEAAC;AAEnD;IAAC,IAAA,cAAS,EAAC,mBAAc,CAAC;sCACC,aAAQ;6DAAC;AAEpC;IAAC,IAAA,cAAS,EAAC,oCAAiB,CAAC;;sEACyB;AAR3C,2BAA2B;IADvC,IAAA,eAAU,GAAE;;GACA,2BAA2B,CAwHvC;AAxHY,kEAA2B"}
|
|
1
|
+
{"version":3,"file":"completeProvider.js","sourceRoot":"","sources":["../../../../src/browser/contrib/inline-completions/completeProvider.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,18 +1,16 @@
|
|
|
1
1
|
import { IDisposable } from '@opensumi/ide-core-browser';
|
|
2
2
|
import { Disposable } from '@opensumi/ide-core-common';
|
|
3
3
|
import { IEditor } from '@opensumi/ide-editor/lib/browser';
|
|
4
|
-
import { IAIMiddleware } from '../../types';
|
|
5
4
|
import { IAIMonacoContribHandler } from '../base';
|
|
6
5
|
export declare class InlineCompletionHandler extends IAIMonacoContribHandler {
|
|
7
6
|
private eventBus;
|
|
8
7
|
private commandService;
|
|
9
|
-
private commandRegistry;
|
|
10
8
|
private readonly aiInlineCompletionsProvider;
|
|
9
|
+
private readonly intelligentCompletionsHandler;
|
|
11
10
|
private aiCompletionsService;
|
|
12
11
|
private sequencer;
|
|
13
12
|
private preDidShowItems;
|
|
14
13
|
registerInlineCompletionFeature(editor: IEditor): IDisposable;
|
|
15
|
-
updateConfig(middlewares: IAIMiddleware[]): void;
|
|
16
14
|
mountEditor(editor: IEditor): Disposable;
|
|
17
15
|
doContribute(): IDisposable;
|
|
18
16
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inline-completions.handler.d.ts","sourceRoot":"","sources":["../../../../src/browser/contrib/inline-completions/inline-completions.handler.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAEzD,OAAO,
|
|
1
|
+
{"version":3,"file":"inline-completions.handler.d.ts","sourceRoot":"","sources":["../../../../src/browser/contrib/inline-completions/inline-completions.handler.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAEzD,OAAO,EAGL,UAAU,EAIX,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAA8B,OAAO,EAAE,MAAM,kCAAkC,CAAC;AAKvF,OAAO,EAAE,uBAAuB,EAAE,MAAM,SAAS,CAAC;AAOlD,qBACa,uBAAwB,SAAQ,uBAAuB;IAElE,OAAO,CAAC,QAAQ,CAAY;IAG5B,OAAO,CAAC,cAAc,CAAqB;IAG3C,OAAO,CAAC,QAAQ,CAAC,2BAA2B,CAA8B;IAG1E,OAAO,CAAC,QAAQ,CAAC,6BAA6B,CAAgC;IAG9E,OAAO,CAAC,oBAAoB,CAAuB;IAEnD,OAAO,CAAC,SAAS,CAAmB;IACpC,OAAO,CAAC,eAAe,CAAgC;IAEhD,+BAA+B,CAAC,MAAM,EAAE,OAAO,GAAG,WAAW;IAkDpE,WAAW,CAAC,MAAM,EAAE,OAAO;IA2B3B,YAAY,IAAI,WAAW;CAyC5B"}
|
|
@@ -6,12 +6,12 @@ const debounce_1 = tslib_1.__importDefault(require("lodash/debounce"));
|
|
|
6
6
|
const di_1 = require("@opensumi/di");
|
|
7
7
|
const command_1 = require("@opensumi/ide-core-browser/lib/ai-native/command");
|
|
8
8
|
const ide_core_common_1 = require("@opensumi/ide-core-common");
|
|
9
|
-
const ide_core_common_2 = require("@opensumi/ide-core-common");
|
|
10
9
|
const browser_1 = require("@opensumi/ide-editor/lib/browser");
|
|
11
10
|
const ide_monaco_1 = require("@opensumi/ide-monaco");
|
|
12
11
|
const monaco_api_1 = require("@opensumi/ide-monaco/lib/browser/monaco-api");
|
|
13
12
|
const inlineCompletionContextKeys_1 = require("@opensumi/monaco-editor-core/esm/vs/editor/contrib/inlineCompletions/browser/inlineCompletionContextKeys");
|
|
14
13
|
const base_1 = require("../base");
|
|
14
|
+
const intelligent_completions_handler_1 = require("../intelligent-completions/intelligent-completions.handler");
|
|
15
15
|
const completeProvider_1 = require("./completeProvider");
|
|
16
16
|
const ai_completions_service_1 = require("./service/ai-completions.service");
|
|
17
17
|
let InlineCompletionHandler = class InlineCompletionHandler extends base_1.IAIMonacoContribHandler {
|
|
@@ -62,17 +62,6 @@ let InlineCompletionHandler = class InlineCompletionHandler extends base_1.IAIMo
|
|
|
62
62
|
}));
|
|
63
63
|
return this;
|
|
64
64
|
}
|
|
65
|
-
updateConfig(middlewares) {
|
|
66
|
-
var _a, _b;
|
|
67
|
-
const middleware = middlewares[middlewares.length - 1];
|
|
68
|
-
if (!middleware) {
|
|
69
|
-
return;
|
|
70
|
-
}
|
|
71
|
-
// currently only support one middleware
|
|
72
|
-
if ((_a = middleware === null || middleware === void 0 ? void 0 : middleware.language) === null || _a === void 0 ? void 0 : _a.provideInlineCompletions) {
|
|
73
|
-
this.aiCompletionsService.setMiddlewareComplete((_b = middleware === null || middleware === void 0 ? void 0 : middleware.language) === null || _b === void 0 ? void 0 : _b.provideInlineCompletions);
|
|
74
|
-
}
|
|
75
|
-
}
|
|
76
65
|
mountEditor(editor) {
|
|
77
66
|
const toDispose = new ide_core_common_1.Disposable();
|
|
78
67
|
this.aiInlineCompletionsProvider.mountEditor(editor);
|
|
@@ -101,7 +90,6 @@ let InlineCompletionHandler = class InlineCompletionHandler extends base_1.IAIMo
|
|
|
101
90
|
if (!this.shouldHandle(model.uri)) {
|
|
102
91
|
return;
|
|
103
92
|
}
|
|
104
|
-
let resultList;
|
|
105
93
|
/**
|
|
106
94
|
* 如果新字符在 inline completion 的 ghost text 内,则走缓存,不重新请求
|
|
107
95
|
*/
|
|
@@ -117,8 +105,8 @@ let InlineCompletionHandler = class InlineCompletionHandler extends base_1.IAIMo
|
|
|
117
105
|
prePosition = undefined;
|
|
118
106
|
}
|
|
119
107
|
}
|
|
120
|
-
|
|
121
|
-
return
|
|
108
|
+
const completionsResult = await this.sequencer.queue(() => this.aiInlineCompletionsProvider.provideInlineCompletionItems(model, position, context, token));
|
|
109
|
+
return completionsResult;
|
|
122
110
|
},
|
|
123
111
|
freeInlineCompletions() { },
|
|
124
112
|
handleItemDidShow: (completions) => {
|
|
@@ -135,17 +123,17 @@ tslib_1.__decorate([
|
|
|
135
123
|
tslib_1.__metadata("design:type", Object)
|
|
136
124
|
], InlineCompletionHandler.prototype, "eventBus", void 0);
|
|
137
125
|
tslib_1.__decorate([
|
|
138
|
-
(0, di_1.Autowired)(
|
|
126
|
+
(0, di_1.Autowired)(ide_core_common_1.CommandService),
|
|
139
127
|
tslib_1.__metadata("design:type", ide_core_common_1.CommandServiceImpl)
|
|
140
128
|
], InlineCompletionHandler.prototype, "commandService", void 0);
|
|
141
|
-
tslib_1.__decorate([
|
|
142
|
-
(0, di_1.Autowired)(ide_core_common_2.CommandRegistry),
|
|
143
|
-
tslib_1.__metadata("design:type", ide_core_common_2.CommandRegistryImpl)
|
|
144
|
-
], InlineCompletionHandler.prototype, "commandRegistry", void 0);
|
|
145
129
|
tslib_1.__decorate([
|
|
146
130
|
(0, di_1.Autowired)(completeProvider_1.AIInlineCompletionsProvider),
|
|
147
131
|
tslib_1.__metadata("design:type", completeProvider_1.AIInlineCompletionsProvider)
|
|
148
132
|
], InlineCompletionHandler.prototype, "aiInlineCompletionsProvider", void 0);
|
|
133
|
+
tslib_1.__decorate([
|
|
134
|
+
(0, di_1.Autowired)(intelligent_completions_handler_1.IntelligentCompletionsHandler),
|
|
135
|
+
tslib_1.__metadata("design:type", intelligent_completions_handler_1.IntelligentCompletionsHandler)
|
|
136
|
+
], InlineCompletionHandler.prototype, "intelligentCompletionsHandler", void 0);
|
|
149
137
|
tslib_1.__decorate([
|
|
150
138
|
(0, di_1.Autowired)(ai_completions_service_1.AICompletionsService),
|
|
151
139
|
tslib_1.__metadata("design:type", ai_completions_service_1.AICompletionsService)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inline-completions.handler.js","sourceRoot":"","sources":["../../../../src/browser/contrib/inline-completions/inline-completions.handler.ts"],"names":[],"mappings":";;;;AAAA,uEAAuC;AAEvC,qCAAqD;AAErD,8EAAgG;AAChG,+
|
|
1
|
+
{"version":3,"file":"inline-completions.handler.js","sourceRoot":"","sources":["../../../../src/browser/contrib/inline-completions/inline-completions.handler.ts"],"names":[],"mappings":";;;;AAAA,uEAAuC;AAEvC,qCAAqD;AAErD,8EAAgG;AAChG,+DAOmC;AACnC,8DAAuF;AACvF,qDAA0E;AAC1E,4EAAwE;AACxE,0JAAuJ;AAEvJ,kCAAkD;AAElD,gHAA2G;AAE3G,yDAAiE;AACjE,6EAAwE;AAGjE,IAAM,uBAAuB,GAA7B,MAAM,uBAAwB,SAAQ,8BAAuB;IAA7D;;QAgBG,cAAS,GAAG,IAAI,2BAAS,EAAE,CAAC;IAyHtC,CAAC;IAtHQ,+BAA+B,CAAC,MAAe;QACpD,MAAM,EAAE,YAAY,EAAE,GAAG,MAAM,CAAC;QAChC,8BAA8B;QAC9B,MAAM,eAAe,GAAG,GAAG,EAAE;YAC3B,IAAI,CAAC,oBAAoB,CAAC,iBAAiB,EAAE,CAAC;YAC9C,MAAM,SAAS,GAAG,YAAY,CAAC,YAAY,EAAE,CAAC;YAC9C,IAAI,CAAC,SAAS,EAAE;gBACd,OAAO;aACR;YAED,WAAW;YACX,IAAI,SAAS,CAAC,eAAe,KAAK,SAAS,CAAC,aAAa,IAAI,SAAS,CAAC,WAAW,KAAK,SAAS,CAAC,SAAS,EAAE;gBAC1G,IAAI,CAAC,2BAA2B,CAAC,aAAa,EAAE,CAAC;aAClD;QACH,CAAC,CAAC;QAEF,MAAM,wBAAwB,GAAG,IAAA,kBAAQ,EAAC,eAAe,EAAE,EAAE,EAAE;YAC7D,OAAO,EAAE,GAAG;YACZ,OAAO,EAAE,IAAI;YACb,QAAQ,EAAE,IAAI;SACf,CAAC,CAAC;QAEH,IAAI,CAAC,WAAW,CAAC,IAAI,CACnB,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,oCAA0B,EAAE,CAAC,CAAC,EAAE,EAAE;YACjD,IAAI,CAAC,CAAC,OAAO,CAAC,MAAM,KAAK,OAAO,EAAE;gBAChC,wBAAwB,EAAE,CAAC;aAC5B;iBAAM;gBACL,wBAAwB,CAAC,MAAM,EAAE,CAAC;gBAClC,eAAe,EAAE,CAAC;aACnB;QACH,CAAC,CAAC,EACF,YAAY,CAAC,uBAAuB,CAAC,CAAC,CAAC,EAAE,EAAE;YACzC,MAAM,OAAO,GAAG,CAAC,CAAC,OAAO,CAAC;YAC1B,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;gBAC5B,IAAI,MAAM,CAAC,IAAI,KAAK,EAAE,EAAE;oBACtB,IAAI,CAAC,2BAA2B,CAAC,UAAU,GAAG,IAAI,CAAC;oBACnD,IAAI,CAAC,2BAA2B,CAAC,aAAa,EAAE,CAAC;iBAClD;qBAAM;oBACL,IAAI,CAAC,2BAA2B,CAAC,UAAU,GAAG,KAAK,CAAC;iBACrD;aACF;QACH,CAAC,CAAC,EACF,YAAY,CAAC,mBAAmB,CAAC,GAAG,EAAE;YACpC,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC,sCAA4B,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;QAC7E,CAAC,CAAC,CACH,CAAC;QAEF,OAAO,IAAI,CAAC;IACd,CAAC;IAED,WAAW,CAAC,MAAe;QACzB,MAAM,SAAS,GAAG,IAAI,4BAAU,EAAE,CAAC;QACnC,IAAI,CAAC,2BAA2B,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QAErD,SAAS,CAAC,UAAU,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC;QAChD,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC;QAEvD,MAAM,gBAAgB,GAAG,IAAI,GAAG,CAAC,CAAC,yDAA2B,CAAC,uBAAuB,CAAC,GAAG,CAAC,CAAC,CAAC;QAC5F,SAAS,CAAC,UAAU,CAClB,MAAM,CAAC,YAAY,CAAC,iBAAiB,CAAC,kBAAkB,CAAC,CAAC,CAAC,EAAE,EAAE;YAC7D,0BAA0B;YAC1B,IAAI,CAAC,CAAC,WAAW,CAAC,gBAAgB,CAAC,EAAE;gBACnC,MAAM,uBAAuB,GAAG,yDAA2B,CAAC,uBAAuB,CAAC,QAAQ,CAC1F,MAAM,CAAC,YAAY,CAAC,iBAAiB,CACtC,CAAC;gBACF,IAAI,CAAC,uBAAuB,IAAI,IAAI,CAAC,eAAe,EAAE;oBACpD,IAAA,6BAAW,EAAC,GAAG,EAAE;wBACf,IAAI,CAAC,eAAe,GAAG,SAAS,CAAC;wBACjC,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC,sCAA4B,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;oBAC7E,CAAC,CAAC,CAAC;iBACJ;aACF;QACH,CAAC,CAAC,CACH,CAAC;QACF,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,YAAY;QACV,IAAI,WAAiC,CAAC;QAEtC,OAAO,sBAAS,CAAC,SAAS,CAAC,iCAAiC,CAAC,GAAG,EAAE;YAChE,OAAO,EAAE,8BAA8B;YACvC,wBAAwB,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE;gBAClE,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;oBACjC,OAAO;iBACR;gBAED;;mBAEG;gBACH,IAAI,IAAI,CAAC,eAAe,EAAE;oBACxB,IAAI,CAAC,WAAW,EAAE;wBAChB,WAAW,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;qBACrC;oBAED,MAAM,UAAU,GAAG,KAAK,CAAC,eAAe,CAAC,kBAAK,CAAC,aAAa,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC,CAAC;oBACrF,IAAI,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE;wBAC9E,OAAO,IAAI,CAAC,eAAe,CAAC;qBAC7B;yBAAM;wBACL,WAAW,GAAG,SAAS,CAAC;qBACzB;iBACF;gBAED,MAAM,iBAAiB,GAAkC,MAAM,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,EAAE,CACvF,IAAI,CAAC,2BAA2B,CAAC,4BAA4B,CAAC,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,CAAC,CAC/F,CAAC;gBAEF,OAAO,iBAAiB,CAAC;YAC3B,CAAC;YACD,qBAAqB,KAAI,CAAC;YAC1B,iBAAiB,EAAE,CAAC,WAAW,EAAE,EAAE;gBACjC,IAAI,WAAW,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;oBAChC,IAAI,CAAC,eAAe,GAAG,WAAW,CAAC;oBACnC,IAAI,CAAC,oBAAoB,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC;iBACtD;YACH,CAAC;SACF,CAAC,CAAC;IACL,CAAC;CACF,CAAA;AAxIC;IAAC,IAAA,cAAS,EAAC,2BAAS,CAAC;;yDACO;AAE5B;IAAC,IAAA,cAAS,EAAC,gCAAc,CAAC;sCACF,oCAAkB;+DAAC;AAE3C;IAAC,IAAA,cAAS,EAAC,8CAA2B,CAAC;sCACO,8CAA2B;4EAAC;AAE1E;IAAC,IAAA,cAAS,EAAC,+DAA6B,CAAC;sCACO,+DAA6B;8EAAC;AAE9E;IAAC,IAAA,cAAS,EAAC,6CAAoB,CAAC;sCACF,6CAAoB;qEAAC;AAdxC,uBAAuB;IADnC,IAAA,eAAU,GAAE;GACA,uBAAuB,CAyInC;AAzIY,0DAAuB"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { IAICompletionResultModel } from '@opensumi/ide-core-common';
|
|
2
1
|
import * as monaco from '@opensumi/ide-monaco';
|
|
2
|
+
import { IIntelligentCompletionsResult } from '../../intelligent-completions/intelligent-completions';
|
|
3
3
|
/**
|
|
4
4
|
* 缓存的结果
|
|
5
5
|
*/
|
|
@@ -44,7 +44,7 @@ export interface CompletionResultModelCache {
|
|
|
44
44
|
/**
|
|
45
45
|
* 缓存结果
|
|
46
46
|
*/
|
|
47
|
-
completionResultModel:
|
|
47
|
+
completionResultModel: IIntelligentCompletionsResult | null;
|
|
48
48
|
}
|
|
49
49
|
/**
|
|
50
50
|
* 补全结果item,继承自InlineCompletionItem
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"competionModel.d.ts","sourceRoot":"","sources":["../../../../../src/browser/contrib/inline-completions/model/competionModel.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"competionModel.d.ts","sourceRoot":"","sources":["../../../../../src/browser/contrib/inline-completions/model/competionModel.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAC;AAE/C,OAAO,EAAE,6BAA6B,EAAE,MAAM,uDAAuD,CAAC;AAEtG;;GAEG;AACH,MAAM,WAAW,sBAAsB;IACrC;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IAEf;;OAEG;IACH,IAAI,EAAE,GAAG,CAAC;CACX;AAED;;GAEG;AACH,MAAM,WAAW,0BAA0B;IACzC;;OAEG;IACH,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB;;OAEG;IACH,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB;;OAEG;IACH,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B;;OAEG;IACH,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB;;OAEG;IACH,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB;;OAEG;IACH,qBAAqB,EAAE,6BAA6B,GAAG,IAAI,CAAC;CAC7D;AAED;;GAEG;AACH,MAAM,WAAW,oBAAqB,SAAQ,MAAM,CAAC,SAAS,CAAC,gBAAgB;IAC7E,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;CACpB"}
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
import { Disposable } from '@opensumi/ide-core-common';
|
|
2
|
+
import { IAICompletionOption } from '@opensumi/ide-core-common';
|
|
3
|
+
import * as monaco from '@opensumi/ide-monaco';
|
|
4
|
+
import { InlineCompletionItem } from '../model/competionModel';
|
|
5
|
+
import { ICompletionContext } from '../types';
|
|
6
|
+
export declare class InlineCompletionRequestTask extends Disposable {
|
|
7
|
+
model: monaco.editor.ITextModel;
|
|
8
|
+
position: monaco.Position;
|
|
9
|
+
token: monaco.CancellationToken;
|
|
10
|
+
private _disposables;
|
|
11
|
+
private aiReporter;
|
|
12
|
+
private promptCache;
|
|
13
|
+
private aiCompletionsService;
|
|
14
|
+
private readonly preferenceService;
|
|
15
|
+
private appConfig;
|
|
16
|
+
isCancelFlag: boolean;
|
|
17
|
+
private isEnablePromptEngineering;
|
|
18
|
+
constructor(model: monaco.editor.ITextModel, position: monaco.Position, token: monaco.CancellationToken);
|
|
19
|
+
protected constructRequestBean(context: ICompletionContext, token: monaco.CancellationToken): Promise<IAICompletionOption>;
|
|
20
|
+
run(): Promise<InlineCompletionItem[]>;
|
|
21
|
+
/**
|
|
22
|
+
* 将补全结果推给用户并注册{@link COMMAND_ACCEPT} 事件
|
|
23
|
+
*/
|
|
24
|
+
private pushLineCompletions;
|
|
25
|
+
dispose(): void;
|
|
26
|
+
cancelRequest(): void;
|
|
27
|
+
}
|
|
28
|
+
//# sourceMappingURL=inlineCompletionRequestTask.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"inlineCompletionRequestTask.d.ts","sourceRoot":"","sources":["../../../../../src/browser/contrib/inline-completions/model/inlineCompletionRequestTask.ts"],"names":[],"mappings":"AAGA,OAAO,EAA6B,UAAU,EAAwB,MAAM,2BAA2B,CAAC;AACxG,OAAO,EAAE,mBAAmB,EAAQ,MAAM,2BAA2B,CAAC;AAGtE,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAC;AAG/C,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAI/D,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAsB9C,qBACa,2BAA4B,SAAQ,UAAU;IAuBhD,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,UAAU;IAC/B,QAAQ,EAAE,MAAM,CAAC,QAAQ;IACzB,KAAK,EAAE,MAAM,CAAC,iBAAiB;IAxBxC,OAAO,CAAC,YAAY,CAAyB;IAG7C,OAAO,CAAC,UAAU,CAAc;IAGhC,OAAO,CAAC,WAAW,CAAc;IAGjC,OAAO,CAAC,oBAAoB,CAAuB;IAGnD,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAoB;IAGtD,OAAO,CAAC,SAAS,CAAY;IAE7B,YAAY,EAAE,OAAO,CAAC;IAEtB,OAAO,CAAC,yBAAyB,CAAQ;gBAGhC,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,UAAU,EAC/B,QAAQ,EAAE,MAAM,CAAC,QAAQ,EACzB,KAAK,EAAE,MAAM,CAAC,iBAAiB;cAqBxB,oBAAoB,CAClC,OAAO,EAAE,kBAAkB,EAC3B,KAAK,EAAE,MAAM,CAAC,iBAAiB,GAC9B,OAAO,CAAC,mBAAmB,CAAC;IAczB,GAAG;IA8ET;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAgF3B,OAAO;IAIP,aAAa;CAId"}
|