Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2025-12-24 20:26:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #120343

Browse Source
This commit is contained in:
Sandeep Somavarapu
2021-04-01 14:52:22 +02:00
parent 5dc3db6ca2
commit be5170cc19
1 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/vs/workbench/contrib/preferences/browser/preferencesEditor.ts
View File

@@ -1025,24 +1025,21 @@ export class DefaultPreferencesEditor extends BaseTextEditor {
return options;
}
setInput(input: DefaultPreferencesEditorInput, options: EditorOptions | undefined, context: IEditorOpenContext, token: CancellationToken): Promise<void> {
return super.setInput(input, options, context, token)
.then(() => this.input!.resolve()
.then<any>(editorModel => {
if (token.isCancellationRequested) {
return undefined;
}
return editorModel!.resolve();
})
.then(editorModel => {
if (token.isCancellationRequested) {
return;
}
const editor = assertIsDefined(this.getControl());
editor.setModel((<ResourceEditorModel>editorModel).textEditorModel);
}));
async setInput(input: DefaultPreferencesEditorInput, options: EditorOptions | undefined, context: IEditorOpenContext, token: CancellationToken): Promise<void> {
await super.setInput(input, options, context, token);
const editorModel = await this.input!.resolve();
if (!editorModel) {
return;
}
if (token.isCancellationRequested) {
return;
}
await editorModel.resolve();
if (token.isCancellationRequested) {
return;
}
const editor = assertIsDefined(this.getControl());
editor.setModel((<ResourceEditorModel>editorModel).textEditorModel);
}
clearInput(): void {