@theia/workspace 1.54.0 → 1.55.0-next.25
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/quick-open-workspace.d.ts +1 -11
- package/lib/browser/quick-open-workspace.d.ts.map +1 -1
- package/lib/browser/quick-open-workspace.js +15 -39
- package/lib/browser/quick-open-workspace.js.map +1 -1
- package/lib/node/default-workspace-server.d.ts.map +1 -1
- package/lib/node/default-workspace-server.js +6 -1
- package/lib/node/default-workspace-server.js.map +1 -1
- package/package.json +5 -5
- package/src/browser/quick-open-workspace.ts +15 -33
- package/src/node/default-workspace-server.ts +6 -1
|
@@ -1,26 +1,16 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { LabelProvider, QuickInputService, QuickInputButton } from '@theia/core/lib/browser';
|
|
2
2
|
import { EnvVariablesServer } from '@theia/core/lib/common/env-variables';
|
|
3
3
|
import { WorkspaceService } from './workspace-service';
|
|
4
|
-
import { WorkspacePreferences } from './workspace-preferences';
|
|
5
|
-
import URI from '@theia/core/lib/common/uri';
|
|
6
|
-
import { FileService } from '@theia/filesystem/lib/browser/file-service';
|
|
7
4
|
import { UntitledWorkspaceService } from '../common/untitled-workspace-service';
|
|
8
|
-
interface RecentlyOpenedPick extends QuickPickItem {
|
|
9
|
-
resource?: URI;
|
|
10
|
-
}
|
|
11
5
|
export declare class QuickOpenWorkspace {
|
|
12
|
-
protected items: Array<RecentlyOpenedPick | QuickPickSeparator>;
|
|
13
6
|
protected opened: boolean;
|
|
14
7
|
protected readonly quickInputService: QuickInputService;
|
|
15
8
|
protected readonly workspaceService: WorkspaceService;
|
|
16
|
-
protected readonly fileService: FileService;
|
|
17
9
|
protected readonly labelProvider: LabelProvider;
|
|
18
|
-
protected preferences: WorkspacePreferences;
|
|
19
10
|
protected readonly envServer: EnvVariablesServer;
|
|
20
11
|
protected untitledWorkspaceService: UntitledWorkspaceService;
|
|
21
12
|
protected readonly removeRecentWorkspaceButton: QuickInputButton;
|
|
22
13
|
open(workspaces: string[]): Promise<void>;
|
|
23
14
|
select(): void;
|
|
24
15
|
}
|
|
25
|
-
export {};
|
|
26
16
|
//# sourceMappingURL=quick-open-workspace.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"quick-open-workspace.d.ts","sourceRoot":"","sources":["../../src/browser/quick-open-workspace.ts"],"names":[],"mappings":"AAiBA,OAAO,
|
|
1
|
+
{"version":3,"file":"quick-open-workspace.d.ts","sourceRoot":"","sources":["../../src/browser/quick-open-workspace.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAiB,aAAa,EAAE,iBAAiB,EAAE,gBAAgB,EAAsB,MAAM,yBAAyB,CAAC;AAChI,OAAO,EAAE,kBAAkB,EAAE,MAAM,sCAAsC,CAAC;AAC1E,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAGvD,OAAO,EAAE,wBAAwB,EAAE,MAAM,sCAAsC,CAAC;AAMhF,qBACa,kBAAkB;IAC3B,SAAS,CAAC,MAAM,EAAE,OAAO,CAAC;IAEa,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IACrE,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IACzD,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IAC3C,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,kBAAkB,CAAC;IAC3C,SAAS,CAAC,wBAAwB,EAAE,wBAAwB,CAAC;IAE/F,SAAS,CAAC,QAAQ,CAAC,2BAA2B,EAAE,gBAAgB,CAG9D;IAEI,IAAI,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IA0C/C,MAAM,IAAI,IAAI;CAQjB"}
|
|
@@ -21,9 +21,7 @@ const inversify_1 = require("@theia/core/shared/inversify");
|
|
|
21
21
|
const browser_1 = require("@theia/core/lib/browser");
|
|
22
22
|
const env_variables_1 = require("@theia/core/lib/common/env-variables");
|
|
23
23
|
const workspace_service_1 = require("./workspace-service");
|
|
24
|
-
const workspace_preferences_1 = require("./workspace-preferences");
|
|
25
24
|
const uri_1 = require("@theia/core/lib/common/uri");
|
|
26
|
-
const file_service_1 = require("@theia/filesystem/lib/browser/file-service");
|
|
27
25
|
const common_1 = require("@theia/core/lib/common");
|
|
28
26
|
const untitled_workspace_service_1 = require("../common/untitled-workspace-service");
|
|
29
27
|
let QuickOpenWorkspace = class QuickOpenWorkspace {
|
|
@@ -35,45 +33,32 @@ let QuickOpenWorkspace = class QuickOpenWorkspace {
|
|
|
35
33
|
}
|
|
36
34
|
async open(workspaces) {
|
|
37
35
|
var _a;
|
|
38
|
-
|
|
39
|
-
const
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
await this.preferences.ready;
|
|
45
|
-
this.items.push({
|
|
46
|
-
type: 'separator',
|
|
47
|
-
label: common_1.nls.localizeByDefault('folders & workspaces')
|
|
48
|
-
});
|
|
36
|
+
const homeDirUri = await this.envServer.getHomeDirUri();
|
|
37
|
+
const home = new uri_1.default(homeDirUri).path.fsPath();
|
|
38
|
+
const items = [{
|
|
39
|
+
type: 'separator',
|
|
40
|
+
label: common_1.nls.localizeByDefault('folders & workspaces')
|
|
41
|
+
}];
|
|
49
42
|
for (const workspace of workspaces) {
|
|
50
43
|
const uri = new uri_1.default(workspace);
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
}
|
|
55
|
-
catch { }
|
|
56
|
-
if (this.untitledWorkspaceService.isUntitledWorkspace(uri) || !stat) {
|
|
57
|
-
continue; // skip the temporary workspace files or an undefined stat.
|
|
44
|
+
const label = uri.path.base;
|
|
45
|
+
if (!label || this.untitledWorkspaceService.isUntitledWorkspace(uri)) {
|
|
46
|
+
continue; // skip temporary workspace files & empty workspace names
|
|
58
47
|
}
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
label: uri.path.base,
|
|
63
|
-
description: common_1.Path.tildify(uri.path.toString(), home),
|
|
64
|
-
iconClasses,
|
|
48
|
+
items.push({
|
|
49
|
+
label: label,
|
|
50
|
+
description: common_1.Path.tildify(uri.path.fsPath(), home),
|
|
65
51
|
buttons: [this.removeRecentWorkspaceButton],
|
|
66
52
|
resource: uri,
|
|
67
53
|
execute: () => {
|
|
68
54
|
const current = this.workspaceService.workspace;
|
|
69
|
-
const uriToOpen = new uri_1.default(workspace);
|
|
70
55
|
if ((current && current.resource.toString() !== workspace) || !current) {
|
|
71
|
-
this.workspaceService.open(
|
|
56
|
+
this.workspaceService.open(uri);
|
|
72
57
|
}
|
|
73
|
-
}
|
|
58
|
+
}
|
|
74
59
|
});
|
|
75
60
|
}
|
|
76
|
-
(_a = this.quickInputService) === null || _a === void 0 ? void 0 : _a.showQuickPick(
|
|
61
|
+
(_a = this.quickInputService) === null || _a === void 0 ? void 0 : _a.showQuickPick(items, {
|
|
77
62
|
placeholder: common_1.nls.localize('theia/workspace/openRecentPlaceholder', 'Type the name of the workspace you want to open'),
|
|
78
63
|
onDidTriggerItemButton: async (context) => {
|
|
79
64
|
const resource = context.item.resource;
|
|
@@ -85,7 +70,6 @@ let QuickOpenWorkspace = class QuickOpenWorkspace {
|
|
|
85
70
|
});
|
|
86
71
|
}
|
|
87
72
|
select() {
|
|
88
|
-
this.items = [];
|
|
89
73
|
this.opened = this.workspaceService.opened;
|
|
90
74
|
this.workspaceService.recentWorkspaces().then(workspaceRoots => {
|
|
91
75
|
if (workspaceRoots) {
|
|
@@ -104,18 +88,10 @@ tslib_1.__decorate([
|
|
|
104
88
|
(0, inversify_1.inject)(workspace_service_1.WorkspaceService),
|
|
105
89
|
tslib_1.__metadata("design:type", workspace_service_1.WorkspaceService)
|
|
106
90
|
], QuickOpenWorkspace.prototype, "workspaceService", void 0);
|
|
107
|
-
tslib_1.__decorate([
|
|
108
|
-
(0, inversify_1.inject)(file_service_1.FileService),
|
|
109
|
-
tslib_1.__metadata("design:type", file_service_1.FileService)
|
|
110
|
-
], QuickOpenWorkspace.prototype, "fileService", void 0);
|
|
111
91
|
tslib_1.__decorate([
|
|
112
92
|
(0, inversify_1.inject)(browser_1.LabelProvider),
|
|
113
93
|
tslib_1.__metadata("design:type", browser_1.LabelProvider)
|
|
114
94
|
], QuickOpenWorkspace.prototype, "labelProvider", void 0);
|
|
115
|
-
tslib_1.__decorate([
|
|
116
|
-
(0, inversify_1.inject)(workspace_preferences_1.WorkspacePreferences),
|
|
117
|
-
tslib_1.__metadata("design:type", Object)
|
|
118
|
-
], QuickOpenWorkspace.prototype, "preferences", void 0);
|
|
119
95
|
tslib_1.__decorate([
|
|
120
96
|
(0, inversify_1.inject)(env_variables_1.EnvVariablesServer),
|
|
121
97
|
tslib_1.__metadata("design:type", Object)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"quick-open-workspace.js","sourceRoot":"","sources":["../../src/browser/quick-open-workspace.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,gFAAgF;AAChF,gFAAgF;;;;AAEhF,4DAA4E;AAC5E,qDAAgI;AAChI,wEAA0E;AAC1E,2DAAuD;AACvD,
|
|
1
|
+
{"version":3,"file":"quick-open-workspace.js","sourceRoot":"","sources":["../../src/browser/quick-open-workspace.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"default-workspace-server.d.ts","sourceRoot":"","sources":["../../src/node/default-workspace-server.ts"],"names":[],"mappings":";AAiBA,OAAO,KAAK,KAAK,MAAM,0BAA0B,CAAC;AAIlD,OAAO,EAAW,8BAA8B,EAAE,MAAM,sBAAsB,CAAC;AAC/E,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,EAAE,QAAQ,EAAE,MAAM,qCAAqC,CAAC;AAC/D,OAAO,EAAE,eAAe,EAAE,wBAAwB,EAAE,MAAM,WAAW,CAAC;AACtE,OAAO,EAAE,kBAAkB,EAAE,MAAM,sCAAsC,CAAC;AAI1E,qBACa,wBAAyB,YAAW,eAAe;IAEhC,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,kBAAkB,CAAC;IACpD,SAAS,CAAC,QAAQ,CAAC,wBAAwB,EAAE,wBAAwB,CAAC;IAExG,aAAa,+BAAsC;IAEnD,SAAS,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,GAAG,IAAI;IAO3B,YAAY,CAAC,IAAI,EAAE,KAAK,CAAC,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAcxD,SAAS,CAAC,qBAAqB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;cAIpC,kCAAkC,CAAC,kBAAkB,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;CAoBhH;AAED,qBACa,sBAAuB,YAAW,eAAe,EAAE,8BAA8B;IAE1F,SAAS,CAAC,IAAI,EAAE,QAAQ,CAAC,MAAM,GAAG,SAAS,CAAC,CAAkB;IAC9D;;;OAGG;IACH,SAAS,CAAC,+BAA+B,SAAM;IAG/C,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,wBAAwB,CAAC;IAGvD,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,kBAAkB,CAAC;IAGjD,SAAS,CAAC,QAAQ,CAAC,wBAAwB,EAAE,wBAAwB,CAAC;IAGtE,SAAS,CAAC,IAAI,IAAI,IAAI;cAIN,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAKjC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;cAId,OAAO,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAWtD,4BAA4B,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAIrD,4BAA4B,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAQ3D,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAYpD,mBAAmB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;cAU9B,mBAAmB,CAAC,gBAAgB,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"default-workspace-server.d.ts","sourceRoot":"","sources":["../../src/node/default-workspace-server.ts"],"names":[],"mappings":";AAiBA,OAAO,KAAK,KAAK,MAAM,0BAA0B,CAAC;AAIlD,OAAO,EAAW,8BAA8B,EAAE,MAAM,sBAAsB,CAAC;AAC/E,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,EAAE,QAAQ,EAAE,MAAM,qCAAqC,CAAC;AAC/D,OAAO,EAAE,eAAe,EAAE,wBAAwB,EAAE,MAAM,WAAW,CAAC;AACtE,OAAO,EAAE,kBAAkB,EAAE,MAAM,sCAAsC,CAAC;AAI1E,qBACa,wBAAyB,YAAW,eAAe;IAEhC,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,kBAAkB,CAAC;IACpD,SAAS,CAAC,QAAQ,CAAC,wBAAwB,EAAE,wBAAwB,CAAC;IAExG,aAAa,+BAAsC;IAEnD,SAAS,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,GAAG,IAAI;IAO3B,YAAY,CAAC,IAAI,EAAE,KAAK,CAAC,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAcxD,SAAS,CAAC,qBAAqB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;cAIpC,kCAAkC,CAAC,kBAAkB,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;CAoBhH;AAED,qBACa,sBAAuB,YAAW,eAAe,EAAE,8BAA8B;IAE1F,SAAS,CAAC,IAAI,EAAE,QAAQ,CAAC,MAAM,GAAG,SAAS,CAAC,CAAkB;IAC9D;;;OAGG;IACH,SAAS,CAAC,+BAA+B,SAAM;IAG/C,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,wBAAwB,CAAC;IAGvD,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,kBAAkB,CAAC;IAGjD,SAAS,CAAC,QAAQ,CAAC,wBAAwB,EAAE,wBAAwB,CAAC;IAGtE,SAAS,CAAC,IAAI,IAAI,IAAI;cAIN,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAKjC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;cAId,OAAO,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAWtD,4BAA4B,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAIrD,4BAA4B,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAQ3D,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAYpD,mBAAmB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;cAU9B,mBAAmB,CAAC,gBAAgB,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;cAS/D,sBAAsB,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAKrE;;;OAGG;cACa,eAAe,CAAC,IAAI,EAAE,wBAAwB,GAAG,OAAO,CAAC,IAAI,CAAC;cAK9D,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAOxE;;OAEG;cACa,oCAAoC,IAAI,OAAO,CAAC,wBAAwB,GAAG,SAAS,CAAC;cAMrF,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;cAQ7D,kBAAkB,IAAI,OAAO,CAAC,MAAM,CAAC;IAKrD;;;OAGG;cACa,2BAA2B,IAAI,OAAO,CAAC,IAAI,CAAC;CAU/D;AAED,MAAM,WAAW,wBAAwB;IACrC,WAAW,EAAE,MAAM,EAAE,CAAC;CACzB;AAED,yBAAiB,wBAAwB,CAAC;IACtC;;;;OAIG;IACH,SAAgB,MAAM,CAAC,IAAI,EAAE,OAAO,GAAG,wBAAwB,GAAG,SAAS,CAO1E;CACJ"}
|
|
@@ -145,7 +145,12 @@ let DefaultWorkspaceServer = class DefaultWorkspaceServer {
|
|
|
145
145
|
return [];
|
|
146
146
|
}
|
|
147
147
|
async workspaceStillExist(workspaceRootUri) {
|
|
148
|
-
|
|
148
|
+
const uri = new uri_1.default(workspaceRootUri);
|
|
149
|
+
// Non file system workspaces cannot be checked for existence
|
|
150
|
+
if (uri.scheme !== 'file') {
|
|
151
|
+
return false;
|
|
152
|
+
}
|
|
153
|
+
return fs.pathExists(uri.path.fsPath());
|
|
149
154
|
}
|
|
150
155
|
async getWorkspaceURIFromCli() {
|
|
151
156
|
const arg = await this.cliParams.workspaceRoot.promise;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"default-workspace-server.js","sourceRoot":"","sources":["../../src/node/default-workspace-server.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"default-workspace-server.js","sourceRoot":"","sources":["../../src/node/default-workspace-server.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,gFAAgF;AAChF,gFAAgF;;;;AAEhF,6BAA6B;AAE7B,kDAAkD;AAClD,4CAA4C;AAC5C,4DAAiF;AACjF,+CAA+E;AAE/E,sEAA+D;AAC/D,sCAAsE;AACtE,wEAA0E;AAC1E,oDAA6C;AAC7C,sCAAuC;AAGhC,IAAM,wBAAwB,GAA9B,MAAM,wBAAwB;IAA9B;QAKH,kBAAa,GAAG,IAAI,uBAAQ,EAAsB,CAAC;IA+CvD,CAAC;IA7CG,SAAS,CAAC,IAAgB;QACtB,IAAI,CAAC,KAAK,CAAC,sCAAsC,CAAC,CAAC;QACnD,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE;YACpB,WAAW,EAAE,2CAA2C;SAC3D,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,IAAqB;QACpC,MAAM,kBAAkB,GAAG,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,qBAAqB,CAAC,EAAE,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC,CAAC;QAC9F,IAAI,kBAAkB,CAAC,MAAM,KAAK,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;YACtD,kBAAkB,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;QACtD,CAAC;QACD,IAAI,kBAAkB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAClC,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QAC1C,CAAC;aAAM,IAAI,kBAAkB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACzC,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,qBAAqB,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAClF,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,kCAAkC,CAAC,kBAAkB,CAAC,CAAC,CAAC;QAC5F,CAAC;IACL,CAAC;IAES,qBAAqB,CAAC,GAAW;QACvC,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IAChD,CAAC;IAES,KAAK,CAAC,kCAAkC,CAAC,kBAA4B;;QAC3E,IAAI,CAAC;YACD,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,GAAG,CAAC,KAAK,EAAC,QAAQ,EAAC,EAAE,WAAC,OAAA,MAAA,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC,0CAAE,WAAW,EAAE,CAAA,EAAA,CAAC,CAAC,CAAC;YAC1I,MAAM,OAAO,GAAG,kBAAkB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;YAC7H,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACrB,OAAO,MAAA,OAAO,CAAC,CAAC,CAAC,0CAAE,IAAI,CAAC;YAC5B,CAAC;YACD,MAAM,oBAAoB,GAAG,MAAM,IAAI,CAAC,wBAAwB,CAAC,uBAAuB,CACpF,IAAI,aAAG,CAAC,MAAM,IAAI,CAAC,kBAAkB,CAAC,eAAe,EAAE,CAAC,EACxD,KAAK,EAAC,GAAG,EAAC,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CACvD,CAAC;YACF,MAAM,qBAAqB,GAAG,oBAAoB,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YAEjE,MAAM,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC,CAAC;YACxD,MAAM,EAAE,CAAC,SAAS,CAAC,qBAAqB,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC;YACrF,OAAO,qBAAqB,CAAC;QACjC,CAAC;QAAC,MAAM,CAAC;YACL,OAAO,SAAS,CAAC;QACrB,CAAC;IACL,CAAC;CACJ,CAAA;AApDY,4DAAwB;AAEc;IAA9C,IAAA,kBAAM,EAAC,kCAAkB,CAAC;;oEAA2D;AACjC;IAApD,IAAA,kBAAM,EAAC,iCAAwB,CAAC;sCAA8C,iCAAwB;0EAAC;mCAH/F,wBAAwB;IADpC,IAAA,sBAAU,GAAE;GACA,wBAAwB,CAoDpC;AAGM,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IAA5B;QAEO,SAAI,GAAiC,IAAI,uBAAQ,EAAE,CAAC;QAC9D;;;WAGG;QACO,oCAA+B,GAAG,EAAE,CAAC;IAwInD,CAAC;IA5Ha,IAAI;QACV,IAAI,CAAC,MAAM,EAAE,CAAC;IAClB,CAAC;IAES,KAAK,CAAC,MAAM;QAClB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;QAClC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5B,CAAC;IAED,KAAK,CAAC,OAAO;QACT,MAAM,IAAI,CAAC,2BAA2B,EAAE,CAAC;IAC7C,CAAC;IAES,KAAK,CAAC,OAAO;QACnB,IAAI,IAAI,GAAG,MAAM,IAAI,CAAC,sBAAsB,EAAE,CAAC;QAC/C,IAAI,CAAC,IAAI,EAAE,CAAC;YACR,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,oCAAoC,EAAE,CAAC;YAC/D,IAAI,IAAI,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;gBAC3B,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;YAC/B,CAAC;QACL,CAAC;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,4BAA4B;QACxB,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC;IAC7B,CAAC;IAED,KAAK,CAAC,4BAA4B,CAAC,MAAc;QAC7C,MAAM,GAAG,GAAG,MAAM,IAAI,IAAI,aAAG,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,kFAAkF;QACpI,IAAI,CAAC,IAAI,GAAG,IAAI,uBAAQ,EAAE,CAAC;QAC3B,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACvB,MAAM,WAAW,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,EAAE,GAAG,MAAM,IAAI,CAAC,mBAAmB,EAAE,CAAC,CAAC,CAAC,CAAC;QACpF,IAAI,CAAC,eAAe,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC;IAC1C,CAAC;IAED,KAAK,CAAC,qBAAqB,CAAC,MAAc;QACtC,MAAM,GAAG,GAAG,MAAM,IAAI,IAAI,aAAG,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,kFAAkF;QACpI,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,mBAAmB,EAAE,CAAC;QACrD,MAAM,KAAK,GAAG,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACvC,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE,CAAC;YACf,WAAW,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;YAC7B,IAAI,CAAC,eAAe,CAAC;gBACjB,WAAW;aACd,CAAC,CAAC;QACP,CAAC;IACL,CAAC;IAED,KAAK,CAAC,mBAAmB;QACrB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,oCAAoC,EAAE,CAAC;QAC/D,IAAI,IAAI,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;YAC3B,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,KAAK,EAAC,OAAO,EAAC,EAAE,CACvE,OAAO,IAAI,MAAM,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;YAC/E,OAAO,WAAW,CAAC,MAAM,CAAC,eAAQ,CAAC,CAAC;QACxC,CAAC;QACD,OAAO,EAAE,CAAC;IACd,CAAC;IAES,KAAK,CAAC,mBAAmB,CAAC,gBAAwB;QACxD,MAAM,GAAG,GAAG,IAAI,aAAG,CAAC,gBAAgB,CAAC,CAAC;QACtC,6DAA6D;QAC7D,IAAI,GAAG,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC;YACxB,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,OAAO,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;IAC5C,CAAC;IAES,KAAK,CAAC,sBAAsB;QAClC,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,OAAO,CAAC;QACvD,OAAO,GAAG,KAAK,SAAS,CAAC,CAAC,CAAC,cAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;IAC1E,CAAC;IAED;;;OAGG;IACO,KAAK,CAAC,eAAe,CAAC,IAA8B;QAC1D,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAC7C,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACvC,CAAC;IAES,KAAK,CAAC,WAAW,CAAC,MAAc,EAAE,IAAY;QACpD,IAAI,CAAC,MAAM,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;YAC/B,MAAM,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC;QAChD,CAAC;QACD,MAAM,EAAE,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IACrC,CAAC;IAED;;OAEG;IACO,KAAK,CAAC,oCAAoC;QAChD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAC/C,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;QACjD,OAAO,wBAAwB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACjD,CAAC;IAES,KAAK,CAAC,gBAAgB,CAAC,MAAc;QAC3C,IAAI,MAAM,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;YAC9B,MAAM,UAAU,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;YACtD,MAAM,eAAe,GAAG,WAAW,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;YAC9D,OAAO,WAAW,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;QAC9C,CAAC;IACL,CAAC;IAES,KAAK,CAAC,kBAAkB;QAC9B,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,eAAe,EAAE,CAAC;QAC5D,OAAO,IAAI,CAAC,OAAO,CAAC,cAAO,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,sBAAsB,CAAC,CAAC;IAC9E,CAAC;IAED;;;OAGG;IACO,KAAK,CAAC,2BAA2B;QACvC,MAAM,OAAO,GAAG,CAAC,MAAM,IAAI,CAAC,mBAAmB,EAAE,CAAC,CAAC,GAAG,CAAC,cAAO,CAAC,MAAM,CAAC,CAAC;QACvE,MAAM,uBAAuB,GAAG,OAAO;aAClC,KAAK,CAAC,IAAI,CAAC,+BAA+B,CAAC;aAC3C,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC,IAAI,CAAC,wBAAwB,CAAC,mBAAmB,CAAC,cAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;QACvG,MAAM,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,cAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QAC5H,IAAI,uBAAuB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACrC,MAAM,IAAI,CAAC,eAAe,CAAC,EAAE,WAAW,EAAE,MAAM,IAAI,CAAC,mBAAmB,EAAE,EAAE,CAAC,CAAC;QAClF,CAAC;IACL,CAAC;CACJ,CAAA;AA/IY,wDAAsB;AAUZ;IADlB,IAAA,kBAAM,EAAC,wBAAwB,CAAC;sCACH,wBAAwB;yDAAC;AAGpC;IADlB,IAAA,kBAAM,EAAC,kCAAkB,CAAC;;yDACsB;AAG9B;IADlB,IAAA,kBAAM,EAAC,iCAAwB,CAAC;sCACY,iCAAwB;wEAAC;AAG5D;IADT,IAAA,yBAAa,GAAE;;;;kDAGf;iCArBQ,sBAAsB;IADlC,IAAA,sBAAU,GAAE;GACA,sBAAsB,CA+IlC;AAMD,IAAiB,wBAAwB,CAcxC;AAdD,WAAiB,wBAAwB;IACrC;;;;OAIG;IACH,SAAgB,MAAM,CAAC,IAAa;QAChC,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAE,IAAiC,CAAC,WAAW,CAAC,EAAE,CAAC;YACtG,OAAO;QACX,CAAC;QACD,OAAO;YACH,WAAW,EAAG,IAAiC,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,IAAI,KAAK,QAAQ,CAAC;SACvG,CAAC;IACN,CAAC;IAPe,+BAAM,SAOrB,CAAA;AACL,CAAC,EAdgB,wBAAwB,wCAAxB,wBAAwB,QAcxC"}
|
package/package.json
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@theia/workspace",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.55.0-next.25+2be612f8a",
|
|
4
4
|
"description": "Theia - Workspace Extension",
|
|
5
5
|
"dependencies": {
|
|
6
|
-
"@theia/core": "1.
|
|
7
|
-
"@theia/filesystem": "1.
|
|
8
|
-
"@theia/variable-resolver": "1.
|
|
6
|
+
"@theia/core": "1.55.0-next.25+2be612f8a",
|
|
7
|
+
"@theia/filesystem": "1.55.0-next.25+2be612f8a",
|
|
8
|
+
"@theia/variable-resolver": "1.55.0-next.25+2be612f8a",
|
|
9
9
|
"jsonc-parser": "^2.2.0",
|
|
10
10
|
"tslib": "^2.6.2",
|
|
11
11
|
"valid-filename": "^2.0.1"
|
|
@@ -52,5 +52,5 @@
|
|
|
52
52
|
"nyc": {
|
|
53
53
|
"extends": "../../configs/nyc.json"
|
|
54
54
|
},
|
|
55
|
-
"gitHead": "
|
|
55
|
+
"gitHead": "2be612f8a7efb90c1183ba47f0897040925b304a"
|
|
56
56
|
}
|
|
@@ -18,10 +18,7 @@ import { injectable, inject, optional } from '@theia/core/shared/inversify';
|
|
|
18
18
|
import { QuickPickItem, LabelProvider, QuickInputService, QuickInputButton, QuickPickSeparator } from '@theia/core/lib/browser';
|
|
19
19
|
import { EnvVariablesServer } from '@theia/core/lib/common/env-variables';
|
|
20
20
|
import { WorkspaceService } from './workspace-service';
|
|
21
|
-
import { WorkspacePreferences } from './workspace-preferences';
|
|
22
21
|
import URI from '@theia/core/lib/common/uri';
|
|
23
|
-
import { FileService } from '@theia/filesystem/lib/browser/file-service';
|
|
24
|
-
import { FileStat } from '@theia/filesystem/lib/common/files';
|
|
25
22
|
import { nls, Path } from '@theia/core/lib/common';
|
|
26
23
|
import { UntitledWorkspaceService } from '../common/untitled-workspace-service';
|
|
27
24
|
|
|
@@ -31,14 +28,11 @@ interface RecentlyOpenedPick extends QuickPickItem {
|
|
|
31
28
|
|
|
32
29
|
@injectable()
|
|
33
30
|
export class QuickOpenWorkspace {
|
|
34
|
-
protected items: Array<RecentlyOpenedPick | QuickPickSeparator>;
|
|
35
31
|
protected opened: boolean;
|
|
36
32
|
|
|
37
33
|
@inject(QuickInputService) @optional() protected readonly quickInputService: QuickInputService;
|
|
38
34
|
@inject(WorkspaceService) protected readonly workspaceService: WorkspaceService;
|
|
39
|
-
@inject(FileService) protected readonly fileService: FileService;
|
|
40
35
|
@inject(LabelProvider) protected readonly labelProvider: LabelProvider;
|
|
41
|
-
@inject(WorkspacePreferences) protected preferences: WorkspacePreferences;
|
|
42
36
|
@inject(EnvVariablesServer) protected readonly envServer: EnvVariablesServer;
|
|
43
37
|
@inject(UntitledWorkspaceService) protected untitledWorkspaceService: UntitledWorkspaceService;
|
|
44
38
|
|
|
@@ -48,45 +42,34 @@ export class QuickOpenWorkspace {
|
|
|
48
42
|
};
|
|
49
43
|
|
|
50
44
|
async open(workspaces: string[]): Promise<void> {
|
|
51
|
-
|
|
52
|
-
const
|
|
53
|
-
|
|
54
|
-
this.workspaceService.getUntitledWorkspace()
|
|
55
|
-
]);
|
|
56
|
-
const home = new URI(homeDirUri).path.toString();
|
|
57
|
-
await this.preferences.ready;
|
|
58
|
-
this.items.push({
|
|
45
|
+
const homeDirUri = await this.envServer.getHomeDirUri();
|
|
46
|
+
const home = new URI(homeDirUri).path.fsPath();
|
|
47
|
+
const items: (RecentlyOpenedPick | QuickPickSeparator)[] = [{
|
|
59
48
|
type: 'separator',
|
|
60
49
|
label: nls.localizeByDefault('folders & workspaces')
|
|
61
|
-
}
|
|
50
|
+
}];
|
|
51
|
+
|
|
62
52
|
for (const workspace of workspaces) {
|
|
63
53
|
const uri = new URI(workspace);
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
} catch { }
|
|
68
|
-
if (this.untitledWorkspaceService.isUntitledWorkspace(uri) || !stat) {
|
|
69
|
-
continue; // skip the temporary workspace files or an undefined stat.
|
|
54
|
+
const label = uri.path.base;
|
|
55
|
+
if (!label || this.untitledWorkspaceService.isUntitledWorkspace(uri)) {
|
|
56
|
+
continue; // skip temporary workspace files & empty workspace names
|
|
70
57
|
}
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
this.items.push({
|
|
75
|
-
label: uri.path.base,
|
|
76
|
-
description: Path.tildify(uri.path.toString(), home),
|
|
77
|
-
iconClasses,
|
|
58
|
+
items.push({
|
|
59
|
+
label: label,
|
|
60
|
+
description: Path.tildify(uri.path.fsPath(), home),
|
|
78
61
|
buttons: [this.removeRecentWorkspaceButton],
|
|
79
62
|
resource: uri,
|
|
80
63
|
execute: () => {
|
|
81
64
|
const current = this.workspaceService.workspace;
|
|
82
|
-
const uriToOpen = new URI(workspace);
|
|
83
65
|
if ((current && current.resource.toString() !== workspace) || !current) {
|
|
84
|
-
this.workspaceService.open(
|
|
66
|
+
this.workspaceService.open(uri);
|
|
85
67
|
}
|
|
86
|
-
}
|
|
68
|
+
}
|
|
87
69
|
});
|
|
88
70
|
}
|
|
89
|
-
|
|
71
|
+
|
|
72
|
+
this.quickInputService?.showQuickPick(items, {
|
|
90
73
|
placeholder: nls.localize(
|
|
91
74
|
'theia/workspace/openRecentPlaceholder',
|
|
92
75
|
'Type the name of the workspace you want to open'),
|
|
@@ -101,7 +84,6 @@ export class QuickOpenWorkspace {
|
|
|
101
84
|
}
|
|
102
85
|
|
|
103
86
|
select(): void {
|
|
104
|
-
this.items = [];
|
|
105
87
|
this.opened = this.workspaceService.opened;
|
|
106
88
|
this.workspaceService.recentWorkspaces().then(workspaceRoots => {
|
|
107
89
|
if (workspaceRoots) {
|
|
@@ -161,7 +161,12 @@ export class DefaultWorkspaceServer implements WorkspaceServer, BackendApplicati
|
|
|
161
161
|
}
|
|
162
162
|
|
|
163
163
|
protected async workspaceStillExist(workspaceRootUri: string): Promise<boolean> {
|
|
164
|
-
|
|
164
|
+
const uri = new URI(workspaceRootUri);
|
|
165
|
+
// Non file system workspaces cannot be checked for existence
|
|
166
|
+
if (uri.scheme !== 'file') {
|
|
167
|
+
return false;
|
|
168
|
+
}
|
|
169
|
+
return fs.pathExists(uri.path.fsPath());
|
|
165
170
|
}
|
|
166
171
|
|
|
167
172
|
protected async getWorkspaceURIFromCli(): Promise<string | undefined> {
|