@opensumi/ide-editor 3.1.4 → 3.1.5-next-1719978700.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/component.js.map +1 -1
- package/lib/browser/editor-collection.service.d.ts +2 -0
- package/lib/browser/editor-collection.service.d.ts.map +1 -1
- package/lib/browser/editor-collection.service.js +4 -0
- package/lib/browser/editor-collection.service.js.map +1 -1
- package/lib/browser/fs-resource/fs-editor-doc.d.ts.map +1 -1
- package/lib/browser/fs-resource/fs-editor-doc.js +1 -0
- package/lib/browser/fs-resource/fs-editor-doc.js.map +1 -1
- package/lib/browser/fs-resource/fs-resource.d.ts.map +1 -1
- package/lib/browser/fs-resource/fs-resource.js +0 -1
- package/lib/browser/fs-resource/fs-resource.js.map +1 -1
- package/lib/browser/merge-conflict/merge-conflict.model.d.ts +7 -0
- package/lib/browser/merge-conflict/merge-conflict.model.d.ts.map +1 -0
- package/lib/browser/merge-conflict/merge-conflict.model.js +51 -0
- package/lib/browser/merge-conflict/merge-conflict.model.js.map +1 -0
- package/lib/browser/merge-conflict/merge-conflict.service.d.ts +14 -0
- package/lib/browser/merge-conflict/merge-conflict.service.d.ts.map +1 -0
- package/lib/browser/merge-conflict/merge-conflict.service.js +66 -0
- package/lib/browser/merge-conflict/merge-conflict.service.js.map +1 -0
- package/lib/browser/merge-conflict/types.d.ts +0 -17
- package/lib/browser/merge-conflict/types.d.ts.map +1 -1
- package/lib/browser/merge-conflict/types.js +1 -6
- package/lib/browser/merge-conflict/types.js.map +1 -1
- package/lib/browser/merge-editor/MergeEditorFloatComponents.d.ts.map +1 -1
- package/lib/browser/merge-editor/MergeEditorFloatComponents.js +7 -40
- package/lib/browser/merge-editor/MergeEditorFloatComponents.js.map +1 -1
- package/lib/browser/tab.view.d.ts.map +1 -1
- package/lib/browser/tab.view.js +1 -1
- package/lib/browser/tab.view.js.map +1 -1
- package/lib/browser/types.d.ts +2 -2
- package/lib/browser/types.d.ts.map +1 -1
- package/lib/browser/types.js.map +1 -1
- package/lib/common/editor.d.ts +1 -0
- package/lib/common/editor.d.ts.map +1 -1
- package/lib/common/editor.js.map +1 -1
- package/package.json +14 -14
- package/src/browser/component.ts +1 -1
- package/src/browser/editor-collection.service.ts +6 -0
- package/src/browser/fs-resource/fs-editor-doc.ts +4 -0
- package/src/browser/fs-resource/fs-resource.ts +0 -1
- package/src/browser/merge-conflict/merge-conflict.model.ts +63 -0
- package/src/browser/merge-conflict/merge-conflict.service.ts +65 -0
- package/src/browser/merge-conflict/types.ts +0 -21
- package/src/browser/merge-editor/MergeEditorFloatComponents.tsx +10 -45
- package/src/browser/preference/schema.ts +1 -1
- package/src/browser/tab.view.tsx +1 -0
- package/src/browser/types.ts +3 -6
- package/src/common/editor.ts +2 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"component.js","sourceRoot":"","sources":["../../src/browser/component.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"component.js","sourceRoot":"","sources":["../../src/browser/component.ts"],"names":[],"mappings":"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"}
|
|
@@ -126,6 +126,8 @@ export declare class BrowserDiffEditor extends WithEventBus implements IDiffEdit
|
|
|
126
126
|
private editorState;
|
|
127
127
|
private currentUri;
|
|
128
128
|
private diffResourceKeys;
|
|
129
|
+
private _onRefOpen;
|
|
130
|
+
onRefOpen: Event<IEditorDocumentModelRef>;
|
|
129
131
|
protected saveCurrentState(): void;
|
|
130
132
|
protected restoreState(): void;
|
|
131
133
|
constructor(monacoDiffEditor: IMonacoDiffEditor, specialOptions?: any);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"editor-collection.service.d.ts","sourceRoot":"","sources":["../../src/browser/editor-collection.service.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"editor-collection.service.d.ts","sourceRoot":"","sources":["../../src/browser/editor-collection.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -466,6 +466,8 @@ class BrowserDiffEditor extends ide_core_common_1.WithEventBus {
|
|
|
466
466
|
this.monacoDiffEditor = monacoDiffEditor;
|
|
467
467
|
this.specialOptions = specialOptions;
|
|
468
468
|
this.editorState = new Map();
|
|
469
|
+
this._onRefOpen = new ide_core_common_1.Emitter();
|
|
470
|
+
this.onRefOpen = this._onRefOpen.event;
|
|
469
471
|
this.wrapEditors();
|
|
470
472
|
this.addDispose(this.configurationService.onDidChangeConfiguration((e) => {
|
|
471
473
|
const changedEditorKeys = Array.from(e.affectedKeys.values()).filter((key) => (0, converter_1.isDiffEditorOption)(key));
|
|
@@ -519,6 +521,8 @@ class BrowserDiffEditor extends ide_core_common_1.WithEventBus {
|
|
|
519
521
|
else {
|
|
520
522
|
this.restoreState();
|
|
521
523
|
}
|
|
524
|
+
this._onRefOpen.fire(originalDocModelRef);
|
|
525
|
+
this._onRefOpen.fire(modifiedDocModelRef);
|
|
522
526
|
const enableHideUnchanged = this.preferenceService.get('diffEditor.hideUnchangedRegions.enabled');
|
|
523
527
|
if (options.revealFirstDiff && !enableHideUnchanged) {
|
|
524
528
|
// 仅在非折叠模式下自动滚动到第一个 Diff
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"editor-collection.service.js","sourceRoot":"","sources":["../../src/browser/editor-collection.service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"editor-collection.service.js","sourceRoot":"","sources":["../../src/browser/editor-collection.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fs-editor-doc.d.ts","sourceRoot":"","sources":["../../../src/browser/fs-resource/fs-editor-doc.ts"],"names":[],"mappings":"AACA,OAAO,EACL,OAAO,EACP,gBAAgB,EAChB,KAAK,EAEL,mBAAmB,EACnB,qBAAqB,EACrB,8BAA8B,EAE9B,iBAAiB,EAEjB,GAAG,EAKJ,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAChE,OAAO,EAAE,GAAG,EAAE,MAAM,mDAAmD,CAAC;AAExE,OAAO,EAAE,mCAAmC,EAAE,MAAM,oBAAoB,CAAC;AACzE,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAEzD,MAAM,WAAW,mBAAmB;IAClC;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;OAEG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B;AAED;;;GAGG;AACH,qBACa,oCAAqC,YAAW,mCAAmC;IAC9F,SAAS,CAAC,mBAAmB,EAAE,OAAO,CAAC,GAAG,CAAC,CAAiB;IAErD,kBAAkB,EAAE,KAAK,CAAC,GAAG,CAAC,CAAkC;IAEvE,SAAS,CAAC,0BAA0B,EAAE,GAAG,CAAC,MAAM,CAAC,CAAa;IAE9D,OAAO,CAAC,oBAAoB,CAA6B;IAGzD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,kBAAkB,CAAC;IAGzD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAGxD,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,mBAAmB,CAAC;IAG3D,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAGxD,gBAAgB,EAAE,gBAAgB,CAAC;;IAcnC,aAAa,CAAC,MAAM,EAAE,MAAM;IAI5B,eAAe,CAAC,GAAG,EAAE,GAAG;IAIlB,UAAU,CAAC,GAAG,EAAE,GAAG;IAenB,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"fs-editor-doc.d.ts","sourceRoot":"","sources":["../../../src/browser/fs-resource/fs-editor-doc.ts"],"names":[],"mappings":"AACA,OAAO,EACL,OAAO,EACP,gBAAgB,EAChB,KAAK,EAEL,mBAAmB,EACnB,qBAAqB,EACrB,8BAA8B,EAE9B,iBAAiB,EAEjB,GAAG,EAKJ,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAChE,OAAO,EAAE,GAAG,EAAE,MAAM,mDAAmD,CAAC;AAExE,OAAO,EAAE,mCAAmC,EAAE,MAAM,oBAAoB,CAAC;AACzE,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAEzD,MAAM,WAAW,mBAAmB;IAClC;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;OAEG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B;AAED;;;GAGG;AACH,qBACa,oCAAqC,YAAW,mCAAmC;IAC9F,SAAS,CAAC,mBAAmB,EAAE,OAAO,CAAC,GAAG,CAAC,CAAiB;IAErD,kBAAkB,EAAE,KAAK,CAAC,GAAG,CAAC,CAAkC;IAEvE,SAAS,CAAC,0BAA0B,EAAE,GAAG,CAAC,MAAM,CAAC,CAAa;IAE9D,OAAO,CAAC,oBAAoB,CAA6B;IAGzD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,kBAAkB,CAAC;IAGzD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAGxD,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,mBAAmB,CAAC;IAG3D,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAGxD,gBAAgB,EAAE,gBAAgB,CAAC;;IAcnC,aAAa,CAAC,MAAM,EAAE,MAAM;IAI5B,eAAe,CAAC,GAAG,EAAE,GAAG;IAIlB,UAAU,CAAC,GAAG,EAAE,GAAG;IAenB,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;IAgC5F,iCAAiC,CAAC,GAAG,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM;IAQ5D,UAAU,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC;IAgBtC,iBAAiB,CACrB,GAAG,EAAE,GAAG,EACR,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,qBAAqB,EAAE,EAChC,QAAQ,EAAE,MAAM,EAChB,UAAU,UAAQ,GACjB,OAAO,CAAC,8BAA8B,CAAC;IAoB1C,iBAAiB,CAAC,GAAG,EAAE,GAAG;IAIpB,aAAa,CAAC,GAAG,EAAE,GAAG;IAI5B,SAAS,CAAC,eAAe,CACvB,QAAQ,EAAE,GAAG,EACb,OAAO,EAAE,mBAAmB,GAAG,SAAS,EACxC,gBAAgB,EAAE,MAAM,GAAG,IAAI,GAC9B,OAAO,CAAC,MAAM,CAAC;cAiBF,sBAAsB,CAAC,QAAQ,EAAE,GAAG,EAAE,iBAAiB,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;CAGnG"}
|
|
@@ -44,6 +44,7 @@ let BaseFileSystemEditorDocumentProvider = class BaseFileSystemEditorDocumentPro
|
|
|
44
44
|
const { content: buffer } = await this.fileServiceClient.readFile(uri.toString());
|
|
45
45
|
const guessEncoding = options.autoGuessEncoding ||
|
|
46
46
|
this.preferenceService.get('files.autoGuessEncoding', undefined, uri.toString(), (0, ide_core_browser_1.getLanguageIdFromMonaco)(uri));
|
|
47
|
+
// TODO: 应该挪到后端去做
|
|
47
48
|
const detected = await (0, ide_core_browser_1.detectEncodingFromBuffer)(buffer, guessEncoding);
|
|
48
49
|
detected.encoding = await this.getReadEncoding(uri, options, detected.encoding);
|
|
49
50
|
const content = buffer.toString(detected.encoding);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fs-editor-doc.js","sourceRoot":"","sources":["../../../src/browser/fs-resource/fs-editor-doc.ts"],"names":[],"mappings":";;;;AAAA,qCAAqD;AACrD,iEAgBoC;AACpC,iEAAgE;AAIhE,iDAAyD;AAezD;;;GAGG;AAEI,IAAM,oCAAoC,GAA1C,MAAM,oCAAoC;IAwB/C;QAvBU,wBAAmB,GAAiB,IAAI,0BAAO,EAAE,CAAC;QAErD,uBAAkB,GAAe,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC;QAE7D,+BAA0B,GAAgB,IAAI,GAAG,EAAE,CAAC;QAEtD,yBAAoB,GAAG,IAAI,GAAG,EAAkB,CAAC;QAkBvD,IAAI,CAAC,iBAAiB,CAAC,cAAc,CAAC,CAAC,OAAO,EAAE,EAAE;YAChD,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;gBACzB,IAAI,IAAI,CAAC,0BAA0B,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE;oBACnD,IAAI,MAAM,CAAC,IAAI,KAAK,iCAAc,CAAC,KAAK,IAAI,MAAM,CAAC,IAAI,KAAK,iCAAc,CAAC,OAAO,EAAE;wBAClF,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,IAAI,sBAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;qBACpD;iBACF;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;IAED,aAAa,CAAC,MAAc;QAC1B,OAAO,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;IACtD,CAAC;IAED,eAAe,CAAC,GAAQ;QACtB,OAAO,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,IAAI,uBAAI,CAAC;IAC/D,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,GAAQ;QACvB,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,YAAY,EAAE,CAAC;QAC/D,MAAM,GAAG,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CACpC,WAAW,EACX,MAAM,EACN,GAAG,CAAC,QAAQ,EAAE,EACd,IAAA,0CAAuB,EAAC,GAAG,CAAE,CAC7B,CAAC;QAEH,IAAI,GAAG,KAAK,MAAM,EAAE;YAClB,OAAO,GAAG,CAAC;SACZ;QACD,OAAO,SAAS,KAAK,kCAAe,CAAC,OAAO,CAAC,CAAC,uBAAU,CAAC,kBAAO,CAAC;IACnE,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,GAAQ,EAAE,OAA4B;QAC/C,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;QAElF,MAAM,aAAa,GACjB,OAAO,CAAC,iBAAiB;YACzB,IAAI,CAAC,iBAAiB,CAAC,GAAG,CACxB,yBAAyB,EACzB,SAAS,EACT,GAAG,CAAC,QAAQ,EAAE,EACd,IAAA,0CAAuB,EAAC,GAAG,CAAE,CAC9B,CAAC;
|
|
1
|
+
{"version":3,"file":"fs-editor-doc.js","sourceRoot":"","sources":["../../../src/browser/fs-resource/fs-editor-doc.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fs-resource.d.ts","sourceRoot":"","sources":["../../../src/browser/fs-resource/fs-resource.ts"],"names":[],"mappings":"AACA,OAAO,EACL,mBAAmB,EACnB,MAAM,EAGN,GAAG,EACH,YAAY,EAGb,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AAEvE,OAAO,EAAE,QAAQ,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AACrF,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAEvD,OAAO,EAAE,aAAa,EAAe,SAAS,EAAE,iBAAiB,EAA2B,MAAM,cAAc,CAAC;AACjH,OAAO,EAAE,2BAA2B,EAAE,MAAM,oBAAoB,CAAC;AAMjE,qBACa,0BAA2B,SAAQ,YAAa,YAAW,iBAAiB;IACvF,OAAO,CAAC,MAAM,CAAC,aAAa,CAAM;IAGlC,SAAS,CAAC,YAAY,EAAE,YAAY,CAAC;IAGrC,SAAS,CAAC,iBAAiB,EAAE,kBAAkB,CAAC;IAGhD,SAAS,CAAC,aAAa,EAAE,cAAc,CAAC;IAGxC,SAAS,CAAC,oBAAoB,EAAE,2BAA2B,CAAC;IAG5D,SAAS,CAAC,kBAAkB,EAAE,mBAAmB,CAAC;IAElD,cAAc,uCAAsD;IAEpE,OAAO,CAAC,aAAa,CAAc;IAEnC,OAAO,CAAC,KAAK,CAAgB;IAE7B,OAAO,CAAC,YAAY,CAAa;;IAQ3B,IAAI;IAKV,UAAU,CAAC,GAAG,EAAE,GAAG,GAAG,MAAM;IAS5B,SAAS,CAAC,MAAM;IA4BV,WAAW,CAAC,GAAG,EAAE,MAAM;YAOf,kBAAkB;YAYlB,kBAAkB;IAa1B,eAAe,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"fs-resource.d.ts","sourceRoot":"","sources":["../../../src/browser/fs-resource/fs-resource.ts"],"names":[],"mappings":"AACA,OAAO,EACL,mBAAmB,EACnB,MAAM,EAGN,GAAG,EACH,YAAY,EAGb,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AAEvE,OAAO,EAAE,QAAQ,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AACrF,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAEvD,OAAO,EAAE,aAAa,EAAe,SAAS,EAAE,iBAAiB,EAA2B,MAAM,cAAc,CAAC;AACjH,OAAO,EAAE,2BAA2B,EAAE,MAAM,oBAAoB,CAAC;AAMjE,qBACa,0BAA2B,SAAQ,YAAa,YAAW,iBAAiB;IACvF,OAAO,CAAC,MAAM,CAAC,aAAa,CAAM;IAGlC,SAAS,CAAC,YAAY,EAAE,YAAY,CAAC;IAGrC,SAAS,CAAC,iBAAiB,EAAE,kBAAkB,CAAC;IAGhD,SAAS,CAAC,aAAa,EAAE,cAAc,CAAC;IAGxC,SAAS,CAAC,oBAAoB,EAAE,2BAA2B,CAAC;IAG5D,SAAS,CAAC,kBAAkB,EAAE,mBAAmB,CAAC;IAElD,cAAc,uCAAsD;IAEpE,OAAO,CAAC,aAAa,CAAc;IAEnC,OAAO,CAAC,KAAK,CAAgB;IAE7B,OAAO,CAAC,YAAY,CAAa;;IAQ3B,IAAI;IAKV,UAAU,CAAC,GAAG,EAAE,GAAG,GAAG,MAAM;IAS5B,SAAS,CAAC,MAAM;IA4BV,WAAW,CAAC,GAAG,EAAE,MAAM;YAOf,kBAAkB;YAYlB,kBAAkB;IAa1B,eAAe,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;IAmBxD,sBAAsB,CAAC,QAAQ,EAAE,SAAS,EAAE,cAAc,EAAE,SAAS,EAAE,GAAG,MAAM,GAAG,IAAI;IA6BvF,iBAAiB,CAAC,QAAQ,KAAA;IAIpB,iCAAiC,CAAC,QAAQ,EAAE,SAAS;IAOrD,KAAK,CAAC,QAAQ,EAAE,SAAS,EAAE,UAAU,CAAC,EAAE,aAAa;IAoBrD,mBAAmB,CAAC,QAAQ,EAAE,SAAS,EAAE,eAAe,EAAE,SAAS,EAAE,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;CAqCjG"}
|
|
@@ -94,7 +94,6 @@ let FileSystemResourceProvider = FileSystemResourceProvider_1 = class FileSystem
|
|
|
94
94
|
return decodeURIComponent(path.withScheme('').toString());
|
|
95
95
|
}
|
|
96
96
|
async provideResource(uri) {
|
|
97
|
-
// 获取文件类型 getFileType: (path: string) => string
|
|
98
97
|
await this.ready;
|
|
99
98
|
this.involvedFiles.add(uri.codeUri.fsPath);
|
|
100
99
|
return Promise.all([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fs-resource.js","sourceRoot":"","sources":["../../../src/browser/fs-resource/fs-resource.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"fs-resource.js","sourceRoot":"","sources":["../../../src/browser/fs-resource/fs-resource.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"merge-conflict.model.d.ts","sourceRoot":"","sources":["../../../src/browser/merge-conflict/merge-conflict.model.ts"],"names":[],"mappings":"AAIA,OAAO,EAAmB,GAAG,EAAE,MAAM,qBAAqB,CAAC;AAM3D,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,GAAG;;;;EAoD7C"}
|
|
@@ -0,0 +1,51 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.useMergeConflictModel = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const debounce_1 = tslib_1.__importDefault(require("lodash/debounce"));
|
|
6
|
+
const react_1 = require("react");
|
|
7
|
+
const ide_core_browser_1 = require("@opensumi/ide-core-browser");
|
|
8
|
+
const ide_utils_1 = require("@opensumi/ide-utils");
|
|
9
|
+
const useEditor_1 = require("../hooks/useEditor");
|
|
10
|
+
const merge_conflict_service_1 = require("./merge-conflict.service");
|
|
11
|
+
function useMergeConflictModel(uri) {
|
|
12
|
+
const editorModel = (0, useEditor_1.useEditorDocumentModelRef)(uri);
|
|
13
|
+
/**
|
|
14
|
+
* 如果是原来就有冲突的文件，当冲突没了之后，仍然显示冲突
|
|
15
|
+
*/
|
|
16
|
+
const [isInitialVisiable, setIsInitialVisiable] = (0, react_1.useState)(false);
|
|
17
|
+
const [conflictsCount, setConflictsCount] = (0, react_1.useState)(0);
|
|
18
|
+
const mergeConflictService = (0, ide_core_browser_1.useInjectable)(merge_conflict_service_1.MergeConflictService);
|
|
19
|
+
const summary = (0, react_1.useMemo)(() => (0, ide_core_browser_1.formatLocalize)('merge-conflicts.merge.conflict.remain', conflictsCount), [conflictsCount]);
|
|
20
|
+
(0, react_1.useEffect)(() => {
|
|
21
|
+
const disposables = new ide_utils_1.DisposableStore();
|
|
22
|
+
if (editorModel) {
|
|
23
|
+
const { instance } = editorModel;
|
|
24
|
+
const run = () => {
|
|
25
|
+
const n = mergeConflictService.scanDocument(instance.getMonacoModel());
|
|
26
|
+
setConflictsCount(n);
|
|
27
|
+
if (n > 0) {
|
|
28
|
+
setIsInitialVisiable(true);
|
|
29
|
+
}
|
|
30
|
+
};
|
|
31
|
+
const debounceRun = (0, debounce_1.default)(run, 150);
|
|
32
|
+
disposables.add(instance.getMonacoModel().onDidChangeContent(() => {
|
|
33
|
+
debounceRun();
|
|
34
|
+
}));
|
|
35
|
+
run();
|
|
36
|
+
return () => {
|
|
37
|
+
disposables.dispose();
|
|
38
|
+
mergeConflictService.clear();
|
|
39
|
+
setIsInitialVisiable(false);
|
|
40
|
+
setConflictsCount(0);
|
|
41
|
+
};
|
|
42
|
+
}
|
|
43
|
+
}, [editorModel]);
|
|
44
|
+
return {
|
|
45
|
+
isVisiable: isInitialVisiable,
|
|
46
|
+
summary,
|
|
47
|
+
canNavigate: conflictsCount > 0,
|
|
48
|
+
};
|
|
49
|
+
}
|
|
50
|
+
exports.useMergeConflictModel = useMergeConflictModel;
|
|
51
|
+
//# sourceMappingURL=merge-conflict.model.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"merge-conflict.model.js","sourceRoot":"","sources":["../../../src/browser/merge-conflict/merge-conflict.model.ts"],"names":[],"mappings":";;;;AAAA,uEAAuC;AACvC,iCAAqD;AAErD,iEAA2E;AAC3E,mDAA2D;AAE3D,kDAA+D;AAE/D,qEAAgE;AAEhE,SAAgB,qBAAqB,CAAC,GAAQ;IAC5C,MAAM,WAAW,GAAG,IAAA,qCAAyB,EAAC,GAAG,CAAC,CAAC;IAEnD;;OAEG;IACH,MAAM,CAAC,iBAAiB,EAAE,oBAAoB,CAAC,GAAG,IAAA,gBAAQ,EAAC,KAAK,CAAC,CAAC;IAClE,MAAM,CAAC,cAAc,EAAE,iBAAiB,CAAC,GAAG,IAAA,gBAAQ,EAAC,CAAC,CAAC,CAAC;IAExD,MAAM,oBAAoB,GAAG,IAAA,gCAAa,EAAuB,6CAAoB,CAAC,CAAC;IAEvF,MAAM,OAAO,GAAG,IAAA,eAAO,EACrB,GAAG,EAAE,CAAC,IAAA,iCAAc,EAAC,uCAAuC,EAAE,cAAc,CAAC,EAC7E,CAAC,cAAc,CAAC,CACjB,CAAC;IAEF,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,MAAM,WAAW,GAAG,IAAI,2BAAe,EAAE,CAAC;QAE1C,IAAI,WAAW,EAAE;YACf,MAAM,EAAE,QAAQ,EAAE,GAAG,WAAW,CAAC;YACjC,MAAM,GAAG,GAAG,GAAG,EAAE;gBACf,MAAM,CAAC,GAAG,oBAAoB,CAAC,YAAY,CAAC,QAAQ,CAAC,cAAc,EAAE,CAAC,CAAC;gBACvE,iBAAiB,CAAC,CAAC,CAAC,CAAC;gBACrB,IAAI,CAAC,GAAG,CAAC,EAAE;oBACT,oBAAoB,CAAC,IAAI,CAAC,CAAC;iBAC5B;YACH,CAAC,CAAC;YAEF,MAAM,WAAW,GAAG,IAAA,kBAAQ,EAAC,GAAG,EAAE,GAAG,CAAC,CAAC;YAEvC,WAAW,CAAC,GAAG,CACb,QAAQ,CAAC,cAAc,EAAE,CAAC,kBAAkB,CAAC,GAAG,EAAE;gBAChD,WAAW,EAAE,CAAC;YAChB,CAAC,CAAC,CACH,CAAC;YAEF,GAAG,EAAE,CAAC;YACN,OAAO,GAAG,EAAE;gBACV,WAAW,CAAC,OAAO,EAAE,CAAC;gBACtB,oBAAoB,CAAC,KAAK,EAAE,CAAC;gBAC7B,oBAAoB,CAAC,KAAK,CAAC,CAAC;gBAC5B,iBAAiB,CAAC,CAAC,CAAC,CAAC;YACvB,CAAC,CAAC;SACH;IACH,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC;IAElB,OAAO;QACL,UAAU,EAAE,iBAAiB;QAC7B,OAAO;QACP,WAAW,EAAE,cAAc,GAAG,CAAC;KAChC,CAAC;AACJ,CAAC;AApDD,sDAoDC"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import * as monaco from '@opensumi/ide-monaco';
|
|
2
|
+
import { DocumentMergeConflict, MergeConflictParser } from './conflict-parser';
|
|
3
|
+
export declare class MergeConflictService {
|
|
4
|
+
parser: MergeConflictParser;
|
|
5
|
+
private readonly editorService;
|
|
6
|
+
private readonly messageService;
|
|
7
|
+
conflicts: DocumentMergeConflict[];
|
|
8
|
+
scanDocument(model: monaco.editor.ITextModel): number;
|
|
9
|
+
clear(): void;
|
|
10
|
+
private navigate;
|
|
11
|
+
navigateNext(): Promise<void>;
|
|
12
|
+
navigatePrevious(): Promise<void>;
|
|
13
|
+
}
|
|
14
|
+
//# sourceMappingURL=merge-conflict.service.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"merge-conflict.service.d.ts","sourceRoot":"","sources":["../../../src/browser/merge-conflict/merge-conflict.service.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAC;AAM/C,OAAO,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAE/E,qBACa,oBAAoB;IAE/B,MAAM,EAAE,mBAAmB,CAAC;IAG5B,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAyB;IAGvD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAkB;IAEjD,SAAS,0BAAiC;IAE1C,YAAY,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,UAAU;IAK5C,KAAK,IAAI,IAAI;YAIC,QAAQ;IA0BtB,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAI7B,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;CAGlC"}
|
|
@@ -0,0 +1,66 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.MergeConflictService = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const di_1 = require("@opensumi/di");
|
|
6
|
+
const merge_editor_1 = require("@opensumi/ide-monaco/lib/browser/contrib/merge-editor");
|
|
7
|
+
const ide_overlay_1 = require("@opensumi/ide-overlay");
|
|
8
|
+
const types_1 = require("../types");
|
|
9
|
+
const conflict_parser_1 = require("./conflict-parser");
|
|
10
|
+
let MergeConflictService = class MergeConflictService {
|
|
11
|
+
constructor() {
|
|
12
|
+
this.conflicts = [];
|
|
13
|
+
}
|
|
14
|
+
scanDocument(model) {
|
|
15
|
+
this.conflicts = this.parser.scanDocument(model);
|
|
16
|
+
return this.conflicts.length;
|
|
17
|
+
}
|
|
18
|
+
clear() {
|
|
19
|
+
this.conflicts = [];
|
|
20
|
+
}
|
|
21
|
+
async navigate(editor, direction) {
|
|
22
|
+
this.conflicts = this.parser.scanDocument(editor.monacoEditor.getModel());
|
|
23
|
+
const ranges = this.conflicts.map((conflict) => conflict.range);
|
|
24
|
+
const navigationResult = (0, merge_editor_1.findRangeForNavigation)(direction, ranges, editor.monacoEditor.getPosition());
|
|
25
|
+
if (!navigationResult) {
|
|
26
|
+
this.messageService.warning('No merge conflicts found in this file');
|
|
27
|
+
return;
|
|
28
|
+
}
|
|
29
|
+
else if (!navigationResult.canNavigate) {
|
|
30
|
+
this.messageService.warning('No other merge conflicts within this file');
|
|
31
|
+
return;
|
|
32
|
+
}
|
|
33
|
+
else if (!navigationResult.range) {
|
|
34
|
+
// impossible path
|
|
35
|
+
return;
|
|
36
|
+
}
|
|
37
|
+
editor.monacoEditor.setPosition(navigationResult.range.getStartPosition());
|
|
38
|
+
// when navigating, we want to show the codelens on the first line of the conflict
|
|
39
|
+
const range = navigationResult.range.delta(-1);
|
|
40
|
+
editor.monacoEditor.revealRangeNearTopIfOutsideViewport(range);
|
|
41
|
+
editor.monacoEditor.focus();
|
|
42
|
+
}
|
|
43
|
+
navigateNext() {
|
|
44
|
+
return this.navigate(this.editorService.currentEditor, merge_editor_1.NavigationDirection.Forwards);
|
|
45
|
+
}
|
|
46
|
+
navigatePrevious() {
|
|
47
|
+
return this.navigate(this.editorService.currentEditor, merge_editor_1.NavigationDirection.Backwards);
|
|
48
|
+
}
|
|
49
|
+
};
|
|
50
|
+
tslib_1.__decorate([
|
|
51
|
+
(0, di_1.Autowired)(conflict_parser_1.MergeConflictParser),
|
|
52
|
+
tslib_1.__metadata("design:type", conflict_parser_1.MergeConflictParser)
|
|
53
|
+
], MergeConflictService.prototype, "parser", void 0);
|
|
54
|
+
tslib_1.__decorate([
|
|
55
|
+
(0, di_1.Autowired)(types_1.WorkbenchEditorService),
|
|
56
|
+
tslib_1.__metadata("design:type", types_1.WorkbenchEditorService)
|
|
57
|
+
], MergeConflictService.prototype, "editorService", void 0);
|
|
58
|
+
tslib_1.__decorate([
|
|
59
|
+
(0, di_1.Autowired)(ide_overlay_1.IMessageService),
|
|
60
|
+
tslib_1.__metadata("design:type", Object)
|
|
61
|
+
], MergeConflictService.prototype, "messageService", void 0);
|
|
62
|
+
MergeConflictService = tslib_1.__decorate([
|
|
63
|
+
(0, di_1.Injectable)()
|
|
64
|
+
], MergeConflictService);
|
|
65
|
+
exports.MergeConflictService = MergeConflictService;
|
|
66
|
+
//# sourceMappingURL=merge-conflict.service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"merge-conflict.service.js","sourceRoot":"","sources":["../../../src/browser/merge-conflict/merge-conflict.service.ts"],"names":[],"mappings":";;;;AAAA,qCAAqD;AAErD,wFAAoH;AACpH,uDAAwD;AAExD,oCAA2D;AAE3D,uDAA+E;AAGxE,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IAA1B;QAUL,cAAS,GAAG,EAA6B,CAAC;IA4C5C,CAAC;IA1CC,YAAY,CAAC,KAA+B;QAC1C,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;QACjD,OAAO,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC;IAC/B,CAAC;IAED,KAAK;QACH,IAAI,CAAC,SAAS,GAAG,EAAE,CAAC;IACtB,CAAC;IAEO,KAAK,CAAC,QAAQ,CAAC,MAAe,EAAE,SAA8B;QACpE,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,YAAY,CAAC,QAAQ,EAAG,CAAC,CAAC;QAC3E,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QAEhE,MAAM,gBAAgB,GAAG,IAAA,qCAAsB,EAAC,SAAS,EAAE,MAAM,EAAE,MAAM,CAAC,YAAY,CAAC,WAAW,EAAG,CAAC,CAAC;QAEvG,IAAI,CAAC,gBAAgB,EAAE;YACrB,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,uCAAuC,CAAC,CAAC;YACrE,OAAO;SACR;aAAM,IAAI,CAAC,gBAAgB,CAAC,WAAW,EAAE;YACxC,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,2CAA2C,CAAC,CAAC;YACzE,OAAO;SACR;aAAM,IAAI,CAAC,gBAAgB,CAAC,KAAK,EAAE;YAClC,kBAAkB;YAClB,OAAO;SACR;QAED,MAAM,CAAC,YAAY,CAAC,WAAW,CAAC,gBAAgB,CAAC,KAAK,CAAC,gBAAgB,EAAE,CAAC,CAAC;QAE3E,kFAAkF;QAClF,MAAM,KAAK,GAAG,gBAAgB,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAE/C,MAAM,CAAC,YAAY,CAAC,mCAAmC,CAAC,KAAK,CAAC,CAAC;QAC/D,MAAM,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC;IAC9B,CAAC;IAED,YAAY;QACV,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,aAAc,EAAE,kCAAmB,CAAC,QAAQ,CAAC,CAAC;IACxF,CAAC;IAED,gBAAgB;QACd,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,aAAc,EAAE,kCAAmB,CAAC,SAAS,CAAC,CAAC;IACzF,CAAC;CACF,CAAA;AArDC;IAAC,IAAA,cAAS,EAAC,qCAAmB,CAAC;sCACvB,qCAAmB;oDAAC;AAE5B;IAAC,IAAA,cAAS,EAAC,8BAAsB,CAAC;sCACF,8BAAsB;2DAAC;AAEvD;IAAC,IAAA,cAAS,EAAC,6BAAe,CAAC;;4DACsB;AARtC,oBAAoB;IADhC,IAAA,eAAU,GAAE;GACA,oBAAoB,CAsDhC;AAtDY,oDAAoB"}
|
|
@@ -32,23 +32,6 @@ export interface IDocumentMergeConflictDescriptor {
|
|
|
32
32
|
export interface ICacheDocumentMergeConflict extends IDocumentMergeConflictDescriptor {
|
|
33
33
|
aiContent?: string;
|
|
34
34
|
}
|
|
35
|
-
export interface IDocumentMergeConflictTracker {
|
|
36
|
-
getConflicts(document: monaco.editor.ITextModel): PromiseLike<IDocumentMergeConflict[]>;
|
|
37
|
-
isPending(document: monaco.editor.ITextModel): boolean;
|
|
38
|
-
forget(document: monaco.editor.ITextModel): void;
|
|
39
|
-
}
|
|
40
|
-
export interface IDocumentMergeConflictTrackerService {
|
|
41
|
-
createTracker(origin: string): IDocumentMergeConflictTracker;
|
|
42
|
-
forget(document: monaco.editor.ITextModel): void;
|
|
43
|
-
}
|
|
44
|
-
export interface IDocumentMergeConflictNavigationResults {
|
|
45
|
-
canNavigate: boolean;
|
|
46
|
-
conflict?: IDocumentMergeConflict;
|
|
47
|
-
}
|
|
48
|
-
export declare enum NavigationDirection {
|
|
49
|
-
Forwards = 0,
|
|
50
|
-
Backwards = 1
|
|
51
|
-
}
|
|
52
35
|
export declare namespace AI_COMMAND {
|
|
53
36
|
const ACCEPT: string;
|
|
54
37
|
const REVERT: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/browser/merge-conflict/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAC;AAE/C,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC;IACtB,gBAAgB,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC;CACjC;AAED,0BAAkB,UAAU;IAC1B,OAAO,IAAA;IACP,QAAQ,IAAA;IACR,IAAI,IAAA;CACL;AAED,MAAM,WAAW,uBAAuB;IACtC,cAAc,EAAE,OAAO,CAAC;IACxB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,oBAAoB,EAAE,OAAO,CAAC;CAC/B;AAED,MAAM,WAAW,sBAAuB,SAAQ,gCAAgC;IAC9E,UAAU,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,UAAU,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC;IAClF,SAAS,CACP,IAAI,EAAE,UAAU,EAChB,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,UAAU,EAClC,IAAI,EAAE;QAAE,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,GAC5D,IAAI,CAAC;CACT;AAED,MAAM,WAAW,gCAAgC;IAC/C,CAAC,CAAC,EAAE,MAAM,GAAG,GAAG,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC;IACpB,OAAO,EAAE,YAAY,CAAC;IACtB,QAAQ,EAAE,YAAY,CAAC;IACvB,eAAe,EAAE,YAAY,EAAE,CAAC;IAChC,QAAQ,EAAE,MAAM,CAAC,KAAK,CAAC;CACxB;AAED,MAAM,WAAW,2BAA4B,SAAQ,gCAAgC;IACnF,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/browser/merge-conflict/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAC;AAE/C,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC;IACtB,gBAAgB,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC;CACjC;AAED,0BAAkB,UAAU;IAC1B,OAAO,IAAA;IACP,QAAQ,IAAA;IACR,IAAI,IAAA;CACL;AAED,MAAM,WAAW,uBAAuB;IACtC,cAAc,EAAE,OAAO,CAAC;IACxB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,oBAAoB,EAAE,OAAO,CAAC;CAC/B;AAED,MAAM,WAAW,sBAAuB,SAAQ,gCAAgC;IAC9E,UAAU,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,UAAU,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC;IAClF,SAAS,CACP,IAAI,EAAE,UAAU,EAChB,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,UAAU,EAClC,IAAI,EAAE;QAAE,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,GAC5D,IAAI,CAAC;CACT;AAED,MAAM,WAAW,gCAAgC;IAC/C,CAAC,CAAC,EAAE,MAAM,GAAG,GAAG,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC;IACpB,OAAO,EAAE,YAAY,CAAC;IACtB,QAAQ,EAAE,YAAY,CAAC;IACvB,eAAe,EAAE,YAAY,EAAE,CAAC;IAChC,QAAQ,EAAE,MAAM,CAAC,KAAK,CAAC;CACxB;AAED,MAAM,WAAW,2BAA4B,SAAQ,gCAAgC;IACnF,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,yBAAiB,UAAU,CAAC;IAEnB,MAAM,MAAM,QAAgC,CAAC;IAC7C,MAAM,MAAM,QAAgC,CAAC;CACrD"}
|
|
@@ -1,11 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.AI_COMMAND =
|
|
4
|
-
var NavigationDirection;
|
|
5
|
-
(function (NavigationDirection) {
|
|
6
|
-
NavigationDirection[NavigationDirection["Forwards"] = 0] = "Forwards";
|
|
7
|
-
NavigationDirection[NavigationDirection["Backwards"] = 1] = "Backwards";
|
|
8
|
-
})(NavigationDirection = exports.NavigationDirection || (exports.NavigationDirection = {}));
|
|
3
|
+
exports.AI_COMMAND = void 0;
|
|
9
4
|
var AI_COMMAND;
|
|
10
5
|
(function (AI_COMMAND) {
|
|
11
6
|
const MERGE_CONFLICT = 'merge-conflict';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/browser/merge-conflict/types.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/browser/merge-conflict/types.ts"],"names":[],"mappings":";;;AA2CA,IAAiB,UAAU,CAI1B;AAJD,WAAiB,UAAU;IACzB,MAAM,cAAc,GAAG,gBAAgB,CAAC;IAC3B,iBAAM,GAAG,GAAG,cAAc,YAAY,CAAC;IACvC,iBAAM,GAAG,GAAG,cAAc,YAAY,CAAC;AACtD,CAAC,EAJgB,UAAU,GAAV,kBAAU,KAAV,kBAAU,QAI1B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MergeEditorFloatComponents.d.ts","sourceRoot":"","sources":["../../../src/browser/merge-editor/MergeEditorFloatComponents.tsx"],"names":[],"mappings":"AAEA,OAAO,
|
|
1
|
+
{"version":3,"file":"MergeEditorFloatComponents.d.ts","sourceRoot":"","sources":["../../../src/browser/merge-editor/MergeEditorFloatComponents.tsx"],"names":[],"mappings":"AAEA,OAAO,EAKL,GAAG,EAEJ,MAAM,4BAA4B,CAAC;AAKpC,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAEhD,eAAO,MAAM,0BAA0B,EAAE,oBAAoB,CAAC;IAAE,GAAG,EAAE,GAAG,CAAA;CAAE,CAsDzE,CAAC"}
|
|
@@ -4,53 +4,21 @@ exports.MergeEditorFloatComponents = void 0;
|
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const react_1 = tslib_1.__importStar(require("react"));
|
|
6
6
|
const ide_core_browser_1 = require("@opensumi/ide-core-browser");
|
|
7
|
-
const ide_core_common_1 = require("@opensumi/ide-core-common");
|
|
8
|
-
const git_1 = require("@opensumi/ide-core-common/lib/commands/git");
|
|
9
7
|
const merge_actions_1 = require("@opensumi/ide-monaco/lib/browser/contrib/merge-editor/components/merge-actions");
|
|
10
|
-
const
|
|
11
|
-
const
|
|
8
|
+
const merge_conflict_model_1 = require("../merge-conflict/merge-conflict.model");
|
|
9
|
+
const merge_conflict_service_1 = require("../merge-conflict/merge-conflict.service");
|
|
12
10
|
const MergeEditorFloatComponents = ({ resource }) => {
|
|
13
11
|
const { uri } = resource;
|
|
14
|
-
const
|
|
15
|
-
const mergeConflictParser = (0, ide_core_browser_1.useInjectable)(merge_conflict_1.MergeConflictParser);
|
|
12
|
+
const mergeConflictService = (0, ide_core_browser_1.useInjectable)(merge_conflict_service_1.MergeConflictService);
|
|
16
13
|
const commandService = (0, ide_core_browser_1.useInjectable)(ide_core_browser_1.CommandService);
|
|
17
14
|
const commandRegistry = (0, ide_core_browser_1.useInjectable)(ide_core_browser_1.CommandRegistry);
|
|
18
|
-
const
|
|
19
|
-
const [conflicts, setConflicts] = (0, react_1.useState)([]);
|
|
20
|
-
(0, react_1.useEffect)(() => {
|
|
21
|
-
const disposables = new ide_core_browser_1.DisposableStore();
|
|
22
|
-
if (editorModel) {
|
|
23
|
-
const { instance } = editorModel;
|
|
24
|
-
const run = () => {
|
|
25
|
-
const conflicts = mergeConflictParser.scanDocument(instance.getMonacoModel());
|
|
26
|
-
if (conflicts.length > 0) {
|
|
27
|
-
setIsVisiable(true);
|
|
28
|
-
setConflicts(conflicts);
|
|
29
|
-
}
|
|
30
|
-
else {
|
|
31
|
-
setIsVisiable(false);
|
|
32
|
-
setConflicts([]);
|
|
33
|
-
}
|
|
34
|
-
};
|
|
35
|
-
disposables.add(editorModel.instance.getMonacoModel().onDidChangeContent(() => {
|
|
36
|
-
run();
|
|
37
|
-
}));
|
|
38
|
-
run();
|
|
39
|
-
return () => {
|
|
40
|
-
disposables.dispose();
|
|
41
|
-
};
|
|
42
|
-
}
|
|
43
|
-
}, [editorModel]);
|
|
15
|
+
const { canNavigate, isVisiable, summary } = (0, merge_conflict_model_1.useMergeConflictModel)(uri);
|
|
44
16
|
const [isAIResolving, setIsAIResolving] = (0, react_1.useState)(false);
|
|
45
17
|
const handlePrev = (0, react_1.useCallback)(() => {
|
|
46
|
-
|
|
47
|
-
// TODO: 编辑器向上滚动一行
|
|
48
|
-
});
|
|
18
|
+
mergeConflictService.navigatePrevious();
|
|
49
19
|
}, []);
|
|
50
20
|
const handleNext = (0, react_1.useCallback)(() => {
|
|
51
|
-
|
|
52
|
-
// TODO: 编辑器向上滚动一行
|
|
53
|
-
});
|
|
21
|
+
mergeConflictService.navigateNext();
|
|
54
22
|
}, []);
|
|
55
23
|
const handleAIResolve = (0, react_1.useCallback)(async () => {
|
|
56
24
|
setIsAIResolving(true);
|
|
@@ -65,8 +33,7 @@ const MergeEditorFloatComponents = ({ resource }) => {
|
|
|
65
33
|
if (!isVisiable) {
|
|
66
34
|
return null;
|
|
67
35
|
}
|
|
68
|
-
|
|
69
|
-
return (react_1.default.createElement(merge_actions_1.MergeActions, { uri: uri, editorType: 'text', summary: summary, handleNext: handleNext, handlePrev: handlePrev, isAIResolving: isAIResolving, onAIResolve: handleAIResolve, onReset: () => {
|
|
36
|
+
return (react_1.default.createElement(merge_actions_1.MergeActions, { uri: uri, editorType: 'text', summary: summary, canNavigate: canNavigate, handleNext: handleNext, handlePrev: handlePrev, isAIResolving: isAIResolving, onAIResolve: handleAIResolve, onReset: () => {
|
|
70
37
|
commandService.executeCommand(ide_core_browser_1.MERGE_CONFLICT_COMMANDS.ALL_RESET.id, uri);
|
|
71
38
|
}, onSwitchEditor: () => {
|
|
72
39
|
[ide_core_browser_1.SCM_COMMANDS.GIT_OPEN_MERGE_EDITOR, ide_core_browser_1.SCM_COMMANDS._GIT_OPEN_MERGE_EDITOR].forEach(({ id: command }) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MergeEditorFloatComponents.js","sourceRoot":"","sources":["../../../src/browser/merge-editor/MergeEditorFloatComponents.tsx"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"MergeEditorFloatComponents.js","sourceRoot":"","sources":["../../../src/browser/merge-editor/MergeEditorFloatComponents.tsx"],"names":[],"mappings":";;;;AAAA,uDAAqD;AAErD,iEAOoC;AACpC,kHAA8G;AAE9G,iFAA+E;AAC/E,qFAAgF;AAGzE,MAAM,0BAA0B,GAAuC,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE;IAC7F,MAAM,EAAE,GAAG,EAAE,GAAG,QAAQ,CAAC;IACzB,MAAM,oBAAoB,GAAG,IAAA,gCAAa,EAAuB,6CAAoB,CAAC,CAAC;IACvF,MAAM,cAAc,GAAG,IAAA,gCAAa,EAAiB,iCAAc,CAAC,CAAC;IACrE,MAAM,eAAe,GAAG,IAAA,gCAAa,EAAkB,kCAAe,CAAC,CAAC;IAExE,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,OAAO,EAAE,GAAG,IAAA,4CAAqB,EAAC,GAAG,CAAC,CAAC;IAExE,MAAM,CAAC,aAAa,EAAE,gBAAgB,CAAC,GAAG,IAAA,gBAAQ,EAAC,KAAK,CAAC,CAAC;IAE1D,MAAM,UAAU,GAAG,IAAA,mBAAW,EAAC,GAAG,EAAE;QAClC,oBAAoB,CAAC,gBAAgB,EAAE,CAAC;IAC1C,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,UAAU,GAAG,IAAA,mBAAW,EAAC,GAAG,EAAE;QAClC,oBAAoB,CAAC,YAAY,EAAE,CAAC;IACtC,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,eAAe,GAAG,IAAA,mBAAW,EAAC,KAAK,IAAI,EAAE;QAC7C,gBAAgB,CAAC,IAAI,CAAC,CAAC;QACvB,IAAI,aAAa,EAAE;YACjB,MAAM,cAAc,CAAC,cAAc,CAAC,0CAAuB,CAAC,kBAAkB,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;SACzF;aAAM;YACL,MAAM,cAAc,CAAC,cAAc,CAAC,0CAAuB,CAAC,aAAa,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;SACpF;QACD,gBAAgB,CAAC,KAAK,CAAC,CAAC;IAC1B,CAAC,EAAE,CAAC,GAAG,EAAE,aAAa,CAAC,CAAC,CAAC;IAEzB,IAAI,CAAC,UAAU,EAAE;QACf,OAAO,IAAI,CAAC;KACb;IAED,OAAO,CACL,8BAAC,4BAAY,IACX,GAAG,EAAE,GAAG,EACR,UAAU,EAAC,MAAM,EACjB,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,WAAW,EACxB,UAAU,EAAE,UAAU,EACtB,UAAU,EAAE,UAAU,EACtB,aAAa,EAAE,aAAa,EAC5B,WAAW,EAAE,eAAe,EAC5B,OAAO,EAAE,GAAG,EAAE;YACZ,cAAc,CAAC,cAAc,CAAC,0CAAuB,CAAC,SAAS,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;QAC3E,CAAC,EACD,cAAc,EAAE,GAAG,EAAE;YACnB,CAAC,+BAAY,CAAC,qBAAqB,EAAE,+BAAY,CAAC,sBAAsB,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;gBACpG,IAAI,eAAe,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,eAAe,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE;oBAC7E,cAAc,CAAC,cAAc,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;iBAC7C;YACH,CAAC,CAAC,CAAC;QACL,CAAC,GACD,CACH,CAAC;AACJ,CAAC,CAAC;AAtDW,QAAA,0BAA0B,8BAsDrC"}
|