@theia/workspace 1.53.2 → 1.54.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-preferences.d.ts.map +1 -1
- package/lib/browser/workspace-trust-preferences.js +1 -0
- package/lib/browser/workspace-trust-preferences.js.map +1 -1
- package/lib/browser/workspace-trust-service.d.ts.map +1 -1
- package/lib/browser/workspace-trust-service.js +11 -9
- package/lib/browser/workspace-trust-service.js.map +1 -1
- package/package.json +6 -6
- package/src/browser/workspace-trust-preferences.ts +2 -1
- package/src/browser/workspace-trust-service.ts +12 -10
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace-trust-preferences.d.ts","sourceRoot":"","sources":["../../src/browser/workspace-trust-preferences.ts"],"names":[],"mappings":"AAgBA,OAAO,EAC4C,eAAe,EAAE,gBAAgB,
|
|
1
|
+
{"version":3,"file":"workspace-trust-preferences.d.ts","sourceRoot":"","sources":["../../src/browser/workspace-trust-preferences.ts"],"names":[],"mappings":"AAgBA,OAAO,EAC4C,eAAe,EAAE,gBAAgB,EAAmB,iBAAiB,EACvH,MAAM,qCAAqC,CAAC;AAE7C,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAE1D,eAAO,MAAM,uBAAuB,qCAAqC,CAAC;AAC1E,eAAO,MAAM,8BAA8B,2CAA2C,CAAC;AACvF,eAAO,MAAM,4BAA4B,yCAAyC,CAAC;AAEnF,oBAAY,oBAAoB;IAC5B,MAAM,WAAW;IACjB,IAAI,SAAS;IACb,KAAK,UAAU;CAClB;AAED,eAAO,MAAM,8BAA8B,EAAE,gBAoB5C,CAAC;AAEF,MAAM,WAAW,2BAA2B;IACxC,CAAC,uBAAuB,CAAC,EAAE,OAAO,CAAC;IACnC,CAAC,8BAA8B,CAAC,EAAE,oBAAoB,CAAC;IACvD,CAAC,4BAA4B,CAAC,EAAE,OAAO,CAAC;CAC3C;AAED,eAAO,MAAM,oCAAoC,eAAiD,CAAC;AACnG,eAAO,MAAM,yBAAyB,eAAsC,CAAC;AAC7E,MAAM,MAAM,yBAAyB,GAAG,eAAe,CAAC,2BAA2B,CAAC,CAAC;AAErF,wBAAgB,+BAA+B,CAAC,WAAW,EAAE,iBAAiB,EAAE,MAAM,GAAE,gBAAiD,GAAG,yBAAyB,CAEpK;AAED,wBAAgB,6BAA6B,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,GAAG,IAAI,CAQzE"}
|
|
@@ -29,6 +29,7 @@ var WorkspaceTrustPrompt;
|
|
|
29
29
|
})(WorkspaceTrustPrompt || (exports.WorkspaceTrustPrompt = WorkspaceTrustPrompt = {}));
|
|
30
30
|
exports.workspaceTrustPreferenceSchema = {
|
|
31
31
|
type: 'object',
|
|
32
|
+
scope: preferences_1.PreferenceScope.User,
|
|
32
33
|
properties: {
|
|
33
34
|
[exports.WORKSPACE_TRUST_ENABLED]: {
|
|
34
35
|
description: nls_1.nls.localize('theia/workspace/trustEnabled', 'Controls whether or not workspace trust is enabled. If disabled, all workspaces are trusted.'),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace-trust-preferences.js","sourceRoot":"","sources":["../../src/browser/workspace-trust-preferences.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,qEAE6C;AAC7C,oDAAiD;AAGpC,QAAA,uBAAuB,GAAG,kCAAkC,CAAC;AAC7D,QAAA,8BAA8B,GAAG,wCAAwC,CAAC;AAC1E,QAAA,4BAA4B,GAAG,sCAAsC,CAAC;AAEnF,IAAY,oBAIX;AAJD,WAAY,oBAAoB;IAC5B,yCAAiB,CAAA;IACjB,qCAAa,CAAA;IACb,uCAAe,CAAA;AACnB,CAAC,EAJW,oBAAoB,oCAApB,oBAAoB,QAI/B;AAEY,QAAA,8BAA8B,GAAqB;IAC5D,IAAI,EAAE,QAAQ;IACd,UAAU,EAAE;QACR,CAAC,+BAAuB,CAAC,EAAE;YACvB,WAAW,EAAE,SAAG,CAAC,QAAQ,CAAC,8BAA8B,EAAE,8FAA8F,CAAC;YACzJ,IAAI,EAAE,SAAS;YACf,YAAY,EAAE,IAAI;SACrB;QACD,CAAC,sCAA8B,CAAC,EAAE;YAC9B,WAAW,EAAE,SAAG,CAAC,iBAAiB,CAAC,iEAAiE,CAAC;YACrG,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,oBAAoB,CAAC;YACzC,YAAY,EAAE,oBAAoB,CAAC,MAAM;SAC5C;QACD,CAAC,oCAA4B,CAAC,EAAE;YAC5B,WAAW,EAAE,SAAG,CAAC,QAAQ,CAAC,kCAAkC,EAAE,oEAAoE,CAAC;YACnI,IAAI,EAAE,SAAS;YACf,YAAY,EAAE,IAAI;SACrB;KACJ;CACJ,CAAC;AAQW,QAAA,oCAAoC,GAAG,MAAM,CAAC,sCAAsC,CAAC,CAAC;AACtF,QAAA,yBAAyB,GAAG,MAAM,CAAC,2BAA2B,CAAC,CAAC;AAG7E,SAAgB,+BAA+B,CAAC,WAA8B,EAAE,SAA2B,sCAA8B;IACrI,OAAO,IAAA,mCAAqB,EAAC,WAAW,EAAE,MAAM,CAAC,CAAC;AACtD,CAAC;AAFD,0EAEC;AAED,SAAgB,6BAA6B,CAAC,IAAqB;IAC/D,IAAI,CAAC,iCAAyB,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE;QACjD,MAAM,WAAW,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAoB,+BAAiB,CAAC,CAAC;QAC5E,MAAM,YAAY,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAyB,4CAAoC,CAAC,CAAC;QACrG,OAAO,+BAA+B,CAAC,WAAW,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC;IAC7E,CAAC,CAAC,CAAC,gBAAgB,EAAE,CAAC;IACtB,IAAI,CAAC,4CAAoC,CAAC,CAAC,eAAe,CAAC,EAAE,MAAM,EAAE,sCAA8B,EAAE,CAAC,CAAC;IACvG,IAAI,CAAC,oCAAsB,CAAC,CAAC,SAAS,CAAC,4CAAoC,CAAC,CAAC;AACjF,CAAC;AARD,sEAQC"}
|
|
1
|
+
{"version":3,"file":"workspace-trust-preferences.js","sourceRoot":"","sources":["../../src/browser/workspace-trust-preferences.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,qEAE6C;AAC7C,oDAAiD;AAGpC,QAAA,uBAAuB,GAAG,kCAAkC,CAAC;AAC7D,QAAA,8BAA8B,GAAG,wCAAwC,CAAC;AAC1E,QAAA,4BAA4B,GAAG,sCAAsC,CAAC;AAEnF,IAAY,oBAIX;AAJD,WAAY,oBAAoB;IAC5B,yCAAiB,CAAA;IACjB,qCAAa,CAAA;IACb,uCAAe,CAAA;AACnB,CAAC,EAJW,oBAAoB,oCAApB,oBAAoB,QAI/B;AAEY,QAAA,8BAA8B,GAAqB;IAC5D,IAAI,EAAE,QAAQ;IACd,KAAK,EAAE,6BAAe,CAAC,IAAI;IAC3B,UAAU,EAAE;QACR,CAAC,+BAAuB,CAAC,EAAE;YACvB,WAAW,EAAE,SAAG,CAAC,QAAQ,CAAC,8BAA8B,EAAE,8FAA8F,CAAC;YACzJ,IAAI,EAAE,SAAS;YACf,YAAY,EAAE,IAAI;SACrB;QACD,CAAC,sCAA8B,CAAC,EAAE;YAC9B,WAAW,EAAE,SAAG,CAAC,iBAAiB,CAAC,iEAAiE,CAAC;YACrG,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,oBAAoB,CAAC;YACzC,YAAY,EAAE,oBAAoB,CAAC,MAAM;SAC5C;QACD,CAAC,oCAA4B,CAAC,EAAE;YAC5B,WAAW,EAAE,SAAG,CAAC,QAAQ,CAAC,kCAAkC,EAAE,oEAAoE,CAAC;YACnI,IAAI,EAAE,SAAS;YACf,YAAY,EAAE,IAAI;SACrB;KACJ;CACJ,CAAC;AAQW,QAAA,oCAAoC,GAAG,MAAM,CAAC,sCAAsC,CAAC,CAAC;AACtF,QAAA,yBAAyB,GAAG,MAAM,CAAC,2BAA2B,CAAC,CAAC;AAG7E,SAAgB,+BAA+B,CAAC,WAA8B,EAAE,SAA2B,sCAA8B;IACrI,OAAO,IAAA,mCAAqB,EAAC,WAAW,EAAE,MAAM,CAAC,CAAC;AACtD,CAAC;AAFD,0EAEC;AAED,SAAgB,6BAA6B,CAAC,IAAqB;IAC/D,IAAI,CAAC,iCAAyB,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE;QACjD,MAAM,WAAW,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAoB,+BAAiB,CAAC,CAAC;QAC5E,MAAM,YAAY,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAyB,4CAAoC,CAAC,CAAC;QACrG,OAAO,+BAA+B,CAAC,WAAW,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC;IAC7E,CAAC,CAAC,CAAC,gBAAgB,EAAE,CAAC;IACtB,IAAI,CAAC,4CAAoC,CAAC,CAAC,eAAe,CAAC,EAAE,MAAM,EAAE,sCAA8B,EAAE,CAAC,CAAC;IACvG,IAAI,CAAC,oCAAsB,CAAC,CAAC,SAAS,CAAC,4CAAoC,CAAC,CAAC;AACjF,CAAC;AARD,sEAQC"}
|
|
@@ -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,
|
|
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,EAAmB,iBAAiB,EAAE,MAAM,wDAAwD,CAAC;AAC5G,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;cAiB/D,cAAc,IAAI,OAAO,CAAC,OAAO,CAAC;IAU5C,qBAAqB,IAAI,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC;CAU9D"}
|
|
@@ -81,15 +81,17 @@ let WorkspaceTrustService = class WorkspaceTrustService {
|
|
|
81
81
|
}
|
|
82
82
|
}
|
|
83
83
|
async handlePreferenceChange(change) {
|
|
84
|
-
if (change.
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
this.
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
84
|
+
if (change.scope === preference_service_1.PreferenceScope.User) {
|
|
85
|
+
if (change.preferenceName === workspace_trust_preferences_1.WORKSPACE_TRUST_STARTUP_PROMPT && change.newValue !== workspace_trust_preferences_1.WorkspaceTrustPrompt.ONCE) {
|
|
86
|
+
this.storage.setData(STORAGE_TRUSTED, undefined);
|
|
87
|
+
}
|
|
88
|
+
if (change.preferenceName === workspace_trust_preferences_1.WORKSPACE_TRUST_ENABLED && this.isWorkspaceTrustResolved() && await this.confirmRestart()) {
|
|
89
|
+
this.windowService.setSafeToShutDown();
|
|
90
|
+
this.windowService.reload();
|
|
91
|
+
}
|
|
92
|
+
if (change.preferenceName === workspace_trust_preferences_1.WORKSPACE_TRUST_ENABLED || change.preferenceName === workspace_trust_preferences_1.WORKSPACE_TRUST_EMPTY_WINDOW) {
|
|
93
|
+
this.resolveWorkspaceTrust();
|
|
94
|
+
}
|
|
93
95
|
}
|
|
94
96
|
}
|
|
95
97
|
async confirmRestart() {
|
|
@@ -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,+
|
|
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.54.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.54.0",
|
|
7
|
+
"@theia/filesystem": "1.54.0",
|
|
8
|
+
"@theia/variable-resolver": "1.54.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.54.0"
|
|
51
51
|
},
|
|
52
52
|
"nyc": {
|
|
53
53
|
"extends": "../../configs/nyc.json"
|
|
54
54
|
},
|
|
55
|
-
"gitHead": "
|
|
55
|
+
"gitHead": "8fb36a237db744cff6e78eaff1481e1f36bb7a69"
|
|
56
56
|
}
|
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
// *****************************************************************************
|
|
16
16
|
|
|
17
17
|
import {
|
|
18
|
-
createPreferenceProxy, PreferenceContribution, PreferenceProxy, PreferenceSchema, PreferenceService
|
|
18
|
+
createPreferenceProxy, PreferenceContribution, PreferenceProxy, PreferenceSchema, PreferenceScope, PreferenceService
|
|
19
19
|
} from '@theia/core/lib/browser/preferences';
|
|
20
20
|
import { nls } from '@theia/core/lib/common/nls';
|
|
21
21
|
import { interfaces } from '@theia/core/shared/inversify';
|
|
@@ -32,6 +32,7 @@ export enum WorkspaceTrustPrompt {
|
|
|
32
32
|
|
|
33
33
|
export const workspaceTrustPreferenceSchema: PreferenceSchema = {
|
|
34
34
|
type: 'object',
|
|
35
|
+
scope: PreferenceScope.User,
|
|
35
36
|
properties: {
|
|
36
37
|
[WORKSPACE_TRUST_ENABLED]: {
|
|
37
38
|
description: nls.localize('theia/workspace/trustEnabled', 'Controls whether or not workspace trust is enabled. If disabled, all workspaces are trusted.'),
|
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
// *****************************************************************************
|
|
16
16
|
|
|
17
17
|
import { ConfirmDialog, Dialog, PreferenceChange, StorageService } from '@theia/core/lib/browser';
|
|
18
|
-
import { PreferenceService } from '@theia/core/lib/browser/preferences/preference-service';
|
|
18
|
+
import { PreferenceScope, PreferenceService } from '@theia/core/lib/browser/preferences/preference-service';
|
|
19
19
|
import { MessageService } from '@theia/core/lib/common/message-service';
|
|
20
20
|
import { nls } from '@theia/core/lib/common/nls';
|
|
21
21
|
import { Deferred } from '@theia/core/lib/common/promise-util';
|
|
@@ -115,17 +115,19 @@ export class WorkspaceTrustService {
|
|
|
115
115
|
}
|
|
116
116
|
|
|
117
117
|
protected async handlePreferenceChange(change: PreferenceChange): Promise<void> {
|
|
118
|
-
if (change.
|
|
119
|
-
|
|
120
|
-
|
|
118
|
+
if (change.scope === PreferenceScope.User) {
|
|
119
|
+
if (change.preferenceName === WORKSPACE_TRUST_STARTUP_PROMPT && change.newValue !== WorkspaceTrustPrompt.ONCE) {
|
|
120
|
+
this.storage.setData(STORAGE_TRUSTED, undefined);
|
|
121
|
+
}
|
|
121
122
|
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
123
|
+
if (change.preferenceName === WORKSPACE_TRUST_ENABLED && this.isWorkspaceTrustResolved() && await this.confirmRestart()) {
|
|
124
|
+
this.windowService.setSafeToShutDown();
|
|
125
|
+
this.windowService.reload();
|
|
126
|
+
}
|
|
126
127
|
|
|
127
|
-
|
|
128
|
-
|
|
128
|
+
if (change.preferenceName === WORKSPACE_TRUST_ENABLED || change.preferenceName === WORKSPACE_TRUST_EMPTY_WINDOW) {
|
|
129
|
+
this.resolveWorkspaceTrust();
|
|
130
|
+
}
|
|
129
131
|
}
|
|
130
132
|
}
|
|
131
133
|
|