sandbox - move fileDialogService to sandbox

Benjamin Pasero · Benjamin Pasero · commit 96bd9fa91e3d · 2020-06-22T10:32:47.000+02:00
diff --git a/src/vs/workbench/services/dialogs/browser/abstractFileDialogService.ts b/src/vs/workbench/services/dialogs/browser/abstractFileDialogService.ts
@@ -219,21 +219,17 @@ export abstract class AbstractFileDialogService implements IFileDialogService {
 	}
 
 	private pickResource(options: IOpenDialogOptions): Promise<URI | undefined> {
-		const simpleFileDialog = this.createSimpleFileDialog();
+		const simpleFileDialog = this.instantiationService.createInstance(SimpleFileDialog);
 
 		return simpleFileDialog.showOpenDialog(options);
 	}
 
 	private saveRemoteResource(options: ISaveDialogOptions): Promise<URI | undefined> {
-		const remoteFileDialog = this.createSimpleFileDialog();
+		const remoteFileDialog = this.instantiationService.createInstance(SimpleFileDialog);
 
 		return remoteFileDialog.showSaveDialog(options);
 	}
 
-	protected createSimpleFileDialog(): SimpleFileDialog {
-		return this.instantiationService.createInstance(SimpleFileDialog);
-	}
-
 	protected getSchemeFilterForWindow(): string {
 		return !this.environmentService.configuration.remoteAuthority ? Schemas.file : REMOTE_HOST_SCHEME;
 	}
diff --git a/src/vs/workbench/services/dialogs/electron-browser/simpleFileDialog.ts b/src/vs/workbench/services/dialogs/electron-browser/simpleFileDialog.ts
diff --git a/src/vs/workbench/services/dialogs/electron-sandbox/fileDialogService.ts b/src/vs/workbench/services/dialogs/electron-sandbox/fileDialogService.ts
@@ -21,8 +21,6 @@ import { Schemas } from 'vs/base/common/network';
 import { IModeService } from 'vs/editor/common/services/modeService';
 import { IWorkspacesService } from 'vs/platform/workspaces/common/workspaces';
 import { ILabelService } from 'vs/platform/label/common/label';
-import { SimpleFileDialog } from 'vs/workbench/services/dialogs/browser/simpleFileDialog';
-import { NativeSimpleFileDialog } from 'vs/workbench/services/dialogs/electron-browser/simpleFileDialog';
 
 export class FileDialogService extends AbstractFileDialogService implements IFileDialogService {
 
@@ -191,10 +189,6 @@ export class FileDialogService extends AbstractFileDialogService implements IFil
 		// Don't allow untitled schema through.
 		return schema === Schemas.untitled ? [Schemas.file] : (schema !== Schemas.file ? [schema, Schemas.file] : [schema]);
 	}
-
-	protected createSimpleFileDialog(): SimpleFileDialog {
-		return this.instantiationService.createInstance(NativeSimpleFileDialog);
-	}
 }
 
 registerSingleton(IFileDialogService, FileDialogService, true);
diff --git a/src/vs/workbench/workbench.desktop.main.ts b/src/vs/workbench/workbench.desktop.main.ts
@@ -34,7 +34,6 @@ import 'vs/workbench/electron-browser/desktop.main';
 
 //#region --- workbench services
 
-import 'vs/workbench/services/dialogs/electron-browser/fileDialogService';
 import 'vs/workbench/services/integrity/node/integrityService';
 import 'vs/workbench/services/textMate/electron-browser/textMateService';
 import 'vs/workbench/services/search/node/searchService';
diff --git a/src/vs/workbench/workbench.sandbox.main.ts b/src/vs/workbench/workbench.sandbox.main.ts
@@ -19,6 +19,7 @@ import 'vs/workbench/workbench.common.main';
 
 //#region --- workbench services
 
+import 'vs/workbench/services/dialogs/electron-sandbox/fileDialogService';
 import 'vs/workbench/services/workspaces/electron-sandbox/workspacesService';
 import 'vs/workbench/services/userDataSync/electron-sandbox/storageKeysSyncRegistryService';
 import 'vs/workbench/services/menubar/electron-sandbox/menubarService';
@@ -32,7 +33,6 @@ import 'vs/workbench/services/request/electron-sandbox/requestService';
 import 'vs/workbench/services/extensionResourceLoader/electron-sandbox/extensionResourceLoaderService';
 import 'vs/workbench/services/clipboard/electron-sandbox/clipboardService';
 
-
 //#endregion
 
 

Original file line number	Diff line number	Diff line change
`@@ -219,21 +219,17 @@ export abstract class AbstractFileDialogService implements IFileDialogService {`
`219`	`219`	`}`
`220`	`220`
`221`	`221`	`private pickResource(options: IOpenDialogOptions): Promise<URI \| undefined> {`
`222`		`- const simpleFileDialog = this.createSimpleFileDialog();`
	`222`	`+ const simpleFileDialog = this.instantiationService.createInstance(SimpleFileDialog);`
`223`	`223`
`224`	`224`	`return simpleFileDialog.showOpenDialog(options);`
`225`	`225`	`}`
`226`	`226`
`227`	`227`	`private saveRemoteResource(options: ISaveDialogOptions): Promise<URI \| undefined> {`
`228`		`- const remoteFileDialog = this.createSimpleFileDialog();`
	`228`	`+ const remoteFileDialog = this.instantiationService.createInstance(SimpleFileDialog);`
`229`	`229`
`230`	`230`	`return remoteFileDialog.showSaveDialog(options);`
`231`	`231`	`}`
`232`	`232`
`233`		`- protected createSimpleFileDialog(): SimpleFileDialog {`
`234`		`- return this.instantiationService.createInstance(SimpleFileDialog);`
`235`		`- }`
`236`		`-`
`237`	`233`	`protected getSchemeFilterForWindow(): string {`
`238`	`234`	`return !this.environmentService.configuration.remoteAuthority ? Schemas.file : REMOTE_HOST_SCHEME;`
`239`	`235`	`}`