fix upgrade path for new serialization model (#8489)

This commit is contained in:
Anthony Dresser
2019-11-27 12:48:54 -08:00
committed by GitHub
parent 5235a1d029
commit d08fb1aee2
2 changed files with 26 additions and 7 deletions

View File

@@ -17,6 +17,7 @@ import { coalesce, firstIndex } from 'vs/base/common/arrays';
import { UntitledEditorInput } from 'vs/workbench/common/editor/untitledEditorInput';
import { FileEditorInput } from 'vs/workbench/contrib/files/common/editors/fileEditorInput';
import { QueryEditorInput } from 'sql/workbench/contrib/query/common/queryEditorInput';
import { doHandleUpgrade } from 'sql/workbench/common/languageAssociation';
const EditorOpenPositioning = {
LEFT: 'left',
@@ -688,7 +689,7 @@ export class EditorGroup extends Disposable {
this.editors = coalesce(data.editors.map(e => {
const factory = registry.getEditorInputFactory(e.id);
if (factory) {
const editor = factory.deserialize(this.instantiationService, e.value);
const editor = this.instantiationService.invokeFunction(doHandleUpgrade, factory.deserialize(this.instantiationService, e.value)); // {{SQL CARBON EDIT}} handle upgrade path to new serialization
if (editor) {
this.registerEditorListeners(editor);
this.updateResourceMap(editor, false /* add */);