@opensumi/ide-editor 2.27.3-rc-1715227667.0 → 3.0.0-alpha.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/diff/index.d.ts.map +1 -1
- package/lib/browser/diff/index.js +1 -0
- package/lib/browser/diff/index.js.map +1 -1
- package/lib/browser/doc-model/editor-document-model-service.d.ts +2 -0
- package/lib/browser/doc-model/editor-document-model-service.d.ts.map +1 -1
- package/lib/browser/doc-model/editor-document-model-service.js +12 -1
- package/lib/browser/doc-model/editor-document-model-service.js.map +1 -1
- package/lib/browser/merge-conflict/conflict-parser.d.ts +3 -6
- package/lib/browser/merge-conflict/conflict-parser.d.ts.map +1 -1
- package/lib/browser/merge-conflict/conflict-parser.js +3 -4
- package/lib/browser/merge-conflict/conflict-parser.js.map +1 -1
- package/lib/browser/merge-conflict/types.d.ts +0 -4
- package/lib/browser/merge-conflict/types.d.ts.map +1 -1
- 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 +17 -44
- package/lib/browser/merge-editor/MergeEditorFloatComponents.js.map +1 -1
- package/lib/browser/merge-editor/merge-editor.provider.d.ts.map +1 -1
- package/lib/browser/merge-editor/merge-editor.provider.js +1 -3
- package/lib/browser/merge-editor/merge-editor.provider.js.map +1 -1
- package/package.json +14 -14
- package/src/browser/diff/index.ts +1 -0
- package/src/browser/doc-model/editor-document-model-service.ts +12 -2
- package/src/browser/merge-conflict/conflict-parser.ts +7 -9
- package/src/browser/merge-conflict/types.ts +1 -5
- package/src/browser/merge-editor/MergeEditorFloatComponents.tsx +27 -93
- package/src/browser/merge-editor/merge-editor.provider.ts +1 -3
- package/lib/browser/hooks/useInMergeChanges.d.ts +0 -3
- package/lib/browser/hooks/useInMergeChanges.d.ts.map +0 -1
- package/lib/browser/hooks/useInMergeChanges.js +0 -27
- package/lib/browser/hooks/useInMergeChanges.js.map +0 -1
- package/lib/browser/merge-editor/merge-editor.module.less +0 -71
- package/src/browser/hooks/useInMergeChanges.ts +0 -30
- package/src/browser/merge-editor/merge-editor.module.less +0 -71
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/browser/diff/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAmB,GAAG,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAChF,OAAO,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AACvE,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAEhE,OAAO,EAEL,aAAa,EACb,iBAAiB,EACjB,6BAA6B,EAE7B,eAAe,EAChB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,yBAAyB,EAAE,uBAAuB,EAAkB,MAAM,UAAU,CAAC;AAO9F,qBACa,oBAAqB,SAAQ,YAAa,YAAW,iBAAiB;IAEjF,YAAY,EAAE,YAAY,CAAC;IAG3B,eAAe,EAAE,eAAe,CAAC;IAGjC,SAAS,CAAC,iBAAiB,EAAE,kBAAkB,CAAC;IAEhD,MAAM,SAAe;IAErB,OAAO,CAAC,kBAAkB,CAA0B;IAEpD,OAAO,CAAC,YAAY,CAAa;IAGjC,+BAA+B,CAAC,CAAC,EAAE,6BAA6B;YAWlD,kBAAkB;YAYlB,kBAAkB;IAa1B,eAAe,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/browser/diff/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAmB,GAAG,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAChF,OAAO,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AACvE,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAEhE,OAAO,EAEL,aAAa,EACb,iBAAiB,EACjB,6BAA6B,EAE7B,eAAe,EAChB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,yBAAyB,EAAE,uBAAuB,EAAkB,MAAM,UAAU,CAAC;AAO9F,qBACa,oBAAqB,SAAQ,YAAa,YAAW,iBAAiB;IAEjF,YAAY,EAAE,YAAY,CAAC;IAG3B,eAAe,EAAE,eAAe,CAAC;IAGjC,SAAS,CAAC,iBAAiB,EAAE,kBAAkB,CAAC;IAEhD,MAAM,SAAe;IAErB,OAAO,CAAC,kBAAkB,CAA0B;IAEpD,OAAO,CAAC,YAAY,CAAa;IAGjC,+BAA+B,CAAC,CAAC,EAAE,6BAA6B;YAWlD,kBAAkB;YAYlB,kBAAkB;IAa1B,eAAe,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,aAAa,CAAC;IAsBjD,mBAAmB,CAAC,QAAQ,KAAA,EAAE,eAAe,KAAA,GAAG,OAAO,CAAC,OAAO,CAAC;CASvE;AAED,qBACa,6BAA8B,YAAW,yBAAyB;IAE7E,oBAAoB,EAAE,oBAAoB,CAAC;IAE3C,gBAAgB,CAAC,eAAe,EAAE,eAAe,GAAG,IAAI;IAIxD,uBAAuB,CAAC,QAAQ,EAAE,uBAAuB;CAO1D"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/browser/diff/index.ts"],"names":[],"mappings":";;;;AAAA,qCAAqD;AACrD,iEAAgF;AAChF,sEAAuE;AACvE,iEAAgE;AAEhE,yCAOsB;AACtB,oCAA8F;AAE9F,YAAY;AACZ,mDAAmD;AACnD,MAAM;AACN,oGAAoG;AAG7F,IAAM,oBAAoB,GAA1B,MAAM,oBAAqB,SAAQ,+BAAY;IAA/C;;QAUL,WAAM,GAAG,oBAAW,CAAC;QAEb,uBAAkB,GAAG,IAAI,GAAG,EAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/browser/diff/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { Injector } from '@opensumi/di';
|
|
2
2
|
import { IDisposable, IEditorDocumentChange, IEditorDocumentModelSaveResult, ILogger, IRef, PreferenceService, StorageProvider, URI, WithEventBus } from '@opensumi/ide-core-browser';
|
|
3
|
+
import { IFileServiceClient } from '@opensumi/ide-file-service';
|
|
3
4
|
import { EOL } from '@opensumi/ide-monaco/lib/browser/monaco-api/types';
|
|
4
5
|
import { IEditorDocumentModel } from '../../common/editor';
|
|
5
6
|
import { EditorDocumentModel } from './editor-document-model';
|
|
@@ -13,6 +14,7 @@ export declare class EditorDocumentModelServiceImpl extends WithEventBus impleme
|
|
|
13
14
|
logger: ILogger;
|
|
14
15
|
preferenceService: PreferenceService;
|
|
15
16
|
private readonly hashCalculateService;
|
|
17
|
+
protected readonly fileSystem: IFileServiceClient;
|
|
16
18
|
private storage;
|
|
17
19
|
private editorDocModels;
|
|
18
20
|
private creatingEditorModels;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"editor-document-model-service.d.ts","sourceRoot":"","sources":["../../../src/browser/doc-model/editor-document-model-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAyC,QAAQ,EAAE,MAAM,cAAc,CAAC;AAC/E,OAAO,EAEL,WAAW,EACX,qBAAqB,EACrB,8BAA8B,EAC9B,OAAO,EACP,IAAI,EAGJ,iBAAiB,EAIjB,eAAe,EACf,GAAG,EACH,YAAY,EAIb,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EAAE,GAAG,EAAE,MAAM,mDAAmD,CAAC;AAExE,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAE3D,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAEL,6CAA6C,EAC7C,mCAAmC,
|
|
1
|
+
{"version":3,"file":"editor-document-model-service.d.ts","sourceRoot":"","sources":["../../../src/browser/doc-model/editor-document-model-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAyC,QAAQ,EAAE,MAAM,cAAc,CAAC;AAC/E,OAAO,EAEL,WAAW,EACX,qBAAqB,EACrB,8BAA8B,EAC9B,OAAO,EACP,IAAI,EAGJ,iBAAiB,EAIjB,eAAe,EACf,GAAG,EACH,YAAY,EAIb,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAChE,OAAO,EAAE,GAAG,EAAE,MAAM,mDAAmD,CAAC;AAExE,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAE3D,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAEL,6CAA6C,EAC7C,mCAAmC,EACnC,2BAA2B,EAC3B,sBAAsB,EACvB,MAAM,SAAS,CAAC;AAEjB,eAAO,MAAM,6BAA6B,EAAE,GAA4D,CAAC;AAEzG,eAAO,MAAM,2BAA2B,oBAAoB,CAAC;AAE7D,qBACa,8BAA+B,SAAQ,YAAa,YAAW,2BAA2B;IAErG,eAAe,EAAE,mCAAmC,CAAC;IAGrD,QAAQ,EAAE,QAAQ,CAAC;IAGnB,UAAU,EAAE,eAAe,CAAC;IAG5B,MAAM,EAAE,OAAO,CAAC;IAGhB,iBAAiB,EAAE,iBAAiB,CAAC;IAGrC,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAwB;IAG7D,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,kBAAkB,CAAC;IAElD,OAAO,CAAC,OAAO,CAAW;IAE1B,OAAO,CAAC,eAAe,CAA0C;IAEjE,OAAO,CAAC,oBAAoB,CAAmD;IAE/E,OAAO,CAAC,sBAAsB,CAAwC;IAEtE,OAAO,CAAC,gBAAgB,CAAqB;IAE7C,OAAO,CAAC,qBAAqB,CAA6C;IAE1E,OAAO,CAAC,MAAM,CAAgD;IAE9D,OAAO,CAAC,4BAA4B,CAAgD;;IAwCpF,sBAAsB,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,IAAI,GAAG,WAAW;IAItE,OAAO,CAAC,OAAO;IAqBf,OAAO,CAAC,SAAS;IAWX,kBAAkB,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,sBAAsB;IA0BlE,wBAAwB;IAKlB,UAAU;IAaV,oBAAoB,CAAC,CAAC,EAAE,6CAA6C;IA2B3E,oBAAoB,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;IAIhG,iBAAiB,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAAC,oBAAoB,CAAC,GAAG,IAAI;IAI3F,YAAY,IAAI,oBAAoB,EAAE;IAItC,WAAW,CAAC,UAAU,KAAA;IAIhB,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAOpF,OAAO,KAAK,SAAS,GAGpB;IAED,OAAO,CAAC,WAAW;YAkBL,aAAa;IAoErB,uBAAuB,CAC3B,GAAG,EAAE,GAAG,EACR,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,qBAAqB,EAAE,EAChC,QAAQ,CAAC,EAAE,MAAM,EACjB,UAAU,CAAC,EAAE,OAAO,EACpB,GAAG,CAAC,EAAE,GAAG,GACR,OAAO,CAAC,8BAA8B,CAAC;IAc1C,OAAO;CAMR"}
|
|
@@ -5,6 +5,7 @@ const tslib_1 = require("tslib");
|
|
|
5
5
|
const di_1 = require("@opensumi/di");
|
|
6
6
|
const ide_core_browser_1 = require("@opensumi/ide-core-browser");
|
|
7
7
|
const hash_calculate_1 = require("@opensumi/ide-core-common/lib/hash-calculate/hash-calculate");
|
|
8
|
+
const ide_file_service_1 = require("@opensumi/ide-file-service");
|
|
8
9
|
const editor_document_model_1 = require("./editor-document-model");
|
|
9
10
|
const types_1 = require("./types");
|
|
10
11
|
exports.EDITOR_DOCUMENT_MODEL_STORAGE = new ide_core_browser_1.URI('editor-doc').withScheme(ide_core_browser_1.STORAGE_SCHEMA.SCOPE);
|
|
@@ -185,7 +186,13 @@ let EditorDocumentModelServiceImpl = class EditorDocumentModelServiceImpl extend
|
|
|
185
186
|
}
|
|
186
187
|
async doCreateModel(uriString, encoding) {
|
|
187
188
|
const uri = new ide_core_browser_1.URI(uriString);
|
|
188
|
-
|
|
189
|
+
let provider = await this.contentRegistry.getProvider(uri);
|
|
190
|
+
if (!provider) {
|
|
191
|
+
const providerReady = await this.fileSystem.shouldWaitProvider(uri.scheme);
|
|
192
|
+
if (providerReady) {
|
|
193
|
+
provider = await this.contentRegistry.getProvider(uri);
|
|
194
|
+
}
|
|
195
|
+
}
|
|
189
196
|
if (!provider) {
|
|
190
197
|
throw new Error(`No document provider found for ${uri.toString()}`);
|
|
191
198
|
}
|
|
@@ -276,6 +283,10 @@ tslib_1.__decorate([
|
|
|
276
283
|
(0, di_1.Autowired)(hash_calculate_1.IHashCalculateService),
|
|
277
284
|
tslib_1.__metadata("design:type", Object)
|
|
278
285
|
], EditorDocumentModelServiceImpl.prototype, "hashCalculateService", void 0);
|
|
286
|
+
tslib_1.__decorate([
|
|
287
|
+
(0, di_1.Autowired)(ide_file_service_1.IFileServiceClient),
|
|
288
|
+
tslib_1.__metadata("design:type", Object)
|
|
289
|
+
], EditorDocumentModelServiceImpl.prototype, "fileSystem", void 0);
|
|
279
290
|
tslib_1.__decorate([
|
|
280
291
|
ide_core_browser_1.memoize,
|
|
281
292
|
tslib_1.__metadata("design:type", Function),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"editor-document-model-service.js","sourceRoot":"","sources":["../../../src/browser/doc-model/editor-document-model-service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"editor-document-model-service.js","sourceRoot":"","sources":["../../../src/browser/doc-model/editor-document-model-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -30,17 +30,14 @@ export declare class MergeConflictParser extends Disposable {
|
|
|
30
30
|
dispose(): void;
|
|
31
31
|
}
|
|
32
32
|
export declare class DocumentMergeConflict implements ICacheDocumentMergeConflict {
|
|
33
|
+
/**
|
|
34
|
+
* full range of the conflict, including header, splitter, footer
|
|
35
|
+
*/
|
|
33
36
|
range: monaco.Range;
|
|
34
37
|
current: IMergeRegion;
|
|
35
38
|
incoming: IMergeRegion;
|
|
36
39
|
commonAncestors: IMergeRegion[];
|
|
37
40
|
splitter: monaco.Range;
|
|
38
|
-
incomingContent: string;
|
|
39
|
-
currentContent: string;
|
|
40
|
-
bothContent: string;
|
|
41
|
-
aiContent?: string;
|
|
42
|
-
defaultContent: string;
|
|
43
|
-
private applied;
|
|
44
41
|
constructor(descriptor: IDocumentMergeConflictDescriptor);
|
|
45
42
|
}
|
|
46
43
|
//# sourceMappingURL=conflict-parser.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conflict-parser.d.ts","sourceRoot":"","sources":["../../../src/browser/merge-conflict/conflict-parser.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAQ,MAAM,2BAA2B,CAAC;AACvE,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAC;AAE/C,OAAO,EAAE,2BAA2B,EAAE,gCAAgC,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AActG,MAAM,WAAW,cAAc;IAC7B,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,OAAO,CAAC;CACrB;AAED,qBAAa,QAAQ;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC;IACpB,uBAAuB,EAAE,MAAM,CAAC,KAAK,CAAC;IACtC,gCAAgC,EAAE,MAAM,CAAC;IACzC,mBAAmB,EAAE,OAAO,CAAC;gBACjB,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,IAAI,EAAE,MAAM;CAY7D;AAED,qBACa,mBAAoB,SAAQ,UAAU;IACjD,KAAK,4CAAsD;IAE3D,OAAO,CAAC,mBAAmB,CAA6B;IAExD,OAAO,CAAC,oBAAoB,CAAuC;IAEnE,OAAO,CAAC,MAAM,CAAC,cAAc;IAI7B,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,UAAU;IAkF/C,eAAe,CAAC,GAAG,EAAE,MAAM;IAG3B,oBAAoB,CAAC,GAAG,EAAE,MAAM;IAIhC,eAAe;IAIf,mBAAmB,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM;IAU3C,kBAAkB,CAAC,GAAG,EAAE,MAAM;IAG9B,OAAO;CAIR;AAiID,qBAAa,qBAAsB,YAAW,2BAA2B;
|
|
1
|
+
{"version":3,"file":"conflict-parser.d.ts","sourceRoot":"","sources":["../../../src/browser/merge-conflict/conflict-parser.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAQ,MAAM,2BAA2B,CAAC;AACvE,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAC;AAE/C,OAAO,EAAE,2BAA2B,EAAE,gCAAgC,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AActG,MAAM,WAAW,cAAc;IAC7B,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,OAAO,CAAC;CACrB;AAED,qBAAa,QAAQ;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC;IACpB,uBAAuB,EAAE,MAAM,CAAC,KAAK,CAAC;IACtC,gCAAgC,EAAE,MAAM,CAAC;IACzC,mBAAmB,EAAE,OAAO,CAAC;gBACjB,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,IAAI,EAAE,MAAM;CAY7D;AAED,qBACa,mBAAoB,SAAQ,UAAU;IACjD,KAAK,4CAAsD;IAE3D,OAAO,CAAC,mBAAmB,CAA6B;IAExD,OAAO,CAAC,oBAAoB,CAAuC;IAEnE,OAAO,CAAC,MAAM,CAAC,cAAc;IAI7B,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,UAAU;IAkF/C,eAAe,CAAC,GAAG,EAAE,MAAM;IAG3B,oBAAoB,CAAC,GAAG,EAAE,MAAM;IAIhC,eAAe;IAIf,mBAAmB,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM;IAU3C,kBAAkB,CAAC,GAAG,EAAE,MAAM;IAG9B,OAAO;CAIR;AAiID,qBAAa,qBAAsB,YAAW,2BAA2B;IACvE;;OAEG;IACI,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;gBAElB,UAAU,EAAE,gCAAgC;CAOzD"}
|
|
@@ -38,7 +38,7 @@ let MergeConflictParser = MergeConflictParser_1 = class MergeConflictParser exte
|
|
|
38
38
|
this._conflictRangeCaches = new Map();
|
|
39
39
|
}
|
|
40
40
|
static createCacheKey(document) {
|
|
41
|
-
return `${document.uri.toString()}-${document.
|
|
41
|
+
return `${document.uri.toString()}-${document.getVersionId()}`;
|
|
42
42
|
}
|
|
43
43
|
scanDocument(document) {
|
|
44
44
|
const cacheKey = MergeConflictParser_1.createCacheKey(document);
|
|
@@ -84,7 +84,7 @@ let MergeConflictParser = MergeConflictParser_1 = class MergeConflictParser exte
|
|
|
84
84
|
currentConflict.endFooter = line;
|
|
85
85
|
// Create a full descriptor from the lines that we matched. This can return
|
|
86
86
|
// null if the descriptor could not be completed.
|
|
87
|
-
const completeDescriptor =
|
|
87
|
+
const completeDescriptor = scanItemToMergeConflictDescriptor(document, currentConflict);
|
|
88
88
|
if (completeDescriptor !== null) {
|
|
89
89
|
conflictDescriptors.push(completeDescriptor);
|
|
90
90
|
}
|
|
@@ -141,7 +141,7 @@ MergeConflictParser = MergeConflictParser_1 = tslib_1.__decorate([
|
|
|
141
141
|
(0, di_1.Injectable)()
|
|
142
142
|
], MergeConflictParser);
|
|
143
143
|
exports.MergeConflictParser = MergeConflictParser;
|
|
144
|
-
function
|
|
144
|
+
function scanItemToMergeConflictDescriptor(document, scanned) {
|
|
145
145
|
// Validate we have all the required lines within the scan item.
|
|
146
146
|
if (!scanned.startHeader || !scanned.splitter || !scanned.endFooter) {
|
|
147
147
|
return null;
|
|
@@ -197,7 +197,6 @@ function shiftBackOneCharacter(document, range, unlessEqual) {
|
|
|
197
197
|
}
|
|
198
198
|
class DocumentMergeConflict {
|
|
199
199
|
constructor(descriptor) {
|
|
200
|
-
this.applied = false;
|
|
201
200
|
this.range = descriptor.range;
|
|
202
201
|
this.current = descriptor.current;
|
|
203
202
|
this.incoming = descriptor.incoming;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conflict-parser.js","sourceRoot":"","sources":["../../../src/browser/merge-conflict/conflict-parser.ts"],"names":[],"mappings":";AAAA;;;gGAGgG;AAChG,wIAAwI;;;;;AAExI,qCAA0C;AAC1C,+DAAuE;AACvE,qEAA+C;AAI/C,MAAM,iBAAiB,GAAG,SAAS,CAAC;AACpC,MAAM,qBAAqB,GAAG,SAAS,CAAC;AACxC,MAAM,cAAc,GAAG,SAAS,CAAC;AACjC,MAAM,eAAe,GAAG,SAAS,CAAC;AAgBlC,MAAa,QAAQ;IAOnB,YAAY,QAAkC,EAAE,IAAY;QAC1D,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,IAAI,CAAC,IAAI,IAAI,GAAG,QAAQ,CAAC,YAAY,EAAE,EAAE;YAC3E,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;SAC7C;QACD,IAAI,CAAC,IAAI,GAAG,QAAQ,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;QAC1C,IAAI,CAAC,gCAAgC,GAAG,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAE,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;QAC5E,IAAI,CAAC,KAAK,GAAG,IAAI,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QACnE,IAAI,CAAC,uBAAuB;YAC1B,IAAI,IAAI,QAAQ,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,EAAE,IAAI,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC;QACxF,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;QACvB,IAAI,CAAC,mBAAmB,GAAG,IAAI,CAAC,gCAAgC,KAAK,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC;IACxF,CAAC;CACF;AAnBD,4BAmBC;AAGM,IAAM,mBAAmB,2BAAzB,MAAM,mBAAoB,SAAQ,4BAAU;IAA5C;;QACL,UAAK,GAAG,IAAI,0BAAQ,CAAkC,GAAG,CAAC,CAAC;QAEnD,wBAAmB,GAAG,IAAI,GAAG,EAAkB,CAAC;QAEhD,yBAAoB,GAAG,IAAI,GAAG,EAA4B,CAAC;IAoHrE,CAAC;IAlHS,MAAM,CAAC,cAAc,CAAC,QAAkC;QAC9D,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,QAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"conflict-parser.js","sourceRoot":"","sources":["../../../src/browser/merge-conflict/conflict-parser.ts"],"names":[],"mappings":"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"}
|
|
@@ -30,11 +30,7 @@ export interface IDocumentMergeConflictDescriptor {
|
|
|
30
30
|
splitter: monaco.Range;
|
|
31
31
|
}
|
|
32
32
|
export interface ICacheDocumentMergeConflict extends IDocumentMergeConflictDescriptor {
|
|
33
|
-
incomingContent: string;
|
|
34
|
-
currentContent: string;
|
|
35
|
-
bothContent: string;
|
|
36
33
|
aiContent?: string;
|
|
37
|
-
defaultContent: string;
|
|
38
34
|
}
|
|
39
35
|
export interface IDocumentMergeConflictTracker {
|
|
40
36
|
getConflicts(document: monaco.editor.ITextModel): PromiseLike<IDocumentMergeConflict[]>;
|
|
@@ -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;
|
|
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,MAAM,WAAW,6BAA6B;IAC5C,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,UAAU,GAAG,WAAW,CAAC,sBAAsB,EAAE,CAAC,CAAC;IACxF,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,UAAU,GAAG,OAAO,CAAC;IACvD,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,UAAU,GAAG,IAAI,CAAC;CAClD;AAED,MAAM,WAAW,oCAAoC;IACnD,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,6BAA6B,CAAC;IAC7D,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,UAAU,GAAG,IAAI,CAAC;CAClD;AAED,MAAM,WAAW,uCAAuC;IACtD,WAAW,EAAE,OAAO,CAAC;IACrB,QAAQ,CAAC,EAAE,sBAAsB,CAAC;CACnC;AAED,oBAAY,mBAAmB;IAC7B,QAAQ,IAAA;IACR,SAAS,IAAA;CACV;AAED,yBAAiB,UAAU,CAAC;IAEnB,MAAM,MAAM,QAAgC,CAAC;IAC7C,MAAM,MAAM,QAAgC,CAAC;CACrD"}
|
|
@@ -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":";;;AA2DA,IAAY,mBAGX;AAHD,WAAY,mBAAmB;IAC7B,qEAAQ,CAAA;IACR,uEAAS,CAAA;AACX,CAAC,EAHW,mBAAmB,GAAnB,2BAAmB,KAAnB,2BAAmB,QAG9B;AAED,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":"
|
|
1
|
+
{"version":3,"file":"MergeEditorFloatComponents.d.ts","sourceRoot":"","sources":["../../../src/browser/merge-editor/MergeEditorFloatComponents.tsx"],"names":[],"mappings":"AAEA,OAAO,EAML,GAAG,EAEJ,MAAM,4BAA4B,CAAC;AAOpC,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAEhD,eAAO,MAAM,0BAA0B,EAAE,oBAAoB,CAAC;IAAE,GAAG,EAAE,GAAG,CAAA;CAAE,CAsFzE,CAAC"}
|
|
@@ -3,23 +3,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.MergeEditorFloatComponents = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const react_1 = tslib_1.__importStar(require("react"));
|
|
6
|
-
const ide_components_1 = require("@opensumi/ide-components");
|
|
7
6
|
const ide_core_browser_1 = require("@opensumi/ide-core-browser");
|
|
8
7
|
const ide_core_common_1 = require("@opensumi/ide-core-common");
|
|
9
8
|
const git_1 = require("@opensumi/ide-core-common/lib/commands/git");
|
|
9
|
+
const merge_actions_1 = require("@opensumi/ide-monaco/lib/browser/contrib/merge-editor/components/merge-actions");
|
|
10
10
|
const useEditor_1 = require("../hooks/useEditor");
|
|
11
|
-
const useInMergeChanges_1 = require("../hooks/useInMergeChanges");
|
|
12
11
|
const merge_conflict_1 = require("../merge-conflict");
|
|
13
|
-
const merge_editor_module_less_1 = tslib_1.__importDefault(require("./merge-editor.module.less"));
|
|
14
12
|
const MergeEditorFloatComponents = ({ resource }) => {
|
|
15
|
-
const
|
|
13
|
+
const { uri } = resource;
|
|
14
|
+
const editorModel = (0, useEditor_1.useEditorDocumentModelRef)(uri);
|
|
15
|
+
const mergeConflictParser = (0, ide_core_browser_1.useInjectable)(merge_conflict_1.MergeConflictParser);
|
|
16
16
|
const commandService = (0, ide_core_browser_1.useInjectable)(ide_core_browser_1.CommandService);
|
|
17
17
|
const commandRegistry = (0, ide_core_browser_1.useInjectable)(ide_core_browser_1.CommandRegistry);
|
|
18
|
-
const mergeConflictParser = (0, ide_core_browser_1.useInjectable)(merge_conflict_1.MergeConflictParser);
|
|
19
|
-
const editorModel = (0, useEditor_1.useEditorDocumentModelRef)(resource.uri);
|
|
20
18
|
const [isVisiable, setIsVisiable] = (0, react_1.useState)(false);
|
|
21
19
|
const [conflicts, setConflicts] = (0, react_1.useState)([]);
|
|
22
|
-
const inMergeChanges = (0, useInMergeChanges_1.useInMergeChanges)(resource.uri.toString());
|
|
23
20
|
(0, react_1.useEffect)(() => {
|
|
24
21
|
const disposables = new ide_core_browser_1.DisposableStore();
|
|
25
22
|
if (editorModel) {
|
|
@@ -45,15 +42,6 @@ const MergeEditorFloatComponents = ({ resource }) => {
|
|
|
45
42
|
}
|
|
46
43
|
}, [editorModel]);
|
|
47
44
|
const [isAIResolving, setIsAIResolving] = (0, react_1.useState)(false);
|
|
48
|
-
const handleOpenMergeEditor = (0, react_1.useCallback)(async () => {
|
|
49
|
-
const { uri } = resource;
|
|
50
|
-
[ide_core_browser_1.SCM_COMMANDS.GIT_OPEN_MERGE_EDITOR, ide_core_browser_1.SCM_COMMANDS._GIT_OPEN_MERGE_EDITOR].forEach(({ id: command }) => {
|
|
51
|
-
if (commandRegistry.getCommand(command) && commandRegistry.isEnabled(command)) {
|
|
52
|
-
commandService.executeCommand(command, uri);
|
|
53
|
-
}
|
|
54
|
-
});
|
|
55
|
-
}, [resource]);
|
|
56
|
-
const isSupportAIResolve = (0, react_1.useCallback)(() => aiNativeConfigService.capabilities.supportsConflictResolve, [aiNativeConfigService]);
|
|
57
45
|
const handlePrev = (0, react_1.useCallback)(() => {
|
|
58
46
|
commandService.tryExecuteCommand(git_1.MergeConflictCommands.Previous).then(() => {
|
|
59
47
|
// TODO: 编辑器向上滚动一行
|
|
@@ -67,41 +55,26 @@ const MergeEditorFloatComponents = ({ resource }) => {
|
|
|
67
55
|
const handleAIResolve = (0, react_1.useCallback)(async () => {
|
|
68
56
|
setIsAIResolving(true);
|
|
69
57
|
if (isAIResolving) {
|
|
70
|
-
await commandService.executeCommand(ide_core_browser_1.MERGE_CONFLICT_COMMANDS.AI_ALL_ACCEPT_STOP.id,
|
|
58
|
+
await commandService.executeCommand(ide_core_browser_1.MERGE_CONFLICT_COMMANDS.AI_ALL_ACCEPT_STOP.id, uri);
|
|
71
59
|
}
|
|
72
60
|
else {
|
|
73
|
-
await commandService.executeCommand(ide_core_browser_1.MERGE_CONFLICT_COMMANDS.AI_ALL_ACCEPT.id,
|
|
61
|
+
await commandService.executeCommand(ide_core_browser_1.MERGE_CONFLICT_COMMANDS.AI_ALL_ACCEPT.id, uri);
|
|
74
62
|
}
|
|
75
63
|
setIsAIResolving(false);
|
|
76
|
-
}, [
|
|
77
|
-
const handleReset = (0, react_1.useCallback)(() => {
|
|
78
|
-
commandService.executeCommand(ide_core_browser_1.MERGE_CONFLICT_COMMANDS.ALL_RESET.id, resource.uri);
|
|
79
|
-
}, [resource]);
|
|
64
|
+
}, [uri, isAIResolving]);
|
|
80
65
|
if (!isVisiable) {
|
|
81
66
|
return null;
|
|
82
67
|
}
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
react_1.default.createElement("span", { className: merge_editor_module_less_1.default.line_vertical }),
|
|
94
|
-
inMergeChanges && (react_1.default.createElement(ide_components_1.Button, { id: 'merge.editor.open.tradition', className: merge_editor_module_less_1.default.merge_conflict_bottom_btn, size: 'default', onClick: handleOpenMergeEditor },
|
|
95
|
-
react_1.default.createElement(ide_components_1.Icon, { icon: 'swap' }),
|
|
96
|
-
react_1.default.createElement("span", null, (0, ide_core_browser_1.localize)('mergeEditor.open.3way')))),
|
|
97
|
-
react_1.default.createElement(ide_components_1.Button, { id: 'merge.editor.rest', className: merge_editor_module_less_1.default.merge_conflict_bottom_btn, size: 'default', onClick: handleReset },
|
|
98
|
-
react_1.default.createElement(ide_components_1.Icon, { icon: 'discard' }),
|
|
99
|
-
react_1.default.createElement("span", null, (0, ide_core_browser_1.localize)('mergeEditor.reset'))),
|
|
100
|
-
isSupportAIResolve() && (react_1.default.createElement(ide_components_1.Button, { id: 'merge.editor.conflict.resolve.all', size: 'default', className: `${merge_editor_module_less_1.default.merge_conflict_bottom_btn} ${merge_editor_module_less_1.default.magic_btn}`, onClick: handleAIResolve }, isAIResolving ? (react_1.default.createElement(react_1.default.Fragment, null,
|
|
101
|
-
react_1.default.createElement(ide_components_1.Icon, { icon: 'circle-pause' }),
|
|
102
|
-
react_1.default.createElement("span", null, (0, ide_core_browser_1.localize)('mergeEditor.conflict.ai.resolve.all.stop')))) : (react_1.default.createElement(react_1.default.Fragment, null,
|
|
103
|
-
react_1.default.createElement(ide_components_1.Icon, { icon: 'magic-wand' }),
|
|
104
|
-
react_1.default.createElement("span", null, (0, ide_core_browser_1.localize)('mergeEditor.conflict.ai.resolve.all')))))))));
|
|
68
|
+
const summary = (0, ide_core_common_1.formatLocalize)('merge-conflicts.merge.conflict.remain', conflicts.length);
|
|
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: () => {
|
|
70
|
+
commandService.executeCommand(ide_core_browser_1.MERGE_CONFLICT_COMMANDS.ALL_RESET.id, uri);
|
|
71
|
+
}, onSwitchEditor: () => {
|
|
72
|
+
[ide_core_browser_1.SCM_COMMANDS.GIT_OPEN_MERGE_EDITOR, ide_core_browser_1.SCM_COMMANDS._GIT_OPEN_MERGE_EDITOR].forEach(({ id: command }) => {
|
|
73
|
+
if (commandRegistry.getCommand(command) && commandRegistry.isEnabled(command)) {
|
|
74
|
+
commandService.executeCommand(command, uri);
|
|
75
|
+
}
|
|
76
|
+
});
|
|
77
|
+
} }));
|
|
105
78
|
};
|
|
106
79
|
exports.MergeEditorFloatComponents = MergeEditorFloatComponents;
|
|
107
80
|
//# sourceMappingURL=MergeEditorFloatComponents.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MergeEditorFloatComponents.js","sourceRoot":"","sources":["../../../src/browser/merge-editor/MergeEditorFloatComponents.tsx"],"names":[],"mappings":";;;;AAAA,uDAAgE;AAEhE,
|
|
1
|
+
{"version":3,"file":"MergeEditorFloatComponents.js","sourceRoot":"","sources":["../../../src/browser/merge-editor/MergeEditorFloatComponents.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merge-editor.provider.d.ts","sourceRoot":"","sources":["../../../src/browser/merge-editor/merge-editor.provider.ts"],"names":[],"mappings":"AACA,OAAO,EAAgB,YAAY,EAAE,GAAG,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAG3F,OAAO,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAC5D,qBACa,2BAA4B,SAAQ,YAAa,YAAW,iBAAiB;IACxF,MAAM,SAAiB;IAGvB,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAe;IAG5C,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAqB;IAEjD,eAAe,CAAC,GAAG,EAAE,GAAG,GAAG,YAAY,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"merge-editor.provider.d.ts","sourceRoot":"","sources":["../../../src/browser/merge-editor/merge-editor.provider.ts"],"names":[],"mappings":"AACA,OAAO,EAAgB,YAAY,EAAE,GAAG,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAG3F,OAAO,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAC5D,qBACa,2BAA4B,SAAQ,YAAa,YAAW,iBAAiB;IACxF,MAAM,SAAiB;IAGvB,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAe;IAG5C,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAqB;IAEjD,eAAe,CAAC,GAAG,EAAE,GAAG,GAAG,YAAY,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;IAyBvD,mBAAmB,CAAC,QAAQ,EAAE,SAAS,CAAC,GAAG,CAAC,EAAE,eAAe,EAAE,SAAS,CAAC,GAAG,CAAC,EAAE,EAAE,GAAG,YAAY,CAAC,OAAO,CAAC;CAajH"}
|
|
@@ -18,9 +18,7 @@ let MergeEditorResourceProvider = class MergeEditorResourceProvider extends ide_
|
|
|
18
18
|
const resultEditorUri = new ide_core_browser_1.URI(output);
|
|
19
19
|
const icon = this.labelService.getIcon(resultEditorUri);
|
|
20
20
|
return {
|
|
21
|
-
|
|
22
|
-
// TODO: 需要增加一个标记，说明这个资源要在某个插件加载后才能 revive
|
|
23
|
-
supportsRevive: false,
|
|
21
|
+
supportsRevive: true,
|
|
24
22
|
name,
|
|
25
23
|
icon,
|
|
26
24
|
uri,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merge-editor.provider.js","sourceRoot":"","sources":["../../../src/browser/merge-editor/merge-editor.provider.ts"],"names":[],"mappings":";;;;AAAA,qCAAqD;AACrD,iEAA2F;AAC3F,qHAAgH;AAIzG,IAAM,2BAA2B,GAAjC,MAAM,2BAA4B,SAAQ,+BAAY;IAAtD;;QACL,WAAM,GAAG,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"merge-editor.provider.js","sourceRoot":"","sources":["../../../src/browser/merge-editor/merge-editor.provider.ts"],"names":[],"mappings":";;;;AAAA,qCAAqD;AACrD,iEAA2F;AAC3F,qHAAgH;AAIzG,IAAM,2BAA2B,GAAjC,MAAM,2BAA4B,SAAQ,+BAAY;IAAtD;;QACL,WAAM,GAAG,aAAa,CAAC;IA8CzB,CAAC;IAtCQ,eAAe,CAAC,GAAQ;QAC7B,MAAM,EAAE,YAAY,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC,cAAc,EAAE,CAAC;QAEpD,IAAI;YACF,MAAM,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;YAC/C,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,aAAa,CAAC;YAC3D,MAAM,eAAe,GAAG,IAAI,sBAAG,CAAC,MAAM,CAAC,CAAC;YACxC,MAAM,IAAI,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;YACxD,OAAO;gBACL,cAAc,EAAE,IAAI;gBACpB,IAAI;gBACJ,IAAI;gBACJ,GAAG;gBACH,QAAQ,EAAE;oBACR,QAAQ;oBACR,MAAM;oBACN,MAAM;oBACN,MAAM;iBACP;aACF,CAAC;SACH;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,KAAK,CAAC,qCAAqC,CAAC,CAAC;SACpD;IACH,CAAC;IAEM,mBAAmB,CAAC,QAAwB,EAAE,eAAmC;QACtF,MAAM,EAAE,YAAY,EAAE,GAAG,QAAQ,CAAC,GAAG,CAAC,cAAc,EAAE,CAAC;QAEvD,IAAI;YACF,MAAM,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;YAC/C,MAAM,EAAE,MAAM,EAAE,GAAG,aAAa,CAAC;YACjC,MAAM,SAAS,GAAG,IAAI,sBAAG,CAAC,MAAM,CAAC,CAAC;YAClC,IAAI,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC;YACpD,OAAO,IAAI,CAAC;SACb;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,KAAK,CAAC,qCAAqC,CAAC,CAAC;SACpD;IACH,CAAC;CACF,CAAA;AA5CC;IAAC,IAAA,cAAS,EAAC,+BAAY,CAAC;sCACO,+BAAY;iEAAC;AAE5C;IAAC,IAAA,cAAS,EAAC,yCAAkB,CAAC;sCACO,yCAAkB;uEAAC;AAP7C,2BAA2B;IADvC,IAAA,eAAU,GAAE;GACA,2BAA2B,CA+CvC;AA/CY,kEAA2B"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@opensumi/ide-editor",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "3.0.0-alpha.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": "
|
|
21
|
-
"@opensumi/ide-core-node": "
|
|
22
|
-
"@opensumi/ide-file-service": "
|
|
23
|
-
"@opensumi/ide-monaco": "
|
|
24
|
-
"@opensumi/ide-utils": "
|
|
20
|
+
"@opensumi/ide-core-common": "3.0.0-alpha.0",
|
|
21
|
+
"@opensumi/ide-core-node": "3.0.0-alpha.0",
|
|
22
|
+
"@opensumi/ide-file-service": "3.0.0-alpha.0",
|
|
23
|
+
"@opensumi/ide-monaco": "3.0.0-alpha.0",
|
|
24
|
+
"@opensumi/ide-utils": "3.0.0-alpha.0",
|
|
25
25
|
"vscode-oniguruma": "1.5.1"
|
|
26
26
|
},
|
|
27
27
|
"devDependencies": {
|
|
28
|
-
"@opensumi/ide-components": "
|
|
29
|
-
"@opensumi/ide-core-browser": "
|
|
30
|
-
"@opensumi/ide-dev-tool": "
|
|
31
|
-
"@opensumi/ide-overlay": "
|
|
32
|
-
"@opensumi/ide-quick-open": "
|
|
33
|
-
"@opensumi/ide-theme": "
|
|
34
|
-
"@opensumi/ide-workspace": "
|
|
28
|
+
"@opensumi/ide-components": "3.0.0-alpha.0",
|
|
29
|
+
"@opensumi/ide-core-browser": "3.0.0-alpha.0",
|
|
30
|
+
"@opensumi/ide-dev-tool": "3.0.0-alpha.0",
|
|
31
|
+
"@opensumi/ide-overlay": "3.0.0-alpha.0",
|
|
32
|
+
"@opensumi/ide-quick-open": "3.0.0-alpha.0",
|
|
33
|
+
"@opensumi/ide-theme": "3.0.0-alpha.0",
|
|
34
|
+
"@opensumi/ide-workspace": "3.0.0-alpha.0"
|
|
35
35
|
},
|
|
36
|
-
"gitHead": "
|
|
36
|
+
"gitHead": "54cd29a63e083491dbbdd34fde188f936504bc3b"
|
|
37
37
|
}
|
|
@@ -20,6 +20,7 @@ import {
|
|
|
20
20
|
serializableToMap,
|
|
21
21
|
} from '@opensumi/ide-core-browser';
|
|
22
22
|
import { IHashCalculateService } from '@opensumi/ide-core-common/lib/hash-calculate/hash-calculate';
|
|
23
|
+
import { IFileServiceClient } from '@opensumi/ide-file-service';
|
|
23
24
|
import { EOL } from '@opensumi/ide-monaco/lib/browser/monaco-api/types';
|
|
24
25
|
|
|
25
26
|
import { IEditorDocumentModel } from '../../common/editor';
|
|
@@ -29,7 +30,6 @@ import {
|
|
|
29
30
|
EditorDocumentModelCreationEvent,
|
|
30
31
|
EditorDocumentModelOptionExternalUpdatedEvent,
|
|
31
32
|
IEditorDocumentModelContentRegistry,
|
|
32
|
-
IEditorDocumentModelCreationEventPayload,
|
|
33
33
|
IEditorDocumentModelService,
|
|
34
34
|
IPreferredModelOptions,
|
|
35
35
|
} from './types';
|
|
@@ -58,6 +58,9 @@ export class EditorDocumentModelServiceImpl extends WithEventBus implements IEdi
|
|
|
58
58
|
@Autowired(IHashCalculateService)
|
|
59
59
|
private readonly hashCalculateService: IHashCalculateService;
|
|
60
60
|
|
|
61
|
+
@Autowired(IFileServiceClient)
|
|
62
|
+
protected readonly fileSystem: IFileServiceClient;
|
|
63
|
+
|
|
61
64
|
private storage: IStorage;
|
|
62
65
|
|
|
63
66
|
private editorDocModels = new Map<string, EditorDocumentModel>();
|
|
@@ -267,7 +270,14 @@ export class EditorDocumentModelServiceImpl extends WithEventBus implements IEdi
|
|
|
267
270
|
|
|
268
271
|
private async doCreateModel(uriString: string, encoding?: string): Promise<EditorDocumentModel> {
|
|
269
272
|
const uri = new URI(uriString);
|
|
270
|
-
|
|
273
|
+
let provider = await this.contentRegistry.getProvider(uri);
|
|
274
|
+
|
|
275
|
+
if (!provider) {
|
|
276
|
+
const providerReady = await this.fileSystem.shouldWaitProvider(uri.scheme);
|
|
277
|
+
if (providerReady) {
|
|
278
|
+
provider = await this.contentRegistry.getProvider(uri);
|
|
279
|
+
}
|
|
280
|
+
}
|
|
271
281
|
|
|
272
282
|
if (!provider) {
|
|
273
283
|
throw new Error(`No document provider found for ${uri.toString()}`);
|
|
@@ -59,7 +59,7 @@ export class MergeConflictParser extends Disposable {
|
|
|
59
59
|
private _conflictRangeCaches = new Map<string, IConflictCache[]>();
|
|
60
60
|
|
|
61
61
|
private static createCacheKey(document: monaco.editor.ITextModel) {
|
|
62
|
-
return `${document.uri.toString()}-${document.
|
|
62
|
+
return `${document.uri.toString()}-${document.getVersionId()}`;
|
|
63
63
|
}
|
|
64
64
|
|
|
65
65
|
scanDocument(document: monaco.editor.ITextModel) {
|
|
@@ -113,7 +113,7 @@ export class MergeConflictParser extends Disposable {
|
|
|
113
113
|
|
|
114
114
|
// Create a full descriptor from the lines that we matched. This can return
|
|
115
115
|
// null if the descriptor could not be completed.
|
|
116
|
-
const completeDescriptor =
|
|
116
|
+
const completeDescriptor = scanItemToMergeConflictDescriptor(document, currentConflict);
|
|
117
117
|
|
|
118
118
|
if (completeDescriptor !== null) {
|
|
119
119
|
conflictDescriptors.push(completeDescriptor);
|
|
@@ -174,7 +174,7 @@ export class MergeConflictParser extends Disposable {
|
|
|
174
174
|
}
|
|
175
175
|
}
|
|
176
176
|
|
|
177
|
-
function
|
|
177
|
+
function scanItemToMergeConflictDescriptor(
|
|
178
178
|
document: monaco.editor.ITextModel,
|
|
179
179
|
scanned: IScanMergedConflict,
|
|
180
180
|
): IDocumentMergeConflictDescriptor | null {
|
|
@@ -302,17 +302,15 @@ function shiftBackOneCharacter(
|
|
|
302
302
|
}
|
|
303
303
|
|
|
304
304
|
export class DocumentMergeConflict implements ICacheDocumentMergeConflict {
|
|
305
|
+
/**
|
|
306
|
+
* full range of the conflict, including header, splitter, footer
|
|
307
|
+
*/
|
|
305
308
|
public range: monaco.Range;
|
|
306
309
|
public current: IMergeRegion;
|
|
307
310
|
public incoming: IMergeRegion;
|
|
308
311
|
public commonAncestors: IMergeRegion[];
|
|
309
312
|
public splitter: monaco.Range;
|
|
310
|
-
|
|
311
|
-
public currentContent: string;
|
|
312
|
-
public bothContent: string;
|
|
313
|
-
public aiContent?: string;
|
|
314
|
-
public defaultContent: string;
|
|
315
|
-
private applied = false;
|
|
313
|
+
|
|
316
314
|
constructor(descriptor: IDocumentMergeConflictDescriptor) {
|
|
317
315
|
this.range = descriptor.range;
|
|
318
316
|
this.current = descriptor.current;
|
|
@@ -37,14 +37,10 @@ export interface IDocumentMergeConflictDescriptor {
|
|
|
37
37
|
splitter: monaco.Range;
|
|
38
38
|
}
|
|
39
39
|
|
|
40
|
-
// 存储初始化内容
|
|
41
40
|
export interface ICacheDocumentMergeConflict extends IDocumentMergeConflictDescriptor {
|
|
42
|
-
incomingContent: string;
|
|
43
|
-
currentContent: string;
|
|
44
|
-
bothContent: string;
|
|
45
41
|
aiContent?: string;
|
|
46
|
-
defaultContent: string;
|
|
47
42
|
}
|
|
43
|
+
|
|
48
44
|
export interface IDocumentMergeConflictTracker {
|
|
49
45
|
getConflicts(document: monaco.editor.ITextModel): PromiseLike<IDocumentMergeConflict[]>;
|
|
50
46
|
isPending(document: monaco.editor.ITextModel): boolean;
|
|
@@ -1,40 +1,32 @@
|
|
|
1
1
|
import React, { useCallback, useEffect, useState } from 'react';
|
|
2
2
|
|
|
3
|
-
import { Button, Icon } from '@opensumi/ide-components';
|
|
4
3
|
import {
|
|
5
|
-
AINativeConfigService,
|
|
6
4
|
CommandRegistry,
|
|
7
5
|
CommandService,
|
|
8
6
|
DisposableStore,
|
|
9
7
|
MERGE_CONFLICT_COMMANDS,
|
|
10
8
|
SCM_COMMANDS,
|
|
11
9
|
URI,
|
|
12
|
-
localize,
|
|
13
10
|
useInjectable,
|
|
14
11
|
} from '@opensumi/ide-core-browser';
|
|
15
12
|
import { formatLocalize } from '@opensumi/ide-core-common';
|
|
16
13
|
import { MergeConflictCommands } from '@opensumi/ide-core-common/lib/commands/git';
|
|
14
|
+
import { MergeActions } from '@opensumi/ide-monaco/lib/browser/contrib/merge-editor/components/merge-actions';
|
|
17
15
|
|
|
18
16
|
import { useEditorDocumentModelRef } from '../hooks/useEditor';
|
|
19
|
-
import { useInMergeChanges } from '../hooks/useInMergeChanges';
|
|
20
17
|
import { DocumentMergeConflict, MergeConflictParser } from '../merge-conflict';
|
|
21
18
|
import { ReactEditorComponent } from '../types';
|
|
22
19
|
|
|
23
|
-
import styles from './merge-editor.module.less';
|
|
24
|
-
|
|
25
20
|
export const MergeEditorFloatComponents: ReactEditorComponent<{ uri: URI }> = ({ resource }) => {
|
|
26
|
-
const
|
|
21
|
+
const { uri } = resource;
|
|
22
|
+
const editorModel = useEditorDocumentModelRef(uri);
|
|
23
|
+
const mergeConflictParser: MergeConflictParser = useInjectable(MergeConflictParser);
|
|
27
24
|
const commandService = useInjectable<CommandService>(CommandService);
|
|
28
25
|
const commandRegistry = useInjectable<CommandRegistry>(CommandRegistry);
|
|
29
|
-
const mergeConflictParser: MergeConflictParser = useInjectable(MergeConflictParser);
|
|
30
|
-
|
|
31
|
-
const editorModel = useEditorDocumentModelRef(resource.uri);
|
|
32
26
|
|
|
33
27
|
const [isVisiable, setIsVisiable] = useState(false);
|
|
34
28
|
const [conflicts, setConflicts] = useState<DocumentMergeConflict[]>([]);
|
|
35
29
|
|
|
36
|
-
const inMergeChanges = useInMergeChanges(resource.uri.toString());
|
|
37
|
-
|
|
38
30
|
useEffect(() => {
|
|
39
31
|
const disposables = new DisposableStore();
|
|
40
32
|
|
|
@@ -64,21 +56,6 @@ export const MergeEditorFloatComponents: ReactEditorComponent<{ uri: URI }> = ({
|
|
|
64
56
|
}, [editorModel]);
|
|
65
57
|
|
|
66
58
|
const [isAIResolving, setIsAIResolving] = useState(false);
|
|
67
|
-
const handleOpenMergeEditor = useCallback(async () => {
|
|
68
|
-
const { uri } = resource;
|
|
69
|
-
|
|
70
|
-
[SCM_COMMANDS.GIT_OPEN_MERGE_EDITOR, SCM_COMMANDS._GIT_OPEN_MERGE_EDITOR].forEach(({ id: command }) => {
|
|
71
|
-
if (commandRegistry.getCommand(command) && commandRegistry.isEnabled(command)) {
|
|
72
|
-
commandService.executeCommand(command, uri);
|
|
73
|
-
}
|
|
74
|
-
});
|
|
75
|
-
}, [resource]);
|
|
76
|
-
|
|
77
|
-
const isSupportAIResolve = useCallback(
|
|
78
|
-
() => aiNativeConfigService.capabilities.supportsConflictResolve,
|
|
79
|
-
[aiNativeConfigService],
|
|
80
|
-
);
|
|
81
|
-
|
|
82
59
|
const handlePrev = useCallback(() => {
|
|
83
60
|
commandService.tryExecuteCommand(MergeConflictCommands.Previous).then(() => {
|
|
84
61
|
// TODO: 编辑器向上滚动一行
|
|
@@ -90,83 +67,40 @@ export const MergeEditorFloatComponents: ReactEditorComponent<{ uri: URI }> = ({
|
|
|
90
67
|
// TODO: 编辑器向上滚动一行
|
|
91
68
|
});
|
|
92
69
|
}, []);
|
|
93
|
-
|
|
94
70
|
const handleAIResolve = useCallback(async () => {
|
|
95
71
|
setIsAIResolving(true);
|
|
96
72
|
if (isAIResolving) {
|
|
97
|
-
await commandService.executeCommand(MERGE_CONFLICT_COMMANDS.AI_ALL_ACCEPT_STOP.id,
|
|
73
|
+
await commandService.executeCommand(MERGE_CONFLICT_COMMANDS.AI_ALL_ACCEPT_STOP.id, uri);
|
|
98
74
|
} else {
|
|
99
|
-
await commandService.executeCommand(MERGE_CONFLICT_COMMANDS.AI_ALL_ACCEPT.id,
|
|
75
|
+
await commandService.executeCommand(MERGE_CONFLICT_COMMANDS.AI_ALL_ACCEPT.id, uri);
|
|
100
76
|
}
|
|
101
77
|
setIsAIResolving(false);
|
|
102
|
-
}, [
|
|
103
|
-
|
|
104
|
-
const handleReset = useCallback(() => {
|
|
105
|
-
commandService.executeCommand(MERGE_CONFLICT_COMMANDS.ALL_RESET.id, resource.uri);
|
|
106
|
-
}, [resource]);
|
|
78
|
+
}, [uri, isAIResolving]);
|
|
107
79
|
|
|
108
80
|
if (!isVisiable) {
|
|
109
81
|
return null;
|
|
110
82
|
}
|
|
111
83
|
|
|
84
|
+
const summary = formatLocalize('merge-conflicts.merge.conflict.remain', conflicts.length);
|
|
112
85
|
return (
|
|
113
|
-
<
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
className={styles.merge_conflict_bottom_btn}
|
|
133
|
-
size='default'
|
|
134
|
-
onClick={handleOpenMergeEditor}
|
|
135
|
-
>
|
|
136
|
-
<Icon icon={'swap'} />
|
|
137
|
-
<span>{localize('mergeEditor.open.3way')}</span>
|
|
138
|
-
</Button>
|
|
139
|
-
)}
|
|
140
|
-
<Button
|
|
141
|
-
id='merge.editor.rest'
|
|
142
|
-
className={styles.merge_conflict_bottom_btn}
|
|
143
|
-
size='default'
|
|
144
|
-
onClick={handleReset}
|
|
145
|
-
>
|
|
146
|
-
<Icon icon={'discard'} />
|
|
147
|
-
<span>{localize('mergeEditor.reset')}</span>
|
|
148
|
-
</Button>
|
|
149
|
-
{isSupportAIResolve() && (
|
|
150
|
-
<Button
|
|
151
|
-
id='merge.editor.conflict.resolve.all'
|
|
152
|
-
size='default'
|
|
153
|
-
className={`${styles.merge_conflict_bottom_btn} ${styles.magic_btn}`}
|
|
154
|
-
onClick={handleAIResolve}
|
|
155
|
-
>
|
|
156
|
-
{isAIResolving ? (
|
|
157
|
-
<>
|
|
158
|
-
<Icon icon={'circle-pause'} />
|
|
159
|
-
<span>{localize('mergeEditor.conflict.ai.resolve.all.stop')}</span>
|
|
160
|
-
</>
|
|
161
|
-
) : (
|
|
162
|
-
<>
|
|
163
|
-
<Icon icon={'magic-wand'} />
|
|
164
|
-
<span>{localize('mergeEditor.conflict.ai.resolve.all')}</span>
|
|
165
|
-
</>
|
|
166
|
-
)}
|
|
167
|
-
</Button>
|
|
168
|
-
)}
|
|
169
|
-
</div>
|
|
170
|
-
</div>
|
|
86
|
+
<MergeActions
|
|
87
|
+
uri={uri}
|
|
88
|
+
editorType='text'
|
|
89
|
+
summary={summary}
|
|
90
|
+
handleNext={handleNext}
|
|
91
|
+
handlePrev={handlePrev}
|
|
92
|
+
isAIResolving={isAIResolving}
|
|
93
|
+
onAIResolve={handleAIResolve}
|
|
94
|
+
onReset={() => {
|
|
95
|
+
commandService.executeCommand(MERGE_CONFLICT_COMMANDS.ALL_RESET.id, uri);
|
|
96
|
+
}}
|
|
97
|
+
onSwitchEditor={() => {
|
|
98
|
+
[SCM_COMMANDS.GIT_OPEN_MERGE_EDITOR, SCM_COMMANDS._GIT_OPEN_MERGE_EDITOR].forEach(({ id: command }) => {
|
|
99
|
+
if (commandRegistry.getCommand(command) && commandRegistry.isEnabled(command)) {
|
|
100
|
+
commandService.executeCommand(command, uri);
|
|
101
|
+
}
|
|
102
|
+
});
|
|
103
|
+
}}
|
|
104
|
+
/>
|
|
171
105
|
);
|
|
172
106
|
};
|
|
@@ -22,9 +22,7 @@ export class MergeEditorResourceProvider extends WithEventBus implements IResour
|
|
|
22
22
|
const resultEditorUri = new URI(output);
|
|
23
23
|
const icon = this.labelService.getIcon(resultEditorUri);
|
|
24
24
|
return {
|
|
25
|
-
|
|
26
|
-
// TODO: 需要增加一个标记，说明这个资源要在某个插件加载后才能 revive
|
|
27
|
-
supportsRevive: false,
|
|
25
|
+
supportsRevive: true,
|
|
28
26
|
name,
|
|
29
27
|
icon,
|
|
30
28
|
uri,
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"useInMergeChanges.d.ts","sourceRoot":"","sources":["../../../src/browser/hooks/useInMergeChanges.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,kBAAkB,aAAwB,CAAC;AAExD,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,WAqB/C"}
|
|
@@ -1,27 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.useInMergeChanges = exports.gitMergeChangesSet = void 0;
|
|
4
|
-
const react_1 = require("react");
|
|
5
|
-
const ide_core_browser_1 = require("@opensumi/ide-core-browser");
|
|
6
|
-
const contextKey = 'git.mergeChangesObj';
|
|
7
|
-
exports.gitMergeChangesSet = new Set([contextKey]);
|
|
8
|
-
function useInMergeChanges(uriStr) {
|
|
9
|
-
const contextKeyService = (0, ide_core_browser_1.useInjectable)(ide_core_browser_1.IContextKeyService);
|
|
10
|
-
const [inMergeChanges, setInMergeChanges] = (0, react_1.useState)(false);
|
|
11
|
-
(0, react_1.useEffect)(() => {
|
|
12
|
-
function run() {
|
|
13
|
-
const mergeChanges = contextKeyService.getValue(contextKey) || {};
|
|
14
|
-
setInMergeChanges(mergeChanges[uriStr] || false);
|
|
15
|
-
}
|
|
16
|
-
run();
|
|
17
|
-
const disposed = contextKeyService.onDidChangeContext(({ payload }) => {
|
|
18
|
-
if (payload.affectsSome(exports.gitMergeChangesSet)) {
|
|
19
|
-
run();
|
|
20
|
-
}
|
|
21
|
-
});
|
|
22
|
-
return () => disposed.dispose();
|
|
23
|
-
}, [uriStr]);
|
|
24
|
-
return inMergeChanges;
|
|
25
|
-
}
|
|
26
|
-
exports.useInMergeChanges = useInMergeChanges;
|
|
27
|
-
//# sourceMappingURL=useInMergeChanges.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"useInMergeChanges.js","sourceRoot":"","sources":["../../../src/browser/hooks/useInMergeChanges.ts"],"names":[],"mappings":";;;AAAA,iCAA4C;AAE5C,iEAA+E;AAE/E,MAAM,UAAU,GAAG,qBAAqB,CAAC;AAE5B,QAAA,kBAAkB,GAAG,IAAI,GAAG,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC;AAExD,SAAgB,iBAAiB,CAAC,MAAc;IAC9C,MAAM,iBAAiB,GAAG,IAAA,gCAAa,EAAqB,qCAAkB,CAAC,CAAC;IAEhF,MAAM,CAAC,cAAc,EAAE,iBAAiB,CAAC,GAAG,IAAA,gBAAQ,EAAC,KAAK,CAAC,CAAC;IAE5D,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,SAAS,GAAG;YACV,MAAM,YAAY,GAAG,iBAAiB,CAAC,QAAQ,CAA0B,UAAU,CAAC,IAAI,EAAE,CAAC;YAC3F,iBAAiB,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,CAAC;QACnD,CAAC;QACD,GAAG,EAAE,CAAC;QAEN,MAAM,QAAQ,GAAG,iBAAiB,CAAC,kBAAkB,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE;YACpE,IAAI,OAAO,CAAC,WAAW,CAAC,0BAAkB,CAAC,EAAE;gBAC3C,GAAG,EAAE,CAAC;aACP;QACH,CAAC,CAAC,CAAC;QACH,OAAO,GAAG,EAAE,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;IAClC,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;IAEb,OAAO,cAAc,CAAC;AACxB,CAAC;AArBD,8CAqBC"}
|
|
@@ -1,71 +0,0 @@
|
|
|
1
|
-
.merge_editor_float_container {
|
|
2
|
-
display: flex;
|
|
3
|
-
flex-direction: column;
|
|
4
|
-
background: var(--kt-panelTab-activeBackground);
|
|
5
|
-
box-shadow: inset 1px 1px 3px 0px var(--kt-panelTab-border);
|
|
6
|
-
justify-content: space-between;
|
|
7
|
-
white-space: nowrap;
|
|
8
|
-
// minimap's z-index is 5
|
|
9
|
-
z-index: 6;
|
|
10
|
-
padding: 10px;
|
|
11
|
-
|
|
12
|
-
.merge_editor_float_container_info {
|
|
13
|
-
width: 100%;
|
|
14
|
-
display: flex;
|
|
15
|
-
padding-left: 20px;
|
|
16
|
-
}
|
|
17
|
-
|
|
18
|
-
.merge_editor_float_container_operation_bar {
|
|
19
|
-
width: 100%;
|
|
20
|
-
display: flex;
|
|
21
|
-
justify-content: flex-end;
|
|
22
|
-
white-space: nowrap;
|
|
23
|
-
padding-top: 4px;
|
|
24
|
-
padding-right: 20px;
|
|
25
|
-
}
|
|
26
|
-
|
|
27
|
-
.merge_conflict_bottom_btn {
|
|
28
|
-
border: 1px solid var(--kt-button-disableForeground);
|
|
29
|
-
border-radius: 8px;
|
|
30
|
-
padding: 5px 16px;
|
|
31
|
-
background: var(--editor-background);
|
|
32
|
-
color: var(--editor-foreground);
|
|
33
|
-
margin: 0 4px;
|
|
34
|
-
line-height: 22px;
|
|
35
|
-
justify-content: end;
|
|
36
|
-
white-space: nowrap;
|
|
37
|
-
cursor: pointer;
|
|
38
|
-
:global {
|
|
39
|
-
.kt-icon {
|
|
40
|
-
font-size: 12px;
|
|
41
|
-
}
|
|
42
|
-
}
|
|
43
|
-
:first-child {
|
|
44
|
-
margin-right: 8px;
|
|
45
|
-
}
|
|
46
|
-
}
|
|
47
|
-
|
|
48
|
-
.magic_btn {
|
|
49
|
-
background-image: radial-gradient(circle at -21% -22%, #19cfff, #8429ff);
|
|
50
|
-
border: none;
|
|
51
|
-
font-weight: 500;
|
|
52
|
-
span {
|
|
53
|
-
color: #fff;
|
|
54
|
-
}
|
|
55
|
-
:global {
|
|
56
|
-
.kt-icon {
|
|
57
|
-
color: #fff;
|
|
58
|
-
font-size: 12px;
|
|
59
|
-
margin-right: 8px;
|
|
60
|
-
}
|
|
61
|
-
}
|
|
62
|
-
}
|
|
63
|
-
|
|
64
|
-
.line_vertical {
|
|
65
|
-
background-color: var(--design-borderColor-common);
|
|
66
|
-
width: 1px;
|
|
67
|
-
min-width: 1px;
|
|
68
|
-
height: 24px;
|
|
69
|
-
margin: 4px;
|
|
70
|
-
}
|
|
71
|
-
}
|
|
@@ -1,30 +0,0 @@
|
|
|
1
|
-
import { useEffect, useState } from 'react';
|
|
2
|
-
|
|
3
|
-
import { IContextKeyService, useInjectable } from '@opensumi/ide-core-browser';
|
|
4
|
-
|
|
5
|
-
const contextKey = 'git.mergeChangesObj';
|
|
6
|
-
|
|
7
|
-
export const gitMergeChangesSet = new Set([contextKey]);
|
|
8
|
-
|
|
9
|
-
export function useInMergeChanges(uriStr: string) {
|
|
10
|
-
const contextKeyService = useInjectable<IContextKeyService>(IContextKeyService);
|
|
11
|
-
|
|
12
|
-
const [inMergeChanges, setInMergeChanges] = useState(false);
|
|
13
|
-
|
|
14
|
-
useEffect(() => {
|
|
15
|
-
function run() {
|
|
16
|
-
const mergeChanges = contextKeyService.getValue<Record<string, boolean>>(contextKey) || {};
|
|
17
|
-
setInMergeChanges(mergeChanges[uriStr] || false);
|
|
18
|
-
}
|
|
19
|
-
run();
|
|
20
|
-
|
|
21
|
-
const disposed = contextKeyService.onDidChangeContext(({ payload }) => {
|
|
22
|
-
if (payload.affectsSome(gitMergeChangesSet)) {
|
|
23
|
-
run();
|
|
24
|
-
}
|
|
25
|
-
});
|
|
26
|
-
return () => disposed.dispose();
|
|
27
|
-
}, [uriStr]);
|
|
28
|
-
|
|
29
|
-
return inMergeChanges;
|
|
30
|
-
}
|
|
@@ -1,71 +0,0 @@
|
|
|
1
|
-
.merge_editor_float_container {
|
|
2
|
-
display: flex;
|
|
3
|
-
flex-direction: column;
|
|
4
|
-
background: var(--kt-panelTab-activeBackground);
|
|
5
|
-
box-shadow: inset 1px 1px 3px 0px var(--kt-panelTab-border);
|
|
6
|
-
justify-content: space-between;
|
|
7
|
-
white-space: nowrap;
|
|
8
|
-
// minimap's z-index is 5
|
|
9
|
-
z-index: 6;
|
|
10
|
-
padding: 10px;
|
|
11
|
-
|
|
12
|
-
.merge_editor_float_container_info {
|
|
13
|
-
width: 100%;
|
|
14
|
-
display: flex;
|
|
15
|
-
padding-left: 20px;
|
|
16
|
-
}
|
|
17
|
-
|
|
18
|
-
.merge_editor_float_container_operation_bar {
|
|
19
|
-
width: 100%;
|
|
20
|
-
display: flex;
|
|
21
|
-
justify-content: flex-end;
|
|
22
|
-
white-space: nowrap;
|
|
23
|
-
padding-top: 4px;
|
|
24
|
-
padding-right: 20px;
|
|
25
|
-
}
|
|
26
|
-
|
|
27
|
-
.merge_conflict_bottom_btn {
|
|
28
|
-
border: 1px solid var(--kt-button-disableForeground);
|
|
29
|
-
border-radius: 8px;
|
|
30
|
-
padding: 5px 16px;
|
|
31
|
-
background: var(--editor-background);
|
|
32
|
-
color: var(--editor-foreground);
|
|
33
|
-
margin: 0 4px;
|
|
34
|
-
line-height: 22px;
|
|
35
|
-
justify-content: end;
|
|
36
|
-
white-space: nowrap;
|
|
37
|
-
cursor: pointer;
|
|
38
|
-
:global {
|
|
39
|
-
.kt-icon {
|
|
40
|
-
font-size: 12px;
|
|
41
|
-
}
|
|
42
|
-
}
|
|
43
|
-
:first-child {
|
|
44
|
-
margin-right: 8px;
|
|
45
|
-
}
|
|
46
|
-
}
|
|
47
|
-
|
|
48
|
-
.magic_btn {
|
|
49
|
-
background-image: radial-gradient(circle at -21% -22%, #19cfff, #8429ff);
|
|
50
|
-
border: none;
|
|
51
|
-
font-weight: 500;
|
|
52
|
-
span {
|
|
53
|
-
color: #fff;
|
|
54
|
-
}
|
|
55
|
-
:global {
|
|
56
|
-
.kt-icon {
|
|
57
|
-
color: #fff;
|
|
58
|
-
font-size: 12px;
|
|
59
|
-
margin-right: 8px;
|
|
60
|
-
}
|
|
61
|
-
}
|
|
62
|
-
}
|
|
63
|
-
|
|
64
|
-
.line_vertical {
|
|
65
|
-
background-color: var(--design-borderColor-common);
|
|
66
|
-
width: 1px;
|
|
67
|
-
min-width: 1px;
|
|
68
|
-
height: 24px;
|
|
69
|
-
margin: 4px;
|
|
70
|
-
}
|
|
71
|
-
}
|