Merge from vscode b12f623603e2fc1c5b3037115fa37c1a6acc4165 (#6760)

This commit is contained in:
Anthony Dresser
2019-08-15 02:19:31 -07:00
committed by GitHub
parent 4966ed8b42
commit 58bfba4b47
161 changed files with 2072 additions and 1317 deletions

View File

@@ -158,9 +158,9 @@ export class KeyboardLayoutPickerAction extends Action {
await this.fileService.resolve(file).then(undefined, (error) => {
return this.fileService.createFile(file, VSBuffer.fromString(KeyboardLayoutPickerAction.DEFAULT_CONTENT));
}).then((stat): Promise<IEditor | null> | null => {
}).then((stat): Promise<IEditor | undefined> | undefined => {
if (!stat) {
return null;
return undefined;
}
return this.editorService.openEditor({
resource: stat.resource,