@theia/workspace 1.73.0-next.3 → 1.73.0-next.39
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-delete-handler.d.ts +2 -0
- package/lib/browser/workspace-delete-handler.d.ts.map +1 -1
- package/lib/browser/workspace-delete-handler.js +8 -2
- package/lib/browser/workspace-delete-handler.js.map +1 -1
- package/lib/browser/workspace-duplicate-handler.d.ts +2 -0
- package/lib/browser/workspace-duplicate-handler.d.ts.map +1 -1
- package/lib/browser/workspace-duplicate-handler.js +7 -1
- package/lib/browser/workspace-duplicate-handler.js.map +1 -1
- package/package.json +5 -5
- package/src/browser/workspace-delete-handler.ts +7 -3
- package/src/browser/workspace-duplicate-handler.ts +6 -2
|
@@ -6,12 +6,14 @@ import { WorkspaceUtils } from './workspace-utils';
|
|
|
6
6
|
import { FileService } from '@theia/filesystem/lib/browser/file-service';
|
|
7
7
|
import { FileSystemPreferences } from '@theia/filesystem/lib/common/filesystem-preferences';
|
|
8
8
|
import { FileDeleteOptions } from '@theia/filesystem/lib/common/files';
|
|
9
|
+
import { ILogger } from '@theia/core';
|
|
9
10
|
export declare class WorkspaceDeleteHandler implements UriCommandHandler<URI[]> {
|
|
10
11
|
protected readonly fileService: FileService;
|
|
11
12
|
protected readonly shell: ApplicationShell;
|
|
12
13
|
protected readonly workspaceUtils: WorkspaceUtils;
|
|
13
14
|
protected readonly workspaceService: WorkspaceService;
|
|
14
15
|
protected readonly fsPreferences: FileSystemPreferences;
|
|
16
|
+
protected readonly logger: ILogger;
|
|
15
17
|
/**
|
|
16
18
|
* Determine if the command is visible.
|
|
17
19
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace-delete-handler.d.ts","sourceRoot":"","sources":["../../src/browser/workspace-delete-handler.ts"],"names":[],"mappings":"AAiBA,OAAO,GAAG,MAAM,4BAA4B,CAAC;AAC7C,OAAO,EAAiB,gBAAgB,EAAqC,MAAM,yBAAyB,CAAC;AAC7G,OAAO,EAAE,iBAAiB,EAAE,MAAM,4CAA4C,CAAC;AAC/E,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,4CAA4C,CAAC;AACzE,OAAO,EAAE,qBAAqB,EAAE,MAAM,qDAAqD,CAAC;AAC5F,OAAO,EAAE,iBAAiB,EAAkC,MAAM,oCAAoC,CAAC;
|
|
1
|
+
{"version":3,"file":"workspace-delete-handler.d.ts","sourceRoot":"","sources":["../../src/browser/workspace-delete-handler.ts"],"names":[],"mappings":"AAiBA,OAAO,GAAG,MAAM,4BAA4B,CAAC;AAC7C,OAAO,EAAiB,gBAAgB,EAAqC,MAAM,yBAAyB,CAAC;AAC7G,OAAO,EAAE,iBAAiB,EAAE,MAAM,4CAA4C,CAAC;AAC/E,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,4CAA4C,CAAC;AACzE,OAAO,EAAE,qBAAqB,EAAE,MAAM,qDAAqD,CAAC;AAC5F,OAAO,EAAE,iBAAiB,EAAkC,MAAM,oCAAoC,CAAC;AAEvG,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAEtC,qBACa,sBAAuB,YAAW,iBAAiB,CAAC,GAAG,EAAE,CAAC;IAGnE,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;IAG5C,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,gBAAgB,CAAC;IAG3C,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;IAGlD,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAGtD,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,qBAAqB,CAAC;IAGxD,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IAEnC;;;;;OAKG;IACH,SAAS,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,OAAO;IAI/B;;;;;OAKG;IACH,SAAS,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,OAAO;IAI/B;;;;OAIG;IACG,OAAO,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAWzC;;;;OAIG;IACH,SAAS,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC;IAaxF;;;;OAIG;IACH,SAAS,CAAC,iBAAiB,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,MAAM,GAAG,WAAW;IA2B9D;;;;;OAKG;IACH,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,GAAG,EAAE;IAStC;;;;;OAKG;cACa,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;cAW3D,qBAAqB,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;cAI1E,eAAe,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IAWpF;;;;OAIG;cACa,wBAAwB,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC;IAmBpE;;;;OAIG;cACa,kBAAkB,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;CAI9D"}
|
|
@@ -25,6 +25,7 @@ const workspace_utils_1 = require("./workspace-utils");
|
|
|
25
25
|
const file_service_1 = require("@theia/filesystem/lib/browser/file-service");
|
|
26
26
|
const filesystem_preferences_1 = require("@theia/filesystem/lib/common/filesystem-preferences");
|
|
27
27
|
const nls_1 = require("@theia/core/lib/common/nls");
|
|
28
|
+
const core_1 = require("@theia/core");
|
|
28
29
|
let WorkspaceDeleteHandler = class WorkspaceDeleteHandler {
|
|
29
30
|
/**
|
|
30
31
|
* Determine if the command is visible.
|
|
@@ -136,7 +137,7 @@ let WorkspaceDeleteHandler = class WorkspaceDeleteHandler {
|
|
|
136
137
|
]);
|
|
137
138
|
}
|
|
138
139
|
catch (e) {
|
|
139
|
-
|
|
140
|
+
this.logger.error(e);
|
|
140
141
|
}
|
|
141
142
|
}
|
|
142
143
|
async deleteFilePermanently(uri, options) {
|
|
@@ -147,7 +148,7 @@ let WorkspaceDeleteHandler = class WorkspaceDeleteHandler {
|
|
|
147
148
|
await this.fileService.delete(uri, { ...options, useTrash: true });
|
|
148
149
|
}
|
|
149
150
|
catch (error) {
|
|
150
|
-
|
|
151
|
+
this.logger.error('Error deleting with trash:', error);
|
|
151
152
|
if (await this.confirmDeletePermanently(uri)) {
|
|
152
153
|
return this.deleteFilePermanently(uri, options);
|
|
153
154
|
}
|
|
@@ -201,6 +202,11 @@ tslib_1.__decorate([
|
|
|
201
202
|
(0, inversify_1.inject)(filesystem_preferences_1.FileSystemPreferences),
|
|
202
203
|
tslib_1.__metadata("design:type", Object)
|
|
203
204
|
], WorkspaceDeleteHandler.prototype, "fsPreferences", void 0);
|
|
205
|
+
tslib_1.__decorate([
|
|
206
|
+
(0, inversify_1.inject)(core_1.ILogger),
|
|
207
|
+
(0, inversify_1.named)('workspace:WorkspaceDeleteHandler'),
|
|
208
|
+
tslib_1.__metadata("design:type", Object)
|
|
209
|
+
], WorkspaceDeleteHandler.prototype, "logger", void 0);
|
|
204
210
|
exports.WorkspaceDeleteHandler = WorkspaceDeleteHandler = tslib_1.__decorate([
|
|
205
211
|
(0, inversify_1.injectable)()
|
|
206
212
|
], WorkspaceDeleteHandler);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace-delete-handler.js","sourceRoot":"","sources":["../../src/browser/workspace-delete-handler.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,
|
|
1
|
+
{"version":3,"file":"workspace-delete-handler.js","sourceRoot":"","sources":["../../src/browser/workspace-delete-handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,10 +3,12 @@ import { WorkspaceUtils } from './workspace-utils';
|
|
|
3
3
|
import { WorkspaceService } from './workspace-service';
|
|
4
4
|
import { UriCommandHandler } from '@theia/core/lib/common/uri-command-handler';
|
|
5
5
|
import { FileService } from '@theia/filesystem/lib/browser/file-service';
|
|
6
|
+
import { ILogger } from '@theia/core';
|
|
6
7
|
export declare class WorkspaceDuplicateHandler implements UriCommandHandler<URI[]> {
|
|
7
8
|
protected readonly fileService: FileService;
|
|
8
9
|
protected readonly workspaceUtils: WorkspaceUtils;
|
|
9
10
|
protected readonly workspaceService: WorkspaceService;
|
|
11
|
+
protected readonly logger: ILogger;
|
|
10
12
|
/**
|
|
11
13
|
* Determine if the command is visible.
|
|
12
14
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace-duplicate-handler.d.ts","sourceRoot":"","sources":["../../src/browser/workspace-duplicate-handler.ts"],"names":[],"mappings":"AAgBA,OAAO,GAAG,MAAM,4BAA4B,CAAC;AAE7C,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,iBAAiB,EAAE,MAAM,4CAA4C,CAAC;AAE/E,OAAO,EAAE,WAAW,EAAE,MAAM,4CAA4C,CAAC;
|
|
1
|
+
{"version":3,"file":"workspace-duplicate-handler.d.ts","sourceRoot":"","sources":["../../src/browser/workspace-duplicate-handler.ts"],"names":[],"mappings":"AAgBA,OAAO,GAAG,MAAM,4BAA4B,CAAC;AAE7C,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,iBAAiB,EAAE,MAAM,4CAA4C,CAAC;AAE/E,OAAO,EAAE,WAAW,EAAE,MAAM,4CAA4C,CAAC;AACzE,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAEtC,qBACa,yBAA0B,YAAW,iBAAiB,CAAC,GAAG,EAAE,CAAC;IAGtE,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;IAG5C,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;IAGlD,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAGtD,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IAEnC;;;;;OAKG;IACH,SAAS,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,OAAO;IAI/B;;;;;OAKG;IACH,SAAS,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,OAAO;IAI/B;;;;OAIG;IACG,OAAO,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAa5C"}
|
|
@@ -22,6 +22,7 @@ const workspace_utils_1 = require("./workspace-utils");
|
|
|
22
22
|
const workspace_service_1 = require("./workspace-service");
|
|
23
23
|
const filesystem_utils_1 = require("@theia/filesystem/lib/common/filesystem-utils");
|
|
24
24
|
const file_service_1 = require("@theia/filesystem/lib/browser/file-service");
|
|
25
|
+
const core_1 = require("@theia/core");
|
|
25
26
|
let WorkspaceDuplicateHandler = class WorkspaceDuplicateHandler {
|
|
26
27
|
/**
|
|
27
28
|
* Determine if the command is visible.
|
|
@@ -55,7 +56,7 @@ let WorkspaceDuplicateHandler = class WorkspaceDuplicateHandler {
|
|
|
55
56
|
await this.fileService.copy(uri, target);
|
|
56
57
|
}
|
|
57
58
|
catch (e) {
|
|
58
|
-
|
|
59
|
+
this.logger.error(e);
|
|
59
60
|
}
|
|
60
61
|
}));
|
|
61
62
|
}
|
|
@@ -73,6 +74,11 @@ tslib_1.__decorate([
|
|
|
73
74
|
(0, inversify_1.inject)(workspace_service_1.WorkspaceService),
|
|
74
75
|
tslib_1.__metadata("design:type", workspace_service_1.WorkspaceService)
|
|
75
76
|
], WorkspaceDuplicateHandler.prototype, "workspaceService", void 0);
|
|
77
|
+
tslib_1.__decorate([
|
|
78
|
+
(0, inversify_1.inject)(core_1.ILogger),
|
|
79
|
+
(0, inversify_1.named)('workspace:WorkspaceDuplicateHandler'),
|
|
80
|
+
tslib_1.__metadata("design:type", Object)
|
|
81
|
+
], WorkspaceDuplicateHandler.prototype, "logger", void 0);
|
|
76
82
|
exports.WorkspaceDuplicateHandler = WorkspaceDuplicateHandler = tslib_1.__decorate([
|
|
77
83
|
(0, inversify_1.injectable)()
|
|
78
84
|
], WorkspaceDuplicateHandler);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace-duplicate-handler.js","sourceRoot":"","sources":["../../src/browser/workspace-duplicate-handler.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;;;;AAGhF,
|
|
1
|
+
{"version":3,"file":"workspace-duplicate-handler.js","sourceRoot":"","sources":["../../src/browser/workspace-duplicate-handler.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;;;;AAGhF,4DAAyE;AACzE,uDAAmD;AACnD,2DAAuD;AAEvD,oFAAgF;AAChF,6EAAyE;AACzE,sCAAsC;AAG/B,IAAM,yBAAyB,GAA/B,MAAM,yBAAyB;IAclC;;;;;OAKG;IACH,SAAS,CAAC,IAAW;QACjB,OAAO,CAAC,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC;IAC7E,CAAC;IAED;;;;;OAKG;IACH,SAAS,CAAC,IAAW;QACjB,OAAO,CAAC,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC;IAC7E,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,OAAO,CAAC,IAAW;QACrB,MAAM,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,EAAC,GAAG,EAAC,EAAE;YACnC,IAAI,CAAC;gBACD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;gBAC1D,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;gBAC3D,MAAM,MAAM,GAAG,kCAAe,CAAC,yBAAyB,CAAC,MAAM,EAAE,GAAG,EAAE,cAAc,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;gBAC1G,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;YAC7C,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACT,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YACzB,CAAC;QACL,CAAC,CAAC,CAAC,CAAC;IACR,CAAC;CAEJ,CAAA;AApDY,8DAAyB;AAGf;IADlB,IAAA,kBAAM,EAAC,0BAAW,CAAC;sCACY,0BAAW;8DAAC;AAGzB;IADlB,IAAA,kBAAM,EAAC,gCAAc,CAAC;sCACY,gCAAc;iEAAC;AAG/B;IADlB,IAAA,kBAAM,EAAC,oCAAgB,CAAC;sCACY,oCAAgB;mEAAC;AAGnC;IADlB,IAAA,kBAAM,EAAC,cAAO,CAAC;IAAE,IAAA,iBAAK,EAAC,qCAAqC,CAAC;;yDAC3B;oCAZ1B,yBAAyB;IADrC,IAAA,sBAAU,GAAE;GACA,yBAAyB,CAoDrC"}
|
package/package.json
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@theia/workspace",
|
|
3
|
-
"version": "1.73.0-next.
|
|
3
|
+
"version": "1.73.0-next.39+b8afaa0a7",
|
|
4
4
|
"description": "Theia - Workspace Extension",
|
|
5
5
|
"dependencies": {
|
|
6
|
-
"@theia/core": "1.73.0-next.
|
|
7
|
-
"@theia/filesystem": "1.73.0-next.
|
|
8
|
-
"@theia/variable-resolver": "1.73.0-next.
|
|
6
|
+
"@theia/core": "1.73.0-next.39+b8afaa0a7",
|
|
7
|
+
"@theia/filesystem": "1.73.0-next.39+b8afaa0a7",
|
|
8
|
+
"@theia/variable-resolver": "1.73.0-next.39+b8afaa0a7",
|
|
9
9
|
"jsonc-parser": "^3.3.1",
|
|
10
10
|
"tslib": "^2.8.1",
|
|
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": "b8afaa0a7ec19427b14ca23df2da2a81bddedbfc"
|
|
56
56
|
}
|
|
@@ -14,7 +14,7 @@
|
|
|
14
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
15
15
|
// *****************************************************************************
|
|
16
16
|
|
|
17
|
-
import { injectable, inject } from '@theia/core/shared/inversify';
|
|
17
|
+
import { injectable, inject, named } from '@theia/core/shared/inversify';
|
|
18
18
|
import URI from '@theia/core/lib/common/uri';
|
|
19
19
|
import { ConfirmDialog, ApplicationShell, SaveableWidget, NavigatableWidget } from '@theia/core/lib/browser';
|
|
20
20
|
import { UriCommandHandler } from '@theia/core/lib/common/uri-command-handler';
|
|
@@ -24,6 +24,7 @@ import { FileService } from '@theia/filesystem/lib/browser/file-service';
|
|
|
24
24
|
import { FileSystemPreferences } from '@theia/filesystem/lib/common/filesystem-preferences';
|
|
25
25
|
import { FileDeleteOptions, FileSystemProviderCapabilities } from '@theia/filesystem/lib/common/files';
|
|
26
26
|
import { nls } from '@theia/core/lib/common/nls';
|
|
27
|
+
import { ILogger } from '@theia/core';
|
|
27
28
|
|
|
28
29
|
@injectable()
|
|
29
30
|
export class WorkspaceDeleteHandler implements UriCommandHandler<URI[]> {
|
|
@@ -43,6 +44,9 @@ export class WorkspaceDeleteHandler implements UriCommandHandler<URI[]> {
|
|
|
43
44
|
@inject(FileSystemPreferences)
|
|
44
45
|
protected readonly fsPreferences: FileSystemPreferences;
|
|
45
46
|
|
|
47
|
+
@inject(ILogger) @named('workspace:WorkspaceDeleteHandler')
|
|
48
|
+
protected readonly logger: ILogger;
|
|
49
|
+
|
|
46
50
|
/**
|
|
47
51
|
* Determine if the command is visible.
|
|
48
52
|
*
|
|
@@ -157,7 +161,7 @@ export class WorkspaceDeleteHandler implements UriCommandHandler<URI[]> {
|
|
|
157
161
|
options.useTrash ? this.moveFileToTrash(uri, options) : this.deleteFilePermanently(uri, options)
|
|
158
162
|
]);
|
|
159
163
|
} catch (e) {
|
|
160
|
-
|
|
164
|
+
this.logger.error(e);
|
|
161
165
|
}
|
|
162
166
|
}
|
|
163
167
|
|
|
@@ -169,7 +173,7 @@ export class WorkspaceDeleteHandler implements UriCommandHandler<URI[]> {
|
|
|
169
173
|
try {
|
|
170
174
|
await this.fileService.delete(uri, { ...options, useTrash: true });
|
|
171
175
|
} catch (error) {
|
|
172
|
-
|
|
176
|
+
this.logger.error('Error deleting with trash:', error);
|
|
173
177
|
if (await this.confirmDeletePermanently(uri)) {
|
|
174
178
|
return this.deleteFilePermanently(uri, options);
|
|
175
179
|
}
|
|
@@ -15,12 +15,13 @@
|
|
|
15
15
|
// *****************************************************************************
|
|
16
16
|
|
|
17
17
|
import URI from '@theia/core/lib/common/uri';
|
|
18
|
-
import { injectable, inject } from '@theia/core/shared/inversify';
|
|
18
|
+
import { injectable, inject, named } from '@theia/core/shared/inversify';
|
|
19
19
|
import { WorkspaceUtils } from './workspace-utils';
|
|
20
20
|
import { WorkspaceService } from './workspace-service';
|
|
21
21
|
import { UriCommandHandler } from '@theia/core/lib/common/uri-command-handler';
|
|
22
22
|
import { FileSystemUtils } from '@theia/filesystem/lib/common/filesystem-utils';
|
|
23
23
|
import { FileService } from '@theia/filesystem/lib/browser/file-service';
|
|
24
|
+
import { ILogger } from '@theia/core';
|
|
24
25
|
|
|
25
26
|
@injectable()
|
|
26
27
|
export class WorkspaceDuplicateHandler implements UriCommandHandler<URI[]> {
|
|
@@ -34,6 +35,9 @@ export class WorkspaceDuplicateHandler implements UriCommandHandler<URI[]> {
|
|
|
34
35
|
@inject(WorkspaceService)
|
|
35
36
|
protected readonly workspaceService: WorkspaceService;
|
|
36
37
|
|
|
38
|
+
@inject(ILogger) @named('workspace:WorkspaceDuplicateHandler')
|
|
39
|
+
protected readonly logger: ILogger;
|
|
40
|
+
|
|
37
41
|
/**
|
|
38
42
|
* Determine if the command is visible.
|
|
39
43
|
*
|
|
@@ -67,7 +71,7 @@ export class WorkspaceDuplicateHandler implements UriCommandHandler<URI[]> {
|
|
|
67
71
|
const target = FileSystemUtils.generateUniqueResourceURI(parent, uri, targetFileStat.isDirectory, 'copy');
|
|
68
72
|
await this.fileService.copy(uri, target);
|
|
69
73
|
} catch (e) {
|
|
70
|
-
|
|
74
|
+
this.logger.error(e);
|
|
71
75
|
}
|
|
72
76
|
}));
|
|
73
77
|
}
|