ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-08 01:28:26 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode 2cd495805cf99b31b6926f08ff4348124b2cf73d

Browse Source
This commit is contained in:
ADS Merger
2020-06-30 04:40:21 +00:00
committed by AzureDataStudio
parent a8a7559229
commit 1388493cc1
602 changed files with 16375 additions and 12940 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/vs/workbench/services/textmodelResolver/common/textModelResolverService.ts
View File

@@ -33,7 +33,11 @@ class ResourceModelCollection extends ReferenceCollection<Promise<ITextEditorMod
super();
}
async createReferencedObject(key: string, skipActivateProvider?: boolean): Promise<ITextEditorModel> {
createReferencedObject(key: string): Promise<ITextEditorModel> {
return this.doCreateReferencedObject(key);
}
private async doCreateReferencedObject(key: string, skipActivateProvider?: boolean): Promise<ITextEditorModel> {
// Untrack as being disposed
this.modelsToDispose.delete(key);
@@ -70,7 +74,7 @@ class ResourceModelCollection extends ReferenceCollection<Promise<ITextEditorMod
if (!skipActivateProvider) {
await this.fileService.activateProvider(resource.scheme);
return this.createReferencedObject(key, true);
return this.doCreateReferencedObject(key, true);
}
throw new Error(`Unable to resolve resource ${key}`);
@@ -179,6 +183,7 @@ export class TextModelResolverService extends Disposable implements ITextModelSe
@IUriIdentityService private readonly uriIdentityService: IUriIdentityService,
) {
super();
this._register(new ModelUndoRedoParticipant(this.modelService, this, this.undoRedoService));
}