@opensumi/ide-ai-native 3.7.1-next-1739430207.0 → 3.7.1-next-1739439717.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 +0 -1
- package/lib/browser/ai-core.contextkeys.d.ts.map +1 -1
- package/lib/browser/ai-core.contextkeys.js +0 -1
- package/lib/browser/ai-core.contextkeys.js.map +1 -1
- package/lib/browser/ai-core.contribution.d.ts +1 -2
- package/lib/browser/ai-core.contribution.d.ts.map +1 -1
- package/lib/browser/ai-core.contribution.js +14 -55
- package/lib/browser/ai-core.contribution.js.map +1 -1
- package/lib/browser/contrib/intelligent-completions/intelligent-completions.contribution.d.ts +0 -1
- package/lib/browser/contrib/intelligent-completions/intelligent-completions.contribution.d.ts.map +1 -1
- package/lib/browser/contrib/intelligent-completions/intelligent-completions.contribution.js +4 -26
- package/lib/browser/contrib/intelligent-completions/intelligent-completions.contribution.js.map +1 -1
- package/lib/browser/contrib/intelligent-completions/intelligent-completions.controller.d.ts +1 -3
- package/lib/browser/contrib/intelligent-completions/intelligent-completions.controller.d.ts.map +1 -1
- package/lib/browser/contrib/intelligent-completions/intelligent-completions.controller.js +1 -9
- package/lib/browser/contrib/intelligent-completions/intelligent-completions.controller.js.map +1 -1
- package/lib/browser/contrib/intelligent-completions/source/base.d.ts +2 -1
- 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 +3 -2
- 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 +21 -51
- package/lib/browser/contrib/intelligent-completions/source/line-change.source.js.map +1 -1
- package/lib/browser/contrib/terminal/component/terminal-command-suggest-controller.js +2 -2
- package/lib/browser/contrib/terminal/component/terminal-command-suggest-controller.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 +10 -14
- package/lib/browser/model/enhanceDecorationsCollection.d.ts.map +1 -1
- package/lib/browser/model/enhanceDecorationsCollection.js +53 -42
- package/lib/browser/model/enhanceDecorationsCollection.js.map +1 -1
- package/lib/browser/model/styles.module.less +7 -0
- package/lib/browser/types.d.ts +1 -2
- package/lib/browser/types.d.ts.map +1 -1
- package/lib/browser/widget/inline-chat/inline-chat-editor.controller.d.ts +1 -2
- 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 +41 -13
- 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 +13 -3
- 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 +72 -24
- 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 +6 -1
- package/lib/browser/widget/inline-chat/inline-chat.service.d.ts.map +1 -1
- package/lib/browser/widget/inline-chat/inline-chat.service.js +19 -5
- package/lib/browser/widget/inline-chat/inline-chat.service.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 +42 -17
- package/lib/browser/widget/inline-chat/inline-content-widget.js.map +1 -1
- package/lib/browser/widget/inline-diff/inline-diff-previewer.d.ts +5 -22
- package/lib/browser/widget/inline-diff/inline-diff-previewer.d.ts.map +1 -1
- package/lib/browser/widget/inline-diff/inline-diff-previewer.js +30 -61
- package/lib/browser/widget/inline-diff/inline-diff-previewer.js.map +1 -1
- package/lib/browser/widget/inline-diff/inline-diff.controller.d.ts +12 -8
- package/lib/browser/widget/inline-diff/inline-diff.controller.d.ts.map +1 -1
- package/lib/browser/widget/inline-diff/inline-diff.controller.js +96 -68
- package/lib/browser/widget/inline-diff/inline-diff.controller.js.map +1 -1
- package/lib/browser/widget/inline-hint/inline-hint.controller.d.ts +1 -0
- package/lib/browser/widget/inline-hint/inline-hint.controller.d.ts.map +1 -1
- package/lib/browser/widget/inline-hint/inline-hint.controller.js +5 -0
- package/lib/browser/widget/inline-hint/inline-hint.controller.js.map +1 -1
- package/lib/browser/widget/inline-input/inline-input-widget.d.ts +2 -12
- package/lib/browser/widget/inline-input/inline-input-widget.d.ts.map +1 -1
- package/lib/browser/widget/inline-input/inline-input-widget.js +18 -26
- package/lib/browser/widget/inline-input/inline-input-widget.js.map +1 -1
- package/lib/browser/widget/inline-input/inline-input.controller.d.ts +6 -14
- package/lib/browser/widget/inline-input/inline-input.controller.d.ts.map +1 -1
- package/lib/browser/widget/inline-input/inline-input.controller.js +169 -320
- package/lib/browser/widget/inline-input/inline-input.controller.js.map +1 -1
- package/lib/browser/widget/inline-input/inline-input.module.less +0 -4
- package/lib/browser/widget/inline-input/inline-input.service.d.ts +7 -19
- package/lib/browser/widget/inline-input/inline-input.service.d.ts.map +1 -1
- package/lib/browser/widget/inline-input/inline-input.service.js +12 -72
- package/lib/browser/widget/inline-input/inline-input.service.js.map +1 -1
- package/lib/browser/widget/inline-stream-diff/inline-stream-diff.handler.d.ts +19 -8
- 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 +41 -48
- 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 +4 -17
- 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 +5 -37
- 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 +11 -7
- 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 +77 -33
- 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 +0 -3
- package/src/browser/ai-core.contribution.ts +16 -63
- package/src/browser/contrib/intelligent-completions/intelligent-completions.contribution.ts +8 -29
- package/src/browser/contrib/intelligent-completions/intelligent-completions.controller.ts +1 -13
- package/src/browser/contrib/intelligent-completions/source/base.ts +2 -0
- package/src/browser/contrib/intelligent-completions/source/line-change.source.ts +24 -79
- package/src/browser/contrib/terminal/component/terminal-command-suggest-controller.tsx +1 -1
- package/src/browser/index.ts +2 -2
- package/src/browser/layout/ai-layout.tsx +2 -5
- package/src/browser/model/enhanceDecorationsCollection.ts +77 -62
- package/src/browser/model/styles.module.less +7 -0
- package/src/browser/types.ts +2 -2
- package/src/browser/widget/inline-chat/inline-chat-editor.controller.ts +56 -21
- package/src/browser/widget/inline-chat/inline-chat.feature.registry.ts +90 -23
- package/src/browser/widget/inline-chat/inline-chat.service.ts +19 -2
- package/src/browser/widget/inline-chat/inline-content-widget.tsx +71 -14
- package/src/browser/widget/inline-diff/inline-diff-previewer.ts +32 -87
- package/src/browser/widget/inline-diff/inline-diff.controller.ts +114 -90
- package/src/browser/widget/inline-hint/inline-hint.controller.ts +7 -1
- package/src/browser/widget/inline-input/inline-input-widget.tsx +12 -34
- package/src/browser/widget/inline-input/inline-input.controller.ts +247 -453
- package/src/browser/widget/inline-input/inline-input.module.less +0 -4
- package/src/browser/widget/inline-input/inline-input.service.ts +13 -92
- package/src/browser/widget/inline-stream-diff/inline-stream-diff.handler.tsx +69 -58
- package/src/browser/widget/inline-stream-diff/live-preview.component.tsx +6 -45
- package/src/browser/widget/inline-stream-diff/live-preview.decoration.tsx +112 -40
- package/lib/browser/widget/inline-input/model.d.ts +0 -34
- package/lib/browser/widget/inline-input/model.d.ts.map +0 -1
- package/lib/browser/widget/inline-input/model.js +0 -63
- package/lib/browser/widget/inline-input/model.js.map +0 -1
- package/src/browser/widget/inline-input/model.ts +0 -74
|
@@ -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 browser_1 = require("@opensumi/ide-editor/lib/browser");
|
|
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,6 +13,7 @@ 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();
|
|
16
17
|
}
|
|
17
18
|
static get(editor) {
|
|
18
19
|
return editor.getContribution(InlineDiffController.ID);
|
|
@@ -20,59 +21,81 @@ class InlineDiffController extends base_1.BaseAIMonacoEditorController {
|
|
|
20
21
|
get preferenceService() {
|
|
21
22
|
return this.injector.get(ide_core_browser_1.PreferenceService);
|
|
22
23
|
}
|
|
24
|
+
get eventBus() {
|
|
25
|
+
return this.injector.get(ide_core_common_1.IEventBus);
|
|
26
|
+
}
|
|
23
27
|
mount() {
|
|
24
|
-
this.
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
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();
|
|
28
|
+
this.featureDisposable.addDispose(this.eventBus.on(browser_1.EditorGroupCloseEvent, (e) => {
|
|
29
|
+
const uriString = e.payload.resource.uri.toString();
|
|
30
|
+
const node = this.getStoredState(uriString);
|
|
31
|
+
if (node && node.previewerOptions.disposeWhenEditorClosed) {
|
|
32
|
+
this.destroyPreviewer(uriString);
|
|
40
33
|
}
|
|
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
|
-
});
|
|
51
34
|
}));
|
|
35
|
+
this.registerInlineDiffFeature(this.monacoEditor);
|
|
52
36
|
return this.featureDisposable;
|
|
53
37
|
}
|
|
54
|
-
|
|
55
|
-
|
|
38
|
+
storeState(key) {
|
|
39
|
+
if (!this.previewer) {
|
|
40
|
+
return;
|
|
41
|
+
}
|
|
42
|
+
// 存储的是快照
|
|
43
|
+
const node = this.previewer.createNodeSnapshot();
|
|
44
|
+
if (node) {
|
|
45
|
+
this._previewerNodeStore.set(key, node);
|
|
46
|
+
}
|
|
56
47
|
}
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
if (!
|
|
48
|
+
tryRestoreState(monacoEditor, key) {
|
|
49
|
+
const node = this.getStoredState(key);
|
|
50
|
+
if (!node) {
|
|
51
|
+
return;
|
|
52
|
+
}
|
|
53
|
+
if (node.disposed) {
|
|
54
|
+
this.destroyPreviewer(key);
|
|
60
55
|
return;
|
|
61
56
|
}
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
57
|
+
return this.restoreState(monacoEditor, node);
|
|
58
|
+
}
|
|
59
|
+
restoreState(monacoEditor, node) {
|
|
60
|
+
var _a;
|
|
61
|
+
const uri = (_a = monacoEditor.getModel()) === null || _a === void 0 ? void 0 : _a.uri;
|
|
62
|
+
if (uri) {
|
|
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
|
+
});
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
registerInlineDiffFeature(monacoEditor) {
|
|
73
|
+
const model = monacoEditor.getModel();
|
|
74
|
+
this.featureDisposable.addDispose(monacoEditor.onWillChangeModel((e) => {
|
|
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
|
+
}));
|
|
66
93
|
}
|
|
67
94
|
}
|
|
68
95
|
showPreviewerByStream(monacoEditor, options) {
|
|
69
96
|
const { crossSelection, chatResponse } = options;
|
|
70
97
|
const disposable = new ide_core_common_1.Disposable();
|
|
71
98
|
const previewer = this.createDiffPreviewer(monacoEditor, crossSelection, options.previewerOptions);
|
|
72
|
-
(0, observable_1.transaction)((tx) => {
|
|
73
|
-
this.currentPreviewer.set(previewer, tx);
|
|
74
|
-
this.previewerStore.set(previewer.modelId, previewer);
|
|
75
|
-
});
|
|
76
99
|
const onFinish = () => {
|
|
77
100
|
previewer.layout();
|
|
78
101
|
disposable.dispose();
|
|
@@ -83,7 +106,7 @@ class InlineDiffController extends base_1.BaseAIMonacoEditorController {
|
|
|
83
106
|
disposable.addDispose([
|
|
84
107
|
controller.onData((data) => {
|
|
85
108
|
if (ide_core_common_1.ReplyResponse.is(data)) {
|
|
86
|
-
|
|
109
|
+
previewer.onData(data);
|
|
87
110
|
}
|
|
88
111
|
}),
|
|
89
112
|
controller.onError((error) => {
|
|
@@ -111,48 +134,53 @@ class InlineDiffController extends base_1.BaseAIMonacoEditorController {
|
|
|
111
134
|
}
|
|
112
135
|
createDiffPreviewer(monacoEditor, selection, options) {
|
|
113
136
|
const inlineDiffMode = this.preferenceService.getValid(ide_core_common_1.AINativeSettingSectionsId.InlineDiffPreviewMode, schema_1.EInlineDiffPreviewMode.inlineLive);
|
|
114
|
-
|
|
137
|
+
this.destroyPreviewer();
|
|
115
138
|
if (inlineDiffMode === schema_1.EInlineDiffPreviewMode.sideBySide) {
|
|
116
|
-
previewer = this.injector.get(inline_diff_previewer_1.SideBySideInlineDiffWidget, [monacoEditor]);
|
|
139
|
+
this.previewer = this.injector.get(inline_diff_previewer_1.SideBySideInlineDiffWidget, [monacoEditor]);
|
|
117
140
|
}
|
|
118
141
|
else {
|
|
119
|
-
previewer = this.injector.get(inline_diff_previewer_1.LiveInlineDiffPreviewer, [monacoEditor]);
|
|
142
|
+
this.previewer = this.injector.get(inline_diff_previewer_1.LiveInlineDiffPreviewer, [monacoEditor]);
|
|
120
143
|
}
|
|
121
|
-
previewer.create(selection, options);
|
|
122
|
-
previewer.show(selection.startLineNumber - 1, selection.endLineNumber - selection.startLineNumber + 2);
|
|
123
|
-
|
|
124
|
-
previewer
|
|
125
|
-
this.previewerStore.delete(previewer.modelId);
|
|
126
|
-
}));
|
|
127
|
-
return previewer;
|
|
144
|
+
this.previewer.create(selection, options);
|
|
145
|
+
this.previewer.show(selection.startLineNumber - 1, selection.endLineNumber - selection.startLineNumber + 2);
|
|
146
|
+
this.listenPreviewer(this.previewer);
|
|
147
|
+
return this.previewer;
|
|
128
148
|
}
|
|
129
|
-
|
|
130
|
-
const previewer = this.getPreviewer();
|
|
149
|
+
listenPreviewer(previewer) {
|
|
131
150
|
if (!previewer) {
|
|
132
151
|
return;
|
|
133
152
|
}
|
|
134
|
-
previewer.
|
|
153
|
+
previewer.addDispose(previewer.onLineCount((lineCount) => this._onMaxLineCount.fire(lineCount)));
|
|
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);
|
|
135
164
|
}
|
|
136
165
|
getModifyContent() {
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
return;
|
|
140
|
-
}
|
|
141
|
-
return previewer.getValue();
|
|
166
|
+
var _a;
|
|
167
|
+
return (_a = this.previewer) === null || _a === void 0 ? void 0 : _a.getValue();
|
|
142
168
|
}
|
|
143
169
|
getOriginContent() {
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
170
|
+
var _a;
|
|
171
|
+
return (_a = this.previewer) === null || _a === void 0 ? void 0 : _a.getOriginValue();
|
|
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);
|
|
147
179
|
}
|
|
148
|
-
return previewer.getOriginValue();
|
|
149
180
|
}
|
|
150
181
|
revealFirstDiff() {
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
return;
|
|
154
|
-
}
|
|
155
|
-
previewer.revealFirstDiff();
|
|
182
|
+
var _a;
|
|
183
|
+
(_a = this.previewer) === null || _a === void 0 ? void 0 : _a.revealFirstDiff();
|
|
156
184
|
}
|
|
157
185
|
}
|
|
158
186
|
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,6 +5,7 @@ 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();
|
|
8
9
|
mount(): IDisposable;
|
|
9
10
|
private registerHintLineFeature;
|
|
10
11
|
}
|
|
@@ -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;AACpE,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAInD,OAAO,EAAE,4BAA4B,EAAE,MAAM,oBAAoB,CAAC;AAOlE,qBAAa,oBAAqB,SAAQ,4BAA4B;IACpE,gBAAuB,EAAE,mCAAmC;WAE9C,GAAG,CAAC,MAAM,EAAE,WAAW,GAAG,oBAAoB,GAAG,IAAI;IAInE,OAAO,KAAK,wBAAwB,GAEnC;IAED,OAAO,KAAK,sBAAsB,GAEjC;IAED,KAAK,IAAI,WAAW;IAIpB,OAAO,CAAC,uBAAuB;CA0FhC"}
|
|
@@ -8,6 +8,7 @@ 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");
|
|
11
12
|
const internal_type_1 = require("../internal.type");
|
|
12
13
|
const inline_hint_line_widget_1 = require("./inline-hint-line-widget");
|
|
13
14
|
class InlineHintController extends base_1.BaseAIMonacoEditorController {
|
|
@@ -17,6 +18,9 @@ class InlineHintController extends base_1.BaseAIMonacoEditorController {
|
|
|
17
18
|
get inlineCompletionsService() {
|
|
18
19
|
return this.injector.get(ai_completions_service_1.AICompletionsService);
|
|
19
20
|
}
|
|
21
|
+
get inlineInputChatService() {
|
|
22
|
+
return this.injector.get(inline_input_service_1.InlineInputChatService);
|
|
23
|
+
}
|
|
20
24
|
mount() {
|
|
21
25
|
return this.registerHintLineFeature(this.monacoEditor);
|
|
22
26
|
}
|
|
@@ -43,6 +47,7 @@ class InlineHintController extends base_1.BaseAIMonacoEditorController {
|
|
|
43
47
|
if (!(lineContent === null || lineContent === void 0 ? void 0 : lineContent.trim())) {
|
|
44
48
|
inlineHintLineDecoration.show(position);
|
|
45
49
|
}
|
|
50
|
+
this.inlineInputChatService.setCurrentVisiblePosition(position);
|
|
46
51
|
aiNativeContextKey.inlineHintWidgetIsVisible.set(true);
|
|
47
52
|
hintDisposable.addDispose(inlineHintLineDecoration.onDispose(() => {
|
|
48
53
|
// 这里的装饰器逻辑可能会被代码补全顶替
|
|
@@ -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,20 +1,10 @@
|
|
|
1
1
|
import { ReactNode } from 'react';
|
|
2
|
-
import { Emitter, Event } from '@opensumi/ide-core-common';
|
|
3
2
|
import { ContentWidgetPositionPreference } from '@opensumi/ide-monaco/lib/browser/monaco-exports/editor';
|
|
4
3
|
import { AIInlineContentWidget } from '../inline-chat/inline-content-widget';
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
protected readonly editor: IMonacoCodeEditor;
|
|
8
|
-
protected readonly defaultValue?: string | undefined;
|
|
4
|
+
export declare class InlineInputChatWidget extends AIInlineContentWidget {
|
|
5
|
+
private inlineInputChatService;
|
|
9
6
|
allowEditorOverflow: boolean;
|
|
10
7
|
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);
|
|
18
8
|
dispose(): void;
|
|
19
9
|
id(): string;
|
|
20
10
|
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,
|
|
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;AAqE7E,qBACa,qBAAsB,SAAQ,qBAAqB;IAE9D,OAAO,CAAC,sBAAsB,CAAyB;IAEvD,mBAAmB,UAAQ;IAC3B,kBAAkB,oCAA2C;IAEpD,OAAO,IAAI,IAAI;IAKf,EAAE,IAAI,MAAM;IAIZ,UAAU,IAAI,SAAS;CAoBjC"}
|
|
@@ -1,10 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.InlineInputChatWidget = 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");
|
|
8
7
|
const index_1 = require("@opensumi/ide-core-browser/lib/components/ai-native/index");
|
|
9
8
|
const ide_core_common_1 = require("@opensumi/ide-core-common");
|
|
10
9
|
const editor_1 = require("@opensumi/ide-monaco/lib/browser/monaco-exports/editor");
|
|
@@ -12,10 +11,10 @@ const index_2 = require("../inline-actions/result-items/index");
|
|
|
12
11
|
const inline_chat_service_1 = require("../inline-chat/inline-chat.service");
|
|
13
12
|
const inline_content_widget_1 = require("../inline-chat/inline-content-widget");
|
|
14
13
|
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 {
|
|
16
|
+
const { onClose, onInteractiveInputSend, onLayoutChange, onChatStatus, onResultClick } = 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);
|
|
19
18
|
(0, react_1.useEffect)(() => {
|
|
20
19
|
const dis = new ide_core_common_1.Disposable();
|
|
21
20
|
dis.addDispose(onChatStatus((s) => setStatus(s)));
|
|
@@ -38,46 +37,39 @@ const InlineInputWidgetRender = (props) => {
|
|
|
38
37
|
if (isDone) {
|
|
39
38
|
return react_1.default.createElement(index_2.InlineResultAction, { onResultClick: onResultClick });
|
|
40
39
|
}
|
|
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,
|
|
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: 320, disabled: isLoading, onSend: handleInteractiveInputSend }) }));
|
|
42
41
|
};
|
|
43
|
-
let
|
|
44
|
-
constructor(
|
|
45
|
-
super(
|
|
46
|
-
this.editor = editor;
|
|
47
|
-
this.defaultValue = defaultValue;
|
|
42
|
+
let InlineInputChatWidget = class InlineInputChatWidget extends inline_content_widget_1.AIInlineContentWidget {
|
|
43
|
+
constructor() {
|
|
44
|
+
super(...arguments);
|
|
48
45
|
this.allowEditorOverflow = true;
|
|
49
46
|
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;
|
|
56
47
|
}
|
|
57
48
|
dispose() {
|
|
58
49
|
super.dispose();
|
|
59
|
-
this.
|
|
50
|
+
this.inlineInputChatService.hide();
|
|
60
51
|
}
|
|
61
52
|
id() {
|
|
62
53
|
return ide_core_common_1.AIInlineInputChatContentWidgetId;
|
|
63
54
|
}
|
|
64
55
|
renderView() {
|
|
65
56
|
return (react_1.default.createElement("div", { className: inline_input_module_less_1.default.input_wrapper },
|
|
66
|
-
react_1.default.createElement(InlineInputWidgetRender, {
|
|
57
|
+
react_1.default.createElement(InlineInputWidgetRender, { onClose: () => this.dispose(), onChatStatus: this.onStatusChange.bind(this), onLayoutChange: () => {
|
|
67
58
|
this.editor.layoutContentWidget(this);
|
|
68
|
-
}, onValueChange: (value) => {
|
|
69
|
-
this._onValueChange.fire(value);
|
|
70
59
|
}, onInteractiveInputSend: (value) => {
|
|
71
60
|
this.launchChatStatus(inline_chat_service_1.EInlineChatStatus.THINKING);
|
|
72
|
-
this.
|
|
61
|
+
this._onInteractiveInputValue.fire(value);
|
|
73
62
|
}, onResultClick: (k) => {
|
|
74
63
|
this._onResultClick.fire(k);
|
|
75
64
|
} })));
|
|
76
65
|
}
|
|
77
66
|
};
|
|
78
|
-
exports.
|
|
79
|
-
|
|
80
|
-
(0, di_1.
|
|
81
|
-
tslib_1.__metadata("design:
|
|
82
|
-
],
|
|
67
|
+
exports.InlineInputChatWidget = InlineInputChatWidget;
|
|
68
|
+
tslib_1.__decorate([
|
|
69
|
+
(0, di_1.Autowired)(inline_input_service_1.InlineInputChatService),
|
|
70
|
+
tslib_1.__metadata("design:type", inline_input_service_1.InlineInputChatService)
|
|
71
|
+
], InlineInputChatWidget.prototype, "inlineInputChatService", void 0);
|
|
72
|
+
exports.InlineInputChatWidget = InlineInputChatWidget = tslib_1.__decorate([
|
|
73
|
+
(0, di_1.Injectable)({ multiple: true })
|
|
74
|
+
], InlineInputChatWidget);
|
|
83
75
|
//# 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,20 +4,12 @@ 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
|
|
11
|
-
private inlineDiffController;
|
|
12
|
-
private inputDisposable;
|
|
13
|
-
private aiNativeContextKey;
|
|
14
|
-
private inputValue;
|
|
15
|
-
private modelChangeObs;
|
|
16
|
-
private inlineInputWidgetStore;
|
|
7
|
+
private get inlineInputChatService();
|
|
8
|
+
private get inlineChatFeatureRegistry();
|
|
9
|
+
private get languageParserService();
|
|
10
|
+
private get inlineChatService();
|
|
17
11
|
mount(): IDisposable;
|
|
18
|
-
|
|
19
|
-
private
|
|
20
|
-
private showInputInEmptyLine;
|
|
21
|
-
private showInputInSelection;
|
|
12
|
+
private doRequestReadable;
|
|
13
|
+
private registerInlineInputFeature;
|
|
22
14
|
}
|
|
23
15
|
//# 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":"AAEA,OAAO,EAKL,WAAW,EAIZ,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAOnD,OAAO,EAAE,4BAA4B,EAAE,MAAM,oBAAoB,CAAC;AAYlE,qBACa,qBAAsB,SAAQ,4BAA4B;IACrE,gBAAuB,EAAE,oCAAoC;WAE/C,GAAG,CAAC,MAAM,EAAE,WAAW,GAAG,qBAAqB,GAAG,IAAI;IAIpE,OAAO,KAAK,sBAAsB,GAEjC;IAED,OAAO,KAAK,yBAAyB,GAEpC;IAED,OAAO,KAAK,qBAAqB,GAEhC;IAED,OAAO,KAAK,iBAAiB,GAE5B;IAED,KAAK,IAAI,WAAW;YAIN,iBAAiB;IA6E/B,OAAO,CAAC,0BAA0B;CAyLnC"}
|