@opensumi/ide-editor 2.27.3-next-1714464252.0 → 2.27.3-next-1714469095.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/merge-editor/MergeEditorFloatComponents.d.ts.map +1 -1
- package/lib/browser/merge-editor/MergeEditorFloatComponents.js +2 -4
- package/lib/browser/merge-editor/MergeEditorFloatComponents.js.map +1 -1
- package/package.json +14 -14
- package/src/browser/merge-editor/MergeEditorFloatComponents.tsx +4 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MergeEditorFloatComponents.d.ts","sourceRoot":"","sources":["../../../src/browser/merge-editor/MergeEditorFloatComponents.tsx"],"names":[],"mappings":"AAGA,OAAO,EAOL,GAAG,EAGJ,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"MergeEditorFloatComponents.d.ts","sourceRoot":"","sources":["../../../src/browser/merge-editor/MergeEditorFloatComponents.tsx"],"names":[],"mappings":"AAGA,OAAO,EAOL,GAAG,EAGJ,MAAM,4BAA4B,CAAC;AAOpC,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAIhD,eAAO,MAAM,0BAA0B,EAAE,oBAAoB,CAAC;IAAE,GAAG,EAAE,GAAG,CAAA;CAAE,CAmJzE,CAAC"}
|
|
@@ -5,6 +5,7 @@ const tslib_1 = require("tslib");
|
|
|
5
5
|
const react_1 = tslib_1.__importStar(require("react"));
|
|
6
6
|
const ide_components_1 = require("@opensumi/ide-components");
|
|
7
7
|
const ide_core_browser_1 = require("@opensumi/ide-core-browser");
|
|
8
|
+
const ide_core_common_1 = require("@opensumi/ide-core-common");
|
|
8
9
|
const git_1 = require("@opensumi/ide-core-common/lib/commands/git");
|
|
9
10
|
const useEditor_1 = require("../hooks/useEditor");
|
|
10
11
|
const useInMergeChanges_1 = require("../hooks/useInMergeChanges");
|
|
@@ -80,10 +81,7 @@ const MergeEditorFloatComponents = ({ resource }) => {
|
|
|
80
81
|
return null;
|
|
81
82
|
}
|
|
82
83
|
return (react_1.default.createElement("div", { className: merge_editor_module_less_1.default.merge_editor_float_container },
|
|
83
|
-
react_1.default.createElement("div", { className: merge_editor_module_less_1.default.merge_editor_float_container_info },
|
|
84
|
-
"\u5269\u4F59\u672A\u89E3\u51B3\u51B2\u7A81 ",
|
|
85
|
-
conflicts.length,
|
|
86
|
-
" \u5904"),
|
|
84
|
+
react_1.default.createElement("div", { className: merge_editor_module_less_1.default.merge_editor_float_container_info }, (0, ide_core_common_1.formatLocalize)('merge-conflicts.merge.conflict.remain', conflicts.length)),
|
|
87
85
|
react_1.default.createElement("div", { className: merge_editor_module_less_1.default.merge_editor_float_container_operation_bar },
|
|
88
86
|
react_1.default.createElement("div", { id: 'merge.editor.action.button.nav' },
|
|
89
87
|
react_1.default.createElement(ide_components_1.Button, { className: merge_editor_module_less_1.default.merge_conflict_bottom_btn, size: 'default', onClick: handlePrev },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MergeEditorFloatComponents.js","sourceRoot":"","sources":["../../../src/browser/merge-editor/MergeEditorFloatComponents.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"MergeEditorFloatComponents.js","sourceRoot":"","sources":["../../../src/browser/merge-editor/MergeEditorFloatComponents.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@opensumi/ide-editor",
|
|
3
|
-
"version": "2.27.3-next-
|
|
3
|
+
"version": "2.27.3-next-1714469095.0",
|
|
4
4
|
"files": [
|
|
5
5
|
"lib",
|
|
6
6
|
"src"
|
|
@@ -17,21 +17,21 @@
|
|
|
17
17
|
"url": "git@github.com:opensumi/core.git"
|
|
18
18
|
},
|
|
19
19
|
"dependencies": {
|
|
20
|
-
"@opensumi/ide-core-common": "2.27.3-next-
|
|
21
|
-
"@opensumi/ide-core-node": "2.27.3-next-
|
|
22
|
-
"@opensumi/ide-file-service": "2.27.3-next-
|
|
23
|
-
"@opensumi/ide-monaco": "2.27.3-next-
|
|
24
|
-
"@opensumi/ide-utils": "2.27.3-next-
|
|
20
|
+
"@opensumi/ide-core-common": "2.27.3-next-1714469095.0",
|
|
21
|
+
"@opensumi/ide-core-node": "2.27.3-next-1714469095.0",
|
|
22
|
+
"@opensumi/ide-file-service": "2.27.3-next-1714469095.0",
|
|
23
|
+
"@opensumi/ide-monaco": "2.27.3-next-1714469095.0",
|
|
24
|
+
"@opensumi/ide-utils": "2.27.3-next-1714469095.0",
|
|
25
25
|
"vscode-oniguruma": "1.5.1"
|
|
26
26
|
},
|
|
27
27
|
"devDependencies": {
|
|
28
|
-
"@opensumi/ide-components": "2.27.3-next-
|
|
29
|
-
"@opensumi/ide-core-browser": "2.27.3-next-
|
|
30
|
-
"@opensumi/ide-dev-tool": "2.27.3-next-
|
|
31
|
-
"@opensumi/ide-overlay": "2.27.3-next-
|
|
32
|
-
"@opensumi/ide-quick-open": "2.27.3-next-
|
|
33
|
-
"@opensumi/ide-theme": "2.27.3-next-
|
|
34
|
-
"@opensumi/ide-workspace": "2.27.3-next-
|
|
28
|
+
"@opensumi/ide-components": "2.27.3-next-1714469095.0",
|
|
29
|
+
"@opensumi/ide-core-browser": "2.27.3-next-1714469095.0",
|
|
30
|
+
"@opensumi/ide-dev-tool": "2.27.3-next-1714469095.0",
|
|
31
|
+
"@opensumi/ide-overlay": "2.27.3-next-1714469095.0",
|
|
32
|
+
"@opensumi/ide-quick-open": "2.27.3-next-1714469095.0",
|
|
33
|
+
"@opensumi/ide-theme": "2.27.3-next-1714469095.0",
|
|
34
|
+
"@opensumi/ide-workspace": "2.27.3-next-1714469095.0"
|
|
35
35
|
},
|
|
36
|
-
"gitHead": "
|
|
36
|
+
"gitHead": "c30535fa0f269adef39d6bf933d4cf499bb5c8dc"
|
|
37
37
|
}
|
|
@@ -12,6 +12,7 @@ import {
|
|
|
12
12
|
localize,
|
|
13
13
|
useInjectable,
|
|
14
14
|
} from '@opensumi/ide-core-browser';
|
|
15
|
+
import { formatLocalize } from '@opensumi/ide-core-common';
|
|
15
16
|
import { MergeConflictCommands } from '@opensumi/ide-core-common/lib/commands/git';
|
|
16
17
|
|
|
17
18
|
import { useEditorDocumentModelRef } from '../hooks/useEditor';
|
|
@@ -110,7 +111,9 @@ export const MergeEditorFloatComponents: ReactEditorComponent<{ uri: URI }> = ({
|
|
|
110
111
|
|
|
111
112
|
return (
|
|
112
113
|
<div className={styles.merge_editor_float_container}>
|
|
113
|
-
<div className={styles.merge_editor_float_container_info}
|
|
114
|
+
<div className={styles.merge_editor_float_container_info}>
|
|
115
|
+
{formatLocalize('merge-conflicts.merge.conflict.remain', conflicts.length)}
|
|
116
|
+
</div>
|
|
114
117
|
<div className={styles.merge_editor_float_container_operation_bar}>
|
|
115
118
|
<div id='merge.editor.action.button.nav'>
|
|
116
119
|
<Button className={styles.merge_conflict_bottom_btn} size='default' onClick={handlePrev}>
|