@opensumi/ide-monaco 3.8.3-next-1746775533.0 → 3.8.3-next-1747035047.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.
|
@@ -42,7 +42,7 @@ const WapperAIInlineResult = (props) => {
|
|
|
42
42
|
], icon: {
|
|
43
43
|
color: 'var(--notificationsWarningIcon-foreground)',
|
|
44
44
|
className: 'question-circle',
|
|
45
|
-
}, title: (0, ide_core_common_1.localize)('aiNative.resolve.conflict.dialog.afresh'), message: (0, ide_core_common_1.localize)('aiNative.resolve.conflict.dialog.detection'), visible: true, messageType:
|
|
45
|
+
}, title: (0, ide_core_common_1.localize)('aiNative.resolve.conflict.dialog.afresh'), message: (0, ide_core_common_1.localize)('aiNative.resolve.conflict.dialog.detection'), visible: true, messageType: ide_core_common_1.MessageType.Warning }))), [isVisiablePopover]);
|
|
46
46
|
const renderGenerate = (0, react_1.useCallback)(() => (react_1.default.createElement(components_1.Popover, { visible: isVisiablePopover, id: uid, content: popoverContent, position: components_1.PopoverPosition.bottom },
|
|
47
47
|
react_1.default.createElement("span", null, (0, ide_core_common_1.localize)('aiNative.operate.afresh.title')))), [isVisiablePopover]);
|
|
48
48
|
const handleRenerate = (0, react_1.useCallback)(() => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolve-result-widget.js","sourceRoot":"","sources":["../../../../../src/browser/contrib/merge-editor/widget/resolve-result-widget.tsx"],"names":[],"mappings":";;;;AAAA,uDAA+D;AAE/D,qCAA0C;AAC1C,
|
|
1
|
+
{"version":3,"file":"resolve-result-widget.js","sourceRoot":"","sources":["../../../../../src/browser/contrib/merge-editor/widget/resolve-result-widget.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@opensumi/ide-monaco",
|
|
3
|
-
"version": "3.8.3-next-
|
|
3
|
+
"version": "3.8.3-next-1747035047.0",
|
|
4
4
|
"files": [
|
|
5
5
|
"lib",
|
|
6
6
|
"src",
|
|
@@ -15,18 +15,18 @@
|
|
|
15
15
|
"build:worker": "../../node_modules/.bin/webpack --config webpack.config.js"
|
|
16
16
|
},
|
|
17
17
|
"dependencies": {
|
|
18
|
-
"@opensumi/ide-components": "3.8.3-next-
|
|
19
|
-
"@opensumi/ide-core-browser": "3.8.3-next-
|
|
20
|
-
"@opensumi/ide-core-common": "3.8.3-next-
|
|
21
|
-
"@opensumi/ide-overlay": "3.8.3-next-
|
|
22
|
-
"@opensumi/ide-theme": "3.8.3-next-
|
|
23
|
-
"@opensumi/ide-utils": "3.8.3-next-
|
|
18
|
+
"@opensumi/ide-components": "3.8.3-next-1747035047.0",
|
|
19
|
+
"@opensumi/ide-core-browser": "3.8.3-next-1747035047.0",
|
|
20
|
+
"@opensumi/ide-core-common": "3.8.3-next-1747035047.0",
|
|
21
|
+
"@opensumi/ide-overlay": "3.8.3-next-1747035047.0",
|
|
22
|
+
"@opensumi/ide-theme": "3.8.3-next-1747035047.0",
|
|
23
|
+
"@opensumi/ide-utils": "3.8.3-next-1747035047.0",
|
|
24
24
|
"@opensumi/monaco-editor-core": "0.54.0-patch.2"
|
|
25
25
|
},
|
|
26
26
|
"devDependencies": {
|
|
27
|
-
"@opensumi/ide-dev-tool": "3.8.3-next-
|
|
28
|
-
"@opensumi/ide-file-service": "3.8.3-next-
|
|
29
|
-
"@opensumi/ide-workspace": "3.8.3-next-
|
|
27
|
+
"@opensumi/ide-dev-tool": "3.8.3-next-1747035047.0",
|
|
28
|
+
"@opensumi/ide-file-service": "3.8.3-next-1747035047.0",
|
|
29
|
+
"@opensumi/ide-workspace": "3.8.3-next-1747035047.0"
|
|
30
30
|
},
|
|
31
|
-
"gitHead": "
|
|
31
|
+
"gitHead": "4871e0077dfcb38ca30e97b571064d2f41898ee7"
|
|
32
32
|
}
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import React, { ReactNode, useCallback, useMemo } from 'react';
|
|
2
2
|
|
|
3
3
|
import { Injectable } from '@opensumi/di';
|
|
4
|
-
import { Button
|
|
4
|
+
import { Button } from '@opensumi/ide-components';
|
|
5
5
|
import { DialogContent, Popover, PopoverPosition } from '@opensumi/ide-core-browser/lib/components';
|
|
6
6
|
import { AIInlineResult } from '@opensumi/ide-core-browser/lib/components/ai-native';
|
|
7
7
|
import { ContentWidgetContainerPanel } from '@opensumi/ide-core-browser/lib/components/ai-native/content-widget/containerPanel';
|
|
8
8
|
import { IAIInlineResultIconItemsProps } from '@opensumi/ide-core-browser/lib/components/ai-native/inline-chat/result';
|
|
9
|
-
import { localize, uuid } from '@opensumi/ide-core-common';
|
|
9
|
+
import { MessageType, localize, uuid } from '@opensumi/ide-core-common';
|
|
10
10
|
|
|
11
11
|
import { ReactInlineContentWidget } from '../../../ai-native/BaseInlineContentWidget';
|
|
12
12
|
import { LineRange } from '../model/line-range';
|