Merge from vscode 52dcb723a39ae75bee1bd56b3312d7fcdc87aeed (#6719)

This commit is contained in:
Anthony Dresser
2019-08-12 21:31:51 -07:00
committed by GitHub
parent 00250839fc
commit 7eba8c4c03
616 changed files with 9472 additions and 7087 deletions

View File

@@ -153,7 +153,7 @@ function createAriaDomNode() {
*/
export class StandaloneCodeEditor extends CodeEditorWidget implements IStandaloneCodeEditor {
private readonly _standaloneKeybindingService: StandaloneKeybindingService;
private readonly _standaloneKeybindingService: StandaloneKeybindingService | null;
constructor(
domElement: HTMLElement,
@@ -178,6 +178,8 @@ export class StandaloneCodeEditor extends CodeEditorWidget implements IStandalon
if (keybindingService instanceof StandaloneKeybindingService) {
this._standaloneKeybindingService = keybindingService;
} else {
this._standaloneKeybindingService = null;
}
// Create the ARIA dom node as soon as the first editor is instantiated