@theia/workspace 1.47.0 → 1.48.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-trust-service.d.ts +2 -0
- package/lib/browser/workspace-trust-service.d.ts.map +1 -1
- package/lib/browser/workspace-trust-service.js +6 -0
- package/lib/browser/workspace-trust-service.js.map +1 -1
- package/package.json +6 -6
- package/src/browser/workspace-trust-service.ts +5 -0
|
@@ -5,6 +5,7 @@ import { Deferred } from '@theia/core/lib/common/promise-util';
|
|
|
5
5
|
import { WindowService } from '@theia/core/lib/browser/window/window-service';
|
|
6
6
|
import { WorkspaceTrustPreferences } from './workspace-trust-preferences';
|
|
7
7
|
import { WorkspaceService } from './workspace-service';
|
|
8
|
+
import { ContextKeyService } from '@theia/core/lib/browser/context-key-service';
|
|
8
9
|
export declare class WorkspaceTrustService {
|
|
9
10
|
protected readonly workspaceService: WorkspaceService;
|
|
10
11
|
protected readonly preferences: PreferenceService;
|
|
@@ -12,6 +13,7 @@ export declare class WorkspaceTrustService {
|
|
|
12
13
|
protected readonly messageService: MessageService;
|
|
13
14
|
protected readonly workspaceTrustPref: WorkspaceTrustPreferences;
|
|
14
15
|
protected readonly windowService: WindowService;
|
|
16
|
+
protected readonly contextKeyService: ContextKeyService;
|
|
15
17
|
protected workspaceTrust: Deferred<boolean>;
|
|
16
18
|
protected init(): void;
|
|
17
19
|
protected doInit(): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace-trust-service.d.ts","sourceRoot":"","sources":["../../src/browser/workspace-trust-service.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAyB,gBAAgB,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAClG,OAAO,EAAE,iBAAiB,EAAE,MAAM,wDAAwD,CAAC;AAC3F,OAAO,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAC;AAExE,OAAO,EAAE,QAAQ,EAAE,MAAM,qCAAqC,CAAC;AAE/D,OAAO,EAAE,aAAa,EAAE,MAAM,+CAA+C,CAAC;AAC9E,OAAO,EACH,yBAAyB,EAC5B,MAAM,+BAA+B,CAAC;AAEvC,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"workspace-trust-service.d.ts","sourceRoot":"","sources":["../../src/browser/workspace-trust-service.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAyB,gBAAgB,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAClG,OAAO,EAAE,iBAAiB,EAAE,MAAM,wDAAwD,CAAC;AAC3F,OAAO,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAC;AAExE,OAAO,EAAE,QAAQ,EAAE,MAAM,qCAAqC,CAAC;AAE/D,OAAO,EAAE,aAAa,EAAE,MAAM,+CAA+C,CAAC;AAC9E,OAAO,EACH,yBAAyB,EAC5B,MAAM,+BAA+B,CAAC;AAEvC,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,iBAAiB,EAAE,MAAM,6CAA6C,CAAC;AAIhF,qBACa,qBAAqB;IAE9B,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAGtD,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,iBAAiB,CAAC;IAGlD,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,cAAc,CAAC;IAG3C,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;IAGlD,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,yBAAyB,CAAC;IAGjE,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IAGhD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAExD,SAAS,CAAC,cAAc,oBAA2B;IAGnD,SAAS,CAAC,IAAI,IAAI,IAAI;cAIN,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAMvC,iBAAiB,IAAI,OAAO,CAAC,OAAO,CAAC;cAIrB,qBAAqB,CAAC,UAAU,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAW1E,SAAS,CAAC,wBAAwB,IAAI,OAAO;cAI7B,uBAAuB,IAAI,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC;cAiBvD,kBAAkB,IAAI,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC;cAMlD,mBAAmB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;cAMlD,sBAAsB,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;cAe/D,cAAc,IAAI,OAAO,CAAC,OAAO,CAAC;IAU5C,qBAAqB,IAAI,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC;CAU9D"}
|
|
@@ -27,6 +27,7 @@ const window_service_1 = require("@theia/core/lib/browser/window/window-service"
|
|
|
27
27
|
const workspace_trust_preferences_1 = require("./workspace-trust-preferences");
|
|
28
28
|
const frontend_application_config_provider_1 = require("@theia/core/lib/browser/frontend-application-config-provider");
|
|
29
29
|
const workspace_service_1 = require("./workspace-service");
|
|
30
|
+
const context_key_service_1 = require("@theia/core/lib/browser/context-key-service");
|
|
30
31
|
const STORAGE_TRUSTED = 'trusted';
|
|
31
32
|
let WorkspaceTrustService = class WorkspaceTrustService {
|
|
32
33
|
constructor() {
|
|
@@ -48,6 +49,7 @@ let WorkspaceTrustService = class WorkspaceTrustService {
|
|
|
48
49
|
const trust = givenTrust !== null && givenTrust !== void 0 ? givenTrust : await this.calculateWorkspaceTrust();
|
|
49
50
|
if (trust !== undefined) {
|
|
50
51
|
await this.storeWorkspaceTrust(trust);
|
|
52
|
+
this.contextKeyService.setContext('isWorkspaceTrusted', trust);
|
|
51
53
|
this.workspaceTrust.resolve(trust);
|
|
52
54
|
}
|
|
53
55
|
}
|
|
@@ -132,6 +134,10 @@ let WorkspaceTrustService = class WorkspaceTrustService {
|
|
|
132
134
|
(0, inversify_1.inject)(window_service_1.WindowService),
|
|
133
135
|
(0, tslib_1.__metadata)("design:type", Object)
|
|
134
136
|
], WorkspaceTrustService.prototype, "windowService", void 0);
|
|
137
|
+
(0, tslib_1.__decorate)([
|
|
138
|
+
(0, inversify_1.inject)(context_key_service_1.ContextKeyService),
|
|
139
|
+
(0, tslib_1.__metadata)("design:type", Object)
|
|
140
|
+
], WorkspaceTrustService.prototype, "contextKeyService", void 0);
|
|
135
141
|
(0, tslib_1.__decorate)([
|
|
136
142
|
(0, inversify_1.postConstruct)(),
|
|
137
143
|
(0, tslib_1.__metadata)("design:type", Function),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace-trust-service.js","sourceRoot":"","sources":["../../src/browser/workspace-trust-service.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,+CAA+C;AAC/C,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,qDAAkG;AAClG,+FAA2F;AAC3F,4EAAwE;AACxE,oDAAiD;AACjD,sEAA+D;AAC/D,4DAAiF;AACjF,kFAA8E;AAC9E,+EAEuC;AACvC,uHAAiH;AACjH,2DAAuD;
|
|
1
|
+
{"version":3,"file":"workspace-trust-service.js","sourceRoot":"","sources":["../../src/browser/workspace-trust-service.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.
|
|
3
|
+
"version": "1.48.0",
|
|
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.48.0",
|
|
7
|
+
"@theia/filesystem": "1.48.0",
|
|
8
|
+
"@theia/variable-resolver": "1.48.0",
|
|
9
9
|
"jsonc-parser": "^2.2.0",
|
|
10
10
|
"tslib": "^2.6.2",
|
|
11
11
|
"valid-filename": "^2.0.1"
|
|
@@ -47,10 +47,10 @@
|
|
|
47
47
|
"watch": "theiaext watch"
|
|
48
48
|
},
|
|
49
49
|
"devDependencies": {
|
|
50
|
-
"@theia/ext-scripts": "1.
|
|
50
|
+
"@theia/ext-scripts": "1.48.0"
|
|
51
51
|
},
|
|
52
52
|
"nyc": {
|
|
53
53
|
"extends": "../../configs/nyc.json"
|
|
54
54
|
},
|
|
55
|
-
"gitHead": "
|
|
55
|
+
"gitHead": "ffae6a0739f7924a7cacafeb5ceb1140d93fe010"
|
|
56
56
|
}
|
|
@@ -26,6 +26,7 @@ import {
|
|
|
26
26
|
} from './workspace-trust-preferences';
|
|
27
27
|
import { FrontendApplicationConfigProvider } from '@theia/core/lib/browser/frontend-application-config-provider';
|
|
28
28
|
import { WorkspaceService } from './workspace-service';
|
|
29
|
+
import { ContextKeyService } from '@theia/core/lib/browser/context-key-service';
|
|
29
30
|
|
|
30
31
|
const STORAGE_TRUSTED = 'trusted';
|
|
31
32
|
|
|
@@ -49,6 +50,9 @@ export class WorkspaceTrustService {
|
|
|
49
50
|
@inject(WindowService)
|
|
50
51
|
protected readonly windowService: WindowService;
|
|
51
52
|
|
|
53
|
+
@inject(ContextKeyService)
|
|
54
|
+
protected readonly contextKeyService: ContextKeyService;
|
|
55
|
+
|
|
52
56
|
protected workspaceTrust = new Deferred<boolean>();
|
|
53
57
|
|
|
54
58
|
@postConstruct()
|
|
@@ -71,6 +75,7 @@ export class WorkspaceTrustService {
|
|
|
71
75
|
const trust = givenTrust ?? await this.calculateWorkspaceTrust();
|
|
72
76
|
if (trust !== undefined) {
|
|
73
77
|
await this.storeWorkspaceTrust(trust);
|
|
78
|
+
this.contextKeyService.setContext('isWorkspaceTrusted', trust);
|
|
74
79
|
this.workspaceTrust.resolve(trust);
|
|
75
80
|
}
|
|
76
81
|
}
|