Merge from vscode 2b0b9136329c181a9e381463a1f7dc3a2d105a34 (#4880)

This commit is contained in:
Karl Burtram
2019-04-05 10:09:18 -07:00
committed by GitHub
parent 9bd7e30d18
commit cb5bcf2248
433 changed files with 8915 additions and 8361 deletions

View File

@@ -53,7 +53,7 @@ export class PreferencesContribution implements IWorkbenchContribution {
private handleSettingsEditorOverride(): void {
// dispose any old listener we had
this.editorOpeningListener = dispose(this.editorOpeningListener);
dispose(this.editorOpeningListener);
// install editor opening listener unless user has disabled this
if (!!this.configurationService.getValue(USE_SPLIT_JSON_SETTING)) {
@@ -144,7 +144,7 @@ export class PreferencesContribution implements IWorkbenchContribution {
}
dispose(): void {
this.editorOpeningListener = dispose(this.editorOpeningListener);
this.settingsListener = dispose(this.settingsListener);
dispose(this.editorOpeningListener);
dispose(this.settingsListener);
}
}