@opensumi/ide-core-common 2.27.3-next-1712837107.0 → 2.27.3-next-1712891776.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.
Files changed (4) hide show
  1. package/lib/types/ai-native/index.d.ts +4 -0
  2. package/lib/types/ai-native/index.d.ts.map +1 -1
  3. package/package.json +4 -4
  4. package/src/types/ai-native/index.ts +7 -0
package/lib/types/ai-native/index.d.ts CHANGED
@@ -123,6 +123,10 @@ export interface IConflictContentMetadata {
123
123
  current: string;
124
124
  base: string;
125
125
  incoming: string;
126
+ currentName?: string;
127
+ baseName?: string;
128
+ incomingName?: string;
129
+ resultContent?: string;
126
130
  }
127
131
  export interface IResolveConflictHandler {
128
132
  providerRequest: (contentMetadata: IConflictContentMetadata, options: {
package/lib/types/ai-native/index.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/types/ai-native/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/types/ai-native/index.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@opensumi/ide-core-common",
3
- "version": "2.27.3-next-1712837107.0",
3
+ "version": "2.27.3-next-1712891776.0",
4
4
  "description": "@opensumi/ide-core-common",
5
5
  "files": [
6
6
  "lib",
@@ -19,11 +19,11 @@
19
19
  },
20
20
  "dependencies": {
21
21
  "@opensumi/di": "^1.4.0",
22
- "@opensumi/ide-utils": "2.27.3-next-1712837107.0",
22
+ "@opensumi/ide-utils": "2.27.3-next-1712891776.0",
23
23
  "jschardet": "3.0.0"
24
24
  },
25
25
  "devDependencies": {
26
- "@opensumi/ide-dev-tool": "2.27.3-next-1712837107.0"
26
+ "@opensumi/ide-dev-tool": "2.27.3-next-1712891776.0"
27
27
  },
28
- "gitHead": "b826365d2b116e1a105e4167244cb9863a35ca21"
28
+ "gitHead": "77b4c5cee1a0dc1b8c68b270647d66c4107a2705"
29
29
  }
package/src/types/ai-native/index.ts CHANGED
@@ -162,6 +162,13 @@ export interface IConflictContentMetadata {
162
162
  current: string;
163
163
  base: string;
164
164
  incoming: string;
165
+
166
+ // 各分支的名称
167
+ currentName?: string;
168
+ baseName?: string;
169
+ incomingName?: string;
170
+
171
+ resultContent?: string;
165
172
  }
166
173
  export interface IResolveConflictHandler {
167
174
  providerRequest: (