@opensumi/ide-core-common 2.27.3-next-1712901337.0 → 2.27.3-next-1712903442.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 (9) hide show
  1. package/lib/types/ai-native/index.d.ts +0 -4
  2. package/lib/types/ai-native/index.d.ts.map +1 -1
  3. package/lib/types/extension.d.ts +0 -2
  4. package/lib/types/extension.d.ts.map +1 -1
  5. package/lib/types/extension.js +1 -4
  6. package/lib/types/extension.js.map +1 -1
  7. package/package.json +4 -4
  8. package/src/types/ai-native/index.ts +0 -7
  9. package/src/types/extension.ts +0 -1
package/lib/types/ai-native/index.d.ts CHANGED
@@ -123,10 +123,6 @@ 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;
130
126
  }
131
127
  export interface IResolveConflictHandler {
132
128
  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/lib/types/extension.d.ts CHANGED
@@ -77,8 +77,6 @@ export interface IExtensionActivateEventPayload {
77
77
  }
78
78
  export declare class ExtensionActivateEvent extends BasicEvent<IExtensionActivateEventPayload> {
79
79
  }
80
- export declare class ExtensionActivatedEvent extends BasicEvent<IExtensionActivateEventPayload> {
81
- }
82
80
  export declare class ExtensionDidContributes extends BasicEvent<void> {
83
81
  }
84
82
  //# sourceMappingURL=extension.d.ts.map
package/lib/types/extension.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"extension.d.ts","sourceRoot":"","sources":["../../src/types/extension.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,qBAAqB,CAAC;AAE1C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,qBAAa,kBAAkB;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,OAAO,CAAC;IACnB,aAAa,EAAE,OAAO,CAAC;CACxB;AAED,oBAAY,0BAA0B;IACpC,KAAK,IAAA;IACL,KAAK,IAAA;CACN;AAED;;GAEG;AACH,MAAM,WAAW,sBAAsB;IAErC,IAAI,EAAE,0BAA0B,CAAC;IAEjC,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED;;GAEG;AACH,MAAM,WAAW,0BAA0B;IACzC,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,aAAa,EAAE,MAAM,EAAE,aAAa,UAAQ,GAAG,kBAAkB,CAErG;AAED,MAAM,WAAW,QAAQ;IACvB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB;AAED,MAAM,WAAW,cAAc;IAC7B;;;OAGG;IACH,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB;;OAEG;IACH,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B;;OAEG;IACH,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC;IAE5B;;OAEG;IACH,QAAQ,CAAC,aAAa,CAAC,EAAE,OAAO,CAAC;CAClC;AAED,MAAM,WAAW,eAAgB,SAAQ,cAAc;IACrD,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,WAAW,EAAE,QAAQ,CAAC;IAC/B,QAAQ,CAAC,iBAAiB,EAAE,QAAQ,GAAG,SAAS,CAAC;IACjD,QAAQ,CAAC,cAAc,EAAE,QAAQ,GAAG,SAAS,CAAC;IAC9C,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,aAAa,EAAE,QAAQ,CAAC;IACjC,QAAQ,CAAC,YAAY,EAAE,QAAQ,CAAC;IAChC,QAAQ,CAAC,iBAAiB,EAAE,OAAO,CAAC;IACpC,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC;IAC9B,QAAQ,CAAC,iBAAiB,EAAE,GAAG,CAAC;IAChC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED,qBAAa,qBAAsB,SAAQ,UAAU,CAAC,eAAe,CAAC;CAAG;AAEzE,MAAM,WAAW,8BAA8B;IAC7C,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,GAAG,CAAC;CACZ;AAED,qBAAa,sBAAuB,SAAQ,UAAU,CAAC,8BAA8B,CAAC;CAAG;AACzF,qBAAa,uBAAwB,SAAQ,UAAU,CAAC,8BAA8B,CAAC;CAAG;AAE1F,qBAAa,uBAAwB,SAAQ,UAAU,CAAC,IAAI,CAAC;CAAG"}
1
+ {"version":3,"file":"extension.d.ts","sourceRoot":"","sources":["../../src/types/extension.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,qBAAqB,CAAC;AAE1C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,qBAAa,kBAAkB;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,OAAO,CAAC;IACnB,aAAa,EAAE,OAAO,CAAC;CACxB;AAED,oBAAY,0BAA0B;IACpC,KAAK,IAAA;IACL,KAAK,IAAA;CACN;AAED;;GAEG;AACH,MAAM,WAAW,sBAAsB;IAErC,IAAI,EAAE,0BAA0B,CAAC;IAEjC,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED;;GAEG;AACH,MAAM,WAAW,0BAA0B;IACzC,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,aAAa,EAAE,MAAM,EAAE,aAAa,UAAQ,GAAG,kBAAkB,CAErG;AAED,MAAM,WAAW,QAAQ;IACvB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB;AAED,MAAM,WAAW,cAAc;IAC7B;;;OAGG;IACH,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB;;OAEG;IACH,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B;;OAEG;IACH,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC;IAE5B;;OAEG;IACH,QAAQ,CAAC,aAAa,CAAC,EAAE,OAAO,CAAC;CAClC;AAED,MAAM,WAAW,eAAgB,SAAQ,cAAc;IACrD,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,WAAW,EAAE,QAAQ,CAAC;IAC/B,QAAQ,CAAC,iBAAiB,EAAE,QAAQ,GAAG,SAAS,CAAC;IACjD,QAAQ,CAAC,cAAc,EAAE,QAAQ,GAAG,SAAS,CAAC;IAC9C,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,aAAa,EAAE,QAAQ,CAAC;IACjC,QAAQ,CAAC,YAAY,EAAE,QAAQ,CAAC;IAChC,QAAQ,CAAC,iBAAiB,EAAE,OAAO,CAAC;IACpC,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC;IAC9B,QAAQ,CAAC,iBAAiB,EAAE,GAAG,CAAC;IAChC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED,qBAAa,qBAAsB,SAAQ,UAAU,CAAC,eAAe,CAAC;CAAG;AAEzE,MAAM,WAAW,8BAA8B;IAC7C,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,GAAG,CAAC;CACZ;AAED,qBAAa,sBAAuB,SAAQ,UAAU,CAAC,8BAA8B,CAAC;CAAG;AAEzF,qBAAa,uBAAwB,SAAQ,UAAU,CAAC,IAAI,CAAC;CAAG"}
package/lib/types/extension.js CHANGED
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.ExtensionDidContributes = exports.ExtensionActivatedEvent = exports.ExtensionActivateEvent = exports.ExtensionEnabledEvent = exports.asExtensionCandidate = exports.ExtensionConnectModeOption = exports.ExtensionCandidate = void 0;
3
+ exports.ExtensionDidContributes = exports.ExtensionActivateEvent = exports.ExtensionEnabledEvent = exports.asExtensionCandidate = exports.ExtensionConnectModeOption = exports.ExtensionCandidate = void 0;
4
4
  const event_bus_1 = require("../event-bus");
5
5
  class ExtensionCandidate {
6
6
  }
@@ -25,9 +25,6 @@ exports.ExtensionEnabledEvent = ExtensionEnabledEvent;
25
25
  class ExtensionActivateEvent extends event_bus_1.BasicEvent {
26
26
  }
27
27
  exports.ExtensionActivateEvent = ExtensionActivateEvent;
28
- class ExtensionActivatedEvent extends event_bus_1.BasicEvent {
29
- }
30
- exports.ExtensionActivatedEvent = ExtensionActivatedEvent;
31
28
  class ExtensionDidContributes extends event_bus_1.BasicEvent {
32
29
  }
33
30
  exports.ExtensionDidContributes = ExtensionDidContributes;
package/lib/types/extension.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"extension.js","sourceRoot":"","sources":["../../src/types/extension.ts"],"names":[],"mappings":";;;AAEA,4CAA0C;AAE1C,MAAa,kBAAkB;CAI9B;AAJD,gDAIC;AAED,IAAY,0BAGX;AAHD,WAAY,0BAA0B;IACpC,yEAAK,CAAA;IACL,yEAAK,CAAA;AACP,CAAC,EAHW,0BAA0B,GAA1B,kCAA0B,KAA1B,kCAA0B,QAGrC;AAoBD;;;;GAIG;AACH,SAAgB,oBAAoB,CAAC,aAAqB,EAAE,aAAa,GAAG,KAAK;IAC/E,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,SAAS,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC;AACjE,CAAC;AAFD,oDAEC;AA8CD,MAAa,qBAAsB,SAAQ,sBAA2B;CAAG;AAAzE,sDAAyE;AAOzE,MAAa,sBAAuB,SAAQ,sBAA0C;CAAG;AAAzF,wDAAyF;AACzF,MAAa,uBAAwB,SAAQ,sBAA0C;CAAG;AAA1F,0DAA0F;AAE1F,MAAa,uBAAwB,SAAQ,sBAAgB;CAAG;AAAhE,0DAAgE"}
1
+ {"version":3,"file":"extension.js","sourceRoot":"","sources":["../../src/types/extension.ts"],"names":[],"mappings":";;;AAEA,4CAA0C;AAE1C,MAAa,kBAAkB;CAI9B;AAJD,gDAIC;AAED,IAAY,0BAGX;AAHD,WAAY,0BAA0B;IACpC,yEAAK,CAAA;IACL,yEAAK,CAAA;AACP,CAAC,EAHW,0BAA0B,GAA1B,kCAA0B,KAA1B,kCAA0B,QAGrC;AAoBD;;;;GAIG;AACH,SAAgB,oBAAoB,CAAC,aAAqB,EAAE,aAAa,GAAG,KAAK;IAC/E,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,SAAS,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC;AACjE,CAAC;AAFD,oDAEC;AA8CD,MAAa,qBAAsB,SAAQ,sBAA2B;CAAG;AAAzE,sDAAyE;AAOzE,MAAa,sBAAuB,SAAQ,sBAA0C;CAAG;AAAzF,wDAAyF;AAEzF,MAAa,uBAAwB,SAAQ,sBAAgB;CAAG;AAAhE,0DAAgE"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@opensumi/ide-core-common",
3
- "version": "2.27.3-next-1712901337.0",
3
+ "version": "2.27.3-next-1712903442.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-1712901337.0",
22
+ "@opensumi/ide-utils": "2.27.3-next-1712903442.0",
23
23
  "jschardet": "3.0.0"
24
24
  },
25
25
  "devDependencies": {
26
- "@opensumi/ide-dev-tool": "2.27.3-next-1712901337.0"
26
+ "@opensumi/ide-dev-tool": "2.27.3-next-1712903442.0"
27
27
  },
28
- "gitHead": "c627ee9aa9848a7ad89e4cbab33c7845d2d380d9"
28
+ "gitHead": "b419288b7dc41392582988b6c6006b8ad8b63e59"
29
29
  }
package/src/types/ai-native/index.ts CHANGED
@@ -162,13 +162,6 @@ 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;
172
165
  }
173
166
  export interface IResolveConflictHandler {
174
167
  providerRequest: (
package/src/types/extension.ts CHANGED
@@ -92,6 +92,5 @@ export interface IExtensionActivateEventPayload {
92
92
  }
93
93
 
94
94
  export class ExtensionActivateEvent extends BasicEvent<IExtensionActivateEventPayload> {}
95
- export class ExtensionActivatedEvent extends BasicEvent<IExtensionActivateEventPayload> {}
96
95
 
97
96
  export class ExtensionDidContributes extends BasicEvent<void> {}