@opensumi/ide-editor 3.0.5-next-1717640023.0 → 3.1.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.
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { URI, WithEventBus } from '@opensumi/ide-core-browser';
|
|
1
|
+
import { AppConfig, URI, WithEventBus } from '@opensumi/ide-core-browser';
|
|
2
2
|
import { LabelService } from '@opensumi/ide-core-browser/lib/services';
|
|
3
3
|
import { IFileServiceClient } from '@opensumi/ide-file-service';
|
|
4
4
|
import { IDiffResource, IResourceProvider, ResourceDecorationChangeEvent, ResourceService } from '../../common';
|
|
@@ -7,6 +7,7 @@ export declare class DiffResourceProvider extends WithEventBus implements IResou
|
|
|
7
7
|
labelService: LabelService;
|
|
8
8
|
resourceService: ResourceService;
|
|
9
9
|
protected fileServiceClient: IFileServiceClient;
|
|
10
|
+
protected readonly appConfig: AppConfig;
|
|
10
11
|
scheme: string;
|
|
11
12
|
private modifiedToResource;
|
|
12
13
|
private userhomePath;
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/browser/diff/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAmB,GAAG,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC3F,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;IAGhD,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC;IAExC,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"}
|
|
@@ -59,17 +59,20 @@ let DiffResourceProvider = class DiffResourceProvider extends ide_core_browser_1
|
|
|
59
59
|
this.labelService.getIcon(originalUri),
|
|
60
60
|
// 默认显示 modified 文件路径
|
|
61
61
|
this.getReadableTooltip(modifiedUri),
|
|
62
|
-
]).then(([icon, title]) =>
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
62
|
+
]).then(([icon, title]) => {
|
|
63
|
+
var _a;
|
|
64
|
+
return ({
|
|
65
|
+
name,
|
|
66
|
+
icon,
|
|
67
|
+
uri,
|
|
68
|
+
supportsRevive: (_a = this.appConfig.enableDiffRevive) !== null && _a !== void 0 ? _a : true,
|
|
69
|
+
metadata: {
|
|
70
|
+
original: originalUri,
|
|
71
|
+
modified: modifiedUri,
|
|
72
|
+
},
|
|
73
|
+
title,
|
|
74
|
+
});
|
|
75
|
+
});
|
|
73
76
|
}
|
|
74
77
|
async shouldCloseResource(resource, openedResources) {
|
|
75
78
|
const { modified } = resource.uri.getParsedQuery();
|
|
@@ -93,6 +96,10 @@ tslib_1.__decorate([
|
|
|
93
96
|
(0, di_1.Autowired)(ide_file_service_1.IFileServiceClient),
|
|
94
97
|
tslib_1.__metadata("design:type", Object)
|
|
95
98
|
], DiffResourceProvider.prototype, "fileServiceClient", void 0);
|
|
99
|
+
tslib_1.__decorate([
|
|
100
|
+
(0, di_1.Autowired)(ide_core_browser_1.AppConfig),
|
|
101
|
+
tslib_1.__metadata("design:type", Object)
|
|
102
|
+
], DiffResourceProvider.prototype, "appConfig", void 0);
|
|
96
103
|
tslib_1.__decorate([
|
|
97
104
|
(0, ide_core_browser_1.OnEvent)(common_1.ResourceDecorationChangeEvent),
|
|
98
105
|
tslib_1.__metadata("design:type", Function),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/browser/diff/index.ts"],"names":[],"mappings":";;;;AAAA,qCAAqD;AACrD,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/browser/diff/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@opensumi/ide-editor",
|
|
3
|
-
"version": "3.
|
|
3
|
+
"version": "3.1.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": "3.
|
|
21
|
-
"@opensumi/ide-core-node": "3.
|
|
22
|
-
"@opensumi/ide-file-service": "3.
|
|
23
|
-
"@opensumi/ide-monaco": "3.
|
|
24
|
-
"@opensumi/ide-utils": "3.
|
|
20
|
+
"@opensumi/ide-core-common": "3.1.0",
|
|
21
|
+
"@opensumi/ide-core-node": "3.1.0",
|
|
22
|
+
"@opensumi/ide-file-service": "3.1.0",
|
|
23
|
+
"@opensumi/ide-monaco": "3.1.0",
|
|
24
|
+
"@opensumi/ide-utils": "3.1.0",
|
|
25
25
|
"vscode-oniguruma": "1.5.1"
|
|
26
26
|
},
|
|
27
27
|
"devDependencies": {
|
|
28
|
-
"@opensumi/ide-components": "3.
|
|
29
|
-
"@opensumi/ide-core-browser": "3.
|
|
30
|
-
"@opensumi/ide-dev-tool": "3.
|
|
31
|
-
"@opensumi/ide-overlay": "3.
|
|
32
|
-
"@opensumi/ide-quick-open": "3.
|
|
33
|
-
"@opensumi/ide-theme": "3.
|
|
34
|
-
"@opensumi/ide-workspace": "3.
|
|
28
|
+
"@opensumi/ide-components": "3.1.0",
|
|
29
|
+
"@opensumi/ide-core-browser": "3.1.0",
|
|
30
|
+
"@opensumi/ide-dev-tool": "3.1.0",
|
|
31
|
+
"@opensumi/ide-overlay": "3.1.0",
|
|
32
|
+
"@opensumi/ide-quick-open": "3.1.0",
|
|
33
|
+
"@opensumi/ide-theme": "3.1.0",
|
|
34
|
+
"@opensumi/ide-workspace": "3.1.0"
|
|
35
35
|
},
|
|
36
|
-
"gitHead": "
|
|
36
|
+
"gitHead": "9d963432d1ba24e64ef26e1c35cd49bf1abed6b7"
|
|
37
37
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Autowired, Injectable } from '@opensumi/di';
|
|
2
|
-
import { Domain, OnEvent, URI, WithEventBus } from '@opensumi/ide-core-browser';
|
|
2
|
+
import { AppConfig, Domain, OnEvent, URI, WithEventBus } from '@opensumi/ide-core-browser';
|
|
3
3
|
import { LabelService } from '@opensumi/ide-core-browser/lib/services';
|
|
4
4
|
import { IFileServiceClient } from '@opensumi/ide-file-service';
|
|
5
5
|
|
|
@@ -29,6 +29,9 @@ export class DiffResourceProvider extends WithEventBus implements IResourceProvi
|
|
|
29
29
|
@Autowired(IFileServiceClient)
|
|
30
30
|
protected fileServiceClient: IFileServiceClient;
|
|
31
31
|
|
|
32
|
+
@Autowired(AppConfig)
|
|
33
|
+
protected readonly appConfig: AppConfig;
|
|
34
|
+
|
|
32
35
|
scheme = DIFF_SCHEME;
|
|
33
36
|
|
|
34
37
|
private modifiedToResource = new Map<string, URI>();
|
|
@@ -85,7 +88,7 @@ export class DiffResourceProvider extends WithEventBus implements IResourceProvi
|
|
|
85
88
|
name,
|
|
86
89
|
icon,
|
|
87
90
|
uri,
|
|
88
|
-
supportsRevive: true,
|
|
91
|
+
supportsRevive: this.appConfig.enableDiffRevive ?? true,
|
|
89
92
|
metadata: {
|
|
90
93
|
original: originalUri,
|
|
91
94
|
modified: modifiedUri,
|