@opensumi/ide-editor 3.1.4 → 3.1.5-next-1719913150.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 (48) hide show
  1. package/lib/browser/component.js.map +1 -1
  2. package/lib/browser/editor-collection.service.d.ts +2 -0
  3. package/lib/browser/editor-collection.service.d.ts.map +1 -1
  4. package/lib/browser/editor-collection.service.js +4 -0
  5. package/lib/browser/editor-collection.service.js.map +1 -1
  6. package/lib/browser/fs-resource/fs-editor-doc.d.ts.map +1 -1
  7. package/lib/browser/fs-resource/fs-editor-doc.js +1 -0
  8. package/lib/browser/fs-resource/fs-editor-doc.js.map +1 -1
  9. package/lib/browser/fs-resource/fs-resource.d.ts.map +1 -1
  10. package/lib/browser/fs-resource/fs-resource.js +0 -1
  11. package/lib/browser/fs-resource/fs-resource.js.map +1 -1
  12. package/lib/browser/merge-conflict/merge-conflict.model.d.ts +7 -0
  13. package/lib/browser/merge-conflict/merge-conflict.model.d.ts.map +1 -0
  14. package/lib/browser/merge-conflict/merge-conflict.model.js +51 -0
  15. package/lib/browser/merge-conflict/merge-conflict.model.js.map +1 -0
  16. package/lib/browser/merge-conflict/merge-conflict.service.d.ts +14 -0
  17. package/lib/browser/merge-conflict/merge-conflict.service.d.ts.map +1 -0
  18. package/lib/browser/merge-conflict/merge-conflict.service.js +66 -0
  19. package/lib/browser/merge-conflict/merge-conflict.service.js.map +1 -0
  20. package/lib/browser/merge-conflict/types.d.ts +0 -17
  21. package/lib/browser/merge-conflict/types.d.ts.map +1 -1
  22. package/lib/browser/merge-conflict/types.js +1 -6
  23. package/lib/browser/merge-conflict/types.js.map +1 -1
  24. package/lib/browser/merge-editor/MergeEditorFloatComponents.d.ts.map +1 -1
  25. package/lib/browser/merge-editor/MergeEditorFloatComponents.js +7 -40
  26. package/lib/browser/merge-editor/MergeEditorFloatComponents.js.map +1 -1
  27. package/lib/browser/tab.view.d.ts.map +1 -1
  28. package/lib/browser/tab.view.js +1 -1
  29. package/lib/browser/tab.view.js.map +1 -1
  30. package/lib/browser/types.d.ts +2 -2
  31. package/lib/browser/types.d.ts.map +1 -1
  32. package/lib/browser/types.js.map +1 -1
  33. package/lib/common/editor.d.ts +1 -0
  34. package/lib/common/editor.d.ts.map +1 -1
  35. package/lib/common/editor.js.map +1 -1
  36. package/package.json +14 -14
  37. package/src/browser/component.ts +1 -1
  38. package/src/browser/editor-collection.service.ts +6 -0
  39. package/src/browser/fs-resource/fs-editor-doc.ts +4 -0
  40. package/src/browser/fs-resource/fs-resource.ts +0 -1
  41. package/src/browser/merge-conflict/merge-conflict.model.ts +63 -0
  42. package/src/browser/merge-conflict/merge-conflict.service.ts +65 -0
  43. package/src/browser/merge-conflict/types.ts +0 -21
  44. package/src/browser/merge-editor/MergeEditorFloatComponents.tsx +10 -45
  45. package/src/browser/preference/schema.ts +1 -1
  46. package/src/browser/tab.view.tsx +1 -0
  47. package/src/browser/types.ts +3 -6
  48. package/src/common/editor.ts +2 -0
@@ -114,13 +114,10 @@ export class RegisterEditorComponentEvent extends BasicEvent<string> {}
114
114
  export abstract class EditorComponentRegistry {
115
115
  abstract registerEditorComponent<T>(component: IEditorComponent<T>, initialProps?: any): IDisposable;
116
116
 
117
- // 等同于 handlesScheme => 10
118
- abstract registerEditorComponentResolver<T>(scheme: string, resolver: IEditorComponentResolver<T>): IDisposable;
119
-
120
- // handlesScheme 返回权重, 小于 0 表示不处理
121
117
  abstract registerEditorComponentResolver<T>(
122
- // eslint-disable-next-line @typescript-eslint/unified-signatures
123
- handlesScheme: (scheme: string) => number,
118
+ handlesScheme:
119
+ | string // 等同于 handlesScheme => 10
120
+ | ((scheme: string) => number), // handlesScheme 返回权重, 小于 0 表示不处理
124
121
  resolver: IEditorComponentResolver<T>,
125
122
  ): IDisposable;
126
123
 
@@ -257,6 +257,8 @@ export interface IDiffEditor extends IDisposable {
257
257
  focus(): void;
258
258
 
259
259
  getLineChanges(): ILineChange[] | null;
260
+
261
+ onRefOpen: Event<IEditorDocumentModelRef>;
260
262
  }
261
263
 
262
264
  @Injectable()