From d781c69d7ed8e60733d83cd40c484d60280b95ab Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Thu, 28 Oct 2021 09:35:36 +0200 Subject: [PATCH] sandbox - enable sandboxed file service by default --- src/vs/workbench/contrib/files/browser/files.contribution.ts | 3 +-- src/vs/workbench/electron-browser/desktop.main.ts | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/vs/workbench/contrib/files/browser/files.contribution.ts b/src/vs/workbench/contrib/files/browser/files.contribution.ts index 732be379785..93a7e0503e5 100644 --- a/src/vs/workbench/contrib/files/browser/files.contribution.ts +++ b/src/vs/workbench/contrib/files/browser/files.contribution.ts @@ -34,7 +34,6 @@ import { IUndoRedoService } from 'vs/platform/undoRedo/common/undoRedo'; import { IExplorerService } from 'vs/workbench/contrib/files/browser/files'; import { FileEditorInputSerializer, FileEditorWorkingCopyEditorHandler } from 'vs/workbench/contrib/files/browser/editors/fileEditorHandler'; import { ModesRegistry } from 'vs/editor/common/modes/modesRegistry'; -import product from 'vs/platform/product/common/product'; class FileUriLabelContribution implements IWorkbenchContribution { @@ -311,7 +310,7 @@ configurationRegistry.registerConfiguration({ 'files.experimentalSandboxedFileService': { 'type': 'boolean', 'description': nls.localize('files.experimentalSandboxedFileService', "Experimental: changes the file service to be sandboxed. Do not change this unless instructed!"), - 'default': product.quality !== 'stable', + 'default': true, 'scope': ConfigurationScope.APPLICATION }, } diff --git a/src/vs/workbench/electron-browser/desktop.main.ts b/src/vs/workbench/electron-browser/desktop.main.ts index 6a7d67b1b3b..3ea765d1884 100644 --- a/src/vs/workbench/electron-browser/desktop.main.ts +++ b/src/vs/workbench/electron-browser/desktop.main.ts @@ -14,7 +14,6 @@ import { INativeHostService } from 'vs/platform/native/electron-sandbox/native'; import { SharedDesktopMain } from 'vs/workbench/electron-sandbox/shared.desktop.main'; import { IMainProcessService } from 'vs/platform/ipc/electron-sandbox/services'; import { ISharedProcessWorkerWorkbenchService } from 'vs/workbench/services/sharedProcess/electron-sandbox/sharedProcessWorkerWorkbenchService'; -import product from 'vs/platform/product/common/product'; class DesktopMain extends SharedDesktopMain { @@ -28,7 +27,7 @@ class DesktopMain extends SharedDesktopMain { // Local Files let diskFileSystemProvider: ElectronFileSystemProvider | SandboxedDiskFileSystemProvider; - if (this.configuration.experimentalSandboxedFileService ?? product.quality !== 'stable') { + if (this.configuration.experimentalSandboxedFileService !== false) { logService.info('[FileService]: Using sandbox ready file system provider'); diskFileSystemProvider = this._register(new SandboxedDiskFileSystemProvider(mainProcessService, sharedProcessWorkerWorkbenchService, logService)); } else {