@theia/workspace 1.30.0-next.3 → 1.30.0-next.30
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/workspace-uri-contribution.d.ts +3 -0
- package/lib/browser/workspace-uri-contribution.d.ts.map +1 -1
- package/lib/browser/workspace-uri-contribution.js +19 -0
- package/lib/browser/workspace-uri-contribution.js.map +1 -1
- package/lib/common/utils.d.ts +2 -1
- package/lib/common/utils.d.ts.map +1 -1
- package/lib/common/utils.js +2 -1
- package/lib/common/utils.js.map +1 -1
- package/package.json +5 -5
- package/src/browser/workspace-uri-contribution.ts +18 -2
- package/src/common/utils.ts +2 -1
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
import { DefaultUriLabelProviderContribution, URIIconReference } from '@theia/core/lib/browser/label-provider';
|
|
2
2
|
import URI from '@theia/core/lib/common/uri';
|
|
3
3
|
import { FileStat } from '@theia/filesystem/lib/common/files';
|
|
4
|
+
import { WorkspaceService } from './workspace-service';
|
|
4
5
|
import { WorkspaceVariableContribution } from './workspace-variable-contribution';
|
|
5
6
|
export declare class WorkspaceUriLabelProviderContribution extends DefaultUriLabelProviderContribution {
|
|
6
7
|
protected readonly workspaceVariable: WorkspaceVariableContribution;
|
|
8
|
+
protected readonly workspaceService: WorkspaceService;
|
|
7
9
|
init(): Promise<void>;
|
|
8
10
|
canHandle(element: object): number;
|
|
9
11
|
getIcon(element: URI | URIIconReference | FileStat): string;
|
|
@@ -12,6 +14,7 @@ export declare class WorkspaceUriLabelProviderContribution extends DefaultUriLab
|
|
|
12
14
|
* trims the workspace root from a file uri, if it is a child.
|
|
13
15
|
*/
|
|
14
16
|
getLongName(element: URI | URIIconReference | FileStat): string | undefined;
|
|
17
|
+
getDetails(element: URI | URIIconReference | FileStat): string | undefined;
|
|
15
18
|
protected asURIIconReference(element: URI | URIIconReference | FileStat): URI | URIIconReference;
|
|
16
19
|
protected getUri(element: URI | URIIconReference | FileStat): URI | undefined;
|
|
17
20
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace-uri-contribution.d.ts","sourceRoot":"","sources":["../../src/browser/workspace-uri-contribution.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,mCAAmC,EAAE,gBAAgB,EAAE,MAAM,wCAAwC,CAAC;AAC/G,OAAO,GAAG,MAAM,4BAA4B,CAAC;AAE7C,OAAO,EAAE,QAAQ,EAAE,MAAM,oCAAoC,CAAC;AAC9D,OAAO,EAAE,6BAA6B,EAAE,MAAM,mCAAmC,CAAC;AAElF,qBACa,qCAAsC,SAAQ,mCAAmC;
|
|
1
|
+
{"version":3,"file":"workspace-uri-contribution.d.ts","sourceRoot":"","sources":["../../src/browser/workspace-uri-contribution.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,mCAAmC,EAAE,gBAAgB,EAAE,MAAM,wCAAwC,CAAC;AAC/G,OAAO,GAAG,MAAM,4BAA4B,CAAC;AAE7C,OAAO,EAAE,QAAQ,EAAE,MAAM,oCAAoC,CAAC;AAC9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,6BAA6B,EAAE,MAAM,mCAAmC,CAAC;AAElF,qBACa,qCAAsC,SAAQ,mCAAmC;IAEnD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,6BAA6B,CAAC;IACjF,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAGjE,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAI3B,SAAS,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM;IAOlC,OAAO,CAAC,OAAO,EAAE,GAAG,GAAG,gBAAgB,GAAG,QAAQ,GAAG,MAAM;IAI3D,OAAO,CAAC,OAAO,EAAE,GAAG,GAAG,gBAAgB,GAAG,QAAQ,GAAG,MAAM,GAAG,SAAS;IAIhF;;OAEG;IACM,WAAW,CAAC,OAAO,EAAE,GAAG,GAAG,gBAAgB,GAAG,QAAQ,GAAG,MAAM,GAAG,SAAS;IAY3E,UAAU,CAAC,OAAO,EAAE,GAAG,GAAG,gBAAgB,GAAG,QAAQ,GAAG,MAAM,GAAG,SAAS;IAenF,SAAS,CAAC,kBAAkB,CAAC,OAAO,EAAE,GAAG,GAAG,gBAAgB,GAAG,QAAQ,GAAG,GAAG,GAAG,gBAAgB;cAW7E,MAAM,CAAC,OAAO,EAAE,GAAG,GAAG,gBAAgB,GAAG,QAAQ,GAAG,GAAG,GAAG,SAAS;CAMzF"}
|
|
@@ -29,6 +29,7 @@ const label_provider_1 = require("@theia/core/lib/browser/label-provider");
|
|
|
29
29
|
const uri_1 = require("@theia/core/lib/common/uri");
|
|
30
30
|
const inversify_1 = require("@theia/core/shared/inversify");
|
|
31
31
|
const files_1 = require("@theia/filesystem/lib/common/files");
|
|
32
|
+
const workspace_service_1 = require("./workspace-service");
|
|
32
33
|
const workspace_variable_contribution_1 = require("./workspace-variable-contribution");
|
|
33
34
|
let WorkspaceUriLabelProviderContribution = class WorkspaceUriLabelProviderContribution extends label_provider_1.DefaultUriLabelProviderContribution {
|
|
34
35
|
async init() {
|
|
@@ -60,6 +61,20 @@ let WorkspaceUriLabelProviderContribution = class WorkspaceUriLabelProviderContr
|
|
|
60
61
|
const relativePath = uri && this.workspaceVariable.getWorkspaceRelativePath(uri);
|
|
61
62
|
return relativePath || super.getLongName(this.asURIIconReference(element));
|
|
62
63
|
}
|
|
64
|
+
getDetails(element) {
|
|
65
|
+
const uri = this.getUri(element);
|
|
66
|
+
if (!uri) {
|
|
67
|
+
return this.getLongName(element);
|
|
68
|
+
}
|
|
69
|
+
// Parent in order to omit the name - that's what comes out of `getName`, and `getDetails` should supplement, not duplicate.
|
|
70
|
+
const relativePath = uri && this.workspaceVariable.getWorkspaceRelativePath(uri.parent);
|
|
71
|
+
if (relativePath !== undefined) {
|
|
72
|
+
const prefix = this.workspaceService.tryGetRoots().length > 1 ? this.getName(this.workspaceVariable.getWorkspaceRootUri(uri)) : '';
|
|
73
|
+
const separator = prefix && relativePath ? ' • ' : '';
|
|
74
|
+
return prefix + separator + relativePath;
|
|
75
|
+
}
|
|
76
|
+
return this.getLongName(uri.parent);
|
|
77
|
+
}
|
|
63
78
|
asURIIconReference(element) {
|
|
64
79
|
var _a;
|
|
65
80
|
if (files_1.FileStat.is(element)) {
|
|
@@ -82,6 +97,10 @@ __decorate([
|
|
|
82
97
|
(0, inversify_1.inject)(workspace_variable_contribution_1.WorkspaceVariableContribution),
|
|
83
98
|
__metadata("design:type", workspace_variable_contribution_1.WorkspaceVariableContribution)
|
|
84
99
|
], WorkspaceUriLabelProviderContribution.prototype, "workspaceVariable", void 0);
|
|
100
|
+
__decorate([
|
|
101
|
+
(0, inversify_1.inject)(workspace_service_1.WorkspaceService),
|
|
102
|
+
__metadata("design:type", workspace_service_1.WorkspaceService)
|
|
103
|
+
], WorkspaceUriLabelProviderContribution.prototype, "workspaceService", void 0);
|
|
85
104
|
__decorate([
|
|
86
105
|
(0, inversify_1.postConstruct)(),
|
|
87
106
|
__metadata("design:type", Function),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace-uri-contribution.js","sourceRoot":"","sources":["../../src/browser/workspace-uri-contribution.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;;;;;;;;;;;;AAEhF,2EAA+G;AAC/G,oDAA6C;AAC7C,4DAAiF;AACjF,8DAA8D;AAC9D,uFAAkF;AAGlF,IAAa,qCAAqC,GAAlD,MAAa,qCAAsC,SAAQ,oDAAmC;IAMjF,KAAK,CAAC,IAAI;QACf,gCAAgC;IACpC,CAAC;IAEQ,SAAS,CAAC,OAAe;QAC9B,IAAI,CAAC,OAAO,YAAY,aAAG,IAAI,OAAO,CAAC,MAAM,KAAK,MAAM,IAAI,iCAAgB,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,gBAAQ,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,EAAE;YAC/G,OAAO,EAAE,CAAC;SACb;QACD,OAAO,CAAC,CAAC;IACb,CAAC;IAEQ,OAAO,CAAC,OAA0C;QACvD,OAAO,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC;IAC3D,CAAC;IAEQ,OAAO,CAAC,OAA0C;QACvD,OAAO,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC;IAC3D,CAAC;IAED;;OAEG;IACM,WAAW,CAAC,OAA0C;QAC3D,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACjC,IAAI,GAAG,EAAE;YACL,MAAM,UAAU,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC;YAC5C,IAAI,UAAU,EAAE;gBACZ,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;aAC1C;SACJ;QACD,MAAM,YAAY,GAAG,GAAG,IAAI,IAAI,CAAC,iBAAiB,CAAC,wBAAwB,CAAC,GAAG,CAAC,CAAC;QACjF,OAAO,YAAY,IAAI,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC;IAC/E,CAAC;IAES,kBAAkB,CAAC,OAA0C;;QACnE,IAAI,gBAAQ,CAAC,EAAE,CAAC,OAAO,CAAC,EAAE;YACtB,OAAO,iCAAgB,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;SAC7F;QACD,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACjC,IAAI,GAAG,KAAI,MAAA,IAAI,CAAC,iBAAiB,CAAC,mBAAmB,CAAC,GAAG,CAAC,0CAAE,OAAO,CAAC,GAAG,CAAC,CAAA,EAAE;YACtE,OAAO,iCAAgB,CAAC,MAAM,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;SACjD;QACD,OAAO,OAAO,CAAC;IACnB,CAAC;IAEkB,MAAM,CAAC,OAA0C;QAChE,IAAI,gBAAQ,CAAC,EAAE,CAAC,OAAO,CAAC,EAAE;YACtB,OAAO,OAAO,CAAC,QAAQ,CAAC;SAC3B;QACD,OAAO,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IACjC,CAAC;CACJ,CAAA;
|
|
1
|
+
{"version":3,"file":"workspace-uri-contribution.js","sourceRoot":"","sources":["../../src/browser/workspace-uri-contribution.ts"],"names":[],"mappings":"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"}
|
package/lib/common/utils.d.ts
CHANGED
|
@@ -5,7 +5,8 @@ import { MaybePromise } from '@theia/core';
|
|
|
5
5
|
export declare const THEIA_EXT = "theia-workspace";
|
|
6
6
|
export declare const VSCODE_EXT = "code-workspace";
|
|
7
7
|
/**
|
|
8
|
-
* @deprecated since 1.4.0 - because of https://github.com/eclipse-theia/theia/
|
|
8
|
+
* @deprecated since 1.4.0 - because of https://github.com/eclipse-theia/theia/tree/master/doc/coding-guidelines.md#di-function-export,
|
|
9
|
+
* use `WorkspaceService.getUntitledWorkspace` instead
|
|
9
10
|
*/
|
|
10
11
|
export declare function getTemporaryWorkspaceFileUri(envVariableServer: EnvVariablesServer): Promise<URI>;
|
|
11
12
|
export declare class CommonWorkspaceUtils {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/common/utils.ts"],"names":[],"mappings":"AAkBA,OAAO,GAAG,MAAM,4BAA4B,CAAC;AAC7C,OAAO,EAAE,kBAAkB,EAAE,MAAM,sCAAsC,CAAC;AAE1E,OAAO,EAAE,QAAQ,EAAE,MAAM,oCAAoC,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C,eAAO,MAAM,SAAS,oBAAoB,CAAC;AAC3C,eAAO,MAAM,UAAU,mBAAmB,CAAC;AAE3C
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/common/utils.ts"],"names":[],"mappings":"AAkBA,OAAO,GAAG,MAAM,4BAA4B,CAAC;AAC7C,OAAO,EAAE,kBAAkB,EAAE,MAAM,sCAAsC,CAAC;AAE1E,OAAO,EAAE,QAAQ,EAAE,MAAM,oCAAoC,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C,eAAO,MAAM,SAAS,oBAAoB,CAAC;AAC3C,eAAO,MAAM,UAAU,mBAAmB,CAAC;AAE3C;;;GAGG;AACH,wBAAsB,4BAA4B,CAAC,iBAAiB,EAAE,kBAAkB,GAAG,OAAO,CAAC,GAAG,CAAC,CAGtG;AAED,qBACa,oBAAoB;IAC7B;;;;OAIG;IACH,eAAe,CAAC,SAAS,EAAE,QAAQ,GAAG,GAAG,GAAG,OAAO;IAKnD,mBAAmB,CAAC,SAAS,CAAC,EAAE,GAAG,GAAG,OAAO;IAIvC,uBAAuB,CAAC,YAAY,EAAE,GAAG,EAAE,YAAY,EAAE,CAAC,SAAS,EAAE,GAAG,KAAK,YAAY,CAAC,OAAO,CAAC,EAAE,UAAU,CAAC,EAAE,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC;CAgBtJ"}
|
package/lib/common/utils.js
CHANGED
|
@@ -29,7 +29,8 @@ const files_1 = require("@theia/filesystem/lib/common/files");
|
|
|
29
29
|
exports.THEIA_EXT = 'theia-workspace';
|
|
30
30
|
exports.VSCODE_EXT = 'code-workspace';
|
|
31
31
|
/**
|
|
32
|
-
* @deprecated since 1.4.0 - because of https://github.com/eclipse-theia/theia/
|
|
32
|
+
* @deprecated since 1.4.0 - because of https://github.com/eclipse-theia/theia/tree/master/doc/coding-guidelines.md#di-function-export,
|
|
33
|
+
* use `WorkspaceService.getUntitledWorkspace` instead
|
|
33
34
|
*/
|
|
34
35
|
async function getTemporaryWorkspaceFileUri(envVariableServer) {
|
|
35
36
|
const configDirUri = await envVariableServer.getConfigDirUri();
|
package/lib/common/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/common/utils.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,0CAA0C;AAC1C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;;;;;;;;;AAEhF,0EAA0E;AAE1E,oDAA6C;AAE7C,4DAA0D;AAC1D,8DAA8D;AAGjD,QAAA,SAAS,GAAG,iBAAiB,CAAC;AAC9B,QAAA,UAAU,GAAG,gBAAgB,CAAC;AAE3C
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/common/utils.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,0CAA0C;AAC1C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;;;;;;;;;AAEhF,0EAA0E;AAE1E,oDAA6C;AAE7C,4DAA0D;AAC1D,8DAA8D;AAGjD,QAAA,SAAS,GAAG,iBAAiB,CAAC;AAC9B,QAAA,UAAU,GAAG,gBAAgB,CAAC;AAE3C;;;GAGG;AACI,KAAK,UAAU,4BAA4B,CAAC,iBAAqC;IACpF,MAAM,YAAY,GAAG,MAAM,iBAAiB,CAAC,eAAe,EAAE,CAAC;IAC/D,OAAO,IAAI,aAAG,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,YAAY,iBAAS,EAAE,CAAC,CAAC;AAClE,CAAC;AAHD,oEAGC;AAGD,IAAa,oBAAoB,GAAjC,MAAa,oBAAoB;IAC7B;;;;OAIG;IACH,eAAe,CAAC,SAAyB;QACrC,MAAM,GAAG,GAAG,gBAAQ,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC;QACpE,OAAO,GAAG,CAAC,IAAI,CAAC,GAAG,KAAK,IAAI,iBAAS,EAAE,IAAI,GAAG,CAAC,IAAI,CAAC,GAAG,KAAK,IAAI,kBAAU,EAAE,CAAC;IACjF,CAAC;IAED,mBAAmB,CAAC,SAAe;QAC/B,OAAO,CAAC,CAAC,SAAS,IAAI,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,IAAI,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;IACxG,CAAC;IAED,KAAK,CAAC,uBAAuB,CAAC,YAAiB,EAAE,YAAuD,EAAE,UAA0B;QAChI,MAAM,SAAS,GAAG,YAAY,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QACrD,IAAI,GAAG,CAAC;QACR,IAAI,QAAQ,GAAG,CAAC,CAAC;QACjB,GAAG;YACC,QAAQ,EAAE,CAAC;YACX,GAAG,GAAG,SAAS,CAAC,OAAO,CAAC,YAAY,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,IAAI,iBAAS,EAAE,CAAC,CAAC;YACrF,IAAI,QAAQ,KAAK,EAAE,EAAE;gBACjB,UAAU,aAAV,UAAU,uBAAV,UAAU,EAAI,CAAC;aAClB;YACD,IAAI,QAAQ,KAAK,EAAE,EAAE;gBACjB,MAAM,IAAI,KAAK,CAAC,+DAA+D,CAAC,CAAC;aACpF;SACJ,QAAQ,CAAC,CAAC,MAAM,YAAY,CAAC,GAAG,CAAC,CAAC,EAAE;QACrC,OAAO,GAAG,CAAC;IACf,CAAC;CACJ,CAAA;AA/BY,oBAAoB;IADhC,IAAA,sBAAU,GAAE;GACA,oBAAoB,CA+BhC;AA/BY,oDAAoB"}
|
package/package.json
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@theia/workspace",
|
|
3
|
-
"version": "1.30.0-next.
|
|
3
|
+
"version": "1.30.0-next.30+559c6cafd",
|
|
4
4
|
"description": "Theia - Workspace Extension",
|
|
5
5
|
"dependencies": {
|
|
6
|
-
"@theia/core": "1.30.0-next.
|
|
7
|
-
"@theia/filesystem": "1.30.0-next.
|
|
8
|
-
"@theia/variable-resolver": "1.30.0-next.
|
|
6
|
+
"@theia/core": "1.30.0-next.30+559c6cafd",
|
|
7
|
+
"@theia/filesystem": "1.30.0-next.30+559c6cafd",
|
|
8
|
+
"@theia/variable-resolver": "1.30.0-next.30+559c6cafd",
|
|
9
9
|
"jsonc-parser": "^2.2.0",
|
|
10
10
|
"valid-filename": "^2.0.1"
|
|
11
11
|
},
|
|
@@ -48,5 +48,5 @@
|
|
|
48
48
|
"nyc": {
|
|
49
49
|
"extends": "../../configs/nyc.json"
|
|
50
50
|
},
|
|
51
|
-
"gitHead": "
|
|
51
|
+
"gitHead": "559c6cafd2f8242a784e1b0077d9f6c6f79c2152"
|
|
52
52
|
}
|
|
@@ -18,13 +18,14 @@ import { DefaultUriLabelProviderContribution, URIIconReference } from '@theia/co
|
|
|
18
18
|
import URI from '@theia/core/lib/common/uri';
|
|
19
19
|
import { injectable, inject, postConstruct } from '@theia/core/shared/inversify';
|
|
20
20
|
import { FileStat } from '@theia/filesystem/lib/common/files';
|
|
21
|
+
import { WorkspaceService } from './workspace-service';
|
|
21
22
|
import { WorkspaceVariableContribution } from './workspace-variable-contribution';
|
|
22
23
|
|
|
23
24
|
@injectable()
|
|
24
25
|
export class WorkspaceUriLabelProviderContribution extends DefaultUriLabelProviderContribution {
|
|
25
26
|
|
|
26
|
-
@inject(WorkspaceVariableContribution)
|
|
27
|
-
protected readonly
|
|
27
|
+
@inject(WorkspaceVariableContribution) protected readonly workspaceVariable: WorkspaceVariableContribution;
|
|
28
|
+
@inject(WorkspaceService) protected readonly workspaceService: WorkspaceService;
|
|
28
29
|
|
|
29
30
|
@postConstruct()
|
|
30
31
|
override async init(): Promise<void> {
|
|
@@ -61,6 +62,21 @@ export class WorkspaceUriLabelProviderContribution extends DefaultUriLabelProvid
|
|
|
61
62
|
return relativePath || super.getLongName(this.asURIIconReference(element));
|
|
62
63
|
}
|
|
63
64
|
|
|
65
|
+
override getDetails(element: URI | URIIconReference | FileStat): string | undefined {
|
|
66
|
+
const uri = this.getUri(element);
|
|
67
|
+
if (!uri) {
|
|
68
|
+
return this.getLongName(element);
|
|
69
|
+
}
|
|
70
|
+
// Parent in order to omit the name - that's what comes out of `getName`, and `getDetails` should supplement, not duplicate.
|
|
71
|
+
const relativePath = uri && this.workspaceVariable.getWorkspaceRelativePath(uri.parent);
|
|
72
|
+
if (relativePath !== undefined) {
|
|
73
|
+
const prefix = this.workspaceService.tryGetRoots().length > 1 ? this.getName(this.workspaceVariable.getWorkspaceRootUri(uri)!) : '';
|
|
74
|
+
const separator = prefix && relativePath ? ' • ' : '';
|
|
75
|
+
return prefix + separator + relativePath;
|
|
76
|
+
}
|
|
77
|
+
return this.getLongName(uri.parent);
|
|
78
|
+
}
|
|
79
|
+
|
|
64
80
|
protected asURIIconReference(element: URI | URIIconReference | FileStat): URI | URIIconReference {
|
|
65
81
|
if (FileStat.is(element)) {
|
|
66
82
|
return URIIconReference.create(element.isDirectory ? 'folder' : 'file', element.resource);
|
package/src/common/utils.ts
CHANGED
|
@@ -26,7 +26,8 @@ export const THEIA_EXT = 'theia-workspace';
|
|
|
26
26
|
export const VSCODE_EXT = 'code-workspace';
|
|
27
27
|
|
|
28
28
|
/**
|
|
29
|
-
* @deprecated since 1.4.0 - because of https://github.com/eclipse-theia/theia/
|
|
29
|
+
* @deprecated since 1.4.0 - because of https://github.com/eclipse-theia/theia/tree/master/doc/coding-guidelines.md#di-function-export,
|
|
30
|
+
* use `WorkspaceService.getUntitledWorkspace` instead
|
|
30
31
|
*/
|
|
31
32
|
export async function getTemporaryWorkspaceFileUri(envVariableServer: EnvVariablesServer): Promise<URI> {
|
|
32
33
|
const configDirUri = await envVariableServer.getConfigDirUri();
|