@opensumi/ide-ai-native 3.7.1-next-1739439717.0 → 3.7.1-next-1739448958.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.contextkeys.d.ts +1 -0
- package/lib/browser/ai-core.contextkeys.d.ts.map +1 -1
- package/lib/browser/ai-core.contextkeys.js +1 -0
- package/lib/browser/ai-core.contextkeys.js.map +1 -1
- package/lib/browser/ai-core.contribution.d.ts +2 -1
- package/lib/browser/ai-core.contribution.d.ts.map +1 -1
- package/lib/browser/ai-core.contribution.js +55 -14
- package/lib/browser/ai-core.contribution.js.map +1 -1
- package/lib/browser/contrib/intelligent-completions/intelligent-completions.contribution.d.ts +1 -0
- package/lib/browser/contrib/intelligent-completions/intelligent-completions.contribution.d.ts.map +1 -1
- package/lib/browser/contrib/intelligent-completions/intelligent-completions.contribution.js +26 -4
- package/lib/browser/contrib/intelligent-completions/intelligent-completions.contribution.js.map +1 -1
- package/lib/browser/contrib/intelligent-completions/intelligent-completions.controller.d.ts +3 -1
- package/lib/browser/contrib/intelligent-completions/intelligent-completions.controller.d.ts.map +1 -1
- package/lib/browser/contrib/intelligent-completions/intelligent-completions.controller.js +9 -1
- package/lib/browser/contrib/intelligent-completions/intelligent-completions.controller.js.map +1 -1
- package/lib/browser/contrib/intelligent-completions/source/base.d.ts +1 -2
- package/lib/browser/contrib/intelligent-completions/source/base.d.ts.map +1 -1
- package/lib/browser/contrib/intelligent-completions/source/base.js.map +1 -1
- package/lib/browser/contrib/intelligent-completions/source/line-change.source.d.ts +2 -3
- package/lib/browser/contrib/intelligent-completions/source/line-change.source.d.ts.map +1 -1
- package/lib/browser/contrib/intelligent-completions/source/line-change.source.js +51 -21
- package/lib/browser/contrib/intelligent-completions/source/line-change.source.js.map +1 -1
- package/lib/browser/index.js +1 -1
- 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 +2 -2
- package/lib/browser/layout/ai-layout.js.map +1 -1
- package/lib/browser/model/enhanceDecorationsCollection.d.ts +14 -10
- package/lib/browser/model/enhanceDecorationsCollection.d.ts.map +1 -1
- package/lib/browser/model/enhanceDecorationsCollection.js +42 -53
- package/lib/browser/model/enhanceDecorationsCollection.js.map +1 -1
- package/lib/browser/types.d.ts +2 -1
- package/lib/browser/types.d.ts.map +1 -1
- package/lib/browser/widget/inline-chat/inline-chat-editor.controller.d.ts +2 -1
- package/lib/browser/widget/inline-chat/inline-chat-editor.controller.d.ts.map +1 -1
- package/lib/browser/widget/inline-chat/inline-chat-editor.controller.js +13 -41
- package/lib/browser/widget/inline-chat/inline-chat-editor.controller.js.map +1 -1
- package/lib/browser/widget/inline-chat/inline-chat.feature.registry.d.ts +3 -13
- package/lib/browser/widget/inline-chat/inline-chat.feature.registry.d.ts.map +1 -1
- package/lib/browser/widget/inline-chat/inline-chat.feature.registry.js +24 -72
- package/lib/browser/widget/inline-chat/inline-chat.feature.registry.js.map +1 -1
- package/lib/browser/widget/inline-chat/inline-chat.service.d.ts +1 -6
- package/lib/browser/widget/inline-chat/inline-chat.service.d.ts.map +1 -1
- package/lib/browser/widget/inline-chat/inline-chat.service.js +5 -19
- package/lib/browser/widget/inline-chat/inline-chat.service.js.map +1 -1
- package/lib/browser/widget/inline-chat/inline-content-widget.d.ts +2 -5
- package/lib/browser/widget/inline-chat/inline-content-widget.d.ts.map +1 -1
- package/lib/browser/widget/inline-chat/inline-content-widget.js +17 -42
- package/lib/browser/widget/inline-chat/inline-content-widget.js.map +1 -1
- package/lib/browser/widget/inline-diff/inline-diff-previewer.d.ts +22 -5
- package/lib/browser/widget/inline-diff/inline-diff-previewer.d.ts.map +1 -1
- package/lib/browser/widget/inline-diff/inline-diff-previewer.js +61 -30
- package/lib/browser/widget/inline-diff/inline-diff-previewer.js.map +1 -1
- package/lib/browser/widget/inline-diff/inline-diff.controller.d.ts +8 -12
- package/lib/browser/widget/inline-diff/inline-diff.controller.d.ts.map +1 -1
- package/lib/browser/widget/inline-diff/inline-diff.controller.js +68 -96
- package/lib/browser/widget/inline-diff/inline-diff.controller.js.map +1 -1
- package/lib/browser/widget/inline-hint/inline-hint.controller.d.ts +0 -1
- package/lib/browser/widget/inline-hint/inline-hint.controller.d.ts.map +1 -1
- package/lib/browser/widget/inline-hint/inline-hint.controller.js +0 -5
- package/lib/browser/widget/inline-hint/inline-hint.controller.js.map +1 -1
- package/lib/browser/widget/inline-input/inline-input-widget.d.ts +12 -2
- package/lib/browser/widget/inline-input/inline-input-widget.d.ts.map +1 -1
- package/lib/browser/widget/inline-input/inline-input-widget.js +26 -18
- package/lib/browser/widget/inline-input/inline-input-widget.js.map +1 -1
- package/lib/browser/widget/inline-input/inline-input.controller.d.ts +14 -6
- package/lib/browser/widget/inline-input/inline-input.controller.d.ts.map +1 -1
- package/lib/browser/widget/inline-input/inline-input.controller.js +320 -169
- package/lib/browser/widget/inline-input/inline-input.controller.js.map +1 -1
- package/lib/browser/widget/inline-input/inline-input.module.less +4 -0
- package/lib/browser/widget/inline-input/inline-input.service.d.ts +19 -7
- package/lib/browser/widget/inline-input/inline-input.service.d.ts.map +1 -1
- package/lib/browser/widget/inline-input/inline-input.service.js +72 -12
- package/lib/browser/widget/inline-input/inline-input.service.js.map +1 -1
- package/lib/browser/widget/inline-input/model.d.ts +34 -0
- package/lib/browser/widget/inline-input/model.d.ts.map +1 -0
- package/lib/browser/widget/inline-input/model.js +63 -0
- package/lib/browser/widget/inline-input/model.js.map +1 -0
- package/lib/browser/widget/inline-stream-diff/inline-stream-diff.handler.d.ts +8 -19
- 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 +48 -41
- package/lib/browser/widget/inline-stream-diff/inline-stream-diff.handler.js.map +1 -1
- package/lib/browser/widget/inline-stream-diff/live-preview.component.d.ts +17 -4
- package/lib/browser/widget/inline-stream-diff/live-preview.component.d.ts.map +1 -1
- package/lib/browser/widget/inline-stream-diff/live-preview.component.js +37 -5
- package/lib/browser/widget/inline-stream-diff/live-preview.component.js.map +1 -1
- package/lib/browser/widget/inline-stream-diff/live-preview.decoration.d.ts +7 -11
- 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 +33 -77
- package/lib/browser/widget/inline-stream-diff/live-preview.decoration.js.map +1 -1
- package/package.json +21 -21
- package/src/browser/ai-core.contextkeys.ts +3 -0
- package/src/browser/ai-core.contribution.ts +63 -16
- package/src/browser/contrib/intelligent-completions/intelligent-completions.contribution.ts +29 -8
- package/src/browser/contrib/intelligent-completions/intelligent-completions.controller.ts +13 -1
- package/src/browser/contrib/intelligent-completions/source/base.ts +0 -2
- package/src/browser/contrib/intelligent-completions/source/line-change.source.ts +79 -24
- package/src/browser/index.ts +2 -2
- package/src/browser/layout/ai-layout.tsx +5 -2
- package/src/browser/model/enhanceDecorationsCollection.ts +62 -77
- package/src/browser/types.ts +2 -2
- package/src/browser/widget/inline-chat/inline-chat-editor.controller.ts +21 -56
- package/src/browser/widget/inline-chat/inline-chat.feature.registry.ts +23 -90
- package/src/browser/widget/inline-chat/inline-chat.service.ts +2 -19
- package/src/browser/widget/inline-chat/inline-content-widget.tsx +14 -71
- package/src/browser/widget/inline-diff/inline-diff-previewer.ts +87 -32
- package/src/browser/widget/inline-diff/inline-diff.controller.ts +90 -114
- package/src/browser/widget/inline-hint/inline-hint.controller.ts +1 -7
- package/src/browser/widget/inline-input/inline-input-widget.tsx +34 -12
- package/src/browser/widget/inline-input/inline-input.controller.ts +453 -247
- package/src/browser/widget/inline-input/inline-input.module.less +4 -0
- package/src/browser/widget/inline-input/inline-input.service.ts +92 -13
- package/src/browser/widget/inline-input/model.ts +74 -0
- package/src/browser/widget/inline-stream-diff/inline-stream-diff.handler.tsx +58 -69
- package/src/browser/widget/inline-stream-diff/live-preview.component.tsx +45 -6
- package/src/browser/widget/inline-stream-diff/live-preview.decoration.tsx +40 -112
- package/lib/browser/model/styles.module.less +0 -7
- package/src/browser/model/styles.module.less +0 -7
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.InlineDiffController = void 0;
|
|
4
4
|
const ide_core_browser_1 = require("@opensumi/ide-core-browser");
|
|
5
5
|
const ide_core_common_1 = require("@opensumi/ide-core-common");
|
|
6
|
-
const
|
|
6
|
+
const observable_1 = require("@opensumi/ide-monaco/lib/common/observable");
|
|
7
7
|
const base_1 = require("../../contrib/base");
|
|
8
8
|
const schema_1 = require("../../preferences/schema");
|
|
9
9
|
const inline_chat_controller_1 = require("../inline-chat/inline-chat-controller");
|
|
@@ -13,7 +13,6 @@ class InlineDiffController extends base_1.BaseAIMonacoEditorController {
|
|
|
13
13
|
super(...arguments);
|
|
14
14
|
this._onMaxLineCount = new ide_core_common_1.Emitter();
|
|
15
15
|
this.onMaxLineCount = this._onMaxLineCount.event;
|
|
16
|
-
this._previewerNodeStore = new Map();
|
|
17
16
|
}
|
|
18
17
|
static get(editor) {
|
|
19
18
|
return editor.getContribution(InlineDiffController.ID);
|
|
@@ -21,81 +20,59 @@ class InlineDiffController extends base_1.BaseAIMonacoEditorController {
|
|
|
21
20
|
get preferenceService() {
|
|
22
21
|
return this.injector.get(ide_core_browser_1.PreferenceService);
|
|
23
22
|
}
|
|
24
|
-
get eventBus() {
|
|
25
|
-
return this.injector.get(ide_core_common_1.IEventBus);
|
|
26
|
-
}
|
|
27
23
|
mount() {
|
|
28
|
-
this.
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
24
|
+
this.previewerStore = new Map();
|
|
25
|
+
this.currentPreviewer = (0, observable_1.observableValue)(this, undefined);
|
|
26
|
+
this.modelChangeObs = (0, observable_1.observableFromEvent)(this, this.monacoEditor.onDidChangeModel, () => this.monacoEditor.getModel());
|
|
27
|
+
this.featureDisposable.addDispose((0, observable_1.autorun)((reader) => {
|
|
28
|
+
const model = this.modelChangeObs.read(reader);
|
|
29
|
+
if (!model) {
|
|
30
|
+
return;
|
|
31
|
+
}
|
|
32
|
+
/**
|
|
33
|
+
* 切换到其他 model 且 previewer 未卸载时
|
|
34
|
+
* 保留 previewer 的实例,仅卸载 previewer 的渲染层
|
|
35
|
+
*/
|
|
36
|
+
const id = model.id;
|
|
37
|
+
const previewer = this.currentPreviewer.read(reader);
|
|
38
|
+
if (previewer && previewer.modelId !== id && !previewer.disposed) {
|
|
39
|
+
previewer.hide();
|
|
33
40
|
}
|
|
41
|
+
const storedPreview = this.previewerStore.get(model.id);
|
|
42
|
+
(0, observable_1.transaction)((tx) => {
|
|
43
|
+
if (storedPreview && storedPreview.modelId === id) {
|
|
44
|
+
this.currentPreviewer.set(storedPreview, tx);
|
|
45
|
+
storedPreview.resume();
|
|
46
|
+
}
|
|
47
|
+
else {
|
|
48
|
+
this.currentPreviewer.set(undefined, tx);
|
|
49
|
+
}
|
|
50
|
+
});
|
|
34
51
|
}));
|
|
35
|
-
this.registerInlineDiffFeature(this.monacoEditor);
|
|
36
52
|
return this.featureDisposable;
|
|
37
53
|
}
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
return;
|
|
41
|
-
}
|
|
42
|
-
// 存储的是快照
|
|
43
|
-
const node = this.previewer.createNodeSnapshot();
|
|
44
|
-
if (node) {
|
|
45
|
-
this._previewerNodeStore.set(key, node);
|
|
46
|
-
}
|
|
47
|
-
}
|
|
48
|
-
tryRestoreState(monacoEditor, key) {
|
|
49
|
-
const node = this.getStoredState(key);
|
|
50
|
-
if (!node) {
|
|
51
|
-
return;
|
|
52
|
-
}
|
|
53
|
-
if (node.disposed) {
|
|
54
|
-
this.destroyPreviewer(key);
|
|
55
|
-
return;
|
|
56
|
-
}
|
|
57
|
-
return this.restoreState(monacoEditor, node);
|
|
54
|
+
getPreviewer() {
|
|
55
|
+
return this.currentPreviewer.get();
|
|
58
56
|
}
|
|
59
|
-
|
|
57
|
+
renderDiff(previewer, data) {
|
|
60
58
|
var _a;
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
this.previewer = this.injector.get(inline_diff_previewer_1.LiveInlineDiffPreviewer, [monacoEditor]);
|
|
64
|
-
this.previewer.attachNode(node);
|
|
65
|
-
this.listenPreviewer(this.previewer);
|
|
66
|
-
const dispose = this.previewer.onDispose(() => {
|
|
67
|
-
this.destroyPreviewer();
|
|
68
|
-
dispose.dispose();
|
|
69
|
-
});
|
|
59
|
+
if (!previewer) {
|
|
60
|
+
return;
|
|
70
61
|
}
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
if (!e.oldModelUrl) {
|
|
76
|
-
return;
|
|
77
|
-
}
|
|
78
|
-
const urlString = e.oldModelUrl.toString();
|
|
79
|
-
this.storeState(urlString);
|
|
80
|
-
this.destroyPreviewer();
|
|
81
|
-
}));
|
|
82
|
-
this.featureDisposable.addDispose(monacoEditor.onDidChangeModel((e) => {
|
|
83
|
-
if (!e.newModelUrl) {
|
|
84
|
-
return;
|
|
85
|
-
}
|
|
86
|
-
this.tryRestoreState(monacoEditor, e.newModelUrl.toString());
|
|
87
|
-
}));
|
|
88
|
-
if (model) {
|
|
89
|
-
this.featureDisposable.addDispose(model.onWillDispose(() => {
|
|
90
|
-
const uriString = model.uri.toString();
|
|
91
|
-
this.destroyPreviewer(uriString);
|
|
92
|
-
}));
|
|
62
|
+
previewer.onData(data);
|
|
63
|
+
// 仅在当前 model 中进行流式渲染
|
|
64
|
+
if (((_a = this.modelChangeObs.get()) === null || _a === void 0 ? void 0 : _a.id) === previewer.modelId) {
|
|
65
|
+
previewer.render();
|
|
93
66
|
}
|
|
94
67
|
}
|
|
95
68
|
showPreviewerByStream(monacoEditor, options) {
|
|
96
69
|
const { crossSelection, chatResponse } = options;
|
|
97
70
|
const disposable = new ide_core_common_1.Disposable();
|
|
98
71
|
const previewer = this.createDiffPreviewer(monacoEditor, crossSelection, options.previewerOptions);
|
|
72
|
+
(0, observable_1.transaction)((tx) => {
|
|
73
|
+
this.currentPreviewer.set(previewer, tx);
|
|
74
|
+
this.previewerStore.set(previewer.modelId, previewer);
|
|
75
|
+
});
|
|
99
76
|
const onFinish = () => {
|
|
100
77
|
previewer.layout();
|
|
101
78
|
disposable.dispose();
|
|
@@ -106,7 +83,7 @@ class InlineDiffController extends base_1.BaseAIMonacoEditorController {
|
|
|
106
83
|
disposable.addDispose([
|
|
107
84
|
controller.onData((data) => {
|
|
108
85
|
if (ide_core_common_1.ReplyResponse.is(data)) {
|
|
109
|
-
|
|
86
|
+
this.renderDiff(previewer, data);
|
|
110
87
|
}
|
|
111
88
|
}),
|
|
112
89
|
controller.onError((error) => {
|
|
@@ -134,53 +111,48 @@ class InlineDiffController extends base_1.BaseAIMonacoEditorController {
|
|
|
134
111
|
}
|
|
135
112
|
createDiffPreviewer(monacoEditor, selection, options) {
|
|
136
113
|
const inlineDiffMode = this.preferenceService.getValid(ide_core_common_1.AINativeSettingSectionsId.InlineDiffPreviewMode, schema_1.EInlineDiffPreviewMode.inlineLive);
|
|
137
|
-
|
|
114
|
+
let previewer;
|
|
138
115
|
if (inlineDiffMode === schema_1.EInlineDiffPreviewMode.sideBySide) {
|
|
139
|
-
|
|
116
|
+
previewer = this.injector.get(inline_diff_previewer_1.SideBySideInlineDiffWidget, [monacoEditor]);
|
|
140
117
|
}
|
|
141
118
|
else {
|
|
142
|
-
|
|
119
|
+
previewer = this.injector.get(inline_diff_previewer_1.LiveInlineDiffPreviewer, [monacoEditor]);
|
|
143
120
|
}
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
121
|
+
previewer.create(selection, options);
|
|
122
|
+
previewer.show(selection.startLineNumber - 1, selection.endLineNumber - selection.startLineNumber + 2);
|
|
123
|
+
previewer.addDispose(previewer.onLineCount((lineCount) => this._onMaxLineCount.fire(lineCount)));
|
|
124
|
+
previewer.addDispose(ide_core_common_1.Disposable.create(() => {
|
|
125
|
+
this.previewerStore.delete(previewer.modelId);
|
|
126
|
+
}));
|
|
127
|
+
return previewer;
|
|
148
128
|
}
|
|
149
|
-
|
|
129
|
+
handleAction(action) {
|
|
130
|
+
const previewer = this.getPreviewer();
|
|
150
131
|
if (!previewer) {
|
|
151
132
|
return;
|
|
152
133
|
}
|
|
153
|
-
previewer.
|
|
154
|
-
}
|
|
155
|
-
getPreviewer() {
|
|
156
|
-
return this.previewer;
|
|
157
|
-
}
|
|
158
|
-
getStoredState(uri) {
|
|
159
|
-
return this._previewerNodeStore.get(uri);
|
|
160
|
-
}
|
|
161
|
-
handleAction(action) {
|
|
162
|
-
var _a;
|
|
163
|
-
(_a = this.previewer) === null || _a === void 0 ? void 0 : _a.handleAction(action);
|
|
134
|
+
previewer.handleAction(action);
|
|
164
135
|
}
|
|
165
136
|
getModifyContent() {
|
|
166
|
-
|
|
167
|
-
|
|
137
|
+
const previewer = this.getPreviewer();
|
|
138
|
+
if (!previewer) {
|
|
139
|
+
return;
|
|
140
|
+
}
|
|
141
|
+
return previewer.getValue();
|
|
168
142
|
}
|
|
169
143
|
getOriginContent() {
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
destroyPreviewer(uriString) {
|
|
174
|
-
var _a;
|
|
175
|
-
(_a = this.previewer) === null || _a === void 0 ? void 0 : _a.dispose();
|
|
176
|
-
this.previewer = undefined;
|
|
177
|
-
if (uriString) {
|
|
178
|
-
this._previewerNodeStore.delete(uriString);
|
|
144
|
+
const previewer = this.getPreviewer();
|
|
145
|
+
if (!previewer) {
|
|
146
|
+
return;
|
|
179
147
|
}
|
|
148
|
+
return previewer.getOriginValue();
|
|
180
149
|
}
|
|
181
150
|
revealFirstDiff() {
|
|
182
|
-
|
|
183
|
-
(
|
|
151
|
+
const previewer = this.getPreviewer();
|
|
152
|
+
if (!previewer) {
|
|
153
|
+
return;
|
|
154
|
+
}
|
|
155
|
+
previewer.revealFirstDiff();
|
|
184
156
|
}
|
|
185
157
|
}
|
|
186
158
|
exports.InlineDiffController = InlineDiffController;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inline-diff.controller.js","sourceRoot":"","sources":["../../../../src/browser/widget/inline-diff/inline-diff.controller.ts"],"names":[],"mappings":";;;AAAA,iEAA+D;AAC/D,+
|
|
1
|
+
{"version":3,"file":"inline-diff.controller.js","sourceRoot":"","sources":["../../../../src/browser/widget/inline-diff/inline-diff.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,6 @@ export declare class InlineHintController extends BaseAIMonacoEditorController {
|
|
|
5
5
|
static readonly ID = "editor.contrib.ai.inline.hint";
|
|
6
6
|
static get(editor: ICodeEditor): InlineHintController | null;
|
|
7
7
|
private get inlineCompletionsService();
|
|
8
|
-
private get inlineInputChatService();
|
|
9
8
|
mount(): IDisposable;
|
|
10
9
|
private registerHintLineFeature;
|
|
11
10
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inline-hint.controller.d.ts","sourceRoot":"","sources":["../../../../src/browser/widget/inline-hint/inline-hint.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAc,WAAW,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"inline-hint.controller.d.ts","sourceRoot":"","sources":["../../../../src/browser/widget/inline-hint/inline-hint.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAc,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAEpE,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAGnD,OAAO,EAAE,4BAA4B,EAAE,MAAM,oBAAoB,CAAC;AAMlE,qBAAa,oBAAqB,SAAQ,4BAA4B;IACpE,gBAAuB,EAAE,mCAAmC;WAE9C,GAAG,CAAC,MAAM,EAAE,WAAW,GAAG,oBAAoB,GAAG,IAAI;IAInE,OAAO,KAAK,wBAAwB,GAEnC;IAED,KAAK,IAAI,WAAW;IAIpB,OAAO,CAAC,uBAAuB;CAyFhC"}
|
|
@@ -8,7 +8,6 @@ const monaco = tslib_1.__importStar(require("@opensumi/ide-monaco"));
|
|
|
8
8
|
const ai_core_contextkeys_1 = require("../../ai-core.contextkeys");
|
|
9
9
|
const base_1 = require("../../contrib/base");
|
|
10
10
|
const ai_completions_service_1 = require("../../contrib/inline-completions/service/ai-completions.service");
|
|
11
|
-
const inline_input_service_1 = require("../inline-input/inline-input.service");
|
|
12
11
|
const internal_type_1 = require("../internal.type");
|
|
13
12
|
const inline_hint_line_widget_1 = require("./inline-hint-line-widget");
|
|
14
13
|
class InlineHintController extends base_1.BaseAIMonacoEditorController {
|
|
@@ -18,9 +17,6 @@ class InlineHintController extends base_1.BaseAIMonacoEditorController {
|
|
|
18
17
|
get inlineCompletionsService() {
|
|
19
18
|
return this.injector.get(ai_completions_service_1.AICompletionsService);
|
|
20
19
|
}
|
|
21
|
-
get inlineInputChatService() {
|
|
22
|
-
return this.injector.get(inline_input_service_1.InlineInputChatService);
|
|
23
|
-
}
|
|
24
20
|
mount() {
|
|
25
21
|
return this.registerHintLineFeature(this.monacoEditor);
|
|
26
22
|
}
|
|
@@ -47,7 +43,6 @@ class InlineHintController extends base_1.BaseAIMonacoEditorController {
|
|
|
47
43
|
if (!(lineContent === null || lineContent === void 0 ? void 0 : lineContent.trim())) {
|
|
48
44
|
inlineHintLineDecoration.show(position);
|
|
49
45
|
}
|
|
50
|
-
this.inlineInputChatService.setCurrentVisiblePosition(position);
|
|
51
46
|
aiNativeContextKey.inlineHintWidgetIsVisible.set(true);
|
|
52
47
|
hintDisposable.addDispose(inlineHintLineDecoration.onDispose(() => {
|
|
53
48
|
// 这里的装饰器逻辑可能会被代码补全顶替
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inline-hint.controller.js","sourceRoot":"","sources":["../../../../src/browser/widget/inline-hint/inline-hint.controller.ts"],"names":[],"mappings":";;;;AAAA,uEAAuC;AAEvC,+DAAoE;
|
|
1
|
+
{"version":3,"file":"inline-hint.controller.js","sourceRoot":"","sources":["../../../../src/browser/widget/inline-hint/inline-hint.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,20 @@
|
|
|
1
1
|
import { ReactNode } from 'react';
|
|
2
|
+
import { Emitter, Event } from '@opensumi/ide-core-common';
|
|
2
3
|
import { ContentWidgetPositionPreference } from '@opensumi/ide-monaco/lib/browser/monaco-exports/editor';
|
|
3
4
|
import { AIInlineContentWidget } from '../inline-chat/inline-content-widget';
|
|
4
|
-
|
|
5
|
-
|
|
5
|
+
import type { ICodeEditor as IMonacoCodeEditor } from '@opensumi/ide-monaco';
|
|
6
|
+
export declare class InlineInputWidget extends AIInlineContentWidget {
|
|
7
|
+
protected readonly editor: IMonacoCodeEditor;
|
|
8
|
+
protected readonly defaultValue?: string | undefined;
|
|
6
9
|
allowEditorOverflow: boolean;
|
|
7
10
|
positionPreference: ContentWidgetPositionPreference[];
|
|
11
|
+
protected readonly _onSend: Emitter<string>;
|
|
12
|
+
readonly onSend: Event<string>;
|
|
13
|
+
protected readonly _onClose: Emitter<void>;
|
|
14
|
+
readonly onClose: Event<void>;
|
|
15
|
+
protected readonly _onValueChange: Emitter<string>;
|
|
16
|
+
readonly onValueChange: Event<string>;
|
|
17
|
+
constructor(editor: IMonacoCodeEditor, defaultValue?: string | undefined);
|
|
8
18
|
dispose(): void;
|
|
9
19
|
id(): string;
|
|
10
20
|
renderView(): ReactNode;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inline-input-widget.d.ts","sourceRoot":"","sources":["../../../../src/browser/widget/inline-input/inline-input-widget.tsx"],"names":[],"mappings":"AAAA,OAAc,EAAE,SAAS,EAA6C,MAAM,OAAO,CAAC;AAKpF,OAAO,EAAE,+BAA+B,EAAE,MAAM,wDAAwD,CAAC;AAIzG,OAAO,EAAE,qBAAqB,EAAE,MAAM,sCAAsC,CAAC;
|
|
1
|
+
{"version":3,"file":"inline-input-widget.d.ts","sourceRoot":"","sources":["../../../../src/browser/widget/inline-input/inline-input-widget.tsx"],"names":[],"mappings":"AAAA,OAAc,EAAE,SAAS,EAA6C,MAAM,OAAO,CAAC;AAKpF,OAAO,EAAgD,OAAO,EAAE,KAAK,EAAY,MAAM,2BAA2B,CAAC;AACnH,OAAO,EAAE,+BAA+B,EAAE,MAAM,wDAAwD,CAAC;AAIzG,OAAO,EAAE,qBAAqB,EAAE,MAAM,sCAAsC,CAAC;AAI7E,OAAO,KAAK,EAAE,WAAW,IAAI,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAwE7E,qBACa,iBAAkB,SAAQ,qBAAqB;IAa9C,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,iBAAiB;IAAE,SAAS,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM;IAZlG,mBAAmB,UAAQ;IAC3B,kBAAkB,oCAA2C;IAE7D,SAAS,CAAC,QAAQ,CAAC,OAAO,kBAAyB;IACnD,SAAgB,MAAM,gBAAsB;IAE5C,SAAS,CAAC,QAAQ,CAAC,QAAQ,gBAAuB;IAClD,SAAgB,OAAO,cAAuB;IAE9C,SAAS,CAAC,QAAQ,CAAC,cAAc,kBAAyB;IAC1D,SAAgB,aAAa,gBAA6B;gBAE3B,MAAM,EAAE,iBAAiB,EAAqB,YAAY,CAAC,EAAE,MAAM,YAAA;IAIzF,OAAO,IAAI,IAAI;IAKf,EAAE,IAAI,MAAM;IAIZ,UAAU,IAAI,SAAS;CAwBjC"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.InlineInputWidget = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const react_1 = tslib_1.__importStar(require("react"));
|
|
6
6
|
const di_1 = require("@opensumi/di");
|
|
7
|
+
const ide_core_browser_1 = require("@opensumi/ide-core-browser");
|
|
7
8
|
const index_1 = require("@opensumi/ide-core-browser/lib/components/ai-native/index");
|
|
8
9
|
const ide_core_common_1 = require("@opensumi/ide-core-common");
|
|
9
10
|
const editor_1 = require("@opensumi/ide-monaco/lib/browser/monaco-exports/editor");
|
|
@@ -11,10 +12,10 @@ const index_2 = require("../inline-actions/result-items/index");
|
|
|
11
12
|
const inline_chat_service_1 = require("../inline-chat/inline-chat.service");
|
|
12
13
|
const inline_content_widget_1 = require("../inline-chat/inline-content-widget");
|
|
13
14
|
const inline_input_module_less_1 = tslib_1.__importDefault(require("./inline-input.module.less"));
|
|
14
|
-
const inline_input_service_1 = require("./inline-input.service");
|
|
15
15
|
const InlineInputWidgetRender = (props) => {
|
|
16
|
-
const { onClose, onInteractiveInputSend, onLayoutChange, onChatStatus, onResultClick } = props;
|
|
16
|
+
const { defaultValue, onClose, onInteractiveInputSend, onLayoutChange, onChatStatus, onResultClick, onValueChange } = props;
|
|
17
17
|
const [status, setStatus] = (0, react_1.useState)(inline_chat_service_1.EInlineChatStatus.READY);
|
|
18
|
+
const aiNativeConfigService = (0, ide_core_browser_1.useInjectable)(ide_core_browser_1.AINativeConfigService);
|
|
18
19
|
(0, react_1.useEffect)(() => {
|
|
19
20
|
const dis = new ide_core_common_1.Disposable();
|
|
20
21
|
dis.addDispose(onChatStatus((s) => setStatus(s)));
|
|
@@ -37,39 +38,46 @@ const InlineInputWidgetRender = (props) => {
|
|
|
37
38
|
if (isDone) {
|
|
38
39
|
return react_1.default.createElement(index_2.InlineResultAction, { onResultClick: onResultClick });
|
|
39
40
|
}
|
|
40
|
-
return (react_1.default.createElement(index_1.AIAction, { loadingShowOperation: true, onClose: handleClose, loading: isLoading, customOperationRender: react_1.default.createElement(index_1.InteractiveInput, { autoFocus: true, onHeightChange: (height) => onLayoutChange(height), size: 'small', placeholder: (0, ide_core_common_1.localize)('aiNative.inline.chat.input.placeholder.default'), width:
|
|
41
|
+
return (react_1.default.createElement(index_1.AIAction, { loadingShowOperation: true, onClose: handleClose, loading: isLoading, customOperationRender: react_1.default.createElement(index_1.InteractiveInput, { autoFocus: true, defaultValue: defaultValue, onValueChange: onValueChange, onHeightChange: (height) => onLayoutChange(height), size: 'small', placeholder: (0, ide_core_common_1.localize)('aiNative.inline.chat.input.placeholder.default'), width: aiNativeConfigService.inlineChat.inputWidth, disabled: isLoading, onSend: handleInteractiveInputSend }) }));
|
|
41
42
|
};
|
|
42
|
-
let
|
|
43
|
-
constructor() {
|
|
44
|
-
super(
|
|
43
|
+
let InlineInputWidget = class InlineInputWidget extends inline_content_widget_1.AIInlineContentWidget {
|
|
44
|
+
constructor(editor, defaultValue) {
|
|
45
|
+
super(editor);
|
|
46
|
+
this.editor = editor;
|
|
47
|
+
this.defaultValue = defaultValue;
|
|
45
48
|
this.allowEditorOverflow = true;
|
|
46
49
|
this.positionPreference = [editor_1.ContentWidgetPositionPreference.ABOVE];
|
|
50
|
+
this._onSend = new ide_core_common_1.Emitter();
|
|
51
|
+
this.onSend = this._onSend.event;
|
|
52
|
+
this._onClose = new ide_core_common_1.Emitter();
|
|
53
|
+
this.onClose = this._onClose.event;
|
|
54
|
+
this._onValueChange = new ide_core_common_1.Emitter();
|
|
55
|
+
this.onValueChange = this._onValueChange.event;
|
|
47
56
|
}
|
|
48
57
|
dispose() {
|
|
49
58
|
super.dispose();
|
|
50
|
-
this.
|
|
59
|
+
this.inlineInputService.hide();
|
|
51
60
|
}
|
|
52
61
|
id() {
|
|
53
62
|
return ide_core_common_1.AIInlineInputChatContentWidgetId;
|
|
54
63
|
}
|
|
55
64
|
renderView() {
|
|
56
65
|
return (react_1.default.createElement("div", { className: inline_input_module_less_1.default.input_wrapper },
|
|
57
|
-
react_1.default.createElement(InlineInputWidgetRender, { onClose: () => this.
|
|
66
|
+
react_1.default.createElement(InlineInputWidgetRender, { defaultValue: this.defaultValue, onClose: () => this._onClose.fire(), onChatStatus: this.onStatusChange.bind(this), onLayoutChange: () => {
|
|
58
67
|
this.editor.layoutContentWidget(this);
|
|
68
|
+
}, onValueChange: (value) => {
|
|
69
|
+
this._onValueChange.fire(value);
|
|
59
70
|
}, onInteractiveInputSend: (value) => {
|
|
60
71
|
this.launchChatStatus(inline_chat_service_1.EInlineChatStatus.THINKING);
|
|
61
|
-
this.
|
|
72
|
+
this._onSend.fire(value);
|
|
62
73
|
}, onResultClick: (k) => {
|
|
63
74
|
this._onResultClick.fire(k);
|
|
64
75
|
} })));
|
|
65
76
|
}
|
|
66
77
|
};
|
|
67
|
-
exports.
|
|
68
|
-
tslib_1.__decorate([
|
|
69
|
-
(0, di_1.
|
|
70
|
-
tslib_1.__metadata("design:
|
|
71
|
-
],
|
|
72
|
-
exports.InlineInputChatWidget = InlineInputChatWidget = tslib_1.__decorate([
|
|
73
|
-
(0, di_1.Injectable)({ multiple: true })
|
|
74
|
-
], InlineInputChatWidget);
|
|
78
|
+
exports.InlineInputWidget = InlineInputWidget;
|
|
79
|
+
exports.InlineInputWidget = InlineInputWidget = tslib_1.__decorate([
|
|
80
|
+
(0, di_1.Injectable)({ multiple: true }),
|
|
81
|
+
tslib_1.__metadata("design:paramtypes", [Object, String])
|
|
82
|
+
], InlineInputWidget);
|
|
75
83
|
//# sourceMappingURL=inline-input-widget.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inline-input-widget.js","sourceRoot":"","sources":["../../../../src/browser/widget/inline-input/inline-input-widget.tsx"],"names":[],"mappings":";;;;AAAA,uDAAoF;AAEpF,
|
|
1
|
+
{"version":3,"file":"inline-input-widget.js","sourceRoot":"","sources":["../../../../src/browser/widget/inline-input/inline-input-widget.tsx"],"names":[],"mappings":"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"}
|
|
@@ -4,12 +4,20 @@ import { BaseAIMonacoEditorController } from '../../contrib/base';
|
|
|
4
4
|
export declare class InlineInputController extends BaseAIMonacoEditorController {
|
|
5
5
|
static readonly ID = "editor.contrib.ai.inline.input";
|
|
6
6
|
static get(editor: ICodeEditor): InlineInputController | null;
|
|
7
|
-
private get
|
|
8
|
-
private get
|
|
9
|
-
private get
|
|
10
|
-
private get
|
|
7
|
+
private get inlineInputService();
|
|
8
|
+
private get aiReporter();
|
|
9
|
+
private get eventBus();
|
|
10
|
+
private get messageService();
|
|
11
|
+
private inlineDiffController;
|
|
12
|
+
private inputDisposable;
|
|
13
|
+
private aiNativeContextKey;
|
|
14
|
+
private inputValue;
|
|
15
|
+
private modelChangeObs;
|
|
16
|
+
private inlineInputWidgetStore;
|
|
11
17
|
mount(): IDisposable;
|
|
12
|
-
|
|
13
|
-
private
|
|
18
|
+
cancelToken(): void;
|
|
19
|
+
private hideInput;
|
|
20
|
+
private showInputInEmptyLine;
|
|
21
|
+
private showInputInSelection;
|
|
14
22
|
}
|
|
15
23
|
//# sourceMappingURL=inline-input.controller.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inline-input.controller.d.ts","sourceRoot":"","sources":["../../../../src/browser/widget/inline-input/inline-input.controller.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"inline-input.controller.d.ts","sourceRoot":"","sources":["../../../../src/browser/widget/inline-input/inline-input.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAOL,WAAW,EAKZ,MAAM,2BAA2B,CAAC;AAGnC,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAanD,OAAO,EAAE,4BAA4B,EAAE,MAAM,oBAAoB,CAAC;AAWlE,qBACa,qBAAsB,SAAQ,4BAA4B;IACrE,gBAAuB,EAAE,oCAAoC;WAE/C,GAAG,CAAC,MAAM,EAAE,WAAW,GAAG,qBAAqB,GAAG,IAAI;IAIpE,OAAO,KAAK,kBAAkB,GAE7B;IAED,OAAO,KAAK,UAAU,GAErB;IAED,OAAO,KAAK,QAAQ,GAEnB;IAED,OAAO,KAAK,cAAc,GAEzB;IAED,OAAO,CAAC,oBAAoB,CAAuB;IACnD,OAAO,CAAC,eAAe,CAAa;IACpC,OAAO,CAAC,kBAAkB,CAAqB;IAE/C,OAAO,CAAC,UAAU,CAA8B;IAChD,OAAO,CAAC,cAAc,CAAiD;IACvE,OAAO,CAAC,sBAAsB,CAG5B;IAEF,KAAK,IAAI,WAAW;IAoEX,WAAW;IAKpB,OAAO,CAAC,SAAS;YAKH,oBAAoB;YAwNpB,oBAAoB;CA8JnC"}
|