@theia/workspace 1.25.0-next.7 → 1.25.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/workspace-commands.d.ts +1 -5
- package/lib/browser/workspace-commands.d.ts.map +1 -1
- package/lib/browser/workspace-commands.js +2 -18
- package/lib/browser/workspace-commands.js.map +1 -1
- package/lib/node/default-workspace-server.d.ts +2 -2
- package/lib/node/default-workspace-server.d.ts.map +1 -1
- package/lib/node/default-workspace-server.js +6 -3
- package/lib/node/default-workspace-server.js.map +1 -1
- package/lib/node/default-workspace-server.spec.js +2 -2
- package/lib/node/default-workspace-server.spec.js.map +1 -1
- package/package.json +6 -6
- package/src/browser/workspace-commands.ts +3 -15
- package/src/node/default-workspace-server.spec.ts +2 -2
- package/src/node/default-workspace-server.ts +6 -3
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import URI from '@theia/core/lib/common/uri';
|
|
2
2
|
import { SelectionService } from '@theia/core/lib/common/selection-service';
|
|
3
|
-
import { ApplicationServer } from '@theia/core/lib/common/application-protocol';
|
|
4
3
|
import { Command, CommandContribution, CommandRegistry } from '@theia/core/lib/common/command';
|
|
5
4
|
import { MenuContribution, MenuModelRegistry } from '@theia/core/lib/common/menu';
|
|
6
5
|
import { FileDialogService } from '@theia/filesystem/lib/browser';
|
|
@@ -12,7 +11,7 @@ import { WorkspacePreferences } from './workspace-preferences';
|
|
|
12
11
|
import { WorkspaceDeleteHandler } from './workspace-delete-handler';
|
|
13
12
|
import { WorkspaceDuplicateHandler } from './workspace-duplicate-handler';
|
|
14
13
|
import { WorkspaceCompareHandler } from './workspace-compare-handler';
|
|
15
|
-
import { Event
|
|
14
|
+
import { Event } from '@theia/core/lib/common';
|
|
16
15
|
import { FileService } from '@theia/filesystem/lib/browser/file-service';
|
|
17
16
|
import { FileStat } from '@theia/filesystem/lib/common/files';
|
|
18
17
|
import { ClipboardService } from '@theia/core/lib/browser/clipboard-service';
|
|
@@ -70,12 +69,9 @@ export declare class WorkspaceCommandContribution implements CommandContribution
|
|
|
70
69
|
protected readonly deleteHandler: WorkspaceDeleteHandler;
|
|
71
70
|
protected readonly duplicateHandler: WorkspaceDuplicateHandler;
|
|
72
71
|
protected readonly compareHandler: WorkspaceCompareHandler;
|
|
73
|
-
protected readonly applicationServer: ApplicationServer;
|
|
74
72
|
protected readonly clipboardService: ClipboardService;
|
|
75
73
|
private readonly onDidCreateNewFileEmitter;
|
|
76
74
|
private readonly onDidCreateNewFolderEmitter;
|
|
77
|
-
protected backendOS: Promise<OS.Type>;
|
|
78
|
-
init(): Promise<void>;
|
|
79
75
|
get onDidCreateNewFile(): Event<DidCreateNewResourceEvent>;
|
|
80
76
|
get onDidCreateNewFolder(): Event<DidCreateNewResourceEvent>;
|
|
81
77
|
protected fireCreateNewFile(uri: DidCreateNewResourceEvent): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace-commands.d.ts","sourceRoot":"","sources":["../../src/browser/workspace-commands.ts"],"names":[],"mappings":"AAiBA,OAAO,GAAG,MAAM,4BAA4B,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,0CAA0C,CAAC;AAC5E,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"workspace-commands.d.ts","sourceRoot":"","sources":["../../src/browser/workspace-commands.ts"],"names":[],"mappings":"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"}
|
|
@@ -27,7 +27,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
27
27
|
exports.WorkspaceRootUriAwareCommandHandler = exports.WorkspaceCommandContribution = exports.EditMenuContribution = exports.FileMenuContribution = exports.WorkspaceCommands = void 0;
|
|
28
28
|
const inversify_1 = require("@theia/core/shared/inversify");
|
|
29
29
|
const selection_service_1 = require("@theia/core/lib/common/selection-service");
|
|
30
|
-
const application_protocol_1 = require("@theia/core/lib/common/application-protocol");
|
|
31
30
|
const command_1 = require("@theia/core/lib/common/command");
|
|
32
31
|
const common_frontend_contribution_1 = require("@theia/core/lib/browser/common-frontend-contribution");
|
|
33
32
|
const browser_1 = require("@theia/filesystem/lib/browser");
|
|
@@ -67,7 +66,7 @@ var WorkspaceCommands;
|
|
|
67
66
|
id: 'workspace:openFile',
|
|
68
67
|
originalCategory: FILE_CATEGORY,
|
|
69
68
|
category: nls_1.nls.localizeByDefault(browser_2.CommonCommands.FILE_CATEGORY),
|
|
70
|
-
dialogLabel: 'Open File'
|
|
69
|
+
dialogLabel: nls_1.nls.localizeByDefault('Open File')
|
|
71
70
|
};
|
|
72
71
|
WorkspaceCommands.OPEN_FOLDER = {
|
|
73
72
|
id: 'workspace:openFolder',
|
|
@@ -187,10 +186,6 @@ let WorkspaceCommandContribution = class WorkspaceCommandContribution {
|
|
|
187
186
|
this.onDidCreateNewFileEmitter = new common_2.Emitter();
|
|
188
187
|
this.onDidCreateNewFolderEmitter = new common_2.Emitter();
|
|
189
188
|
}
|
|
190
|
-
async init() {
|
|
191
|
-
this.backendOS = this.applicationServer.getBackendOS();
|
|
192
|
-
}
|
|
193
|
-
;
|
|
194
189
|
get onDidCreateNewFile() {
|
|
195
190
|
return this.onDidCreateNewFileEmitter.event;
|
|
196
191
|
}
|
|
@@ -358,8 +353,7 @@ let WorkspaceCommandContribution = class WorkspaceCommandContribution {
|
|
|
358
353
|
return new WorkspaceRootUriAwareCommandHandler(this.workspaceService, this.selectionService, handler);
|
|
359
354
|
}
|
|
360
355
|
async validateFileRename(oldName, newName, parent) {
|
|
361
|
-
if (
|
|
362
|
-
&& parent.resource.resolve(newName).isEqual(parent.resource.resolve(oldName), false)) {
|
|
356
|
+
if (common_2.OS.backend.isWindows && parent.resource.resolve(newName).isEqual(parent.resource.resolve(oldName), false)) {
|
|
363
357
|
return '';
|
|
364
358
|
}
|
|
365
359
|
return this.validateFileName(newName, parent, false);
|
|
@@ -562,20 +556,10 @@ __decorate([
|
|
|
562
556
|
(0, inversify_1.inject)(workspace_compare_handler_1.WorkspaceCompareHandler),
|
|
563
557
|
__metadata("design:type", workspace_compare_handler_1.WorkspaceCompareHandler)
|
|
564
558
|
], WorkspaceCommandContribution.prototype, "compareHandler", void 0);
|
|
565
|
-
__decorate([
|
|
566
|
-
(0, inversify_1.inject)(application_protocol_1.ApplicationServer),
|
|
567
|
-
__metadata("design:type", Object)
|
|
568
|
-
], WorkspaceCommandContribution.prototype, "applicationServer", void 0);
|
|
569
559
|
__decorate([
|
|
570
560
|
(0, inversify_1.inject)(clipboard_service_1.ClipboardService),
|
|
571
561
|
__metadata("design:type", Object)
|
|
572
562
|
], WorkspaceCommandContribution.prototype, "clipboardService", void 0);
|
|
573
|
-
__decorate([
|
|
574
|
-
(0, inversify_1.postConstruct)(),
|
|
575
|
-
__metadata("design:type", Function),
|
|
576
|
-
__metadata("design:paramtypes", []),
|
|
577
|
-
__metadata("design:returntype", Promise)
|
|
578
|
-
], WorkspaceCommandContribution.prototype, "init", null);
|
|
579
563
|
WorkspaceCommandContribution = __decorate([
|
|
580
564
|
(0, inversify_1.injectable)()
|
|
581
565
|
], WorkspaceCommandContribution);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace-commands.js","sourceRoot":"","sources":["../../src/browser/workspace-commands.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"workspace-commands.js","sourceRoot":"","sources":["../../src/browser/workspace-commands.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,8 +24,8 @@ export declare class DefaultWorkspaceServer implements WorkspaceServer, BackendA
|
|
|
24
24
|
onStart(): Promise<void>;
|
|
25
25
|
protected getRoot(): Promise<string | undefined>;
|
|
26
26
|
getMostRecentlyUsedWorkspace(): Promise<string | undefined>;
|
|
27
|
-
setMostRecentlyUsedWorkspace(
|
|
28
|
-
removeRecentWorkspace(
|
|
27
|
+
setMostRecentlyUsedWorkspace(rawUri: string): Promise<void>;
|
|
28
|
+
removeRecentWorkspace(rawUri: string): Promise<void>;
|
|
29
29
|
getRecentWorkspaces(): Promise<string[]>;
|
|
30
30
|
protected workspaceStillExist(workspaceRootUri: string): boolean;
|
|
31
31
|
protected getWorkspaceURIFromCli(): Promise<string | undefined>;
|
|
@@ -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,oBAAoB,EAAE,MAAM,WAAW,CAAC;AAClE,OAAO,EAAE,kBAAkB,EAAE,MAAM,sCAAsC,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,oBAAoB,EAAE,MAAM,WAAW,CAAC;AAClE,OAAO,EAAE,kBAAkB,EAAE,MAAM,sCAAsC,CAAC;AAG1E,qBACa,wBAAyB,YAAW,eAAe;IAE5D,aAAa,+BAAsC;IAEnD,SAAS,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,GAAG,IAAI;IAOjC,YAAY,CAAC,IAAI,EAAE,KAAK,CAAC,SAAS,GAAG,IAAI;CAkB5C;AAED,qBACa,sBAAuB,YAAW,eAAe,EAAE,8BAA8B;IAE1F,SAAS,CAAC,IAAI,EAAE,QAAQ,CAAC,MAAM,GAAG,SAAS,CAAC,CAAkB;IAC9D;;;OAGG;IACH,SAAS,CAAC,gCAAgC,SAAM;IAGhD,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,wBAAwB,CAAC;IAGvD,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,kBAAkB,CAAC;IAGjD,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,oBAAoB,CAAC;cAG/B,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAK/B,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;IAe9C,SAAS,CAAC,mBAAmB,CAAC,gBAAgB,EAAE,MAAM,GAAG,OAAO;cAIhD,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;CAQ/D;AAED,UAAU,wBAAwB;IAC9B,WAAW,EAAE,MAAM,EAAE,CAAC;CACzB;AAED,kBAAU,wBAAwB,CAAC;IAC/B;;;;OAIG;IACH,SAAgB,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,wBAAwB,GAAG,SAAS;QAElF,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,IAAI,GAAG,CAAC,CAAC,aAAa,CAAC,CAAC,EAAE;YAC3F,OAAO;SACV;QACD,OAAO;YAEH,WAAW,EAAE,CAAC,IAAI,IAAI,GAAG,CAAC,CAAC,aAAa,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE,CAAC,OAAO,IAAI,KAAK,QAAQ,CAAC;SAChG,CAAC;IACN,CAAC;CACJ"}
|
|
@@ -33,6 +33,7 @@ const node_1 = require("@theia/core/lib/node");
|
|
|
33
33
|
const promise_util_1 = require("@theia/core/lib/common/promise-util");
|
|
34
34
|
const common_1 = require("../common");
|
|
35
35
|
const env_variables_1 = require("@theia/core/lib/common/env-variables");
|
|
36
|
+
const uri_1 = require("@theia/core/lib/common/uri");
|
|
36
37
|
let WorkspaceCliContribution = class WorkspaceCliContribution {
|
|
37
38
|
constructor() {
|
|
38
39
|
this.workspaceRoot = new promise_util_1.Deferred();
|
|
@@ -95,13 +96,15 @@ let DefaultWorkspaceServer = class DefaultWorkspaceServer {
|
|
|
95
96
|
getMostRecentlyUsedWorkspace() {
|
|
96
97
|
return this.root.promise;
|
|
97
98
|
}
|
|
98
|
-
async setMostRecentlyUsedWorkspace(
|
|
99
|
+
async setMostRecentlyUsedWorkspace(rawUri) {
|
|
100
|
+
const uri = rawUri && new uri_1.default(rawUri).toString(); // the empty string is used as a signal from the frontend not to load a workspace.
|
|
99
101
|
this.root = new promise_util_1.Deferred();
|
|
100
102
|
this.root.resolve(uri);
|
|
101
103
|
const recentRoots = Array.from(new Set([uri, ...await this.getRecentWorkspaces()]));
|
|
102
104
|
this.writeToUserHome({ recentRoots });
|
|
103
105
|
}
|
|
104
|
-
async removeRecentWorkspace(
|
|
106
|
+
async removeRecentWorkspace(rawUri) {
|
|
107
|
+
const uri = rawUri && new uri_1.default(rawUri).toString(); // the empty string is used as a signal from the frontend not to load a workspace.
|
|
105
108
|
const recentRoots = await this.getRecentWorkspaces();
|
|
106
109
|
const index = recentRoots.indexOf(uri);
|
|
107
110
|
if (index !== -1) {
|
|
@@ -118,7 +121,7 @@ let DefaultWorkspaceServer = class DefaultWorkspaceServer {
|
|
|
118
121
|
data.recentRoots.forEach(element => {
|
|
119
122
|
if (element.length > 0) {
|
|
120
123
|
if (this.workspaceStillExist(element)) {
|
|
121
|
-
listUri.push(
|
|
124
|
+
listUri.push(element);
|
|
122
125
|
}
|
|
123
126
|
}
|
|
124
127
|
});
|
|
@@ -1 +1 @@
|
|
|
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,2EAA2E;AAC3E,gFAAgF;;;;;;;;;;;;AAEhF,6BAA6B;AAE7B,kDAAkD;AAClD,4CAA4C;AAC5C,4DAAiF;AACjF,+CAA+E;AAE/E,sEAA+D;AAC/D,sCAAkE;AAClE,wEAA0E;
|
|
1
|
+
{"version":3,"file":"default-workspace-server.js","sourceRoot":"","sources":["../../src/node/default-workspace-server.ts"],"names":[],"mappings":"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"}
|
|
@@ -65,7 +65,7 @@ describe('DefaultWorkspaceServer', function () {
|
|
|
65
65
|
]
|
|
66
66
|
}));
|
|
67
67
|
const recent = await workspaceServer.getRecentWorkspaces();
|
|
68
|
-
(0, chai_1.expect)(recent).to.have.members([
|
|
68
|
+
(0, chai_1.expect)(recent).to.have.members([tmpConfigDir.toString()]);
|
|
69
69
|
});
|
|
70
70
|
it('should ignore non-string array entries but return remaining existing file paths', async function () {
|
|
71
71
|
// previously caused: 'TypeError: Cannot read property 'fsPath' of undefined', see issue #10250
|
|
@@ -79,7 +79,7 @@ describe('DefaultWorkspaceServer', function () {
|
|
|
79
79
|
]
|
|
80
80
|
}));
|
|
81
81
|
const recent = await workspaceServer.getRecentWorkspaces();
|
|
82
|
-
(0, chai_1.expect)(recent).to.have.members([
|
|
82
|
+
(0, chai_1.expect)(recent).to.have.members([tmpConfigDir.toString()]);
|
|
83
83
|
});
|
|
84
84
|
});
|
|
85
85
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"default-workspace-server.spec.js","sourceRoot":"","sources":["../../src/node/default-workspace-server.spec.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"default-workspace-server.spec.js","sourceRoot":"","sources":["../../src/node/default-workspace-server.spec.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@theia/workspace",
|
|
3
|
-
"version": "1.25.0
|
|
3
|
+
"version": "1.25.0",
|
|
4
4
|
"description": "Theia - Workspace Extension",
|
|
5
5
|
"dependencies": {
|
|
6
|
-
"@theia/core": "1.25.0
|
|
7
|
-
"@theia/filesystem": "1.25.0
|
|
8
|
-
"@theia/variable-resolver": "1.25.0
|
|
6
|
+
"@theia/core": "1.25.0",
|
|
7
|
+
"@theia/filesystem": "1.25.0",
|
|
8
|
+
"@theia/variable-resolver": "1.25.0",
|
|
9
9
|
"jsonc-parser": "^2.2.0",
|
|
10
10
|
"valid-filename": "^2.0.1"
|
|
11
11
|
},
|
|
@@ -43,10 +43,10 @@
|
|
|
43
43
|
"watch": "theiaext watch"
|
|
44
44
|
},
|
|
45
45
|
"devDependencies": {
|
|
46
|
-
"@theia/ext-scripts": "1.
|
|
46
|
+
"@theia/ext-scripts": "1.25.0"
|
|
47
47
|
},
|
|
48
48
|
"nyc": {
|
|
49
49
|
"extends": "../../configs/nyc.json"
|
|
50
50
|
},
|
|
51
|
-
"gitHead": "
|
|
51
|
+
"gitHead": "937a6bebf37de6e379445283cfb0fb595428ba35"
|
|
52
52
|
}
|
|
@@ -14,10 +14,9 @@
|
|
|
14
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
15
15
|
// *****************************************************************************
|
|
16
16
|
|
|
17
|
-
import { inject, injectable
|
|
17
|
+
import { inject, injectable } from '@theia/core/shared/inversify';
|
|
18
18
|
import URI from '@theia/core/lib/common/uri';
|
|
19
19
|
import { SelectionService } from '@theia/core/lib/common/selection-service';
|
|
20
|
-
import { ApplicationServer } from '@theia/core/lib/common/application-protocol';
|
|
21
20
|
import { Command, CommandContribution, CommandRegistry } from '@theia/core/lib/common/command';
|
|
22
21
|
import { MenuContribution, MenuModelRegistry } from '@theia/core/lib/common/menu';
|
|
23
22
|
import { CommonMenus } from '@theia/core/lib/browser/common-frontend-contribution';
|
|
@@ -65,7 +64,7 @@ export namespace WorkspaceCommands {
|
|
|
65
64
|
id: 'workspace:openFile',
|
|
66
65
|
originalCategory: FILE_CATEGORY,
|
|
67
66
|
category: nls.localizeByDefault(CommonCommands.FILE_CATEGORY),
|
|
68
|
-
dialogLabel: 'Open File'
|
|
67
|
+
dialogLabel: nls.localizeByDefault('Open File')
|
|
69
68
|
};
|
|
70
69
|
export const OPEN_FOLDER: Command & { dialogLabel: string } = {
|
|
71
70
|
id: 'workspace:openFolder',
|
|
@@ -204,19 +203,11 @@ export class WorkspaceCommandContribution implements CommandContribution {
|
|
|
204
203
|
@inject(WorkspaceDeleteHandler) protected readonly deleteHandler: WorkspaceDeleteHandler;
|
|
205
204
|
@inject(WorkspaceDuplicateHandler) protected readonly duplicateHandler: WorkspaceDuplicateHandler;
|
|
206
205
|
@inject(WorkspaceCompareHandler) protected readonly compareHandler: WorkspaceCompareHandler;
|
|
207
|
-
@inject(ApplicationServer) protected readonly applicationServer: ApplicationServer;
|
|
208
206
|
@inject(ClipboardService) protected readonly clipboardService: ClipboardService;
|
|
209
207
|
|
|
210
208
|
private readonly onDidCreateNewFileEmitter = new Emitter<DidCreateNewResourceEvent>();
|
|
211
209
|
private readonly onDidCreateNewFolderEmitter = new Emitter<DidCreateNewResourceEvent>();
|
|
212
210
|
|
|
213
|
-
protected backendOS: Promise<OS.Type>;
|
|
214
|
-
|
|
215
|
-
@postConstruct()
|
|
216
|
-
async init(): Promise<void> {
|
|
217
|
-
this.backendOS = this.applicationServer.getBackendOS();
|
|
218
|
-
};
|
|
219
|
-
|
|
220
211
|
get onDidCreateNewFile(): Event<DidCreateNewResourceEvent> {
|
|
221
212
|
return this.onDidCreateNewFileEmitter.event;
|
|
222
213
|
}
|
|
@@ -395,10 +386,7 @@ export class WorkspaceCommandContribution implements CommandContribution {
|
|
|
395
386
|
}
|
|
396
387
|
|
|
397
388
|
protected async validateFileRename(oldName: string, newName: string, parent: FileStat): Promise<string> {
|
|
398
|
-
if (
|
|
399
|
-
await this.backendOS === OS.Type.Windows
|
|
400
|
-
&& parent.resource.resolve(newName).isEqual(parent.resource.resolve(oldName), false)
|
|
401
|
-
) {
|
|
389
|
+
if (OS.backend.isWindows && parent.resource.resolve(newName).isEqual(parent.resource.resolve(oldName), false)) {
|
|
402
390
|
return '';
|
|
403
391
|
}
|
|
404
392
|
return this.validateFileName(newName, parent, false);
|
|
@@ -78,7 +78,7 @@ describe('DefaultWorkspaceServer', function (): void {
|
|
|
78
78
|
|
|
79
79
|
const recent = await workspaceServer.getRecentWorkspaces();
|
|
80
80
|
|
|
81
|
-
expect(recent).to.have.members([
|
|
81
|
+
expect(recent).to.have.members([tmpConfigDir.toString()]);
|
|
82
82
|
});
|
|
83
83
|
|
|
84
84
|
it('should ignore non-string array entries but return remaining existing file paths', async function (): Promise<void> {
|
|
@@ -95,7 +95,7 @@ describe('DefaultWorkspaceServer', function (): void {
|
|
|
95
95
|
|
|
96
96
|
const recent = await workspaceServer.getRecentWorkspaces();
|
|
97
97
|
|
|
98
|
-
expect(recent).to.have.members([
|
|
98
|
+
expect(recent).to.have.members([tmpConfigDir.toString()]);
|
|
99
99
|
});
|
|
100
100
|
});
|
|
101
101
|
});
|
|
@@ -24,6 +24,7 @@ import { CliContribution } from '@theia/core/lib/node/cli';
|
|
|
24
24
|
import { Deferred } from '@theia/core/lib/common/promise-util';
|
|
25
25
|
import { WorkspaceServer, CommonWorkspaceUtils } from '../common';
|
|
26
26
|
import { EnvVariablesServer } from '@theia/core/lib/common/env-variables';
|
|
27
|
+
import URI from '@theia/core/lib/common/uri';
|
|
27
28
|
|
|
28
29
|
@injectable()
|
|
29
30
|
export class WorkspaceCliContribution implements CliContribution {
|
|
@@ -101,14 +102,16 @@ export class DefaultWorkspaceServer implements WorkspaceServer, BackendApplicati
|
|
|
101
102
|
return this.root.promise;
|
|
102
103
|
}
|
|
103
104
|
|
|
104
|
-
async setMostRecentlyUsedWorkspace(
|
|
105
|
+
async setMostRecentlyUsedWorkspace(rawUri: string): Promise<void> {
|
|
106
|
+
const uri = rawUri && new URI(rawUri).toString(); // the empty string is used as a signal from the frontend not to load a workspace.
|
|
105
107
|
this.root = new Deferred();
|
|
106
108
|
this.root.resolve(uri);
|
|
107
109
|
const recentRoots = Array.from(new Set([uri, ...await this.getRecentWorkspaces()]));
|
|
108
110
|
this.writeToUserHome({ recentRoots });
|
|
109
111
|
}
|
|
110
112
|
|
|
111
|
-
async removeRecentWorkspace(
|
|
113
|
+
async removeRecentWorkspace(rawUri: string): Promise<void> {
|
|
114
|
+
const uri = rawUri && new URI(rawUri).toString(); // the empty string is used as a signal from the frontend not to load a workspace.
|
|
112
115
|
const recentRoots = await this.getRecentWorkspaces();
|
|
113
116
|
const index = recentRoots.indexOf(uri);
|
|
114
117
|
if (index !== -1) {
|
|
@@ -126,7 +129,7 @@ export class DefaultWorkspaceServer implements WorkspaceServer, BackendApplicati
|
|
|
126
129
|
data.recentRoots.forEach(element => {
|
|
127
130
|
if (element.length > 0) {
|
|
128
131
|
if (this.workspaceStillExist(element)) {
|
|
129
|
-
listUri.push(
|
|
132
|
+
listUri.push(element);
|
|
130
133
|
}
|
|
131
134
|
}
|
|
132
135
|
});
|