From 94e6480fcb08b03a54730596321d78b47c529744 Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Wed, 13 Feb 2019 12:41:03 -0800 Subject: [PATCH] Strict null fixes in dialogService --- .../services/dialogs/electron-browser/dialogService.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/vs/workbench/services/dialogs/electron-browser/dialogService.ts b/src/vs/workbench/services/dialogs/electron-browser/dialogService.ts index 769835433d6..4cc73dadcfe 100644 --- a/src/vs/workbench/services/dialogs/electron-browser/dialogService.ts +++ b/src/vs/workbench/services/dialogs/electron-browser/dialogService.ts @@ -227,7 +227,7 @@ export class FileDialogService implements IFileDialogService { if (schema !== Schemas.file) { const title = nls.localize('openFileOrFolder.title', 'Open File Or Folder'); const availableFileSystems = [schema, Schemas.file]; // always allow file as well - return this.pickRemoteResourceAndOpen({ canSelectFiles: true, canSelectFolders: true, canSelectMany: false, defaultUri: options.defaultUri, title, availableFileSystems }, options.forceNewWindow, true); + return this.pickRemoteResourceAndOpen({ canSelectFiles: true, canSelectFolders: true, canSelectMany: false, defaultUri: options.defaultUri, title, availableFileSystems }, !!options.forceNewWindow, true); } return this.windowService.pickFileFolderAndOpen(this.toNativeOpenDialogOptions(options)); @@ -243,7 +243,7 @@ export class FileDialogService implements IFileDialogService { if (schema !== Schemas.file) { const title = nls.localize('openFile.title', 'Open File'); const availableFileSystems = [schema, Schemas.file]; // always allow file as well - return this.pickRemoteResourceAndOpen({ canSelectFiles: true, canSelectFolders: false, canSelectMany: false, defaultUri: options.defaultUri, title, availableFileSystems }, options.forceNewWindow, true); + return this.pickRemoteResourceAndOpen({ canSelectFiles: true, canSelectFolders: false, canSelectMany: false, defaultUri: options.defaultUri, title, availableFileSystems }, !!options.forceNewWindow, true); } return this.windowService.pickFileAndOpen(this.toNativeOpenDialogOptions(options)); @@ -259,7 +259,7 @@ export class FileDialogService implements IFileDialogService { if (schema !== Schemas.file) { const title = nls.localize('openFolder.title', 'Open Folder'); const availableFileSystems = [schema, Schemas.file]; // always allow file as well - return this.pickRemoteResourceAndOpen({ canSelectFiles: false, canSelectFolders: true, canSelectMany: false, defaultUri: options.defaultUri, title, availableFileSystems }, options.forceNewWindow, false); + return this.pickRemoteResourceAndOpen({ canSelectFiles: false, canSelectFolders: true, canSelectMany: false, defaultUri: options.defaultUri, title, availableFileSystems }, !!options.forceNewWindow, false); } return this.windowService.pickFolderAndOpen(this.toNativeOpenDialogOptions(options)); @@ -276,7 +276,7 @@ export class FileDialogService implements IFileDialogService { const title = nls.localize('openWorkspace.title', 'Open Workspace'); const filters: FileFilter[] = [{ name: nls.localize('filterName.workspace', 'Workspace'), extensions: [WORKSPACE_EXTENSION] }]; const availableFileSystems = [schema, Schemas.file]; // always allow file as well - return this.pickRemoteResourceAndOpen({ canSelectFiles: true, canSelectFolders: false, canSelectMany: false, defaultUri: options.defaultUri, title, filters, availableFileSystems }, options.forceNewWindow, false); + return this.pickRemoteResourceAndOpen({ canSelectFiles: true, canSelectFolders: false, canSelectMany: false, defaultUri: options.defaultUri, title, filters, availableFileSystems }, !!options.forceNewWindow, false); } -- GitLab