@theia/workspace 1.45.1 → 1.46.0-next.72

package/src/browser/workspace-storage-service.ts

@@ -1,67 +1,67 @@
-// *****************************************************************************
-// Copyright (C) 2017 TypeFox and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
-import { LocalStorageService, StorageService } from '@theia/core/lib/browser/storage-service';
-import { WorkspaceService } from './workspace-service';
-import { FileStat } from '@theia/filesystem/lib/common/files';
-
-/*
- * Prefixes any stored data with the current workspace path.
- */
-@injectable()
-export class WorkspaceStorageService implements StorageService {
-
-    private prefix: string;
-    private initialized: Promise<void>;
-
-    @inject(LocalStorageService) protected storageService: StorageService;
-    @inject(WorkspaceService) protected workspaceService: WorkspaceService;
-
-    @postConstruct()
-    protected init(): void {
-        this.initialized = this.workspaceService.roots.then(() => {
-            this.updatePrefix();
-            this.workspaceService.onWorkspaceLocationChanged(() => this.updatePrefix());
-        });
-    }
-
-    async setData<T>(key: string, data: T): Promise<void> {
-        if (!this.prefix) {
-            await this.initialized;
-        }
-        const fullKey = this.prefixWorkspaceURI(key);
-        return this.storageService.setData(fullKey, data);
-    }
-
-    async getData<T>(key: string, defaultValue?: T): Promise<T | undefined> {
-        await this.initialized;
-        const fullKey = this.prefixWorkspaceURI(key);
-        return this.storageService.getData(fullKey, defaultValue);
-    }
-
-    protected prefixWorkspaceURI(originalKey: string): string {
-        return `${this.prefix}:${originalKey}`;
-    }
-
-    protected getPrefix(workspaceStat: FileStat | undefined): string {
-        return workspaceStat ? workspaceStat.resource.toString() : '_global_';
-    }
-
-    private updatePrefix(): void {
-        this.prefix = this.getPrefix(this.workspaceService.workspace);
-    }
-}
+// *****************************************************************************
+// Copyright (C) 2017 TypeFox and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
+import { LocalStorageService, StorageService } from '@theia/core/lib/browser/storage-service';
+import { WorkspaceService } from './workspace-service';
+import { FileStat } from '@theia/filesystem/lib/common/files';
+
+/*
+ * Prefixes any stored data with the current workspace path.
+ */
+@injectable()
+export class WorkspaceStorageService implements StorageService {
+
+    private prefix: string;
+    private initialized: Promise<void>;
+
+    @inject(LocalStorageService) protected storageService: StorageService;
+    @inject(WorkspaceService) protected workspaceService: WorkspaceService;
+
+    @postConstruct()
+    protected init(): void {
+        this.initialized = this.workspaceService.roots.then(() => {
+            this.updatePrefix();
+            this.workspaceService.onWorkspaceLocationChanged(() => this.updatePrefix());
+        });
+    }
+
+    async setData<T>(key: string, data: T): Promise<void> {
+        if (!this.prefix) {
+            await this.initialized;
+        }
+        const fullKey = this.prefixWorkspaceURI(key);
+        return this.storageService.setData(fullKey, data);
+    }
+
+    async getData<T>(key: string, defaultValue?: T): Promise<T | undefined> {
+        await this.initialized;
+        const fullKey = this.prefixWorkspaceURI(key);
+        return this.storageService.getData(fullKey, defaultValue);
+    }
+
+    protected prefixWorkspaceURI(originalKey: string): string {
+        return `${this.prefix}:${originalKey}`;
+    }
+
+    protected getPrefix(workspaceStat: FileStat | undefined): string {
+        return workspaceStat ? workspaceStat.resource.toString() : '_global_';
+    }
+
+    private updatePrefix(): void {
+        this.prefix = this.getPrefix(this.workspaceService.workspace);
+    }
+}

package/src/browser/workspace-trust-preferences.ts

@@ -1,76 +1,76 @@
-// *****************************************************************************
-// Copyright (C) 2021 EclipseSource and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import {
-    createPreferenceProxy, PreferenceContribution, PreferenceProxy, PreferenceSchema, PreferenceService
-} from '@theia/core/lib/browser/preferences';
-import { nls } from '@theia/core/lib/common/nls';
-import { interfaces } from '@theia/core/shared/inversify';
-
-export const WORKSPACE_TRUST_ENABLED = 'security.workspace.trust.enabled';
-export const WORKSPACE_TRUST_STARTUP_PROMPT = 'security.workspace.trust.startupPrompt';
-export const WORKSPACE_TRUST_EMPTY_WINDOW = 'security.workspace.trust.emptyWindow';
-
-export enum WorkspaceTrustPrompt {
-    ALWAYS = 'always',
-    ONCE = 'once',
-    NEVER = 'never'
-}
-
-export const workspaceTrustPreferenceSchema: PreferenceSchema = {
-    type: 'object',
-    properties: {
-        [WORKSPACE_TRUST_ENABLED]: {
-            description: nls.localize('theia/workspace/trustEnabled', 'Controls whether or not workspace trust is enabled. If disabled, all workspaces are trusted.'),
-            type: 'boolean',
-            defaultValue: true
-        },
-        [WORKSPACE_TRUST_STARTUP_PROMPT]: {
-            description: nls.localizeByDefault('Controls when the startup prompt to trust a workspace is shown.'),
-            enum: Object.values(WorkspaceTrustPrompt),
-            defaultValue: WorkspaceTrustPrompt.ALWAYS
-        },
-        [WORKSPACE_TRUST_EMPTY_WINDOW]: {
-            description: nls.localize('theia/workspace/trustEmptyWindow', 'Controls whether or not the empty workspace is trusted by default.'),
-            type: 'boolean',
-            defaultValue: true
-        }
-    }
-};
-
-export interface WorkspaceTrustConfiguration {
-    [WORKSPACE_TRUST_ENABLED]: boolean,
-    [WORKSPACE_TRUST_STARTUP_PROMPT]: WorkspaceTrustPrompt;
-    [WORKSPACE_TRUST_EMPTY_WINDOW]: boolean;
-}
-
-export const WorkspaceTrustPreferenceContribution = Symbol('WorkspaceTrustPreferenceContribution');
-export const WorkspaceTrustPreferences = Symbol('WorkspaceTrustPreferences');
-export type WorkspaceTrustPreferences = PreferenceProxy<WorkspaceTrustConfiguration>;
-
-export function createWorkspaceTrustPreferences(preferences: PreferenceService, schema: PreferenceSchema = workspaceTrustPreferenceSchema): WorkspaceTrustPreferences {
-    return createPreferenceProxy(preferences, schema);
-}
-
-export function bindWorkspaceTrustPreferences(bind: interfaces.Bind): void {
-    bind(WorkspaceTrustPreferences).toDynamicValue(ctx => {
-        const preferences = ctx.container.get<PreferenceService>(PreferenceService);
-        const contribution = ctx.container.get<PreferenceContribution>(WorkspaceTrustPreferenceContribution);
-        return createWorkspaceTrustPreferences(preferences, contribution.schema);
-    }).inSingletonScope();
-    bind(WorkspaceTrustPreferenceContribution).toConstantValue({ schema: workspaceTrustPreferenceSchema });
-    bind(PreferenceContribution).toService(WorkspaceTrustPreferenceContribution);
-}
+// *****************************************************************************
+// Copyright (C) 2021 EclipseSource and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import {
+    createPreferenceProxy, PreferenceContribution, PreferenceProxy, PreferenceSchema, PreferenceService
+} from '@theia/core/lib/browser/preferences';
+import { nls } from '@theia/core/lib/common/nls';
+import { interfaces } from '@theia/core/shared/inversify';
+
+export const WORKSPACE_TRUST_ENABLED = 'security.workspace.trust.enabled';
+export const WORKSPACE_TRUST_STARTUP_PROMPT = 'security.workspace.trust.startupPrompt';
+export const WORKSPACE_TRUST_EMPTY_WINDOW = 'security.workspace.trust.emptyWindow';
+
+export enum WorkspaceTrustPrompt {
+    ALWAYS = 'always',
+    ONCE = 'once',
+    NEVER = 'never'
+}
+
+export const workspaceTrustPreferenceSchema: PreferenceSchema = {
+    type: 'object',
+    properties: {
+        [WORKSPACE_TRUST_ENABLED]: {
+            description: nls.localize('theia/workspace/trustEnabled', 'Controls whether or not workspace trust is enabled. If disabled, all workspaces are trusted.'),
+            type: 'boolean',
+            defaultValue: true
+        },
+        [WORKSPACE_TRUST_STARTUP_PROMPT]: {
+            description: nls.localizeByDefault('Controls when the startup prompt to trust a workspace is shown.'),
+            enum: Object.values(WorkspaceTrustPrompt),
+            defaultValue: WorkspaceTrustPrompt.ALWAYS
+        },
+        [WORKSPACE_TRUST_EMPTY_WINDOW]: {
+            description: nls.localize('theia/workspace/trustEmptyWindow', 'Controls whether or not the empty workspace is trusted by default.'),
+            type: 'boolean',
+            defaultValue: true
+        }
+    }
+};
+
+export interface WorkspaceTrustConfiguration {
+    [WORKSPACE_TRUST_ENABLED]: boolean,
+    [WORKSPACE_TRUST_STARTUP_PROMPT]: WorkspaceTrustPrompt;
+    [WORKSPACE_TRUST_EMPTY_WINDOW]: boolean;
+}
+
+export const WorkspaceTrustPreferenceContribution = Symbol('WorkspaceTrustPreferenceContribution');
+export const WorkspaceTrustPreferences = Symbol('WorkspaceTrustPreferences');
+export type WorkspaceTrustPreferences = PreferenceProxy<WorkspaceTrustConfiguration>;
+
+export function createWorkspaceTrustPreferences(preferences: PreferenceService, schema: PreferenceSchema = workspaceTrustPreferenceSchema): WorkspaceTrustPreferences {
+    return createPreferenceProxy(preferences, schema);
+}
+
+export function bindWorkspaceTrustPreferences(bind: interfaces.Bind): void {
+    bind(WorkspaceTrustPreferences).toDynamicValue(ctx => {
+        const preferences = ctx.container.get<PreferenceService>(PreferenceService);
+        const contribution = ctx.container.get<PreferenceContribution>(WorkspaceTrustPreferenceContribution);
+        return createWorkspaceTrustPreferences(preferences, contribution.schema);
+    }).inSingletonScope();
+    bind(WorkspaceTrustPreferenceContribution).toConstantValue({ schema: workspaceTrustPreferenceSchema });
+    bind(PreferenceContribution).toService(WorkspaceTrustPreferenceContribution);
+}

package/src/browser/workspace-trust-service.ts

@@ -1,147 +1,147 @@
-// *****************************************************************************
-// Copyright (C) 2021 EclipseSource and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import { ConfirmDialog, Dialog, PreferenceChange, StorageService } from '@theia/core/lib/browser';
-import { PreferenceService } from '@theia/core/lib/browser/preferences/preference-service';
-import { MessageService } from '@theia/core/lib/common/message-service';
-import { nls } from '@theia/core/lib/common/nls';
-import { Deferred } from '@theia/core/lib/common/promise-util';
-import { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
-import { WindowService } from '@theia/core/lib/browser/window/window-service';
-import {
-    WorkspaceTrustPreferences, WORKSPACE_TRUST_EMPTY_WINDOW, WORKSPACE_TRUST_ENABLED, WORKSPACE_TRUST_STARTUP_PROMPT, WorkspaceTrustPrompt
-} from './workspace-trust-preferences';
-import { FrontendApplicationConfigProvider } from '@theia/core/lib/browser/frontend-application-config-provider';
-import { WorkspaceService } from './workspace-service';
-
-const STORAGE_TRUSTED = 'trusted';
-
-@injectable()
-export class WorkspaceTrustService {
-    @inject(WorkspaceService)
-    protected readonly workspaceService: WorkspaceService;
-
-    @inject(PreferenceService)
-    protected readonly preferences: PreferenceService;
-
-    @inject(StorageService)
-    protected readonly storage: StorageService;
-
-    @inject(MessageService)
-    protected readonly messageService: MessageService;
-
-    @inject(WorkspaceTrustPreferences)
-    protected readonly workspaceTrustPref: WorkspaceTrustPreferences;
-
-    @inject(WindowService)
-    protected readonly windowService: WindowService;
-
-    protected workspaceTrust = new Deferred<boolean>();
-
-    @postConstruct()
-    protected init(): void {
-        this.doInit();
-    }
-
-    protected async doInit(): Promise<void> {
-        await this.workspaceService.ready;
-        await this.resolveWorkspaceTrust();
-        this.preferences.onPreferenceChanged(change => this.handlePreferenceChange(change));
-    }
-
-    getWorkspaceTrust(): Promise<boolean> {
-        return this.workspaceTrust.promise;
-    }
-
-    protected async resolveWorkspaceTrust(givenTrust?: boolean): Promise<void> {
-        if (!this.isWorkspaceTrustResolved()) {
-            const trust = givenTrust ?? await this.calculateWorkspaceTrust();
-            if (trust !== undefined) {
-                await this.storeWorkspaceTrust(trust);
-                this.workspaceTrust.resolve(trust);
-            }
-        }
-    }
-
-    protected isWorkspaceTrustResolved(): boolean {
-        return this.workspaceTrust.state !== 'unresolved';
-    }
-
-    protected async calculateWorkspaceTrust(): Promise<boolean | undefined> {
-        if (!this.workspaceTrustPref[WORKSPACE_TRUST_ENABLED]) {
-            // in VS Code if workspace trust is disabled, we implicitly trust the workspace
-            return true;
-        }
-
-        if (this.workspaceTrustPref[WORKSPACE_TRUST_EMPTY_WINDOW] && !this.workspaceService.workspace) {
-            return true;
-        }
-
-        if (this.workspaceTrustPref[WORKSPACE_TRUST_STARTUP_PROMPT] === WorkspaceTrustPrompt.NEVER) {
-            return false;
-        }
-
-        return this.loadWorkspaceTrust();
-    }
-
-    protected async loadWorkspaceTrust(): Promise<boolean | undefined> {
-        if (this.workspaceTrustPref[WORKSPACE_TRUST_STARTUP_PROMPT] === WorkspaceTrustPrompt.ONCE) {
-            return this.storage.getData<boolean>(STORAGE_TRUSTED);
-        }
-    }
-
-    protected async storeWorkspaceTrust(trust: boolean): Promise<void> {
-        if (this.workspaceTrustPref[WORKSPACE_TRUST_STARTUP_PROMPT] === WorkspaceTrustPrompt.ONCE) {
-            return this.storage.setData(STORAGE_TRUSTED, trust);
-        }
-    }
-
-    protected async handlePreferenceChange(change: PreferenceChange): Promise<void> {
-        if (change.preferenceName === WORKSPACE_TRUST_STARTUP_PROMPT && change.newValue !== WorkspaceTrustPrompt.ONCE) {
-            this.storage.setData(STORAGE_TRUSTED, undefined);
-        }
-
-        if (change.preferenceName === WORKSPACE_TRUST_ENABLED && this.isWorkspaceTrustResolved() && await this.confirmRestart()) {
-            this.windowService.setSafeToShutDown();
-            this.windowService.reload();
-        }
-
-        if (change.preferenceName === WORKSPACE_TRUST_ENABLED || change.preferenceName === WORKSPACE_TRUST_EMPTY_WINDOW) {
-            this.resolveWorkspaceTrust();
-        }
-    }
-
-    protected async confirmRestart(): Promise<boolean> {
-        const shouldRestart = await new ConfirmDialog({
-            title: nls.localizeByDefault('A setting has changed that requires a restart to take effect.'),
-            msg: nls.localizeByDefault('Press the restart button to restart {0} and enable the setting.', FrontendApplicationConfigProvider.get().applicationName),
-            ok: nls.localizeByDefault('Restart'),
-            cancel: Dialog.CANCEL,
-        }).open();
-        return shouldRestart === true;
-    }
-
-    async requestWorkspaceTrust(): Promise<boolean | undefined> {
-        if (!this.isWorkspaceTrustResolved()) {
-            const isTrusted = await this.messageService.info(nls.localize('theia/workspace/trustRequest',
-                'An extension requests workspace trust but the corresponding API is not yet fully supported. Do you want to trust this workspace?'),
-                Dialog.YES, Dialog.NO);
-            const trusted = isTrusted === Dialog.YES;
-            this.resolveWorkspaceTrust(trusted);
-        }
-        return this.workspaceTrust.promise;
-    }
-}
+// *****************************************************************************
+// Copyright (C) 2021 EclipseSource and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { ConfirmDialog, Dialog, PreferenceChange, StorageService } from '@theia/core/lib/browser';
+import { PreferenceService } from '@theia/core/lib/browser/preferences/preference-service';
+import { MessageService } from '@theia/core/lib/common/message-service';
+import { nls } from '@theia/core/lib/common/nls';
+import { Deferred } from '@theia/core/lib/common/promise-util';
+import { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
+import { WindowService } from '@theia/core/lib/browser/window/window-service';
+import {
+    WorkspaceTrustPreferences, WORKSPACE_TRUST_EMPTY_WINDOW, WORKSPACE_TRUST_ENABLED, WORKSPACE_TRUST_STARTUP_PROMPT, WorkspaceTrustPrompt
+} from './workspace-trust-preferences';
+import { FrontendApplicationConfigProvider } from '@theia/core/lib/browser/frontend-application-config-provider';
+import { WorkspaceService } from './workspace-service';
+
+const STORAGE_TRUSTED = 'trusted';
+
+@injectable()
+export class WorkspaceTrustService {
+    @inject(WorkspaceService)
+    protected readonly workspaceService: WorkspaceService;
+
+    @inject(PreferenceService)
+    protected readonly preferences: PreferenceService;
+
+    @inject(StorageService)
+    protected readonly storage: StorageService;
+
+    @inject(MessageService)
+    protected readonly messageService: MessageService;
+
+    @inject(WorkspaceTrustPreferences)
+    protected readonly workspaceTrustPref: WorkspaceTrustPreferences;
+
+    @inject(WindowService)
+    protected readonly windowService: WindowService;
+
+    protected workspaceTrust = new Deferred<boolean>();
+
+    @postConstruct()
+    protected init(): void {
+        this.doInit();
+    }
+
+    protected async doInit(): Promise<void> {
+        await this.workspaceService.ready;
+        await this.resolveWorkspaceTrust();
+        this.preferences.onPreferenceChanged(change => this.handlePreferenceChange(change));
+    }
+
+    getWorkspaceTrust(): Promise<boolean> {
+        return this.workspaceTrust.promise;
+    }
+
+    protected async resolveWorkspaceTrust(givenTrust?: boolean): Promise<void> {
+        if (!this.isWorkspaceTrustResolved()) {
+            const trust = givenTrust ?? await this.calculateWorkspaceTrust();
+            if (trust !== undefined) {
+                await this.storeWorkspaceTrust(trust);
+                this.workspaceTrust.resolve(trust);
+            }
+        }
+    }
+
+    protected isWorkspaceTrustResolved(): boolean {
+        return this.workspaceTrust.state !== 'unresolved';
+    }
+
+    protected async calculateWorkspaceTrust(): Promise<boolean | undefined> {
+        if (!this.workspaceTrustPref[WORKSPACE_TRUST_ENABLED]) {
+            // in VS Code if workspace trust is disabled, we implicitly trust the workspace
+            return true;
+        }
+
+        if (this.workspaceTrustPref[WORKSPACE_TRUST_EMPTY_WINDOW] && !this.workspaceService.workspace) {
+            return true;
+        }
+
+        if (this.workspaceTrustPref[WORKSPACE_TRUST_STARTUP_PROMPT] === WorkspaceTrustPrompt.NEVER) {
+            return false;
+        }
+
+        return this.loadWorkspaceTrust();
+    }
+
+    protected async loadWorkspaceTrust(): Promise<boolean | undefined> {
+        if (this.workspaceTrustPref[WORKSPACE_TRUST_STARTUP_PROMPT] === WorkspaceTrustPrompt.ONCE) {
+            return this.storage.getData<boolean>(STORAGE_TRUSTED);
+        }
+    }
+
+    protected async storeWorkspaceTrust(trust: boolean): Promise<void> {
+        if (this.workspaceTrustPref[WORKSPACE_TRUST_STARTUP_PROMPT] === WorkspaceTrustPrompt.ONCE) {
+            return this.storage.setData(STORAGE_TRUSTED, trust);
+        }
+    }
+
+    protected async handlePreferenceChange(change: PreferenceChange): Promise<void> {
+        if (change.preferenceName === WORKSPACE_TRUST_STARTUP_PROMPT && change.newValue !== WorkspaceTrustPrompt.ONCE) {
+            this.storage.setData(STORAGE_TRUSTED, undefined);
+        }
+
+        if (change.preferenceName === WORKSPACE_TRUST_ENABLED && this.isWorkspaceTrustResolved() && await this.confirmRestart()) {
+            this.windowService.setSafeToShutDown();
+            this.windowService.reload();
+        }
+
+        if (change.preferenceName === WORKSPACE_TRUST_ENABLED || change.preferenceName === WORKSPACE_TRUST_EMPTY_WINDOW) {
+            this.resolveWorkspaceTrust();
+        }
+    }
+
+    protected async confirmRestart(): Promise<boolean> {
+        const shouldRestart = await new ConfirmDialog({
+            title: nls.localizeByDefault('A setting has changed that requires a restart to take effect.'),
+            msg: nls.localizeByDefault('Press the restart button to restart {0} and enable the setting.', FrontendApplicationConfigProvider.get().applicationName),
+            ok: nls.localizeByDefault('Restart'),
+            cancel: Dialog.CANCEL,
+        }).open();
+        return shouldRestart === true;
+    }
+
+    async requestWorkspaceTrust(): Promise<boolean | undefined> {
+        if (!this.isWorkspaceTrustResolved()) {
+            const isTrusted = await this.messageService.info(nls.localize('theia/workspace/trustRequest',
+                'An extension requests workspace trust but the corresponding API is not yet fully supported. Do you want to trust this workspace?'),
+                Dialog.YES, Dialog.NO);
+            const trusted = isTrusted === Dialog.YES;
+            this.resolveWorkspaceTrust(trusted);
+        }
+        return this.workspaceTrust.promise;
+    }
+}